diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
| commit | 5861b2783c0615345b80a93470312b36d1cb9907 (patch) | |
| tree | 42ded4821e0834063449a5620a1b46bc6f1e509b /package/gdk-pixbuf/patches | |
| parent | e3d296fa18ef060fad7e654cd9308e57ffd0934b (diff) | |
| parent | d8a75c17f7cb861b42f327afc9a9ec3901133d2c (diff) | |
fix conflict
Diffstat (limited to 'package/gdk-pixbuf/patches')
| -rw-r--r-- | package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in | 10 | ||||
| -rw-r--r-- | package/gdk-pixbuf/patches/patch-ltmain_sh | 11 |
2 files changed, 0 insertions, 21 deletions
diff --git a/package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in b/package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in deleted file mode 100644 index ae45cef82..000000000 --- a/package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in +++ /dev/null @@ -1,10 +0,0 @@ ---- gdk-pixbuf-2.23.1.orig/gdk-pixbuf-2.0.pc.in 2010-11-30 03:37:47.000000000 +0100 -+++ gdk-pixbuf-2.23.1/gdk-pixbuf-2.0.pc.in 2011-04-25 18:07:16.917662321 +0200 -@@ -13,6 +13,6 @@ Description: Image loading and scaling - Version: @VERSION@ - Requires: gobject-2.0 - Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@ --Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@ -+Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ -ltiff -ljpeg -lpng12 -lm - Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@ - diff --git a/package/gdk-pixbuf/patches/patch-ltmain_sh b/package/gdk-pixbuf/patches/patch-ltmain_sh deleted file mode 100644 index 058119f49..000000000 --- a/package/gdk-pixbuf/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- gdk-pixbuf-2.23.0.orig/ltmain.sh 2010-12-06 15:06:25.000000000 +0100 -+++ gdk-pixbuf-2.23.0/ltmain.sh 2011-01-14 23:45:56.000000000 +0100 -@@ -5840,7 +5840,7 @@ func_mode_link () - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" |