Patchwork [meta-oe,1/2] midori: remove midori.inc and oe-stylize

login
register
mail settings
Submitter Andreas Müller
Date March 21, 2012, 8:10 p.m.
Message ID <1332360619-3060-2-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/24033/
State Accepted
Commit a6d45578d95f7d5cce658ab0472ada6ce4794a9f
Headers show

Comments

Andreas Müller - March 21, 2012, 8:10 p.m.
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    |   41 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 42 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/midori/midori.inc
Martin Jansa - March 28, 2012, 2:21 p.m.
On Wed, Mar 21, 2012 at 09:10:18PM +0100, Andreas Müller wrote:
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

Acked-by: Martin Jansa <Martin.Jansa@gmail.com>

> ---
>  meta-oe/recipes-connectivity/midori/midori.inc     |   39 -------------------
>  .../recipes-connectivity/midori/midori_0.4.4.bb    |   41 ++++++++++++++++++-
>  2 files changed, 38 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..87855b1 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,43 @@
> -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 \
> +}
> +
> +PARALLEL_MAKE = ""
> +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"
> -- 
> 1.7.4.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

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..87855b1 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,43 @@ 
-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 \
+}
+
+PARALLEL_MAKE = ""
+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"