summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2010-03-01 14:25:52 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-03-01 14:25:52 +0100
commitec35cfce09a05bb81b2449367528771214cd04fa (patch)
tree09bd8258ea29b933b299cadf0de51e85afa44c1e
parent4c664e5ead508f0efdc198dd6f79c0590f6376b5 (diff)
downloadptxdist-ec35cfce09a05bb81b2449367528771214cd04fa.tar.gz
ptxdist-ec35cfce09a05bb81b2449367528771214cd04fa.tar.xz
[gtk] version bump 2.18.3 -> 2.18.7
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
l---------patches/gtk+-2.18.7/autogen.sh (renamed from patches/gtk+-2.18.3/autogen.sh)0
-rw-r--r--patches/gtk+-2.18.7/gtk+-2.10.11-iconcache.diff (renamed from patches/gtk+-2.18.3/gtk+-2.10.11-iconcache.diff)0
-rw-r--r--patches/gtk+-2.18.7/gtk+-2.10.12-no-demos.diff (renamed from patches/gtk+-2.18.3/gtk+-2.10.12-no-demos.diff)0
-rw-r--r--patches/gtk+-2.18.7/series (renamed from patches/gtk+-2.18.3/series)0
-rw-r--r--rules/gtk.make40
5 files changed, 21 insertions, 19 deletions
diff --git a/patches/gtk+-2.18.3/autogen.sh b/patches/gtk+-2.18.7/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/gtk+-2.18.3/autogen.sh
+++ b/patches/gtk+-2.18.7/autogen.sh
diff --git a/patches/gtk+-2.18.3/gtk+-2.10.11-iconcache.diff b/patches/gtk+-2.18.7/gtk+-2.10.11-iconcache.diff
index 206977d69..206977d69 100644
--- a/patches/gtk+-2.18.3/gtk+-2.10.11-iconcache.diff
+++ b/patches/gtk+-2.18.7/gtk+-2.10.11-iconcache.diff
diff --git a/patches/gtk+-2.18.3/gtk+-2.10.12-no-demos.diff b/patches/gtk+-2.18.7/gtk+-2.10.12-no-demos.diff
index b8d131a19..b8d131a19 100644
--- a/patches/gtk+-2.18.3/gtk+-2.10.12-no-demos.diff
+++ b/patches/gtk+-2.18.7/gtk+-2.10.12-no-demos.diff
diff --git a/patches/gtk+-2.18.3/series b/patches/gtk+-2.18.7/series
index 306739059..306739059 100644
--- a/patches/gtk+-2.18.3/series
+++ b/patches/gtk+-2.18.7/series
diff --git a/rules/gtk.make b/rules/gtk.make
index fc4269758..e7568b444 100644
--- a/rules/gtk.make
+++ b/rules/gtk.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_GTK) += gtk
#
# Paths and names
#
-GTK_VERSION := 2.18.3
+GTK_VERSION := 2.18.7
GTK := gtk+-$(GTK_VERSION)
GTK_SUFFIX := tar.bz2
GTK_URL := http://ftp.gtk.org/pub/gtk/2.18/$(GTK).$(GTK_SUFFIX)
@@ -96,6 +96,8 @@ ifdef PTXCONF_GTK_TARGET_WIN32
GTK_AUTOCONF += --with-gdktarget=win32
endif
+GTK_VERSION_TUPLE := $(subst ., ,$(GTK_VERSION))
+GTK_LIBVERSION := 0.$(word 2,$(GTK_VERSION_TUPLE))00.$(word 3,$(GTK_VERSION_TUPLE))
# ----------------------------------------------------------------------------
# Target-Install
@@ -130,7 +132,7 @@ $(STATEDIR)/gtk.targetinstall:
# /usr/share/themes/Raleigh
# /usr/share/themes/Raleigh/gtk-2.0
# /usr/share/themes/Raleigh/gtk-2.0/gtkrc
-# /usr/lib/libgdk_pixbuf-2.0.so.0.1800.3
+# /usr/lib/libgdk_pixbuf-2.0.so.$(GTK_LIBVERSION)
# /usr/lib/libgdk-directfb-2.0.so
# /usr/lib/gtk-2.0/modules/libferret.so
# /usr/lib/gtk-2.0/modules/libgail.so
@@ -143,34 +145,34 @@ $(STATEDIR)/gtk.targetinstall:
# /usr/lib/libgailutil.so
# /usr/lib/libgdk_pixbuf-2.0.so
# /usr/lib/libgtk-directfb-2.0.so.0
-# /usr/lib/libgdk-directfb-2.0.so.0.1800.3
+# /usr/lib/libgdk-directfb-2.0.so.$(GTK_LIBVERSION)
# /usr/lib/libgtk-directfb-2.0.so
-# /usr/lib/libgtk-directfb-2.0.so.0.1800.3
+# /usr/lib/libgtk-directfb-2.0.so.$(GTK_LIBVERSION)
# /etc/gtk-2.0/im-multipress.conf
ifdef PTXCONF_GTK_TARGET_DIRECTFB
- @$(call install_copy, gtk, 0, 0, 0644, -, /usr/lib/libgdk-directfb-2.0.so.0.1800.3)
- @$(call install_link, gtk, libgdk-directfb-2.0.so.0.1800.3, /usr/lib/libgdk-directfb-2.0.so.0)
- @$(call install_link, gtk, libgdk-directfb-2.0.so.0.1800.3, /usr/lib/libgdk-directfb-2.0.so)
+ @$(call install_copy, gtk, 0, 0, 0644, -, /usr/lib/libgdk-directfb-2.0.so.$(GTK_LIBVERSION))
+ @$(call install_link, gtk, libgdk-directfb-2.0.so.$(GTK_LIBVERSION), /usr/lib/libgdk-directfb-2.0.so.0)
+ @$(call install_link, gtk, libgdk-directfb-2.0.so.$(GTK_LIBVERSION), /usr/lib/libgdk-directfb-2.0.so)
- @$(call install_copy, gtk, 0, 0, 0644, -, /usr/lib/libgtk-directfb-2.0.so.0.1800.3)
- @$(call install_link, gtk, libgtk-directfb-2.0.so.0.1800.3, /usr/lib/libgtk-directfb-2.0.so.0)
- @$(call install_link, gtk, libgtk-directfb-2.0.so.0.1800.3, /usr/lib/libgtk-directfb-2.0.so)
+ @$(call install_copy, gtk, 0, 0, 0644, -, /usr/lib/libgtk-directfb-2.0.so.$(GTK_LIBVERSION))
+ @$(call install_link, gtk, libgtk-directfb-2.0.so.$(GTK_LIBVERSION), /usr/lib/libgtk-directfb-2.0.so.0)
+ @$(call install_link, gtk, libgtk-directfb-2.0.so.$(GTK_LIBVERSION), /usr/lib/libgtk-directfb-2.0.so)
endif
ifdef PTXCONF_GTK_TARGET_X11
- @$(call install_copy, gtk, 0, 0, 0644, -, /usr/lib/libgdk-x11-2.0.so.0.1800.3)
- @$(call install_link, gtk, libgdk-x11-2.0.so.0.1800.3, /usr/lib/libgdk-x11-2.0.so.0)
- @$(call install_link, gtk, libgdk-x11-2.0.so.0.1800.3, /usr/lib/libgdk-x11-2.0.so)
+ @$(call install_copy, gtk, 0, 0, 0644, -, /usr/lib/libgdk-x11-2.0.so.$(GTK_LIBVERSION))
+ @$(call install_link, gtk, libgdk-x11-2.0.so.$(GTK_LIBVERSION), /usr/lib/libgdk-x11-2.0.so.0)
+ @$(call install_link, gtk, libgdk-x11-2.0.so.$(GTK_LIBVERSION), /usr/lib/libgdk-x11-2.0.so)
- @$(call install_copy, gtk, 0, 0, 0644, -, /usr/lib/libgtk-x11-2.0.so.0.1800.3)
- @$(call install_link, gtk, libgtk-x11-2.0.so.0.1800.3, /usr/lib/libgtk-x11-2.0.so.0)
- @$(call install_link, gtk, libgtk-x11-2.0.so.0.1800.3, /usr/lib/libgtk-x11-2.0.so)
+ @$(call install_copy, gtk, 0, 0, 0644, -, /usr/lib/libgtk-x11-2.0.so.$(GTK_LIBVERSION))
+ @$(call install_link, gtk, libgtk-x11-2.0.so.$(GTK_LIBVERSION), /usr/lib/libgtk-x11-2.0.so.0)
+ @$(call install_link, gtk, libgtk-x11-2.0.so.$(GTK_LIBVERSION), /usr/lib/libgtk-x11-2.0.so)
endif
- @$(call install_copy, gtk, 0, 0, 0644, -, /usr/lib/libgdk_pixbuf-2.0.so.0.1800.3)
- @$(call install_link, gtk, libgdk_pixbuf-2.0.so.0.1800.3, /usr/lib/libgdk_pixbuf-2.0.so.0)
- @$(call install_link, gtk, libgdk_pixbuf-2.0.so.0.1800.3, /usr/lib/libgdk_pixbuf-2.0.so)
+ @$(call install_copy, gtk, 0, 0, 0644, -, /usr/lib/libgdk_pixbuf-2.0.so.$(GTK_LIBVERSION))
+ @$(call install_link, gtk, libgdk_pixbuf-2.0.so.$(GTK_LIBVERSION), /usr/lib/libgdk_pixbuf-2.0.so.0)
+ @$(call install_link, gtk, libgdk_pixbuf-2.0.so.$(GTK_LIBVERSION), /usr/lib/libgdk_pixbuf-2.0.so)
ifdef PTXCONF_GTK_DEMO
@$(call install_copy, gtk, 0, 0, 0755, \