From: Apelete Seketeli <apelete@seketeli.net>
To: openembedded-devel@openembedded.org
Cc: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Subject: [oe-classic][gtk+][PATCH v2 2/2] gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1
Date: Tue, 19 Jun 2012 23:55:19 +0200 [thread overview]
Message-ID: <20120619215519.GI4845@hermes> (raw)
In-Reply-To: <20120619215238.GH4845@hermes>
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 <apelete@seketeli.net>
---
.../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
next prev parent reply other threads:[~2012-06-19 22:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-18 23:42 [PATCH 0/1] gtk+: Regenerate no-demos.patch and update recipe Apelete Seketeli
2012-06-18 23:42 ` [PATCH 1/1] " Apelete Seketeli
2012-06-19 5:29 ` Martin Jansa
2012-06-19 6:07 ` Apelete Seketeli
2012-06-19 6:34 ` Martin Jansa
2012-06-19 19:56 ` Apelete Seketeli
2012-06-19 21:49 ` [oe-classic][gtk+][PATCH v2 0/2] gtk+: fix build issue by not building demo programs Apelete Seketeli
2012-06-19 21:52 ` [oe-classic][gtk+][PATCH v2 1/2] gtk+: Rebase gtk+-2.20.1/no-demos.patch Apelete Seketeli
2012-06-19 21:55 ` Apelete Seketeli [this message]
2012-06-27 16:30 ` [oe-classic][gtk+][PATCH v2 2/2] gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1 Apelete Seketeli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120619215519.GI4845@hermes \
--to=apelete@seketeli.net \
--cc=kristoffer.ericson@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
--cc=openembedded-devel@openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox