regen patches

This commit is contained in:
naddy 2009-01-09 16:13:22 +00:00
parent ce3ab68a5a
commit 492ace4db5
4 changed files with 21 additions and 21 deletions

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.5 2002/11/14 21:03:41 marcm Exp $
--- Makefile.in.orig Sat Sep 28 01:10:27 2002
+++ Makefile.in Mon Oct 7 17:21:51 2002
@@ -491,6 +491,9 @@ gdk_pixbufConf.sh: gdk_pixbufConf.sh.in
$OpenBSD: patch-Makefile_in,v 1.6 2009/01/09 16:13:22 naddy Exp $
--- Makefile.in.orig Wed Dec 18 23:19:32 2002
+++ Makefile.in Fri Jan 9 17:12:25 2009
@@ -491,6 +491,9 @@ gdk_pixbufConf.sh: gdk_pixbufConf.sh.in Makefile
-e 's?\@GDK_PIXBUF_INCLUDEDIR\@?$(GDK_PIXBUF_INCLUDEDIR)?g' \
-e 's?\@VERSION\@?$(VERSION)?g' \
-e 's?\@GDK_PIXBUF_LIBS\@?$(GDK_PIXBUF_LIBS)?g' \
@ -11,7 +11,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2002/11/14 21:03:41 marcm Exp $
< $(srcdir)/gdk_pixbufConf.sh.in > gdk_pixbufConf.tmp \
&& mv gdk_pixbufConf.tmp gdk_pixbufConf.sh
@@ -499,6 +502,9 @@ gdk_pixbuf_xlibConf.sh: gdk_pixbuf_xlibC
@@ -499,6 +502,9 @@ gdk_pixbuf_xlibConf.sh: gdk_pixbuf_xlibConf.sh.in Make
-e 's?\@GDK_PIXBUF_XLIB_INCLUDEDIR\@?$(GDK_PIXBUF_XLIB_INCLUDEDIR)?g' \
-e 's?\@VERSION\@?$(VERSION)?g' \
-e 's?\@GDK_PIXBUF_XLIB_LIBS\@?$(GDK_PIXBUF_XLIB_LIBS)?g' \
@ -21,7 +21,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2002/11/14 21:03:41 marcm Exp $
< $(srcdir)/gdk_pixbuf_xlibConf.sh.in > gdk_pixbuf_xlibConf.tmp \
&& mv gdk_pixbuf_xlibConf.tmp gdk_pixbuf_xlibConf.sh
@@ -507,6 +513,9 @@ gnomecanvaspixbufConf.sh: gnomecanvaspix
@@ -507,6 +513,9 @@ gnomecanvaspixbufConf.sh: gnomecanvaspixbufConf.sh.in
-e 's?\@GNOMECANVASPIXBUF_INCLUDEDIR\@?$(GNOMECANVASPIXBUF_INCLUDEDIR)?g' \
-e 's?\@VERSION\@?$(VERSION)?g' \
-e 's?\@GNOMECANVASPIXBUF_LIBS\@?$(GNOMECANVASPIXBUF_LIBS)?g' \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gdk-pixbuf_io-bmp_c,v 1.2 2005/11/21 20:20:54 naddy Exp $
$OpenBSD: patch-gdk-pixbuf_io-bmp_c,v 1.3 2009/01/09 16:13:22 naddy Exp $
--- gdk-pixbuf/io-bmp.c.orig Fri Sep 27 23:12:40 2002
+++ gdk-pixbuf/io-bmp.c Sat Nov 19 18:23:36 2005
+++ gdk-pixbuf/io-bmp.c Fri Jan 9 17:12:25 2009
@@ -245,7 +245,15 @@ lsb_16 (guchar *src)
static gboolean
grow_buffer (struct bmp_progressive_state *State)
@ -18,7 +18,7 @@ $OpenBSD: patch-gdk-pixbuf_io-bmp_c,v 1.2 2005/11/21 20:20:54 naddy Exp $
if (!tmp) {
State->read_state = READ_STATE_ERROR;
return FALSE;
@@ -870,8 +878,10 @@ DoCompressed(struct bmp_progressive_stat
@@ -870,8 +878,10 @@ DoCompressed(struct bmp_progressive_state *context)
guchar c;
gint idx;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gdk-pixbuf_io-ico_c,v 1.1 2004/09/19 23:41:32 brad Exp $
--- gdk-pixbuf/io-ico.c.orig Sat Sep 18 22:16:41 2004
+++ gdk-pixbuf/io-ico.c Sat Sep 18 22:17:54 2004
@@ -330,6 +330,11 @@ DecodeHeader (guchar *Data, gint Bytes,
$OpenBSD: patch-gdk-pixbuf_io-ico_c,v 1.2 2009/01/09 16:13:22 naddy Exp $
--- gdk-pixbuf/io-ico.c.orig Sat Sep 28 00:19:15 2002
+++ gdk-pixbuf/io-ico.c Fri Jan 9 17:12:25 2009
@@ -330,6 +330,11 @@ DecodeHeader (guchar *Data, gint Bytes, struct ico_pro
State->HeaderSize+=I;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gdk-pixbuf_io-xpm_c,v 1.2 2005/11/21 20:20:54 naddy Exp $
$OpenBSD: patch-gdk-pixbuf_io-xpm_c,v 1.3 2009/01/09 16:13:22 naddy Exp $
--- gdk-pixbuf/io-xpm.c.orig Thu Mar 1 21:16:28 2001
+++ gdk-pixbuf/io-xpm.c Sat Nov 19 20:30:14 2005
@@ -281,7 +281,8 @@ file_buffer (enum buf_op op, gpointer ha
+++ gdk-pixbuf/io-xpm.c Fri Jan 9 17:12:25 2009
@@ -281,7 +281,8 @@ file_buffer (enum buf_op op, gpointer handle)
/* Fall through to the xpm_read_string. */
case op_body:
@ -11,7 +11,7 @@ $OpenBSD: patch-gdk-pixbuf_io-xpm_c,v 1.2 2005/11/21 20:20:54 naddy Exp $
return h->buffer;
default:
@@ -342,7 +343,8 @@ pixbuf_create_from_xpm (const gchar * (*
@@ -342,7 +343,8 @@ pixbuf_create_from_xpm (const gchar * (*get_buf) (enum
gchar pixel_str[32];
GHashTable *color_hash;
_XPMColor *colors, *color, *fallbackcolor;
@ -21,7 +21,7 @@ $OpenBSD: patch-gdk-pixbuf_io-xpm_c,v 1.2 2005/11/21 20:20:54 naddy Exp $
fallbackcolor = NULL;
@@ -352,17 +354,31 @@ pixbuf_create_from_xpm (const gchar * (*
@@ -352,17 +354,31 @@ pixbuf_create_from_xpm (const gchar * (*get_buf) (enum
return NULL;
}
sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp);
@ -56,7 +56,7 @@ $OpenBSD: patch-gdk-pixbuf_io-xpm_c,v 1.2 2005/11/21 20:20:54 naddy Exp $
for (cnt = 0; cnt < n_col; cnt++) {
gchar *color_name;
@@ -397,12 +413,8 @@ pixbuf_create_from_xpm (const gchar * (*
@@ -397,12 +413,8 @@ pixbuf_create_from_xpm (const gchar * (*get_buf) (enum
fallbackcolor = color;
}
@ -71,7 +71,7 @@ $OpenBSD: patch-gdk-pixbuf_io-xpm_c,v 1.2 2005/11/21 20:20:54 naddy Exp $
g_hash_table_destroy (color_hash);
g_free (colors);
g_free (name_buf);
@@ -410,7 +422,7 @@ pixbuf_create_from_xpm (const gchar * (*
@@ -410,7 +422,7 @@ pixbuf_create_from_xpm (const gchar * (*get_buf) (enum
}
wbytes = w * cpp;
@ -80,7 +80,7 @@ $OpenBSD: patch-gdk-pixbuf_io-xpm_c,v 1.2 2005/11/21 20:20:54 naddy Exp $
for (ycnt = 0; ycnt < h; ycnt++) {
buffer = (*get_buf) (op_body, handle);
@@ -443,9 +455,7 @@ pixbuf_create_from_xpm (const gchar * (*
@@ -443,9 +455,7 @@ pixbuf_create_from_xpm (const gchar * (*get_buf) (enum
g_free (colors);
g_free (name_buf);