r24813 - in /desktop/experimental/gdk-pixbuf: ./ debian/ debian/patches/ debian/source/

seb128 at users.alioth.debian.org seb128 at users.alioth.debian.org
Mon Jul 19 14:43:10 UTC 2010


Author: seb128
Date: Mon Jul 19 14:42:59 2010
New Revision: 24813

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24813
Log:
Commit initial work from robert_ancell to debian

Added:
    desktop/experimental/gdk-pixbuf/
    desktop/experimental/gdk-pixbuf/debian/
    desktop/experimental/gdk-pixbuf/debian/changelog
    desktop/experimental/gdk-pixbuf/debian/compat
    desktop/experimental/gdk-pixbuf/debian/control
    desktop/experimental/gdk-pixbuf/debian/control.in
    desktop/experimental/gdk-pixbuf/debian/copyright
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-dev.install
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-doc.install
    desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf0.install
    desktop/experimental/gdk-pixbuf/debian/patches/
    desktop/experimental/gdk-pixbuf/debian/patches/021_loader-files-d.patch
    desktop/experimental/gdk-pixbuf/debian/patches/022_module-files-append-compat-module-files-d.patch
    desktop/experimental/gdk-pixbuf/debian/patches/041_ia32-libs.patch
    desktop/experimental/gdk-pixbuf/debian/patches/series
    desktop/experimental/gdk-pixbuf/debian/rules   (with props)
    desktop/experimental/gdk-pixbuf/debian/source/
    desktop/experimental/gdk-pixbuf/debian/source/format
    desktop/experimental/gdk-pixbuf/debian/watch

