* [meta-oe v2 0/2] midori: cleanup
@ 2012-03-19 22:32 Andreas Müller
2012-03-19 22:32 ` [meta-oe v2 1/2] midori: remove midori.inc and oe-stylize Andreas Müller
2012-03-19 22:32 ` [meta-oe v2 2/2] midori: add librsvg-native to DEPENDS Andreas Müller
0 siblings, 2 replies; 4+ messages in thread
From: Andreas Müller @ 2012-03-19 22:32 UTC (permalink / raw)
To: openembedded-devel
v1 -> v2:
change order variables/functions as suggested in [1]
[1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-March/038650.html
Andreas Müller (2):
midori: remove midori.inc and oe-stylize
midori: add librsvg-native to DEPENDS
meta-oe/recipes-connectivity/midori/midori.inc | 39 ------------------
.../recipes-connectivity/midori/midori_0.4.4.bb | 42 +++++++++++++++++++-
2 files changed, 40 insertions(+), 41 deletions(-)
delete mode 100644 meta-oe/recipes-connectivity/midori/midori.inc
--
1.7.4.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [meta-oe v2 1/2] midori: remove midori.inc and oe-stylize
2012-03-19 22:32 [meta-oe v2 0/2] midori: cleanup Andreas Müller
@ 2012-03-19 22:32 ` Andreas Müller
2012-03-20 17:23 ` Koen Kooi
2012-03-19 22:32 ` [meta-oe v2 2/2] midori: add librsvg-native to DEPENDS Andreas Müller
1 sibling, 1 reply; 4+ messages in thread
From: Andreas Müller @ 2012-03-19 22:32 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
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 = ""
--
1.7.4.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-oe v2 2/2] midori: add librsvg-native to DEPENDS
2012-03-19 22:32 [meta-oe v2 0/2] midori: cleanup Andreas Müller
2012-03-19 22:32 ` [meta-oe v2 1/2] midori: remove midori.inc and oe-stylize Andreas Müller
@ 2012-03-19 22:32 ` Andreas Müller
1 sibling, 0 replies; 4+ messages in thread
From: Andreas Müller @ 2012-03-19 22:32 UTC (permalink / raw)
To: openembedded-devel
configure found rsvg-convert on host:
...
Checking for program rsvg-convert : /usr/bin/rsvg-convert
...
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../recipes-connectivity/midori/midori_0.4.4.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
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 bccc7b3..a317b5a 100644
--- a/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb
+++ b/meta-oe/recipes-connectivity/midori/midori_0.4.4.bb
@@ -2,7 +2,9 @@ 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"
+DEPENDS = "webkit-gtk libsoup-2.4 libsexy openssl vala-native python-native python-docutils-native librsvg-native"
+
+PR = "r1"
SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
"
--
1.7.4.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-oe v2 1/2] midori: remove midori.inc and oe-stylize
2012-03-19 22:32 ` [meta-oe v2 1/2] midori: remove midori.inc and oe-stylize Andreas Müller
@ 2012-03-20 17:23 ` Koen Kooi
0 siblings, 0 replies; 4+ messages in thread
From: Koen Kooi @ 2012-03-20 17:23 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 19-03-12 23:32, Andreas Müller schreef:
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---
> 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-----
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-20 17:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-19 22:32 [meta-oe v2 0/2] midori: cleanup Andreas Müller
2012-03-19 22:32 ` [meta-oe v2 1/2] midori: remove midori.inc and oe-stylize Andreas Müller
2012-03-20 17:23 ` Koen Kooi
2012-03-19 22:32 ` [meta-oe v2 2/2] midori: add librsvg-native to DEPENDS Andreas Müller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.