From af7ba55889cf59e09b93472cfa6b45cea27d8790 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 18 Apr 2011 20:37:01 +0200 Subject: downgrade, otherwise firefox segfaults --- package/gtk+/Makefile | 8 ++++---- package/gtk+/patches/patch-Makefile_in | 13 ------------- package/gtk+/patches/patch-ltmain_sh | 11 ----------- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 package/gtk+/patches/patch-Makefile_in delete mode 100644 package/gtk+/patches/patch-ltmain_sh (limited to 'package/gtk+') diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index 3b88cf9e5..b9e5ef525 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gtk+ -PKG_VERSION:= 2.24.3 -PKG_EXTRAVER:= 2.24 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 2c9f2dc5768480bedf26c6dfc3f7c254 +PKG_VERSION:= 2.18.6 +PKG_EXTRAVER:= 2.18 +PKG_RELEASE:= 2 +PKG_MD5SUM:= f98617af9f6be3065f64248f78dae2b7 PKG_DESCR:= GTK+ library PKG_SECTION:= libs PKG_DEPENDS:= glib diff --git a/package/gtk+/patches/patch-Makefile_in b/package/gtk+/patches/patch-Makefile_in deleted file mode 100644 index 01b7c66da..000000000 --- a/package/gtk+/patches/patch-Makefile_in +++ /dev/null @@ -1,13 +0,0 @@ ---- gtk+-2.24.3.orig/Makefile.in 2011-03-14 18:10:47.000000000 +0100 -+++ gtk+-2.24.3/Makefile.in 2011-03-18 00:48:15.433370501 +0100 -@@ -457,8 +457,8 @@ XVFB_START = \ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - --SRC_SUBDIRS = gdk gtk modules demos tests perf --SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build -+SRC_SUBDIRS = gdk gtk modules perf -+SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros build - - # require automake 1.4 - AUTOMAKE_OPTIONS = 1.7 diff --git a/package/gtk+/patches/patch-ltmain_sh b/package/gtk+/patches/patch-ltmain_sh deleted file mode 100644 index 8104e4837..000000000 --- a/package/gtk+/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.24.3.orig/ltmain.sh 2011-02-08 13:25:07.000000000 +0100 -+++ gtk+-2.24.3/ltmain.sh 2011-03-18 00:44:15.143369818 +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" -- cgit v1.2.3