From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from seketeli.net ([91.121.166.71] helo=ms.seketeli.net) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Sh6Yp-0007hh-P7 for openembedded-devel@openembedded.org; Wed, 20 Jun 2012 00:06:07 +0200 Received: from localhost (unknown [109.190.26.176]) by ms.seketeli.net (Postfix) with ESMTP id B6E05EA040; Wed, 20 Jun 2012 00:03:06 +0200 (CEST) Received: by localhost (Postfix, from userid 1000) id 01D08604DE; Tue, 19 Jun 2012 23:55:19 +0200 (CEST) Date: Tue, 19 Jun 2012 23:55:19 +0200 From: Apelete Seketeli To: openembedded-devel@openembedded.org Message-ID: <20120619215519.GI4845@hermes> References: <1340062930-19293-1-git-send-email-apelete@seketeli.net> <1340062930-19293-2-git-send-email-apelete@seketeli.net> <20120619052932.GN3178@jama.jama.net> <20120619060703.GA4845@hermes> <20120619063448.GO3178@jama.jama.net> <20120619195610.GC4845@hermes> <20120619214933.GG4845@hermes> <20120619215238.GH4845@hermes> MIME-Version: 1.0 In-Reply-To: <20120619215238.GH4845@hermes> X-Operating-System: Debian GNU/Linux wheezy/sid X-URL: http://www.seketeli.net/~apelete User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Kristoffer Ericson Subject: [oe-classic][gtk+][PATCH v2 2/2] gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1 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: Tue, 19 Jun 2012 22:06:07 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline This patch adds a patch to the gtk+-2.20.1 recipe that removes the need to build test-inline-pixbufs.h in the demos/Makefile.am file of the gtk+-2.20.1 upstream package. It also removes all the demo programs that were dependant on test-inline-pixbufs.h from demos/Makefile.am. Signed-off-by: Apelete Seketeli --- .../gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch | 22 ++++++++++++++++++++ recipes/gtk+/gtk+_2.20.1.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch diff --git a/recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch b/recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch new file mode 100644 index 0000000..c1fcbd7 --- /dev/null +++ b/recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch @@ -0,0 +1,22 @@ +--- gtk+-2.20.1/demos/Makefile.am.orig 2012-06-18 21:53:07.365997572 +0200 ++++ gtk+-2.20.1/demos/Makefile.am 2012-06-18 21:53:43.718177837 +0200 +@@ -23,18 +23,9 @@ + $(GTK_DEP_LIBS) \ + $(MATH_LIB) + +-noinst_PROGRAMS = \ +- testpixbuf-drawable \ +- testanimation \ +- testpixbuf-color \ +- testpixbuf-save \ +- testpixbuf-scale \ +- pixbuf-demo +- + # Need to build test-inline-pixbufs.h for testpixbuf + if HAVE_PNG +-noinst_PROGRAMS += testpixbuf +-BUILT_SOURCES = test-inline-pixbufs.h ++BUILT_SOURCES = + endif + + if CROSS_COMPILING diff --git a/recipes/gtk+/gtk+_2.20.1.bb b/recipes/gtk+/gtk+_2.20.1.bb index 9cffee1..af73d31 100644 --- a/recipes/gtk+/gtk+_2.20.1.bb +++ b/recipes/gtk+/gtk+_2.20.1.bb @@ -5,6 +5,7 @@ SRC_URI_append_virtclass-native = " file://no-demos.patch \ SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch \ file://cross-nm.patch \ file://xkb-ifdef.patch \ + file://no-test-inline-pixbufs.patch \ " SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa" -- 1.7.10 -- Apelete