r17373 - in /desktop/experimental/gtk+2.0/debian: changelog patches/071_jasper_link_fix.patch patches/series

[kov at users.alioth.debian.org]

Author: kov
Date: Tue Nov  4 21:53:50 2008
New Revision: 17373

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17373
Log:
new patch to fix linking with libjasper

Added:
    desktop/experimental/gtk+2.0/debian/patches/071_jasper_link_fix.patch
Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/patches/series

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=17373&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Tue Nov  4 21:53:50 2008
@@ -19,6 +19,8 @@
     JPEG2000
   * debian/patches/092_fix_printtest_include.patch:
   - new patch, to fix build problem in print test
+  * debian/patches/071_jasper_link_fix.patch:
+  - make gdk-pixbuf-csource link correctly with libjasper
   * debian/rules:
   - FIXME: do not build directfb for now; we need a newer libdirectfb-dev
 

Added: desktop/experimental/gtk+2.0/debian/patches/071_jasper_link_fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/071_jasper_link_fix.patch?rev=17373&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/071_jasper_link_fix.patch (added)
+++ desktop/experimental/gtk+2.0/debian/patches/071_jasper_link_fix.patch Tue Nov  4 21:53:50 2008
@@ -1,0 +1,32 @@
+diff -urN gtk+-2.14.4.old/configure gtk+-2.14.4/configure
+--- gtk+-2.14.4.old/configure	2008-11-04 17:41:20.000000000 -0200
++++ gtk+-2.14.4/configure	2008-11-04 17:45:07.000000000 -0200
+@@ -29356,8 +29356,11 @@
+   if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
+     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
+   fi
++  if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
++    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
++  fi
+ else
+-  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
++  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
+ fi
+ 
+ # Checks to see whether we should include mediaLib
+diff -urN gtk+-2.14.4.old/configure.in gtk+-2.14.4/configure.in
+--- gtk+-2.14.4.old/configure.in	2008-10-17 01:06:38.000000000 -0300
++++ gtk+-2.14.4/configure.in	2008-11-04 17:44:57.000000000 -0200
+@@ -1163,8 +1163,11 @@
+   if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
+     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
+   fi
++  if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
++    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
++  fi
+ else
+-  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
++  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
+ fi
+ 
+ # Checks to see whether we should include mediaLib

Modified: desktop/experimental/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/series?rev=17373&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/series (original)
+++ desktop/experimental/gtk+2.0/debian/patches/series Tue Nov  4 21:53:50 2008
@@ -18,5 +18,6 @@
 042_treeview_single-focus.patch
 060_ignore-random-icons.patch
 070_mandatory-relibtoolize.patch
+071_jasper_link_fix.patch
 091_workaround_no_gtk_init_incorrect_display.patch
 092_fix_printtest_include.patch