diff options
Diffstat (limited to 'graphics/gdk-pixbuf/files')
| -rw-r--r-- | graphics/gdk-pixbuf/files/patch-aa | 41 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf/files/patch-ab | 28 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf/files/patch-ac | 118 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf/files/patch-ad | 16 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S | 11 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf/files/patch-ltmain.sh | 33 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf/files/patch-pixbuf-security | 41 |
7 files changed, 288 insertions, 0 deletions
diff --git a/graphics/gdk-pixbuf/files/patch-aa b/graphics/gdk-pixbuf/files/patch-aa new file mode 100644 index 000000000..eddda5e63 --- /dev/null +++ b/graphics/gdk-pixbuf/files/patch-aa @@ -0,0 +1,41 @@ +--- configure.orig Thu Apr 18 18:52:49 2002 ++++ configure Fri Apr 19 12:40:56 2002 +@@ -8849,6 +8849,7 @@ + fi + STRIP_DUMMY= + ++if [ x"$BUILD_CANVAS" != x"no" ]; then + # Extract the first word of "gnome-config", so it can be a program name with args. + set dummy gnome-config; ac_word=$2 + echo "$as_me:8854: checking for $ac_word" >&5 +@@ -8878,6 +8879,10 @@ + esac + fi + GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG ++else ++GNOME_CONFIG="no" ++fi ++ + + if test -n "$GNOME_CONFIG"; then + echo "$as_me:8883: result: $GNOME_CONFIG" >&5 +@@ -8994,8 +8999,8 @@ + #define USE_GMODULE 1 + EOF + +- GMODULE_LIBS="`glib-config --libs gmodule`" +- GMODULE_FLAGS="`glib-config --cflags gmodule`" ++ GMODULE_LIBS="`$GLIB_CONFIG --libs gmodule`" ++ GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`" + + echo "$as_me:9000: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +@@ -10104,7 +10109,7 @@ + fi; + + if test "x$with_html_dir" = "x" ; then +- HTML_DIR='${datadir}/gnome/html' ++ HTML_DIR='${datadir}/html' + else + HTML_DIR=$with_html_dir + fi diff --git a/graphics/gdk-pixbuf/files/patch-ab b/graphics/gdk-pixbuf/files/patch-ab new file mode 100644 index 000000000..ae0c38ff3 --- /dev/null +++ b/graphics/gdk-pixbuf/files/patch-ab @@ -0,0 +1,28 @@ +--- Makefile.in.orig Sat Oct 5 01:19:24 2002 ++++ Makefile.in Sat Oct 5 01:20:58 2002 +@@ -115,22 +115,10 @@ + + bin_SCRIPTS = gdk-pixbuf-config + +-confexecdir = $(libdir) +-confexec_DATA = \ +- gdk_pixbufConf.sh \ +- gdk_pixbuf_xlibConf.sh \ +- gnomecanvaspixbufConf.sh +- +- +-EXTRA_DIST = \ +- gdk_pixbufConf.sh.in \ +- gdk_pixbuf_xlibConf.sh.in \ +- gnomecanvaspixbufConf.sh.in \ +- gdk-pixbuf-config.in \ +- gdk-pixbuf.m4 \ +- gdk-pixbuf.spec \ +- gdk-pixbuf.spec.in ++confexecdir = $(sysconfdir) ++confexec_DATA = gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh @BUILD_CANVAS_ITEM_TRUE@gnomecanvaspixbufConf.sh + ++EXTRA_DIST = gdk_pixbufConf.sh.in gdk_pixbuf_xlibConf.sh.in gdk-pixbuf-config.in gdk-pixbuf.m4 gdk-pixbuf.spec gdk-pixbuf.spec.in @BUILD_CANVAS_ITEM_TRUE@gnomecanvaspixbufConf.sh.in + + m4datadir = $(prefix)/share/aclocal + m4data_DATA = gdk-pixbuf.m4 diff --git a/graphics/gdk-pixbuf/files/patch-ac b/graphics/gdk-pixbuf/files/patch-ac new file mode 100644 index 000000000..830e4a77a --- /dev/null +++ b/graphics/gdk-pixbuf/files/patch-ac @@ -0,0 +1,118 @@ +--- gdk-pixbuf/Makefile.in.orig Sat Oct 5 01:29:29 2002 ++++ gdk-pixbuf/Makefile.in Sat Oct 5 01:32:30 2002 +@@ -132,71 +132,71 @@ + # The PNG plugin. + # + libpixbufloader_png_la_SOURCES = io-png.c +-libpixbufloader_png_la_LDFLAGS = -module -avoid-version +-libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS) ++libpixbufloader_png_la_LDFLAGS = -avoid-version -module ++libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) + + # + # The JPEG loader + # + libpixbufloader_jpeg_la_SOURCES = io-jpeg.c +-libpixbufloader_jpeg_la_LDFLAGS = -module -avoid-version +-libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS) ++libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module ++libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) + + # + # The XPM loader + # + libpixbufloader_xpm_la_SOURCES = io-xpm.c +-libpixbufloader_xpm_la_LDFLAGS = -module -avoid-version +-libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) ++libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module ++libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) + + # + # The GIF loader + # + libpixbufloader_gif_la_SOURCES = io-gif.c +-libpixbufloader_gif_la_LDFLAGS = -module -avoid-version +-libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) ++libpixbufloader_gif_la_LDFLAGS = -avoid-version -module ++libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) + + # + # The ICO loader + # + libpixbufloader_ico_la_SOURCES = io-ico.c +-libpixbufloader_ico_la_LDFLAGS = -module -avoid-version +-libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) ++libpixbufloader_ico_la_LDFLAGS = -avoid-version -module ++libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) + + # + # The RAS loader + # + libpixbufloader_ras_la_SOURCES = io-ras.c +-libpixbufloader_ras_la_LDFLAGS = -module -avoid-version +-libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) ++libpixbufloader_ras_la_LDFLAGS = -avoid-version -module ++libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) + + # + # The TIFF loader + # + libpixbufloader_tiff_la_SOURCES = io-tiff.c +-libpixbufloader_tiff_la_LDFLAGS = -module -avoid-version +-libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS) ++libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module ++libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) + + # + # The PNM loader + # + libpixbufloader_pnm_la_SOURCES = io-pnm.c +-libpixbufloader_pnm_la_LDFLAGS = -module -avoid-version +-libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) ++libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module ++libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) + + # + # The BMP loader + # + libpixbufloader_bmp_la_SOURCES = io-bmp.c +-libpixbufloader_bmp_la_LDFLAGS = -module -avoid-version +-libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) ++libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module ++libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) + + # + # The XBM loader + # + libpixbufloader_xbm_la_SOURCES = io-xbm.c +-libpixbufloader_xbm_la_LDFLAGS = -module -avoid-version +-libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) ++libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module ++libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) + + @HAVE_PNG_TRUE@PNG_LIB = @HAVE_PNG_TRUE@libpixbufloader-png.la + +@@ -259,11 +259,11 @@ + + LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS) + +-test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule +-testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule ++test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule` ++testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule` + testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS) + testpixbuf_scale_LDADD = $(LDADDS) $(GNOME_LIBS) +-testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule ++testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule` + + GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIBS) + +@@ -400,7 +400,7 @@ + libpixbufloader_bmp_la_OBJECTS = io-bmp.lo + libpixbufloader_xbm_la_DEPENDENCIES = libgdk_pixbuf.la + libpixbufloader_xbm_la_OBJECTS = io-xbm.lo +-noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \ ++noinst_PROGRAMS = # test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \ + testpixbuf-drawable$(EXEEXT) testanimation$(EXEEXT) \ + testpixbuf-scale$(EXEEXT) + PROGRAMS = $(noinst_PROGRAMS) diff --git a/graphics/gdk-pixbuf/files/patch-ad b/graphics/gdk-pixbuf/files/patch-ad new file mode 100644 index 000000000..37e0eca62 --- /dev/null +++ b/graphics/gdk-pixbuf/files/patch-ad @@ -0,0 +1,16 @@ +--- gdk-pixbuf-config.in.orig Tue Oct 23 20:44:44 2001 ++++ gdk-pixbuf-config.in Fri Oct 26 11:06:32 2001 +@@ -40,11 +40,11 @@ + ;; + --cflags) + includes=-I@includedir@/gdk-pixbuf-1.0 +- echo $includes `gtk-config --cflags` ++ echo $includes `@GTK_CONFIG@ --cflags` + ;; + --libs) + libdirs=-L@libdir@ +- echo $libdirs -lgdk_pixbuf `gtk-config --libs` ++ echo $libdirs -lgdk_pixbuf `@GTK_CONFIG@ --libs` + ;; + *) + echo "${usage}" 1>&2 diff --git a/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S b/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S new file mode 100644 index 000000000..ea3dd6a81 --- /dev/null +++ b/graphics/gdk-pixbuf/files/patch-gdk-pixbuf::pixops::have_mmx.S @@ -0,0 +1,11 @@ +--- gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:34:50 1.1 ++++ gdk-pixbuf/pixops/have_mmx.S 2001/11/16 10:35:21 +@@ -19,6 +19,8 @@ + popfl + pushfl + popl %eax ++ pushl %ebx ++ popfl + + cmpl %eax, %ebx + diff --git a/graphics/gdk-pixbuf/files/patch-ltmain.sh b/graphics/gdk-pixbuf/files/patch-ltmain.sh new file mode 100644 index 000000000..d35b31cea --- /dev/null +++ b/graphics/gdk-pixbuf/files/patch-ltmain.sh @@ -0,0 +1,33 @@ +--- ltmain.sh.orig Sun Jan 20 16:11:07 2002 ++++ ltmain.sh Tue Jan 22 13:34:20 2002 +@@ -1060,6 +1060,7 @@ + + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -2442,6 +2443,9 @@ + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4208,10 +4212,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/graphics/gdk-pixbuf/files/patch-pixbuf-security b/graphics/gdk-pixbuf/files/patch-pixbuf-security new file mode 100644 index 000000000..9c4230063 --- /dev/null +++ b/graphics/gdk-pixbuf/files/patch-pixbuf-security @@ -0,0 +1,41 @@ +--- gdk-pixbuf/io-ico.c.orig Mon Oct 11 15:44:43 2004 ++++ gdk-pixbuf/io-ico.c Mon Oct 11 15:47:29 2004 +@@ -330,6 +330,10 @@ + + State->HeaderSize+=I; + ++ if (State->HeaderSize < 0) { ++ return FALSE; ++ } ++ + if (State->HeaderSize>State->BytesInHeaderBuf) { + guchar *tmp=realloc(State->HeaderBuf,State->HeaderSize); + if (!tmp) +--- gdk-pixbuf/io-xpm.c.orig Thu Mar 1 15:16:28 2001 ++++ gdk-pixbuf/io-xpm.c Sun Oct 17 17:05:38 2004 +@@ -352,16 +352,21 @@ + return NULL; + } + sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp); +- if (cpp >= 32) { +- g_warning ("XPM has more than 31 chars per pixel."); ++ if (cpp <= 0 || cpp >= 32) { ++ g_warning ("XPM has invalid number of chars per pixel"); ++ return NULL; ++ } ++ ++ if (n_col <= 0 || n_col >= G_MAXINT / (cpp + 1)) { ++ g_warning ("XPM file has invalid number of colors"); + return NULL; + } + + /* The hash is used for fast lookups of color from chars */ + color_hash = g_hash_table_new (g_str_hash, g_str_equal); + +- name_buf = g_new (gchar, n_col * (cpp + 1)); +- colors = g_new (_XPMColor, n_col); ++ name_buf = (gchar *) g_malloc (n_col * (cpp + 1)); ++ colors = (_XPMColor *) g_malloc (sizeof (_XPMColor) * n_col); + + for (cnt = 0; cnt < n_col; cnt++) { + gchar *color_name; |