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

new patch to fix linking with libjasper

Browse Source
This commit is contained in:
Gustavo Noronha
2008-11-04 21:53:50 +00:00
parent 2c2a9c9788
commit f908335c05
3 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -19,6 +19,8 @@ gtk+2.0 (2.14.4-1) UNRELEASED; urgency=low
JPEG2000 JPEG2000
* debian/patches/092_fix_printtest_include.patch: * debian/patches/092_fix_printtest_include.patch:
- new patch, to fix build problem in print test - 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: * debian/rules:
- FIXME: do not build directfb for now; we need a newer libdirectfb-dev - FIXME: do not build directfb for now; we need a newer libdirectfb-dev

32
debian/patches/071_jasper_link_fix.patch vendored Normal file
View File

@ -0,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

1
debian/patches/series vendored
View File

@ -18,5 +18,6 @@
042_treeview_single-focus.patch 042_treeview_single-focus.patch
060_ignore-random-icons.patch 060_ignore-random-icons.patch
070_mandatory-relibtoolize.patch 070_mandatory-relibtoolize.patch
071_jasper_link_fix.patch
091_workaround_no_gtk_init_incorrect_display.patch 091_workaround_no_gtk_init_incorrect_display.patch
092_fix_printtest_include.patch 092_fix_printtest_include.patch