libopenraw-loaders-location.patch

   1 From 252cd9b20d7857091c0529955998b86d7a90e6c5 Mon Sep 17 00:00:00 2001
   2 From: Hubert Figuiere <hub@figuiere.net>
   3 Date: Thu, 22 Jul 2010 07:04:54 +0000
   4 Subject: Install the GdkPixbuf in the right place. (Closes #29208) (Vincent Untz)
   5
   6 ---
   7 diff --git a/configure.in b/configure.in
   8 index 1d44b9c..c16a20c 100644
   9 --- a/configure.in
  10 +++ b/configure.in
  11 @@ -137,8 +137,7 @@ if test x$enable_gnome = xyes ; then
  12     if test x$HAVE_LIBGLIB = xyes ; then
  13        PKG_CHECK_MODULES(LIBGDKPIXBUF, gdk-pixbuf-2.0 >= $LIBGDKPIXBUF_REQUIRED,
  14                       [AC_DEFINE(HAVE_LIBGDKPIXBUF, 1, [Define to 1 to enable libgdkpixbuf support])
  15 -                     GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
  16 -                     GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders"
  17 +                     GDK_PIXBUF_DIR=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0`
  18                       AC_SUBST(GDK_PIXBUF_DIR)
  19                       HAVE_LIBGDKPIXBUF=yes],
  20                       [HAVE_LIBGDKPIXBUF=no])
  21 diff --git a/gnome/Makefile.am b/gnome/Makefile.am
  22 index ecfe27d..2c0bca5 100644
  23 --- a/gnome/Makefile.am
  24 +++ b/gnome/Makefile.am
  25 @@ -16,7 +16,7 @@ pkgconfig_DATA = $(PKG_CONFIG_FILES)
  26
  27  lib_LTLIBRARIES = $(GNOME_TARGETS)
  28
  29 -loaderdir = $(libdir)/$(GDK_PIXBUF_DIR)
  30 +loaderdir = $(GDK_PIXBUF_DIR)
  31  loader_LTLIBRARIES = $(GDK_PIXBUF_PLUGIN)
  32
  33  libopenrawgnome_la_LDFLAGS = \
  34 --
  35 cgit v0.8.3-6-g21f6
  36 From d4061df829ede099e9e5093e9d33f30c4a9f7783 Mon Sep 17 00:00:00 2001
  37 From: Hubert Figuiere <hub@figuiere.net>
  38 Date: Sun, 05 Sep 2010 02:25:39 +0000
  39 Subject: Fix detection of the module dir for GdkPixbuf. (Closes: #30013)
  40
  41 This is a regression caused by a previous commit.
  42 ---
  43 diff --git a/configure.in b/configure.in
  44 index c16a20c..a9a1a80 100644
  45 --- a/configure.in
  46 +++ b/configure.in
  47 @@ -138,6 +138,12 @@ if test x$enable_gnome = xyes ; then
  48        PKG_CHECK_MODULES(LIBGDKPIXBUF, gdk-pixbuf-2.0 >= $LIBGDKPIXBUF_REQUIRED,
  49                       [AC_DEFINE(HAVE_LIBGDKPIXBUF, 1, [Define to 1 to enable libgdkpixbuf support])
  50                       GDK_PIXBUF_DIR=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0`
  51 +                       dnl This is because the variable is only defined on recent gdk-pixbuf.
  52 +                       dnl Revert to the old method otherwise. (https://bugs.freedesktop.org/show_bug.cgi?id=30013)
  53 +                       if test -z "$GDK_PIXBUF_DIR" ; then
  54 +                               GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
  55 +                               GDK_PIXBUF_DIR="$libdir/gtk-2.0/$GTK_VERSION/loaders"
  56 +                       fi
  57                       AC_SUBST(GDK_PIXBUF_DIR)
  58                       HAVE_LIBGDKPIXBUF=yes],
  59                       [HAVE_LIBGDKPIXBUF=no])
  60 --
  61 cgit v0.8.3-6-g21f6