]>
Commit | Line | Data |
---|---|---|
1c27810a JB |
1 | --- gdk-pixbuf-2.22.1/configure.ac.orig 2010-11-06 00:33:52.000000000 +0100 |
2 | +++ gdk-pixbuf-2.22.1/configure.ac 2010-11-12 08:18:07.347103290 +0100 | |
3 | @@ -598,7 +598,6 @@ | |
4 | if $PKG_CONFIG --exists $l ; then | |
5 | AC_MSG_RESULT(yes) | |
6 | PNG='png' | |
7 | - PNG_DEP_CFLAGS_PACKAGES=$l | |
8 | LIBPNG=`$PKG_CONFIG --libs $l` | |
9 | break | |
10 | else | |
11 | @@ -919,9 +918,8 @@ | |
12 | GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB" | |
13 | GDK_PIXBUF_EXTRA_CFLAGS= | |
14 | GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" | |
15 | -GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" | |
16 | +GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" | |
17 | ||
18 | -AC_SUBST(PNG_DEP_CFLAGS_PACKAGES) | |
19 | AC_SUBST(GDK_PIXBUF_PACKAGES) | |
20 | AC_SUBST(GDK_PIXBUF_EXTRA_LIBS) | |
21 | AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS) | |
22 | --- gdk-pixbuf-2.22.1/gdk-pixbuf-2.0-uninstalled.pc.in.orig 2010-08-10 03:26:57.000000000 +0200 | |
23 | +++ gdk-pixbuf-2.22.1/gdk-pixbuf-2.0-uninstalled.pc.in 2010-11-12 08:19:30.375102452 +0100 | |
24 | @@ -6,6 +6,6 @@ | |
25 | Name: GdkPixbuf Uninstalled | |
26 | Description: Image loading and scaling, Not Installed | |
27 | Version: @VERSION@ | |
28 | -Requires: gobject-2.0 gmodule-2.0 @PNG_DEP_CFLAGS_PACKAGES@ | |
29 | +Requires: gobject-2.0 gmodule-2.0 | |
30 | Libs: ${pc_top_builddir}/${pcfiledir}/gdk-pixbuf/libgdk_pixbuf-@GDK_PIXBUF_API_VERSION@.la @GDK_PIXBUF_EXTRA_LIBS@ | |
31 | Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} @GDK_PIXBUF_EXTRA_CFLAGS@ | |
32 | --- gdk-pixbuf-2.22.1/gdk-pixbuf-2.0.pc.in.orig 2010-09-10 14:58:06.000000000 +0200 | |
33 | +++ gdk-pixbuf-2.22.1/gdk-pixbuf-2.0.pc.in 2010-11-12 08:19:10.523101613 +0100 | |
34 | @@ -11,7 +11,7 @@ | |
35 | Name: GdkPixbuf | |
36 | Description: Image loading and scaling | |
37 | Version: @VERSION@ | |
38 | -Requires: gobject-2.0 gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@ | |
39 | +Requires: gobject-2.0 gmodule-no-export-2.0 | |
40 | Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@ | |
41 | Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@ | |
42 |