]>
Commit | Line | Data |
---|---|---|
1 | --- gdk-pixbuf-2.24.1/gdk-pixbuf-2.0.pc.in.orig 2011-08-27 04:33:58.000000000 +0200 | |
2 | +++ gdk-pixbuf-2.24.1/gdk-pixbuf-2.0.pc.in 2011-12-26 21:54:19.189840017 +0100 | |
3 | @@ -12,7 +12,7 @@ | |
4 | Description: Image loading and scaling | |
5 | Version: @VERSION@ | |
6 | Requires: gobject-2.0 | |
7 | -Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@ | |
8 | +Requires.private: gmodule-no-export-2.0 | |
9 | Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ | |
10 | Libs.private: @GDK_PIXBUF_EXTRA_LIBS@ | |
11 | Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@ | |
12 | --- gdk-pixbuf-2.24.1/gdk-pixbuf-2.0-uninstalled.pc.in.orig 2011-08-16 03:45:14.000000000 +0200 | |
13 | +++ gdk-pixbuf-2.24.1/gdk-pixbuf-2.0-uninstalled.pc.in 2011-12-26 21:54:34.193173854 +0100 | |
14 | @@ -6,6 +6,6 @@ | |
15 | Name: GdkPixbuf Uninstalled | |
16 | Description: Image loading and scaling, Not Installed | |
17 | Version: @VERSION@ | |
18 | -Requires: gobject-2.0 gmodule-2.0 @PNG_DEP_CFLAGS_PACKAGES@ | |
19 | +Requires: gobject-2.0 gmodule-2.0 | |
20 | Libs: ${pc_top_builddir}/${pcfiledir}/gdk-pixbuf/libgdk_pixbuf-@GDK_PIXBUF_API_VERSION@.la @GDK_PIXBUF_EXTRA_LIBS@ | |
21 | Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_PIXBUF_EXTRA_CFLAGS@ | |
22 | --- gdk-pixbuf-2.24.1/configure.ac.orig 2011-12-26 19:47:09.966251231 +0100 | |
23 | +++ gdk-pixbuf-2.24.1/configure.ac 2011-12-26 21:55:25.193175561 +0100 | |
24 | @@ -814,9 +814,7 @@ | |
25 | STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG" | |
26 | fi | |
27 | if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then | |
28 | - if test -z $PNG_DEP_CFLAGS_PACKAGES; then | |
29 | STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG" | |
30 | - fi | |
31 | fi | |
32 | if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then | |
33 | STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER" | |
34 | @@ -918,8 +916,8 @@ | |
35 | GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0" | |
36 | GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB" | |
37 | GDK_PIXBUF_EXTRA_CFLAGS= | |
38 | -GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" | |
39 | -GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" | |
40 | +GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" | |
41 | +GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" | |
42 | ||
43 | AC_SUBST(PNG_DEP_CFLAGS_PACKAGES) | |
44 | AC_SUBST(GDK_PIXBUF_PACKAGES) |