diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2012-07-19 07:13:47 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-07-19 11:09:49 +0200 |
| commit | 20cfbc9640550d80c0a484edf9abbc8c58784359 (patch) | |
| tree | 1134e3e08a7e23d928c5c84adc128f3d94c6dfc9 /meta-gnome | |
| parent | ef13d654ef3ebcf42bc8f03eab988a41b7564b81 (diff) | |
| download | meta-openembedded-contrib-20cfbc9640550d80c0a484edf9abbc8c58784359.tar.gz | |
gtk+3: fix build with automake-1.12.x
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-gnome')
| -rw-r--r-- | meta-gnome/recipes-gnome/gtk+/gtk+3/fix.build.automake-1.12.x.patch | 27 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb | 6 |
2 files changed, 32 insertions, 1 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 new file mode 100644 index 0000000000..3cbf7dddfd --- /dev/null +++ b/meta-gnome/recipes-gnome/gtk+/gtk+3/fix.build.automake-1.12.x.patch @@ -0,0 +1,27 @@ +diff -uNr gtk+-3.2.3.orig/gtk/Makefile.am gtk+-3.2.3/gtk/Makefile.am +--- gtk+-3.2.3.orig/gtk/Makefile.am 2011-12-19 14:58:28.000000000 +0100 ++++ gtk+-3.2.3/gtk/Makefile.am 2012-07-18 02:01:59.042628402 +0200 +@@ -942,7 +942,7 @@ + + if USE_QUARTZ + install-mac-key-theme: +- $(mkdir_p) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0 ++ $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0 + $(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css + uninstall-mac-key-theme: + rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css +@@ -985,11 +985,11 @@ + + # Install a RC file for the default GTK+ theme, and key themes + install-data-local: install-ms-lib install-def-file install-mac-key-theme +- $(mkdir_p) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0 ++ $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0 + $(INSTALL_DATA) $(srcdir)/gtk.css.raleigh $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css +- $(mkdir_p) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0 ++ $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0 + $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css +- $(mkdir_p) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0 ++ $(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0 + $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css + + 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.2.3.bb index 2dc4c6438f..8553eb8816 100644 --- a/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb +++ b/meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb @@ -16,10 +16,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ file://tests/testgtk.c;endline=27;md5=ac85be7b810a1e9b00479af8e2018053" -SRC_URI = "http://download.gnome.org/sources/gtk+/3.2/gtk+-${PV}.tar.xz" +SRC_URI = "http://download.gnome.org/sources/gtk+/3.2/gtk+-${PV}.tar.xz \ + file://fix.build.automake-1.12.x.patch \ +" SRC_URI[md5sum] = "b4edcc69e39159dd7be17828249afb46" SRC_URI[sha256sum] = "e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d" +PR = "r1" + inherit autotools pkgconfig S = "${WORKDIR}/gtk+-${PV}" |