summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-06 02:48:24 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-01-06 13:09:34 +0100
commitf1525721beb9a1a01d9968bc5e1f0babe25ae587 (patch)
tree45889d8e123135f423509d3cc7f49c9a4cf6d279
parent3e65b43f9d483b3ecc69ecd2a5eb2e41a82da653 (diff)
downloadmeta-openembedded-f1525721beb9a1a01d9968bc5e1f0babe25ae587.tar.gz
gtk+3: update to upstream version 3.4.4
* fix.build.automake-1.12.x.patch dropped as upstream has fixed the problem addressed. * COPYING has had formatting changes * In license segments of source files FSF street address is replaced with URL. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-gnome/recipes-gnome/gtk+/gtk+3/fix.build.automake-1.12.x.patch27
-rw-r--r--meta-gnome/recipes-gnome/gtk+/gtk+3_3.4.4.bb (renamed from meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb)25
2 files changed, 15 insertions, 37 deletions
diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+3/fix.build.automake-1.12.x.patch b/meta-gnome/recipes-gnome/gtk+/gtk+3/fix.build.automake-1.12.x.patch
deleted file mode 100644
index 3cbf7dddf..000000000
--- a/meta-gnome/recipes-gnome/gtk+/gtk+3/fix.build.automake-1.12.x.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1diff -uNr gtk+-3.2.3.orig/gtk/Makefile.am gtk+-3.2.3/gtk/Makefile.am
2--- gtk+-3.2.3.orig/gtk/Makefile.am 2011-12-19 14:58:28.000000000 +0100
3+++ gtk+-3.2.3/gtk/Makefile.am 2012-07-18 02:01:59.042628402 +0200
4@@ -942,7 +942,7 @@
5
6 if USE_QUARTZ
7 install-mac-key-theme:
8- $(mkdir_p) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
9+ $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
10 $(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
11 uninstall-mac-key-theme:
12 rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
13@@ -985,11 +985,11 @@
14
15 # Install a RC file for the default GTK+ theme, and key themes
16 install-data-local: install-ms-lib install-def-file install-mac-key-theme
17- $(mkdir_p) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0
18+ $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0
19 $(INSTALL_DATA) $(srcdir)/gtk.css.raleigh $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css
20- $(mkdir_p) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
21+ $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
22 $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
23- $(mkdir_p) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
24+ $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
25 $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
26
27 uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
diff --git a/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb b/meta-gnome/recipes-gnome/gtk+/gtk+3_3.4.4.bb
index 55397cc91..ce09615d9 100644
--- a/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb
+++ b/meta-gnome/recipes-gnome/gtk+/gtk+3_3.4.4.bb
@@ -11,18 +11,18 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor \
11 11
12LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" 12LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
13 13
14LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ 14LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
15 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ 15 file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
16 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ 16 file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \
17 file://tests/testgtk.c;endline=27;md5=ac85be7b810a1e9b00479af8e2018053" 17 file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1"
18 18
19SRC_URI = "http://download.gnome.org/sources/gtk+/3.2/gtk+-${PV}.tar.xz \ 19SRC_URI = "http://download.gnome.org/sources/gtk+/3.4/gtk+-${PV}.tar.xz \
20 file://fix.build.automake-1.12.x.patch \
21" 20"
22SRC_URI[md5sum] = "b4edcc69e39159dd7be17828249afb46"
23SRC_URI[sha256sum] = "e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d"
24 21
25PR = "r2" 22SRC_URI[md5sum] = "1b2cf29502a6394e8d4b30f7f5bb9131"
23SRC_URI[sha256sum] = "f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7"
24
25PR = "r0"
26 26
27inherit autotools pkgconfig 27inherit autotools pkgconfig
28 28
@@ -45,12 +45,17 @@ do_configure_prepend() {
45PACKAGES =+ "${PN}-demo" 45PACKAGES =+ "${PN}-demo"
46LIBV = "3.0.0" 46LIBV = "3.0.0"
47 47
48FILES_${PN}-demo = "${bindir}/gtk3-demo ${datadir}/gtk-3.0/demo" 48FILES_${PN}-demo = "${bindir}/gtk3-demo \
49 ${datadir}/gtk-3.0/demo \
50 ${bindir}/gtk3-demo-application \
51 ${bindir}/gtk3-widget-factory \
52"
49 53
50FILES_${PN} = "${bindir}/gtk-update-icon-cache \ 54FILES_${PN} = "${bindir}/gtk-update-icon-cache \
51 ${bindir}/gtk-query-immodules-3.0 \ 55 ${bindir}/gtk-query-immodules-3.0 \
52 ${libdir}/lib*${SOLIBS} \ 56 ${libdir}/lib*${SOLIBS} \
53 ${datadir}/themes ${sysconfdir} ${datadir}/glib-2.0/schemas/ \ 57 ${datadir}/themes ${sysconfdir} ${datadir}/glib-2.0/schemas/ \
58 ${datadir}/gtk-3.0/gtkbuilder.rng \
54 ${libdir}/gtk-3.0/${LIBV}/engines/libpixmap.so \ 59 ${libdir}/gtk-3.0/${LIBV}/engines/libpixmap.so \
55 ${libdir}/gtk-3.0/modules/*.so" 60 ${libdir}/gtk-3.0/modules/*.so"
56 61