summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/gdk-pixbuf/Makefile8
-rw-r--r--package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in10
-rw-r--r--package/gdk-pixbuf/patches/patch-ltmain_sh11
3 files changed, 5 insertions, 24 deletions
diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile
index 9844014fb..db3e3cd7e 100644
--- a/package/gdk-pixbuf/Makefile
+++ b/package/gdk-pixbuf/Makefile
@@ -4,17 +4,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= gdk-pixbuf
-PKG_VERSION:= 2.23.1
+PKG_VERSION:= 2.24.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 74818d3ac4d7ebaf6bf24883c171a885
+PKG_MD5SUM:= bd7c2a9d23b573db467e39833f12103d
PKG_DESCR:= GDK pixbuf library
PKG_SECTION:= libs
PKG_BUILDDEP:= jpeg libtiff
-PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.23/
+PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/
PKG_NEED_CXX:= 1
PKG_SUBPKGS:= GDK_PIXBUF GDK_PIXBUF_DEV
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz
+
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,GDK_PIXBUF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
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"