Author: qboosh Date: Fri Oct 27 22:46:48 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 3.2.5_alpha7
---- Files affected:
SOURCES:
transfig-badc.patch (1.1 -> 1.2) , transfig-broken.patch (1.1 -> 1.2) ,
transfig-config.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/transfig-badc.patch
diff -u SOURCES/transfig-badc.patch:1.1 SOURCES/transfig-badc.patch:1.2
--- SOURCES/transfig-badc.patch:1.1 Mon Feb 20 23:08:17 2006
+++ SOURCES/transfig-badc.patch Sat Oct 28 00:46:43 2006
@@ -1,16 +1,3 @@
-diff -ur transfig/fig2dev/fig2dev.c transfig.3.2.4/fig2dev/fig2dev.c
---- transfig/fig2dev/fig2dev.c 2004-10-18 22:19:04.396035488 +0200
-+++ transfig.3.2.4/fig2dev/fig2dev.c 2004-10-18 22:30:39.739327240 +0200
-@@ -707,7 +707,8 @@
- depth_usage();
- switch(*s) { /* what's the delim? */
- case ':': /* parse a range */
-- d->d2 = strtol(++s,&s,10);
-+ s++;
-+ d->d2 = strtol(s,&s,10);
- if (d->d2 < d->d1)
- depth_usage();
- break;
diff -ur transfig/transfig/sys.c transfig.3.2.4/transfig/sys.c
--- transfig/transfig/sys.c 2004-10-18 22:19:04.000000000 +0200
+++ transfig.3.2.4/transfig/sys.c 2004-10-18 23:04:48.129924536 +0200
================================================================
Index: SOURCES/transfig-broken.patch
diff -u SOURCES/transfig-broken.patch:1.1 SOURCES/transfig-broken.patch:1.2
--- SOURCES/transfig-broken.patch:1.1 Sun Jul 13 23:03:37 2003
+++ SOURCES/transfig-broken.patch Sat Oct 28 00:46:43 2006
@@ -1,29 +1,38 @@
---- transfig.3.2.4/fig2dev/dev/genemf.c.orig 2003-06-17 10:18:43.000000000
-0400
-+++ transfig.3.2.4/fig2dev/dev/genemf.c 2003-06-17 10:18:34.000000000
-0400
-@@ -375,7 +375,7 @@
- static void rotate();
+--- transfig.3.2.5_alpha7/fig2dev/dev/genemf.c.orig 2004-02-10
17:32:02.000000000 +0100
++++ transfig.3.2.5_alpha7/fig2dev/dev/genemf.c 2006-10-28 00:20:55.363664750
+0200
+@@ -683,7 +683,7 @@
static void shape();
static void shape_interior();
+ static void textunicode();
-static void text();
+static void textfunc();
- static void textangle();
static void textcolr();
- static void textfont();
-@@ -1788,7 +1788,7 @@
- }
+ static void textalign();
+ #if defined(I18N) && defined(USE_ICONV)
+@@ -3000,7 +3000,7 @@
+ }/* end textunicode */
--static void text(x, y, h, l, text, type)
-+static void textfunc(x, y, h, l, text, type)
- int x, y;
- double h, l; /* Pixels (1200 dpi) */
- char *text;
-@@ -2206,7 +2206,7 @@
- texttype(t->type);
- textcolr(t->color);
- textangle(t->angle);
-- text(t->base_x, t->base_y, t->height, t->length, t->cstring, t->type);
-+ textfunc(t->base_x, t->base_y, t->height, t->length, t->cstring, t->type);
- }
+-static void text(x, y, bbx, str)
++static void textfunc(x, y, bbx, str)
+ int x, y; /* reference point */
+ RECTL *bbx; /* bounding box */
+ char *str;
+@@ -3482,7 +3482,7 @@
+ bak = *s1;
+ *s1 = '\0';
+
+- text(0, 0, &rclBounds, s);
++ textfunc(0, 0, &rclBounds, s);
+
+ *s1 = bak;
+ }
+@@ -3508,7 +3508,7 @@
+ }
+
+ textfont(font, t->size, round(t->angle * RAD_01DEG));
+- text(t->base_x, t->base_y, &rclBounds, t->cstring);
++ textfunc(t->base_x, t->base_y, &rclBounds, t->cstring);
+ }/* end genemf_text */
================================================================
Index: SOURCES/transfig-config.patch
diff -u SOURCES/transfig-config.patch:1.4 SOURCES/transfig-config.patch:1.5
--- SOURCES/transfig-config.patch:1.4 Mon Feb 20 23:27:36 2006
+++ SOURCES/transfig-config.patch Sat Oct 28 00:46:43 2006
@@ -1,6 +1,6 @@
---- transfig.3.2.4/fig2dev/Imakefile.orig Thu Dec 19 18:33:44 2002
-+++ transfig.3.2.4/fig2dev/Imakefile Tue Mar 25 01:38:21 2003
-@@ -20,7 +20,7 @@
+--- transfig.3.2.5_alpha7/fig2dev/Imakefile.orig 2005-10-27
18:56:02.000000000 +0200
++++ transfig.3.2.5_alpha7/fig2dev/Imakefile 2006-10-28 00:17:31.890948500
+0200
+@@ -34,7 +34,7 @@
XCOMM You should point XFIGLIBDIR to the same directory you did when you
compiled
XCOMM and installed xfig.
@@ -8,8 +8,8 @@
+XFIGLIBDIR = /usr/share/xfig
XCOMM ******
- XCOMM If your system has the strerror() function (doesn't have sys_errlist)
then
-@@ -48,7 +48,7 @@
+ XCOMM If your system doesn't have the strerror() function (has sys_errlist)
then
+@@ -62,7 +62,7 @@
XCOMM the full name (rgb.txt) now.
XCOMM
@@ -18,30 +18,25 @@
XCOMM Comment out the following #define USEPNG if you don't want PNG support
XCOMM Uncomment the #define for USEPNG if you want to be able to import
-@@ -61,7 +61,7 @@
-
+@@ -76,7 +76,7 @@
#ifdef USEPNG
PNGLIBDIR = $(USRLIBDIR)
+ ZLIBDIR = $(USRLIBDIR)
-PNGINC = -I/usr/include/X11
+PNGINC =
#endif
XCOMM ****************
-@@ -126,11 +126,11 @@
+@@ -141,7 +141,7 @@
#ifdef I18N
I18N_DEFS = -DI18N
-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
+FIG2DEV_LIBDIR = /usr/share/fig2dev
- I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\"
+ I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR)
-DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\"
- install::
-- [ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir $(DESTDIR)$(FIG2DEV_LIBDIR)
-+ [ -d $(DESTDIR)$(FIG2DEV_LIBDIR) ] || mkdir -p
$(DESTDIR)$(FIG2DEV_LIBDIR)
- $(INSTALL) -c dev/japanese.ps $(DESTDIR)$(FIG2DEV_LIBDIR)
- ( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \
- rm -f ja.ps ja_JP.ps ja_JP.ujis.ps ja_JP.eucJP.ps ja_JP.EUC.ps; \
-@@ -154,7 +154,7 @@
+ #endif /* I18N */
+@@ -150,7 +150,7 @@
XCOMM *** You shouldn't have to change anything below this point ***
XCOMM **************************************************************
@@ -50,7 +45,7 @@
#ifdef USEPNG
DUSEPNG = -DUSE_PNG
-@@ -229,11 +229,11 @@
+@@ -225,11 +225,11 @@
XCOMM Install the tk bitmaps here
install::
@(cd bitmaps ; \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/transfig-badc.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/transfig-broken.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/transfig-config.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
