Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12157/10.4-transitional/stable/main/finkinfo/gnome
Modified Files:
gnome-libs.patch
Log Message:
Move fixed patchfile from unstable
Index: gnome-libs.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/gnome/gnome-libs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gnome-libs.patch 13 May 2005 12:57:31 -0000 1.3
+++ gnome-libs.patch 10 Jun 2005 16:25:43 -0000 1.4
@@ -1,6 +1,6 @@
-diff -ruN gnome-libs-1.4.2/configure gnome-libs-1.4.2-patched/configure
---- gnome-libs-1.4.2/configure 2002-08-16 07:24:44.000000000 +0900
-+++ gnome-libs-1.4.2-patched/configure 2005-05-10 23:46:00.000000000 +0900
+diff -Naur gnome-libs-1.4.2/configure gnome-libs-new/configure
+--- gnome-libs-1.4.2/configure 2002-08-15 18:24:44.000000000 -0400
++++ gnome-libs-new/configure 2005-05-22 15:47:13.000000000 -0400
@@ -3578,14 +3578,14 @@
;;
@@ -19,9 +19,9 @@
hardcode_shlibpath_var=no
whole_archive_flag_spec='-all_load $convenience'
;;
-diff -ruN gnome-libs-1.4.2/gtk-xmhtml/Makefile.in
gnome-libs-1.4.2-patched/gtk-xmhtml/Makefile.in
---- gnome-libs-1.4.2/gtk-xmhtml/Makefile.in 2002-08-16 07:25:39.000000000
+0900
-+++ gnome-libs-1.4.2-patched/gtk-xmhtml/Makefile.in 2005-05-10
23:40:50.000000000 +0900
+diff -Naur gnome-libs-1.4.2/gtk-xmhtml/Makefile.in
gnome-libs-new/gtk-xmhtml/Makefile.in
+--- gnome-libs-1.4.2/gtk-xmhtml/Makefile.in 2002-08-15 18:25:39.000000000
-0400
++++ gnome-libs-new/gtk-xmhtml/Makefile.in 2005-05-22 15:47:13.000000000
-0400
@@ -211,7 +211,7 @@
htmltest_SOURCES = test.c
@@ -31,9 +31,46 @@
EXTRA_DIST = gtk-xmhtml.c XmHTML-motif.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-diff -ruN gnome-libs-1.4.2/libart_lgpl/configure
gnome-libs-1.4.2-patched/libart_lgpl/configure
---- gnome-libs-1.4.2/libart_lgpl/configure 2002-08-01 23:30:58.000000000
+0900
-+++ gnome-libs-1.4.2-patched/libart_lgpl/configure 2005-05-10
23:49:21.000000000 +0900
+diff -Naur gnome-libs-1.4.2/gtk-xmhtml/colors.c
gnome-libs-new/gtk-xmhtml/colors.c
+--- gnome-libs-1.4.2/gtk-xmhtml/colors.c 2002-08-06 17:25:41.000000000
-0400
++++ gnome-libs-new/gtk-xmhtml/colors.c 2005-05-22 15:47:13.000000000 -0400
+@@ -292,33 +292,6 @@
+ #define BMASK 0xc0
+ #define BSHIFT 6
+
+-/* XXX: This function does an XQueryColors() the hard way, because there is
+- * no corresponding function in Gdk.
+- */
+-#ifndef WITH_MOTIF
+-static void
+-my_x_query_colors(GdkColormap *colormap,
+- GdkColor *colors,
+- gint ncolors)
+-{
+- XColor *xcolors;
+- gint i;
+-
+- xcolors = g_new(XColor, ncolors);
+- for (i = 0; i < ncolors; i++)
+- xcolors[i].pixel = colors[i].pixel;
+-
+- XQueryColors(gdk_display, GDK_COLORMAP_XCOLORMAP(colormap), xcolors,
ncolors);
+-
+- for (i = 0; i < ncolors; i++) {
+- colors[i].red = xcolors[i].red;
+- colors[i].green = xcolors[i].green;
+- colors[i].blue = xcolors[i].blue;
+- }
+-
+- g_free(xcolors);
+-}
+-#endif
+ /*****
+ * Name: tryColor
+ * Return Type: Boolean
+diff -Naur gnome-libs-1.4.2/libart_lgpl/configure
gnome-libs-new/libart_lgpl/configure
+--- gnome-libs-1.4.2/libart_lgpl/configure 2002-08-01 10:30:58.000000000
-0400
++++ gnome-libs-new/libart_lgpl/configure 2005-05-22 15:47:13.000000000
-0400
@@ -3329,14 +3329,14 @@
;;
@@ -52,21 +89,21 @@
hardcode_shlibpath_var=no
whole_archive_flag_spec='-all_load $convenience'
;;
-diff -ruN gnome-libs-1.4.2/libgnorba/Makefile.in
gnome-libs-1.4.2-patched/libgnorba/Makefile.in
---- gnome-libs-1.4.2/libgnorba/Makefile.in 2002-08-16 07:25:44.000000000
+0900
-+++ gnome-libs-1.4.2-patched/libgnorba/Makefile.in 2005-05-10
23:40:51.000000000 +0900
+diff -Naur gnome-libs-1.4.2/libgnorba/Makefile.in
gnome-libs-new/libgnorba/Makefile.in
+--- gnome-libs-1.4.2/libgnorba/Makefile.in 2002-08-15 18:25:44.000000000
-0400
++++ gnome-libs-new/libgnorba/Makefile.in 2005-05-22 15:47:36.000000000
-0400
@@ -229,7 +229,7 @@
libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir)
-libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
-+libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) ../libgnome/libgnome.la
$(GNOME_LIBS) $(GTK_LIBS) -lm
++libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) ../libgnome/libgnome.la
$(GTK_LIBS) -lm
loadshlib_SOURCES = loadshlib.c
-diff -ruN gnome-libs-1.4.2/ltmain.sh gnome-libs-1.4.2-patched/ltmain.sh
---- gnome-libs-1.4.2/ltmain.sh 2002-08-01 23:30:57.000000000 +0900
-+++ gnome-libs-1.4.2-patched/ltmain.sh 2005-05-10 23:59:49.000000000 +0900
+diff -Naur gnome-libs-1.4.2/ltmain.sh gnome-libs-new/ltmain.sh
+--- gnome-libs-1.4.2/ltmain.sh 2002-08-01 10:30:57.000000000 -0400
++++ gnome-libs-new/ltmain.sh 2005-05-22 15:47:13.000000000 -0400
@@ -1598,10 +1598,17 @@
absdir="$libdir"
fi
@@ -119,9 +156,9 @@
fi
done
fi
-diff -ruN gnome-libs-1.4.2/po/Makefile.in.in
gnome-libs-1.4.2-patched/po/Makefile.in.in
---- gnome-libs-1.4.2/po/Makefile.in.in 2002-08-01 23:30:49.000000000 +0900
-+++ gnome-libs-1.4.2-patched/po/Makefile.in.in 2005-05-10 23:40:51.000000000
+0900
+diff -Naur gnome-libs-1.4.2/po/Makefile.in.in gnome-libs-new/po/Makefile.in.in
+--- gnome-libs-1.4.2/po/Makefile.in.in 2002-08-01 10:30:49.000000000 -0400
++++ gnome-libs-new/po/Makefile.in.in 2005-05-22 15:47:13.000000000 -0400
@@ -106,7 +106,10 @@
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -134,9 +171,9 @@
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(mkinstalldirs) $(DESTDIR)$$dir; \
if test -r $$cat; then \
-diff -ruN gnome-libs-1.4.2/zvt/Makefile.in
gnome-libs-1.4.2-patched/zvt/Makefile.in
---- gnome-libs-1.4.2/zvt/Makefile.in 2002-08-16 07:25:41.000000000 +0900
-+++ gnome-libs-1.4.2-patched/zvt/Makefile.in 2005-05-10 23:40:51.000000000
+0900
+diff -Naur gnome-libs-1.4.2/zvt/Makefile.in gnome-libs-new/zvt/Makefile.in
+--- gnome-libs-1.4.2/zvt/Makefile.in 2002-08-15 18:25:41.000000000 -0400
++++ gnome-libs-new/zvt/Makefile.in 2005-05-22 15:47:13.000000000 -0400
@@ -611,7 +611,7 @@
install-exec-local:
@@ -146,9 +183,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -ruN gnome-libs-1.4.2/zvt/gnome-pty-helper.c
gnome-libs-1.4.2-patched/zvt/gnome-pty-helper.c
---- gnome-libs-1.4.2/zvt/gnome-pty-helper.c 2001-11-25 19:05:45.000000000
+0900
-+++ gnome-libs-1.4.2-patched/zvt/gnome-pty-helper.c 2005-05-10
23:40:51.000000000 +0900
+diff -Naur gnome-libs-1.4.2/zvt/gnome-pty-helper.c
gnome-libs-new/zvt/gnome-pty-helper.c
+--- gnome-libs-1.4.2/zvt/gnome-pty-helper.c 2001-11-25 05:05:45.000000000
-0500
++++ gnome-libs-new/zvt/gnome-pty-helper.c 2005-05-22 15:47:14.000000000
-0400
@@ -646,10 +646,13 @@
if (getrlimit (sensible_limits [i].limit, &rlim) != 0)
continue;
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
