Received: from mail-we0-f175.google.com ([74.125.82.175]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SrI9a-0005rX-P7 for openembedded-devel@lists.openembedded.org; Wed, 18 Jul 2012 02:30:10 +0200 Received: by weyr6 with SMTP id r6so592955wey.6 for ; Tue, 17 Jul 2012 17:18:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=v1N8c9JXIZFj5bExsD5N8faOQ1hvcRA8ZwpTjduX0i8=; b=mWyr3ie6nv09zQn2nv41VWzp3EfKLbNcJf7qqC/GWPzAo4Z1/2NTOpLqqY96w1rEfF fiXRu59EW4mTLapxdvdxEadX8a54Bi8OCuN+qn5hRwXyPpgKF7YOiUQw7xISDTCNUyuU sJWOlnu8Y4cuXdsUz+AsBCbUlhryplj9jzde3M/GbPuy0b4SBrX4kVFldBVlXQkuDqP5 bkgYjM5K5CEZTckkjeI+vmzG7/WqKaltoLa2F6FOcWztUSNOvvyKdzGUp/toXnIujVBs Lzc107W4cwORr+IqlztLeaSWk4/aCq3Q14GAKitusHAGgLk4i5jN1ZxCNgxL87WgAsVm e9GA== Received: by 10.180.82.164 with SMTP id j4mr1853823wiy.18.1342570731023; Tue, 17 Jul 2012 17:18:51 -0700 (PDT) Received: from localhost ([94.230.152.246]) by mx.google.com with ESMTPS id y2sm29714703wix.7.2012.07.17.17.18.49 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Jul 2012 17:18:50 -0700 (PDT) From: Martin Jansa To: openembedded-devel@lists.openembedded.org Date: Wed, 18 Jul 2012 02:18:51 +0200 Message-Id: <1342570731-8385-2-git-send-email-Martin.Jansa@gmail.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1342570731-8385-1-git-send-email-Martin.Jansa@gmail.com> References: <1342564992-18614-2-git-send-email-Martin.Jansa@gmail.com> <1342570731-8385-1-git-send-email-Martin.Jansa@gmail.com> Subject: [meta-gnome][PATCH 2/2] gtk+3: fix build with automake-1.12.x X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jul 2012 00:30:10 -0000 Signed-off-by: Martin Jansa --- .../gtk+/gtk+3/fix.build.automake-1.12.x.patch | 27 ++++++++++++++++++++ meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb | 6 +++- 2 files changed, 32 insertions(+), 1 deletions(-) create mode 100644 meta-gnome/recipes-gnome/gtk+/gtk+3/fix.build.automake-1.12.x.patch 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 0000000..3cbf7dd --- /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 2dc4c64..8553eb8 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}" -- 1.7.8.6