From 138ea8fa8d3f94bbd477c7f86480a6c80c7f1b61 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sat, 24 Dec 2005 14:56:39 +0000 Subject: [PATCH] Clifford Wolf: Updated magicpoint (1.11b) [2005121417013224728] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6804 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/clifford/magicpoint/gcc34.patch | 59 -------------------- package/clifford/magicpoint/head-usage.patch | 8 ++- package/clifford/magicpoint/magicpoint.conf | 2 + package/clifford/magicpoint/magicpoint.desc | 6 +- package/clifford/magicpoint/stdarg.patch | 30 ---------- 5 files changed, 10 insertions(+), 95 deletions(-) delete mode 100644 package/clifford/magicpoint/gcc34.patch delete mode 100644 package/clifford/magicpoint/stdarg.patch diff --git a/package/clifford/magicpoint/gcc34.patch b/package/clifford/magicpoint/gcc34.patch deleted file mode 100644 index 47007b9ae..000000000 --- a/package/clifford/magicpoint/gcc34.patch +++ /dev/null @@ -1,59 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/clifford/magicpoint/gcc34.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./mng.c.orig 2004-05-14 11:27:46.980807688 +0200 -+++ ./mng.c 2004-05-14 11:28:40.725637232 +0200 -@@ -216,7 +216,7 @@ - mymng = (mngstuff*)mng_get_userdata(mng); - - /* pull out the chuck type as a string */ -- // FIXME: does this assume unsigned char? -+ /* FIXME: does this assume unsigned char? */ - chunk[0] = (char)((chunktype >> 24) & 0xFF); - chunk[1] = (char)((chunktype >> 16) & 0xFF); - chunk[2] = (char)((chunktype >> 8) & 0xFF); -@@ -317,7 +317,7 @@ - } - } - --void -+int - mng_window_setup(mymng, x, y, width, height) - mngstuff *mymng; - int x, y; ---- ./scanner.l.orig 2004-05-14 11:25:56.259639864 +0200 -+++ ./scanner.l 2004-05-14 11:26:57.899269216 +0200 -@@ -59,7 +59,7 @@ - #include "tokdefs.h" - - static int stoi __P((char *)); --static inline int xdtoi __P((int)); -+static int xdtoi __P((int)); - - #ifdef FLEX_SCANNER - #define YY_NO_UNPUT -@@ -202,7 +202,7 @@ - } - - /* Hex digit to integer. */ --static inline int -+static int - xdtoi(c) - register int c; - { diff --git a/package/clifford/magicpoint/head-usage.patch b/package/clifford/magicpoint/head-usage.patch index 9374c1b2a..25cb696d0 100644 --- a/package/clifford/magicpoint/head-usage.patch +++ b/package/clifford/magicpoint/head-usage.patch @@ -19,16 +19,18 @@ --- ./configure.orig 2004-05-14 11:24:03.748744120 +0200 +++ ./configure 2004-05-14 11:24:15.483960096 +0200 -@@ -1766,7 +1766,7 @@ - for dir in /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr; do +@@ -4114,8 +4114,8 @@ + for dir in /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr /usr/include/freetype1 /sw; do ac_cv_ft_lib=no ac_cv_ft_include=no - shlib1=`echo $dir/lib/libttf.so* | head -1 | sed -e 's/.*\///'` +- shlib2=`echo $dir/lib/libttf.dylib* | head -1 | sed -e 's/.*\///'` + shlib1=`echo $dir/lib/libttf.so* | head -n 1 | sed -e 's/.*\///'` ++ shlib2=`echo $dir/lib/libttf.dylib* | head -n 1 | sed -e 's/.*\///'` if test x$shlib1 = x; then shlib1=no fi -@@ -1962,8 +1962,8 @@ +@@ -4396,8 +4396,8 @@ ac_cv_vf_libname=VFlib ac_cv_vf_libdir=no ac_cv_vf_hdrdir=no diff --git a/package/clifford/magicpoint/magicpoint.conf b/package/clifford/magicpoint/magicpoint.conf index 6955beb7e..51787e4e5 100644 --- a/package/clifford/magicpoint/magicpoint.conf +++ b/package/clifford/magicpoint/magicpoint.conf @@ -27,6 +27,8 @@ install_ttf() { cp -rv ttf/* $datadir/fonts/ttf/ } +var_append CC_WRAPPER_REMOVE "" "-ansi" + MAKE="$MAKE CCOPTIONS='-DFREETYPEFONTDIR=\\\"$datadir/fonts/ttf\\\"'" postmake=install_ttf diff --git a/package/clifford/magicpoint/magicpoint.desc b/package/clifford/magicpoint/magicpoint.desc index 1e5ad8163..96cdbb2c8 100644 --- a/package/clifford/magicpoint/magicpoint.desc +++ b/package/clifford/magicpoint/magicpoint.desc @@ -38,11 +38,11 @@ [L] GPL [S] Stable -[V] 2.0.4 +[V] 1.11b [P] X -?---5---9 143.300 -[D] 4169413261 magicpoint-1.09a.tar.gz ftp://ftp.mew.org/pub/MagicPoint/ -[D] 3999283226 ttf.tar.gz ftp://ftp.mew.org/pub/MagicPoint/ +[D] 2967622638 magicpoint-1.11b.tar.gz ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/ +[D] 3999283226 ttf.tar.gz ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/ [CV-URL] http://member.wide.ad.jp/wg/mgp/ diff --git a/package/clifford/magicpoint/stdarg.patch b/package/clifford/magicpoint/stdarg.patch deleted file mode 100644 index 80f66466b..000000000 --- a/package/clifford/magicpoint/stdarg.patch +++ /dev/null @@ -1,30 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/clifford/magicpoint/stdarg.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./image/rlelib.c.orig 2003-06-09 12:25:47.000000000 +0200 -+++ ./image/rlelib.c 2003-06-09 12:26:00.000000000 +0200 -@@ -12,7 +12,7 @@ - - #include - #include --#include -+#include - #include - - #include "image.h" /* need ZFILE definition */