Added: desktop/experimental/gdk-pixbuf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/changelog?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/changelog (added)
+++ desktop/experimental/gdk-pixbuf/debian/changelog [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,5 @@
+gdk-pixbuf (2.21.6-1) UNRELEASED; urgency=low
+
+  * Initial release
+
+ -- Robert Ancell <robert.ancell at canonical.com>  Tue, 13 Jul 2010 15:04:22 +1000

Added: desktop/experimental/gdk-pixbuf/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/compat?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/compat (added)
+++ desktop/experimental/gdk-pixbuf/debian/compat [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,1 @@
+7

Added: desktop/experimental/gdk-pixbuf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/control?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/control (added)
+++ desktop/experimental/gdk-pixbuf/debian/control [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,59 @@
+Source: gdk-pixbuf
+Section: libs
+Priority: optional
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop at lists.ubuntu.com>
+Build-Depends: cdbs (>= 0.4.41),
+               debhelper (>= 7),
+               gnome-pkg-tools (>= 0.10),
+               dh-autoreconf,
+               libglib2.0-dev (>= 2.25.9),
+               libpng12-dev,
+               libjpeg62-dev,
+               libjasper-dev,
+               libtiff4-dev
+Standards-Version: 3.9.0
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gdk-pixbuf/ubuntu
+Homepage: http://www.gtk.org/
+
+Package: libgdk-pixbuf0
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Conflicts: libgtk2.0-0 (<< 2.90.4), libgtk2.0-bin (<< 2.90.4)
+Replaces: libgtk2.0-0 (<< 2.90.4), libgtk2.0-bin (<< 2.90.4)
+Description: GDK Pixbuf library
+ The Gdk Pixbuf library provides:
+  - Image loading and saving facilities.
+  - Fast scaling and compositing of pixbufs.
+  - Simple animation loading (ie. animated GIFs)
+
+Package: libgdk-pixbuf-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgdk-pixbuf0 (= ${binary:Version})
+Conflicts: libgtk2.0-dev (<< 2.90.4)
+Replaces: libgtk2.0-dev (<< 2.90.4)
+Description: GDK Pixbuf library (development files)
+ The Gdk Pixbuf library provides:
+  - Image loading and saving facilities.
+  - Fast scaling and compositing of pixbufs.
+  - Simple animation loading (ie. animated GIFs)
+ .
+ This package contains the header files which are needed for using GDK Pixbuf.
+
+Package: libgdk-pixbuf-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: libgtk2.0-dev (<< 2.90.4)
+Replaces: libgtk2.0-dev (<< 2.90.4)
+Description: GDK Pixbuf library (documentation)
+ The Gdk Pixbuf library provides:
+  - Image loading and saving facilities.
+  - Fast scaling and compositing of pixbufs.
+  - Simple animation loading (ie. animated GIFs)
+ .
+ This package contains the HTML documentation for the GDK Pixbuf library
+ in /usr/share/doc/libgtk2.0-doc/ .

Added: desktop/experimental/gdk-pixbuf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/control.in?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/control.in (added)
+++ desktop/experimental/gdk-pixbuf/debian/control.in [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,59 @@
+Source: gdk-pixbuf
+Section: libs
+Priority: optional
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop at lists.ubuntu.com>
+Uploaders: @GNOME_TEAM@
+Build-Depends: cdbs (>= 0.4.41),
+               debhelper (>= 7),
+               gnome-pkg-tools (>= 0.10),
+               dh-autoreconf,
+               libglib2.0-dev (>= 2.25.9),
+               libpng12-dev,
+               libjpeg62-dev,
+               libjasper-dev,
+               libtiff4-dev
+Standards-Version: 3.9.0
+Homepage: http://www.gtk.org/
+
+Package: libgdk-pixbuf0
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Conflicts: libgtk2.0-0 (<< 2.90.4), libgtk2.0-bin (<< 2.90.4)
+Replaces: libgtk2.0-0 (<< 2.90.4), libgtk2.0-bin (<< 2.90.4)
+Description: GDK Pixbuf library
+ The Gdk Pixbuf library provides:
+  - Image loading and saving facilities.
+  - Fast scaling and compositing of pixbufs.
+  - Simple animation loading (ie. animated GIFs)
+
+Package: libgdk-pixbuf-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libgdk-pixbuf0 (= ${binary:Version})
+Conflicts: libgtk2.0-dev (<< 2.90.4)
+Replaces: libgtk2.0-dev (<< 2.90.4)
+Description: GDK Pixbuf library (development files)
+ The Gdk Pixbuf library provides:
+  - Image loading and saving facilities.
+  - Fast scaling and compositing of pixbufs.
+  - Simple animation loading (ie. animated GIFs)
+ .
+ This package contains the header files which are needed for using GDK Pixbuf.
+
+Package: libgdk-pixbuf-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: libgtk2.0-dev (<< 2.90.4)
+Replaces: libgtk2.0-dev (<< 2.90.4)
+Description: GDK Pixbuf library (documentation)
+ The Gdk Pixbuf library provides:
+  - Image loading and saving facilities.
+  - Fast scaling and compositing of pixbufs.
+  - Simple animation loading (ie. animated GIFs)
+ .
+ This package contains the HTML documentation for the GDK Pixbuf library
+ in /usr/share/doc/libgtk2.0-doc/ .

Added: desktop/experimental/gdk-pixbuf/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/copyright?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/copyright (added)
+++ desktop/experimental/gdk-pixbuf/debian/copyright [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,43 @@
+This work was packaged for Debian by:
+
+    Robert Ancell <robert.ancell at canonical.com> on Tue, 13 Jul 2010 15:04:22 +1000
+
+It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/
+
+Upstream Author(s):
+
+    Peter Mattis       <petm at xcf.berkeley.edu>
+    Spencer Kimball    <spencer at xcf.berkeley.edu>
+    Josh MacDonald     <jmacd at xcf.berkeley.edu>
+
+    Please do not mail the original authors asking questions about this
+    version of GLib.
+
+    GLib Team
+    ---------
+    Shawn T. Amundson  <amundson at gimp.org>
+    Jeff Garzik        <jgarzik at pobox.com>
+    Raja R Harinath    <harinath at cs.umn.edu>
+    Tim Janik          <timj at gtk.org>
+    Elliot Lee         <sopwith at redhat.com>
+    Tor Lillqvist      <tml at iki.fi>
+    Paolo Molaro       <lupus at debian.org>
+    Havoc Pennington   <hp at pobox.com>
+    Manish Singh       <yosh at gimp.org>
+    Owen Taylor        <otaylor at gtk.org>
+    Sebastian Wilhelmi <wilhelmi at ira.uka.de>
+
+License:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the licence, or (at your option) any later version.
+
+    On Debian systems, the complete text of the GNU Lesser General
+    Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Robert Ancell <robert.ancell at canonical.com> and is
+    licensed under the GPL version 3, see `/usr/share/common-licenses/GPL-3'.

Added: desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-dev.install?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-dev.install (added)
+++ desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-dev.install [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,5 @@
+debian/tmp/usr/bin/gdk-pixbuf-csource
+debian/tmp/usr/include
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/man/man1/gdk-pixbuf-csource.*

Added: desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-doc.install?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-doc.install (added)
+++ desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf-doc.install [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,1 @@
+debian/tmp/usr/share/gtk-doc/html/gdk-pixbuf/

Added: desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf0.install?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf0.install (added)
+++ desktop/experimental/gdk-pixbuf/debian/libgdk-pixbuf0.install [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,5 @@
+debian/tmp/usr/bin/gdk-pixbuf-query-loaders
+debian/tmp/usr/lib/*.so.*
+debian/tmp/usr/lib/gdk-pixbuf-2.0/
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/man/man1/gdk-pixbuf-query-loaders.*

Added: desktop/experimental/gdk-pixbuf/debian/patches/021_loader-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/patches/021_loader-files-d.patch?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/patches/021_loader-files-d.patch (added)
+++ desktop/experimental/gdk-pixbuf/debian/patches/021_loader-files-d.patch [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,392 @@
+Index: gdk-pixbuf-2.21.6/gdk-pixbuf/Makefile.am
+===================================================================
+--- gdk-pixbuf-2.21.6.orig/gdk-pixbuf/Makefile.am	2010-07-10 02:51:30.000000000 +0200
++++ gdk-pixbuf-2.21.6/gdk-pixbuf/Makefile.am	2010-07-19 14:28:33.028037001 +0200
+@@ -58,6 +58,7 @@
+ lib_LTLIBRARIES = libgdk_pixbuf-2.0.la
+ 
+ loaderdir = $(libdir)/gdk-pixbuf-2.0/$(GDK_PIXBUF_BINARY_VERSION)/loaders
++loaderfilesdir = $(libdir)/gdk-pixbuf-2.0/$(GDK_PIXBUF_BINARY_VERSION)/loader-files.d
+ 
+ module_libs = libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
+ 
+@@ -511,7 +512,7 @@
+ 	$(GDK_PIXBUF_DEP_CFLAGS)					\
+ 	-DGDK_PIXBUF_ENABLE_BACKEND
+ 
+-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
++AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
+ LDADDS = libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
+ 
+ noinst_PROGRAMS = test-gdk-pixbuf
+Index: gdk-pixbuf-2.21.6/gdk-pixbuf/gdk-pixbuf-io.c
+===================================================================
+--- gdk-pixbuf-2.21.6.orig/gdk-pixbuf/gdk-pixbuf-io.c	2010-07-10 02:52:30.000000000 +0200
++++ gdk-pixbuf-2.21.6/gdk-pixbuf/gdk-pixbuf-io.c	2010-07-19 14:28:33.028037001 +0200
+@@ -49,6 +49,9 @@
+ #define SNIFF_BUFFER_SIZE 4096
+ #define LOAD_BUFFER_SIZE 65536
+ 
++#define LOADERFILEEXT ".loaders"
++#define LOADERFILEEXT_LEN ((int) strlen (LOADERFILEEXT))
++
+ #ifndef GDK_PIXBUF_USE_GIO_MIME 
+ static gint 
+ format_check (GdkPixbufModule *module, guchar *buffer, int size)
+@@ -315,118 +318,93 @@
+ gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
+                                  GError         **error);
+ 
++/* FIXME this is a static copy of a public pango function which should really
++ * livein glib */
++static char *
++_ugly_copy_of_pango_trim_string (const char *str)
++{
++  int len;
++
++  g_return_val_if_fail (str != NULL, NULL);
++  
++  while (*str && g_ascii_isspace (*str))
++    str++;
++
++  len = strlen (str);
++  while (len > 0 && g_ascii_isspace (str[len-1]))
++    len--;
++
++  return g_strndup (str, len);
++}
++
++/* FIXME this is a static copy of a public pango function which should really
++ * livein glib */
++char **
++_ugly_copy_of_pango_split_file_list (const char *str)
++{
++  int i = 0;
++  int j;
++  char **files;
++
++  files = g_strsplit (str, G_SEARCHPATH_SEPARATOR_S, -1);
++
++  while (files[i])
++    {
++      char *file = _ugly_copy_of_pango_trim_string (files[i]);
++
++      /* If the resulting file is empty, skip it */
++      if (file[0] == '\0')
++        {
++          g_free(file);
++          g_free (files[i]);
++          
++          for (j = i + 1; files[j]; j++)
++            files[j - 1] = files[j];
++          
++          files[j - 1] = NULL;
++
++          continue;
++        }
++#ifndef G_OS_WIN32
++      /* '~' is a quite normal and common character in file names on
++       * Windows, especially in the 8.3 versions of long file names, which
++       * still occur now and then. Also, few Windows user are aware of the
++       * Unix shell convention that '~' stands for the home directory,
++       * even if they happen to have a home directory.
++       */
++      if (file[0] == '~' && file[1] == G_DIR_SEPARATOR)
++        {
++          char *tmp = g_strconcat (g_get_home_dir(), file + 1, NULL);
++          g_free (file);
++          file = tmp;
++        }
++      else if (file[0] == '~' && file[1] == '\0')
++        {
++          g_free (file);
++          file = g_strdup (g_get_home_dir());
++        }
++#endif
++      g_free (files[i]);
++      files[i] = file;
++        
++      i++;
++    }
++
++  return files;
++}
++
+ static void 
+-gdk_pixbuf_io_init (void)
++process_module_file (const gchar *filename, GIOChannel *channel)
+ {
+ #ifdef USE_GMODULE
+-        GIOChannel *channel;
+         gchar *line_buf;
+         gsize term;
+         GString *tmp_buf = g_string_new (NULL);
+         gboolean have_error = FALSE;
+         GdkPixbufModule *module = NULL;
+-        gchar *filename = gdk_pixbuf_get_module_file ();
+         int flags;
+         int n_patterns = 0;
+         GdkPixbufModulePattern *pattern;
+-        GError *error = NULL;
+-#endif
+-        GdkPixbufModule *builtin_module ;
+-
+-        /*  initialize on separate line to avoid compiler warnings in the
+-         *  common case of no compiled-in modules.
+-         */
+-        builtin_module = NULL;
+-
+-#define load_one_builtin_module(format)                                 \
+-        builtin_module = g_new0 (GdkPixbufModule, 1);                   \
+-        builtin_module->module_name = #format;                          \
+-        if (gdk_pixbuf_load_module_unlocked (builtin_module, NULL))             \
+-                file_formats = g_slist_prepend (file_formats, builtin_module);\
+-        else                                                            \
+-                g_free (builtin_module)
+-
+-#ifdef INCLUDE_ani
+-        load_one_builtin_module (ani);
+-#endif
+-#ifdef INCLUDE_png
+-        load_one_builtin_module (png);
+-#endif
+-#ifdef INCLUDE_bmp
+-        load_one_builtin_module (bmp);
+-#endif
+-#ifdef INCLUDE_wbmp
+-        load_one_builtin_module (wbmp);
+-#endif
+-#ifdef INCLUDE_gif
+-        load_one_builtin_module (gif);
+-#endif
+-#ifdef INCLUDE_ico
+-        load_one_builtin_module (ico);
+-#endif
+-#ifdef INCLUDE_jpeg
+-        load_one_builtin_module (jpeg);
+-#endif
+-#ifdef INCLUDE_pnm
+-        load_one_builtin_module (pnm);
+-#endif
+-#ifdef INCLUDE_ras
+-        load_one_builtin_module (ras);
+-#endif
+-#ifdef INCLUDE_tiff
+-        load_one_builtin_module (tiff);
+-#endif
+-#ifdef INCLUDE_xpm
+-        load_one_builtin_module (xpm);
+-#endif
+-#ifdef INCLUDE_xbm
+-        load_one_builtin_module (xbm);
+-#endif
+-#ifdef INCLUDE_tga
+-        load_one_builtin_module (tga);
+-#endif
+-#ifdef INCLUDE_pcx
+-        load_one_builtin_module (pcx);
+-#endif
+-#ifdef INCLUDE_icns
+-        load_one_builtin_module (icns);
+-#endif
+-#ifdef INCLUDE_jasper
+-        load_one_builtin_module (jasper);
+-#endif
+-#ifdef INCLUDE_qtif
+-        load_one_builtin_module (qtif);
+-#endif
+-#ifdef INCLUDE_gdiplus
+-        /* We don't bother having the GDI+ loaders individually selectable
+-         * for building in or not.
+-         */
+-        load_one_builtin_module (ico);
+-        load_one_builtin_module (wmf);
+-        load_one_builtin_module (emf);
+-        load_one_builtin_module (bmp);
+-        load_one_builtin_module (gif);
+-        load_one_builtin_module (jpeg);
+-        load_one_builtin_module (tiff);
+-#endif
+-#ifdef INCLUDE_gdip_png
+-        /* Except the gdip-png loader which normally isn't built at all even */
+-        load_one_builtin_module (png);
+-#endif
+-
+-#undef load_one_builtin_module
+-
+-#ifdef USE_GMODULE
+-        channel = g_io_channel_new_file (filename, "r",  &error);
+-        if (!channel) {
+-                /* Don't bother warning if we have some built-in loaders */
+-                if (file_formats == NULL)
+-                        g_warning ("Cannot open pixbuf loader module file '%s': %s",
+-                                   filename, error->message);
+-                g_string_free (tmp_buf, TRUE);
+-                g_free (filename);
+-                return;
+-        }
+         
+         while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
+                 const char *p;
+@@ -564,8 +542,159 @@
+                 g_free (line_buf);
+         }
+         g_string_free (tmp_buf, TRUE);
+-        g_io_channel_unref (channel);
+-        g_free (filename);
++#endif /* USE_GMODULE */
++}
++
++
++static void 
++gdk_pixbuf_io_init (void)
++{
++#ifdef USE_GMODULE
++        GIOChannel *channel;
++        gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file ();
++        gchar *list_str;
++        char **files;
++        GError *error = NULL;
++        int n;
++#endif
++        GdkPixbufModule *builtin_module = NULL;
++
++#define load_one_builtin_module(format)                                        \
++        builtin_module = g_new0 (GdkPixbufModule, 1);                        \
++        builtin_module->module_name = #format;                                \
++        if (gdk_pixbuf_load_module_unlocked (builtin_module, NULL))                \
++                file_formats = g_slist_prepend (file_formats, builtin_module);\
++        else                                                                \
++                g_free (builtin_module)
++
++#ifdef INCLUDE_ani
++        load_one_builtin_module (ani);
++#endif
++#ifdef INCLUDE_png
++        load_one_builtin_module (png);
++#endif
++#ifdef INCLUDE_bmp
++        load_one_builtin_module (bmp);
++#endif
++#ifdef INCLUDE_wbmp
++        load_one_builtin_module (wbmp);
++#endif
++#ifdef INCLUDE_gif
++        load_one_builtin_module (gif);
++#endif
++#ifdef INCLUDE_ico
++        load_one_builtin_module (ico);
++#endif
++#ifdef INCLUDE_jpeg
++        load_one_builtin_module (jpeg);
++#endif
++#ifdef INCLUDE_pnm
++        load_one_builtin_module (pnm);
++#endif
++#ifdef INCLUDE_ras
++        load_one_builtin_module (ras);
++#endif
++#ifdef INCLUDE_tiff
++        load_one_builtin_module (tiff);
++#endif
++#ifdef INCLUDE_xpm
++        load_one_builtin_module (xpm);
++#endif
++#ifdef INCLUDE_xbm
++        load_one_builtin_module (xbm);
++#endif
++#ifdef INCLUDE_tga
++        load_one_builtin_module (tga);
++#endif
++#ifdef INCLUDE_pcx
++        load_one_builtin_module (pcx);
++#endif
++#ifdef INCLUDE_icns
++        load_one_builtin_module (icns);
++#endif
++#ifdef INCLUDE_jasper
++        load_one_builtin_module (jasper);
++#endif
++#ifdef INCLUDE_qtif
++        load_one_builtin_module (qtif);
++#endif
++#ifdef INCLUDE_gdiplus
++        /* We don't bother having the GDI+ loaders individually selectable
++         * for building in or not.
++         */
++        load_one_builtin_module (ico);
++        load_one_builtin_module (wmf);
++        load_one_builtin_module (emf);
++        load_one_builtin_module (bmp);
++        load_one_builtin_module (gif);
++        load_one_builtin_module (jpeg);
++        load_one_builtin_module (tiff);
++#endif
++#ifdef INCLUDE_gdip_png
++        /* Except the gdip-png loader which normally isn't built at all even */
++        load_one_builtin_module (png);
++#endif
++
++#undef load_one_builtin_module
++
++#ifdef USE_GMODULE
++        list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
++                              gdkpixbuf_module_file_str,
++                              PIXBUF_FILES_LIBDIR,
++                              NULL);
++
++        files = _ugly_copy_of_pango_split_file_list (list_str);
++
++        n = 0;
++        while (files[n])
++                n++;
++
++        while (n-- > 0) {
++                GDir *dir = g_dir_open (files[n], 0, NULL);
++                if (dir) {
++                        const char *dent;
++
++                        while ((dent = g_dir_read_name (dir))) {
++                                int len = strlen (dent);
++                                if (len > LOADERFILEEXT_LEN && strcmp (dent + len - LOADERFILEEXT_LEN, LOADERFILEEXT) == 0) {
++                                        gchar *pathname = g_build_filename (files[n], dent, NULL);
++                                        channel = g_io_channel_new_file (pathname, "r",  &error);
++                                        if (!channel) {
++                                                /* we don't care about issuing a warning
++                                                 * g_warning ("Cannot open pixbuf loader module file '%s': %s",
++                                                 *           pathname,
++                                                 *           error->message);
++                                                 */
++                                                g_error_free (error);
++                                                error = NULL;
++                                        } else {
++                                                process_module_file (pathname, channel);
++                                                g_io_channel_unref (channel);
++                                        }
++                                        g_free (pathname);
++                                }
++                        }
++                        g_dir_close (dir);
++                } else {
++                        channel = g_io_channel_new_file (files[n], "r", &error);
++                        if (!channel) {
++                                /* we don't care about issuing a warning
++                                 * g_warning ("Cannot open pixbuf loader module file '%s': %s",
++                                 *           files[n],
++                                 *           error->message);
++                                 */
++                                g_error_free (error);
++                                error = NULL;
++                        } else {
++                                process_module_file (files[n], channel);
++                                g_io_channel_unref (channel);
++                        }
++                }
++        }
++
++        g_strfreev (files);
++        g_free (list_str);
++        g_free (gdkpixbuf_module_file_str);
+ #endif
+ }
+ 

Added: desktop/experimental/gdk-pixbuf/debian/patches/022_module-files-append-compat-module-files-d.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/patches/022_module-files-append-compat-module-files-d.patch?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/patches/022_module-files-append-compat-module-files-d.patch (added)
+++ desktop/experimental/gdk-pixbuf/debian/patches/022_module-files-append-compat-module-files-d.patch [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,53 @@
+Index: gdk-pixbuf-2.21.6/gdk-pixbuf/gdk-pixbuf-io.c
+===================================================================
+--- gdk-pixbuf-2.21.6.orig/gdk-pixbuf/gdk-pixbuf-io.c	2010-07-19 14:28:33.000000000 +0200
++++ gdk-pixbuf-2.21.6/gdk-pixbuf/gdk-pixbuf-io.c	2010-07-19 14:32:54.468037002 +0200
+@@ -552,6 +552,18 @@
+ #ifdef USE_GMODULE
+         GIOChannel *channel;
+         gchar *gdkpixbuf_module_file_str = gdk_pixbuf_get_module_file ();
++
++#if defined(__linux__) && defined (__i386__)
++        gchar *compat_gdkpixbuf_module_files_d_str = g_build_filename ("/usr/lib32/gtk-2.0",
++                                                        GDK_PIXBUF_BINARY_VERSION,
++                                                        "loader-files.d",
++                                                        NULL);
++#elif defined(__linux__) && ( defined (__x86_64__) || defined(__ia64__) )
++        gchar *compat_gdkpixbuf_module_files_d_str = g_build_filename ("/usr/lib64/gtk-2.0",
++                                                        GDK_PIXBUF_BINARY_VERSION,
++                                                        "loader-files.d",
++                                                        NULL);
++#endif
+         gchar *list_str;
+         char **files;
+         GError *error = NULL;
+@@ -638,6 +650,18 @@
+ #undef load_one_builtin_module
+ 
+ #ifdef USE_GMODULE
++
++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
++  /* prefer compat_gdkpixbuf_module_files_d_str over PIXBUF_FILES_LIBDIR
++   * on the above arches if it's usable */
++  if (! g_access(compat_gdkpixbuf_module_files_d_str, R_OK|X_OK))
++      list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
++                            gdkpixbuf_module_file_str,
++                            compat_gdkpixbuf_module_files_d_str,
++                            NULL);
++  else /* continued below */
++#endif
++
+         list_str = g_strjoin (G_SEARCHPATH_SEPARATOR_S,
+                               gdkpixbuf_module_file_str,
+                               PIXBUF_FILES_LIBDIR,
+@@ -693,6 +717,10 @@
+         }
+ 
+         g_strfreev (files);
++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
++
++        g_free (compat_gdkpixbuf_module_files_d_str);
++#endif
+         g_free (list_str);
+         g_free (gdkpixbuf_module_file_str);
+ #endif

Added: desktop/experimental/gdk-pixbuf/debian/patches/041_ia32-libs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/patches/041_ia32-libs.patch?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/patches/041_ia32-libs.patch (added)
+++ desktop/experimental/gdk-pixbuf/debian/patches/041_ia32-libs.patch [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,27 @@
+Index: gdk-pixbuf-2.21.6/gdk-pixbuf/gdk-pixbuf-io.c
+===================================================================
+--- gdk-pixbuf-2.21.6.orig/gdk-pixbuf/gdk-pixbuf-io.c	2010-07-19 14:40:54.168037001 +0200
++++ gdk-pixbuf-2.21.6/gdk-pixbuf/gdk-pixbuf-io.c	2010-07-19 14:41:53.358037002 +0200
+@@ -306,8 +306,20 @@
+   gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
+ 
+   if (!result)
+-          result = g_build_filename (GDK_PIXBUF_LIBDIR, "gdk-pixbuf-2.0", GDK_PIXBUF_BINARY_VERSION, "loaders.cache", NULL);
+-
++    {
++#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
++# if defined (__i386__)
++      result = g_build_filename (GDK_PIXBUF_LIBDIR, "gdk-pixbuf-2.0", GDK_PIXBUF_BINARY_VERSION, "loaders.cache.32", NULL);
++# else
++      result = g_build_filename (GDK_PIXBUF_LIBDIR, "gdk-pixbuf-2.0", GDK_PIXBUF_BINARY_VERSION, "loaders.cache.64", NULL);
++#endif
++      /* Prefer compat gdk-pixbuf.loaders file if it's usable. */
++      if (g_file_test(result, G_FILE_TEST_EXISTS))
++        return result;
++      g_free (result);
++#endif
++      result = g_build_filename (GDK_PIXBUF_LIBDIR, "gdk-pixbuf-2.0", GDK_PIXBUF_BINARY_VERSION, "loaders.cache", NULL);
++    }
+   return result;
+ }
+ 

Added: desktop/experimental/gdk-pixbuf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/patches/series?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/patches/series (added)
+++ desktop/experimental/gdk-pixbuf/debian/patches/series [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,3 @@
+021_loader-files-d.patch
+022_module-files-append-compat-module-files-d.patch
+041_ia32-libs.patch

Added: desktop/experimental/gdk-pixbuf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/rules?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/rules (added)
+++ desktop/experimental/gdk-pixbuf/debian/rules [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,8 @@
+#!/usr/bin/make -f 
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+

Propchange: desktop/experimental/gdk-pixbuf/debian/rules
------------------------------------------------------------------------------
    svn:executable = *

Added: desktop/experimental/gdk-pixbuf/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/source/format?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/source/format (added)
+++ desktop/experimental/gdk-pixbuf/debian/source/format [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

Added: desktop/experimental/gdk-pixbuf/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/watch?rev=24813&op=file
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/watch (added)
+++ desktop/experimental/gdk-pixbuf/debian/watch [utf-8] Mon Jul 19 14:42:59 2010
@@ -1,0 +1,3 @@
+version=2
+http://download.gnome.org/sources/gdk-pixbuf/([\d\.]+)\d/ \
+	gdk-pixbuf\+-(.*)\.tar\.gz




More information about the pkg-gnome-commits mailing list