diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:21:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:21:13 +0200 |
| commit | f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c (patch) | |
| tree | 50b3bae39301c2ef89bbbabdb843a62d679e034e /package/gtk+ | |
| parent | c2bd3a43342e37a05a97e12581dd2bd52993877a (diff) | |
I am to tupid for git, today.
Revert "Revert "fix conflict, autoseect libgcj""
This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a.
Diffstat (limited to 'package/gtk+')
| -rw-r--r-- | package/gtk+/Makefile | 8 | ||||
| -rw-r--r-- | package/gtk+/patches/patch-Makefile_in | 14 | ||||
| -rw-r--r-- | package/gtk+/patches/patch-ltmain_sh | 14 |
3 files changed, 18 insertions, 18 deletions
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index 47fad3fa0..e1c0eb5de 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gtk+ -PKG_VERSION:= 2.18.6 -PKG_EXTRAVER:= 2.18 -PKG_RELEASE:= 2 -PKG_MD5SUM:= f98617af9f6be3065f64248f78dae2b7 +PKG_VERSION:= 2.24.3 +PKG_EXTRAVER:= 2.24 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 2c9f2dc5768480bedf26c6dfc3f7c254 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 index 5f732adc4..01b7c66da 100644 --- a/package/gtk+/patches/patch-Makefile_in +++ b/package/gtk+/patches/patch-Makefile_in @@ -1,13 +1,13 @@ ---- gtk+-2.18.6.orig/Makefile.in 2010-01-11 22:11:32.000000000 +0100 -+++ gtk+-2.18.6/Makefile.in 2011-01-19 15:27:36.616158611 +0100 -@@ -467,8 +467,8 @@ XVFB_START = \ +--- 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-pixbuf gdk gtk modules demos tests perf contrib --SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules -+SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros +-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 index 77ed2f207..8104e4837 100644 --- a/package/gtk+/patches/patch-ltmain_sh +++ b/package/gtk+/patches/patch-ltmain_sh @@ -1,11 +1,11 @@ ---- gtk+-2.18.6.orig/ltmain.sh 2009-12-02 12:35:38.000000000 +0100 -+++ gtk+-2.18.6/ltmain.sh 2011-01-19 15:27:06.368658496 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files +--- 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*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) + -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" |