diff --git a/package/gnome2/gtk+/configure.in-pango.patch b/package/gnome2/gtk+/configure.in-pango.patch deleted file mode 100644 index df14f4be9..000000000 --- a/package/gnome2/gtk+/configure.in-pango.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./configure.in.vanilla 2005-12-01 08:47:22.000000000 +0100 -+++ ./configure.in 2005-12-01 08:48:19.000000000 +0100 -@@ -1356,7 +1356,7 @@ - if test "x$gdktarget" = "xwin32"; then - PANGO_PACKAGES="pangowin32 pangocairo" - else -- PANGO_PACKAGES="pango pangocairo" -+ PANGO_PACKAGES="pango pangocairo pangoft2" - fi - - AC_MSG_CHECKING(Pango flags) diff --git a/package/gnome2/gtk+/fontsel-fix.patch b/package/gnome2/gtk+/fontsel-fix.patch deleted file mode 100644 index 47d4487ff..000000000 --- a/package/gnome2/gtk+/fontsel-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/gnome2/gtk+/fontsel-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- gtk+-2.2.4/gtk/gtkfontsel.c.orig 2003-10-07 01:54:42.000000000 +0200 -+++ gtk+-2.2.4/gtk/gtkfontsel.c 2003-10-07 01:55:07.000000000 +0200 -@@ -1007,6 +1007,8 @@ - if (fontsel->face) - { - font_desc = pango_font_face_describe (fontsel->face); -+ pango_font_description_set_family(font_desc, -+ pango_font_family_get_name (fontsel->family)); - pango_font_description_set_size (font_desc, fontsel->size); - } - else diff --git a/package/gnome2/gtk+/gtk+.conf b/package/gnome2/gtk+/gtk+.conf index 957ea8b9a..427abeabd 100644 --- a/package/gnome2/gtk+/gtk+.conf +++ b/package/gnome2/gtk+/gtk+.conf @@ -26,8 +26,3 @@ # --enable-fbmanager enable framebuffer manager support (GtkFB) var_append confopt ' ' "--with-xinput=yes" -#we need to run autoconf because we patched configure.in -#running autogen is broken ... - -hook_add preconf 3 'autoconf' - diff --git a/package/gnome2/gtk+/gtk+.desc b/package/gnome2/gtk+/gtk+.desc index 15d38b528..67f4a49d4 100644 --- a/package/gnome2/gtk+/gtk+.desc +++ b/package/gnome2/gtk+/gtk+.desc @@ -39,8 +39,8 @@ [L] GPL [S] Stable -[V] 2.12.1 +[V] 2.14.4 [P] X --?--5---9 160.200 -[D] 1912485766 gtk+-2.12.1.tar.bz2 http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.1/sources/ +[D] 2479133091 gtk+-2.14.4.tar.bz2 http://ftp.gnome.org/pub/GNOME/platform/2.24/2.24.1/sources/ diff --git a/package/gnome2/gtk+/jasper-hotfix.patch b/package/gnome2/gtk+/jasper-hotfix.patch new file mode 100644 index 000000000..94431a358 --- /dev/null +++ b/package/gnome2/gtk+/jasper-hotfix.patch @@ -0,0 +1,11 @@ +--- ./configure.orig 2008-10-30 06:50:57.000000000 +0000 ++++ ./configure 2008-10-30 06:51:25.000000000 +0000 +@@ -28483,7 +28483,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ljasper -ljpeg $LIBS" ++LIBS="-ljasper -ljpeg -lm $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF