callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* 021_loader-files-d.patch: enclose process_module_file in correct

Browse Source 
#ifdef's.
This commit is contained in:
Josselin Mouette
2007-11-04 11:44:27 +00:00
parent f13357573f
commit 4578892ac0
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -21,8 +21,10 @@ gtk+2.0 (2.12.1-2) UNRELEASED; urgency=low
* Conflict against libeel2-2.18. Closes: #443701, #499070. * Conflict against libeel2-2.18. Closes: #443701, #499070.
* Conflict against xfwm4 < 4.4.1-3 (previous versions freeze on * Conflict against xfwm4 < 4.4.1-3 (previous versions freeze on
startup). startup).
* 021_loader-files-d.patch: enclose process_module_file in correct
#ifdef's.
-- Josselin Mouette <joss@debian.org> Sat, 03 Nov 2007 23:04:02 +0100 -- Josselin Mouette <joss@debian.org> Sun, 04 Nov 2007 12:38:27 +0100
gtk+2.0 (2.12.1-1) unstable; urgency=low gtk+2.0 (2.12.1-1) unstable; urgency=low

30
debian/patches/021_loader-files-d.patch vendored
View File

@ -1,7 +1,7 @@
Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c Index: gtk+-2.12.1/gdk-pixbuf/gdk-pixbuf-io.c
=================================================================== ===================================================================
--- gtk+2.0-2.11.2.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-06 13:43:15.000000000 +0200 --- gtk+-2.12.1.orig/gdk-pixbuf/gdk-pixbuf-io.c 2007-11-04 12:35:24.378152677 +0100
+++ gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c 2007-06-13 11:57:45.000000000 +0200 +++ gtk+-2.12.1/gdk-pixbuf/gdk-pixbuf-io.c 2007-11-04 12:38:15.659913468 +0100
@@ -45,6 +45,9 @@ @@ -45,6 +45,9 @@
#undef STRICT #undef STRICT
#endif #endif
@ -12,10 +12,12 @@ Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
static gint static gint
format_check (GdkPixbufModule *module, guchar *buffer, int size) format_check (GdkPixbufModule *module, guchar *buffer, int size)
{ {
@@ -284,87 +287,93 @@ @@ -284,87 +287,95 @@ gdk_pixbuf_get_module_file (void)
#endif /* USE_GMODULE */ #endif /* USE_GMODULE */
-static void
-gdk_pixbuf_io_init (void)
+/* FIXME this is a static copy of a public pango function which should really +/* FIXME this is a static copy of a public pango function which should really
+ * livein glib */ + * livein glib */
+static char * +static char *
@ -39,7 +41,7 @@ Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
+ * livein glib */ + * livein glib */
+char ** +char **
+_ugly_copy_of_pango_split_file_list (const char *str) +_ugly_copy_of_pango_split_file_list (const char *str)
+{ {
+ int i = 0; + int i = 0;
+ int j; + int j;
+ char **files; + char **files;
@ -91,12 +93,12 @@ Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
+ return files; + return files;
+} +}
+ +
static void #ifdef USE_GMODULE
-gdk_pixbuf_io_init (void)
+process_module_file (const gchar *filename, GIOChannel *channel)
{
-#ifdef USE_GMODULE
- GIOChannel *channel; - GIOChannel *channel;
+
+static void
+process_module_file (const gchar *filename, GIOChannel *channel)
+{
gchar *line_buf; gchar *line_buf;
gsize term; gsize term;
GString *tmp_buf = g_string_new (NULL); GString *tmp_buf = g_string_new (NULL);
@ -117,7 +119,7 @@ Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
- file_formats = g_slist_prepend (file_formats, builtin_module);\ - file_formats = g_slist_prepend (file_formats, builtin_module);\
- else \ - else \
- g_free (builtin_module) - g_free (builtin_module)
-
-#ifdef INCLUDE_ani -#ifdef INCLUDE_ani
- load_one_builtin_module (ani); - load_one_builtin_module (ani);
-#endif -#endif
@ -162,7 +164,7 @@ Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
-#endif -#endif
- -
-#undef load_one_builtin_module -#undef load_one_builtin_module
-
-#ifdef USE_GMODULE -#ifdef USE_GMODULE
- channel = g_io_channel_new_file (filename, "r", &error); - channel = g_io_channel_new_file (filename, "r", &error);
- if (!channel) { - if (!channel) {
@ -176,7 +178,7 @@ Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) { while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
const char *p; const char *p;
@@ -497,8 +506,138 @@ @@ -497,8 +508,140 @@ gdk_pixbuf_io_init (void)
g_free (line_buf); g_free (line_buf);
} }
g_string_free (tmp_buf, TRUE); g_string_free (tmp_buf, TRUE);
@ -184,6 +186,8 @@ Index: gtk+2.0-2.11.2/gdk-pixbuf/gdk-pixbuf-io.c
- g_free (filename); - g_free (filename);
+} +}
+ +
+#endif /* USE_GMODULE */
+
+static void +static void
+gdk_pixbuf_io_init (void) +gdk_pixbuf_io_init (void)
+{ +{