From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from plane.gmane.org ([80.91.229.3]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SA2wU-0000FJ-Cw for openembedded-devel@lists.openembedded.org; Tue, 20 Mar 2012 18:33:54 +0100 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1SA2nu-0002Sl-UF for openembedded-devel@lists.openembedded.org; Tue, 20 Mar 2012 18:25:02 +0100 Received: from ip545070eb.adsl-surfen.hetnet.nl ([84.80.112.235]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 20 Mar 2012 18:25:02 +0100 Received: from koen by ip545070eb.adsl-surfen.hetnet.nl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 20 Mar 2012 18:25:02 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: openembedded-devel@lists.openembedded.org From: Koen Kooi Date: Tue, 20 Mar 2012 18:23:03 +0100 Message-ID: References: <1332196360-3171-1-git-send-email-schnitzeltony@googlemail.com> <1332196360-3171-2-git-send-email-schnitzeltony@googlemail.com> Mime-Version: 1.0 X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: ip545070eb.adsl-surfen.hetnet.nl User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 In-Reply-To: <1332196360-3171-2-git-send-email-schnitzeltony@googlemail.com> X-Enigmail-Version: 1.3.5 Subject: Re: [meta-oe v2 1/2] midori: remove midori.inc and oe-stylize 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, 20 Mar 2012 17:33:54 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Op 19-03-12 23:32, Andreas Müller schreef: > > Signed-off-by: Andreas Müller --- > meta-oe/recipes-connectivity/midori/midori.inc | 39 > ------------------ .../recipes-connectivity/midori/midori_0.4.4.bb | > 42 ++++++++++++++++++- 2 files changed, 39 insertions(+), 42 > deletions(-) delete mode 100644 > meta-oe/recipes-connectivity/midori/midori.inc > > diff --git a/meta-oe/recipes-connectivity/midori/midori.inc > b/meta-oe/recipes-connectivity/midori/midori.inc deleted file mode > 100644 index dccb3ee..0000000 --- > a/meta-oe/recipes-connectivity/midori/midori.inc +++ /dev/null @@ -1,39 > +0,0 @@ -DESCRIPTION = "Midori is a lightweight web browser." -HOMEPAGE = > "http://www.twotoasts.de/index.php?/pages/midori_summary.html" -LICENSE = > "LGPLv2.1" -LIC_FILES_CHKSUM = > "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -DEPENDS = > "webkit-gtk libsoup-2.4 libsexy openssl vala-native python-native > python-docutils-native" - -inherit gtk-icon-cache pkgconfig - > -do_configure() { - sed -i -e 's:, shell=False::g' -e > s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript - ./configure > \ - --prefix=${prefix} \ - --bindir=${bindir} \ - > --sbindir=${sbindir} \ - --libexecdir=${libexecdir} \ - > --datadir=${datadir} \ - --sysconfdir=${sysconfdir} \ - > --sharedstatedir=${sharedstatedir} \ - > --localstatedir=${localstatedir} \ - --libdir=${libdir} \ - > --includedir=${includedir} \ - --infodir=${infodir} \ - > --mandir=${mandir} \ - --disable-hildon \ - > --disable-gtk3 \ -} - -LDFLAGS_append = " -ljavascriptcoregtk-1.0 " - > -do_install() { - oe_runmake DESTDIR=${D} install -} - -RRECOMMENDS_${PN} > += "glib-networking ca-certificates gnome-icon-theme" - -FILES_${PN}-dev > += "${datadir}/vala/vapi" - -TARGET_CC_ARCH += "${LDFLAGS}" diff --git > a/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb > b/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb index > 827eb19..bccc7b3 100644 --- > a/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb +++ > b/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb @@ -1,8 +1,44 @@ > -require midori.inc - -PARALLEL_MAKE = "" +DESCRIPTION = "Midori is a > lightweight web browser." +HOMEPAGE = > "http://www.twotoasts.de/index.php?/pages/midori_summary.html" +LICENSE = > "LGPLv2.1" +LIC_FILES_CHKSUM = > "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +DEPENDS = > "webkit-gtk libsoup-2.4 libsexy openssl vala-native python-native > python-docutils-native" > > SRC_URI = > "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori > \ " SRC_URI[midori.md5sum] = "a6578ebfd237c0f22cce49113b95f70c" > SRC_URI[midori.sha256sum] = > "fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2" + > +inherit gtk-icon-cache pkgconfig + +do_configure() { + sed -i -e 's:, > shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g > wscript + ./configure \ + --prefix=${prefix} \ + > --bindir=${bindir} \ + --sbindir=${sbindir} \ + > --libexecdir=${libexecdir} \ + --datadir=${datadir} \ + > --sysconfdir=${sysconfdir} \ + > --sharedstatedir=${sharedstatedir} \ + > --localstatedir=${localstatedir} \ + --libdir=${libdir} \ + > --includedir=${includedir} \ + --infodir=${infodir} \ + > --mandir=${mandir} \ + --disable-hildon \ + > --disable-gtk3 \ +} + +LDFLAGS_append = " -ljavascriptcoregtk-1.0 " > +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install() { + oe_runmake > DESTDIR=${D} install +} + +RRECOMMENDS_${PN} += "glib-networking > ca-certificates gnome-icon-theme" + +FILES_${PN}-dev += > "${datadir}/vala/vapi" + +PARALLEL_MAKE = "" You missed PARALLEL_MAKE :) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (Darwin) Comment: GPGTools - http://gpgtools.org iQIcBAEBAgAGBQJPaLz0AAoJEHZqAkdh1vT6zp4P/ArqfiSyTF+0b2ioQMcTgd/7 xWtP53rcd9m51XV67mqOlsoRreTC4GAGeK5kM2mGx834GZk53lZWzMQgo4txuIaf GgSmWa5Z9dy4sgtPT7LlrnPIUFuMD//pqcqTIsb55VxnAE5Hv8eUmuaWwMajqa1X VgdxzD/lOqxYX4tZHBwrUOGwGZO7gTAzk4SiS/xfBg/wF/TBcgK3CYg9DDz0ABjF 7nizbZqG3obYAvmWm/FrrsJ8V6ztTU2ecVG8+0/1SQsYCThfcxvBjveWXnB8G9cl kGsZcOhj4yEiP0ClWYz42nABB71YVlpOkWsPNiLREbDayoA0/o26TZoQPGIT1Yhl EalA+iy5oZyw2ygCktri/zzbd0xVCdP3IJzuW2Z8GwTWy0xlW8SR5ZvR/rngYxjZ YbyNm/6zmOaEXC0ILL9/lF3MfIak4d6WbdudNulA7O06h7B6NmowDbLUA7wgU12Q oVgTy0J6spoaCfoRWXrRpFCjuSXX7PeqR7a/uSCuKnAevRVNE/5Ywm1AFLBFcbiS aJJqNXqQghJKKGq9QqAWVVRvUWAm1zxr6woXZFVOdBMxEhmiERngwRMgs/jipEYV Kx/4C4fW2fqwGY7JiU0VHNTEPXWvEqBRSHYsd+a9y/GIpYdQwFqdW3OqwlMnRlQe cuuCEF4LDfXngP0lepYp =OlQq -----END PGP SIGNATURE-----