diff options
Diffstat (limited to 'gnome-base/gnome-libs/files')
8 files changed, 210 insertions, 0 deletions
diff --git a/gnome-base/gnome-libs/files/gnome-libs-1.4.2-ds-db.diff b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-ds-db.diff new file mode 100644 index 0000000..0d37625 --- /dev/null +++ b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-ds-db.diff @@ -0,0 +1,50 @@ +diff -dPNur gnome-libs-1.4.2/configure.in gnome-libs-1.4.2-ds/configure.in +--- gnome-libs-1.4.2/configure.in 2012-01-15 00:48:44.000000000 +0100 ++++ gnome-libs-1.4.2-ds/configure.in 2012-01-15 00:46:27.000000000 +0100 +@@ -305,43 +305,20 @@ + dnl + DB_LIB= + AC_CHECK_FUNC(dbopen, [], +-if test "$prefer_db1" = "yes"; then +- AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1", +- AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb", +- AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3", +- AC_CHECK_LIB(db-4, __db185_open, DB_LIB="-ldb-4", +- AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode]) +- ) +- ) +- ) +- ) +-else + AC_CHECK_LIB(db, dbopen, DB_LIB="-ldb", +- AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1", ++# AC_CHECK_LIB(db1, dbopen, DB_LIB="-ldb1", + AC_CHECK_LIB(db-3, __db185_open, DB_LIB="-ldb-3", + AC_CHECK_LIB(db-4, __db185_open, DB_LIB="-ldb-4", + AC_MSG_ERROR([Your db library is missing db 1.85 compatibility mode]) + ) + ) + ) +- ) +-fi ++# ) + ) + + dnl look for db headers +-if test "$prefer_db1" = "yes"; then +- AC_CHECK_HEADERS(db_185.h db1/db.h) +- if test "$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nono; then +- AC_MSG_ERROR([Berkeley db library required for Gnome]) +- fi +- AC_DEFINE(PREFER_DB1) +-else +- AC_CHECK_HEADERS(db.h db_185.h db1/db.h) ++AC_CHECK_HEADERS(db.h db_185.h db1/db.h) + +- if test "$ac_cv_header_db_h$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nonono; then +- AC_MSG_ERROR([Berkeley db library required for Gnome]) +- fi +-fi + + dnl + dnl This is needed for the gnome-moz-remote program. It doesn't use GDK, diff --git a/gnome-base/gnome-libs/files/gnome-libs-1.4.2-ds-gmodule.diff b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-ds-gmodule.diff new file mode 100644 index 0000000..e237412 --- /dev/null +++ b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-ds-gmodule.diff @@ -0,0 +1,18 @@ +diff -dPNur gnome-libs-1.4.2/configure.in gnome-libs-1.4.2-ds/configure.in +--- gnome-libs-1.4.2/configure.in 2012-01-15 00:30:56.000000000 +0100 ++++ gnome-libs-1.4.2-ds/configure.in 2012-01-15 00:27:53.000000000 +0100 +@@ -119,13 +119,7 @@ + AC_CACHE_CHECK([for gmodule support], ac_cv_gmodule,[ + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS `glib-config --libs gmodule`" +- AC_TRY_RUN([ +-#include <gmodule.h> +- +-int main() +-{ +- return g_module_supported() == 0; +-}],ac_cv_gmodule=yes,ac_cv_gmodule=no,ac_cv_gmodule=yes) ++ ac_cv_gmodule=yes + LDFLAGS="$save_LDFLAGS"]) + if test $ac_cv_gmodule = no; then + AC_MSG_ERROR([Dynamic linking is not available on this platform. Some apps, diff --git a/gnome-base/gnome-libs/files/gnome-libs-1.4.2-gcc4.patch b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-gcc4.patch new file mode 100644 index 0000000..e9d3625 --- /dev/null +++ b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-gcc4.patch @@ -0,0 +1,13 @@ +diff -urN ../tmp-orig/gnome-libs-1.4.2/gtk-xmhtml/XmHTMLI.h ./gtk-xmhtml/XmHTMLI.h +--- src/gtk-xmhtml/XmHTMLI.h 1999-07-29 03:26:28.000000000 +0200 ++++ new/gtk-xmhtml/XmHTMLI.h 2004-12-22 18:02:43.408331024 +0100 +@@ -1058,9 +1058,6 @@ + #include "gtk-xmhtml-p.h" + + void gtk_xmhtml_set_outline (GtkXmHTML *html, int flag); +-void my_x_query_colors(GdkColormap *colormap, +- GdkColor *colors, +- gint ncolors); + void + gtk_xmhtml_set_colors (GtkXmHTML *html, + Pixel foreground, diff --git a/gnome-base/gnome-libs/files/gnome-libs-1.4.2-gtkdoc_fixes.patch b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-gtkdoc_fixes.patch new file mode 100644 index 0000000..b3d2517 --- /dev/null +++ b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-gtkdoc_fixes.patch @@ -0,0 +1,29 @@ +diff -NurB gnome-libs-1.4.2-orig/libart_lgpl/doc/libart.sgml gnome-libs-1.4.2/libart_lgpl/doc/libart.sgml +--- gnome-libs-1.4.2-orig/libart_lgpl/doc/libart.sgml 2004-04-03 13:41:19.000000000 -0500 ++++ gnome-libs-1.4.2/libart_lgpl/doc/libart.sgml 2004-04-03 13:47:44.000000000 -0500 +@@ -1,5 +1,4 @@ + <!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [ +-<!entity FDL SYSTEM "fdl.sgml"> + <!entity art-construction-core SYSTEM "sgml/art_construction_core.sgml"> + <!entity art-construction-extended SYSTEM "sgml/art_construction_extended.sgml"> + <!entity art-construction-trans SYSTEM "sgml/art_construction_trans.sgml"> +@@ -848,7 +847,6 @@ + </chapter> + + +- &FDL; + + + </book> +diff -NurB gnome-libs-1.4.2-orig/libart_lgpl/doc/tmpl/art_svp.sgml gnome-libs-1.4.2/libart_lgpl/doc/tmpl/art_svp.sgml +--- gnome-libs-1.4.2-orig/libart_lgpl/doc/tmpl/art_svp.sgml 2004-04-03 13:41:19.000000000 -0500 ++++ gnome-libs-1.4.2/libart_lgpl/doc/tmpl/art_svp.sgml 2004-04-03 13:48:03.000000000 -0500 +@@ -33,8 +33,6 @@ + </figure> + </para> + +-<para> +- + <!-- ##### SECTION See_Also ##### --> + <para> + diff --git a/gnome-base/gnome-libs/files/gnome-libs-1.4.2-m4.patch b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-m4.patch new file mode 100644 index 0000000..348e9fd --- /dev/null +++ b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-m4.patch @@ -0,0 +1,9 @@ +Fix aclocal warning: +/usr/share/aclocal/libart.m4:11: warning: underquoted definition of AM_PATH_LIBART +--- gnome-libs-1.4.2/libart_lgpl/libart.m4 ++++ gnome-libs-1.4.2/libart_lgpl/libart.m4 +@@ -10,3 +10,3 @@ + dnl +-AC_DEFUN(AM_PATH_LIBART, ++AC_DEFUN([AM_PATH_LIBART], + [dnl diff --git a/gnome-base/gnome-libs/files/gnome-libs-1.4.2-ppc64.patch b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-ppc64.patch new file mode 100644 index 0000000..36ca703 --- /dev/null +++ b/gnome-base/gnome-libs/files/gnome-libs-1.4.2-ppc64.patch @@ -0,0 +1,11 @@ +diff -ur gnome-libs-1.4.2-orig/configure.in gnome-libs-1.4.2/configure.in +--- gnome-libs-1.4.2-orig/configure.in 2006-01-16 03:30:34.000000000 +0000 ++++ gnome-libs-1.4.2/configure.in 2006-01-16 03:34:06.000000000 +0000 +@@ -304,7 +304,6 @@ + AC_CHECK_FUNCS(strdup) + AC_CHECK_HEADERS(utime.h) + AC_FUNC_MMAP +-AC_CHECK_TYPE(umode_t, int) + + AC_ARG_ENABLE(prefer-db1, [ --enable-prefer-db1 Prefer Berkeley DB 1.x] [default=no]],[prefer_db1="$enableval"],[prefer_db1=no]) + dnl diff --git a/gnome-base/gnome-libs/files/gnome-libs-ds-gnorba.patch b/gnome-base/gnome-libs/files/gnome-libs-ds-gnorba.patch new file mode 100644 index 0000000..43318f1 --- /dev/null +++ b/gnome-base/gnome-libs/files/gnome-libs-ds-gnorba.patch @@ -0,0 +1,47 @@ +diff -dPNur gnome-libs-1.4.2/configure.in gnome-libs-1.4.2-ds/configure.in +--- gnome-libs-1.4.2/configure.in 2002-08-16 00:24:36.000000000 +0200 ++++ gnome-libs-1.4.2-ds/configure.in 2012-11-17 09:09:13.000000000 +0100 +@@ -401,7 +371,7 @@ + dnl + dnl ORBit checks + dnl +-GNOME_ORBIT_CHECK ++#GNOME_ORBIT_CHECK + + dnl + dnl test-gnome +diff -dPNur gnome-libs-1.4.2/Makefile.am gnome-libs-1.4.2-ds/Makefile.am +--- gnome-libs-1.4.2/Makefile.am 2001-09-19 21:03:19.000000000 +0200 ++++ gnome-libs-1.4.2-ds/Makefile.am 2012-11-17 09:16:52.000000000 +0100 +@@ -16,8 +16,8 @@ + tools \ + images \ + libart_lgpl \ +- libgnome libgnomeui gtk-xmhtml zvt \ +- libgnorba idl $(test_gnome) devel-docs gnome-data man ++ libgnome libgnomeui ++# zvt libgnorba idl $(test_gnome) devel-docs gnome-data man + + gnomeincludedir=$(includedir)/gnome-1.0 + gnomeinclude_HEADERS = gnome.h +diff -dPNur gnome-libs-1.4.2/tools/convertrgb/loadpng.c gnome-libs-1.4.2-png/tools/convertrgb/loadpng.c +--- gnome-libs-1.4.2/tools/convertrgb/loadpng.c 1998-09-25 17:33:59.000000000 +0200 ++++ gnome-libs-1.4.2-png/tools/convertrgb/loadpng.c 2012-11-16 12:58:48.000000000 +0100 +@@ -29,7 +29,7 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++/* if (setjmp(png_ptr->jmpbuf)) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -39,7 +39,7 @@ + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +- } ++ }*/ + png_init_io(png_ptr, f); + /* Read Header */ + png_read_info(png_ptr, info_ptr); diff --git a/gnome-base/gnome-libs/files/gnome-png.diff b/gnome-base/gnome-libs/files/gnome-png.diff new file mode 100644 index 0000000..cf9cc2b --- /dev/null +++ b/gnome-base/gnome-libs/files/gnome-png.diff @@ -0,0 +1,33 @@ +diff -dPNur gnome-libs-1.4.2/Makefile.am gnome-libs-1.4.2-png/Makefile.am +--- gnome-libs-1.4.2/Makefile.am 2001-09-19 21:03:19.000000000 +0200 ++++ gnome-libs-1.4.2-png/Makefile.am 2012-11-16 14:18:30.000000000 +0100 +@@ -16,7 +16,7 @@ + tools \ + images \ + libart_lgpl \ +- libgnome libgnomeui gtk-xmhtml zvt \ ++ libgnome libgnomeui zvt \ + libgnorba idl $(test_gnome) devel-docs gnome-data man + + gnomeincludedir=$(includedir)/gnome-1.0 +diff -dPNur gnome-libs-1.4.2/tools/convertrgb/loadpng.c gnome-libs-1.4.2-png/tools/convertrgb/loadpng.c +--- gnome-libs-1.4.2/tools/convertrgb/loadpng.c 1998-09-25 17:33:59.000000000 +0200 ++++ gnome-libs-1.4.2-png/tools/convertrgb/loadpng.c 2012-11-16 12:58:48.000000000 +0100 +@@ -29,7 +29,7 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++/* if (setjmp(png_ptr->jmpbuf)) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -39,7 +39,7 @@ + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +- } ++ }*/ + png_init_io(png_ptr, f); + /* Read Header */ + png_read_info(png_ptr, info_ptr); |