[PATCHES] Fixing Mamona-related packages.

[PATCHES] Fixing Mamona-related packages.

[Ricardo Salveti de Araujo]

Patches:
[PATCH 1/2] mamonaim-e-applet-git: bumping rev, fixing PV and using oe-stylize
[PATCH 2/2] mamona-input-methods-git: bumping rev, fixing PV and using oe-stylize

Both patches are basically to fix broken Mamona-related packages at current OE. When Rodrigo Vivi started
to merge some Mamona commits, he actually got the wrong ones for these recipes, so this basically fix
something that didn't actually work.

As current Rodrigo Vivi is not working at Mamona and OE anymore (at least not directly related as before),
I'm basically maintaining it with Alecrim and Willer, but as none of us have commit access, I'm asking
for anyone to please apply both pathes at OE tree.

We are currently working at Mamona Overlay and probably until the end of this week I'll submit many other
commits for review and merge.

Thanks,

Ricardo

[PATCH 1/2] mamonaim-e-applet-git: bumping rev, fixing PV and using oe-stylize

[Ricardo Salveti de Araujo]

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@openbossa.org>
---
 conf/distro/include/sane-srcrevs.inc    |    2 +-
 recipes/mamona/mamonaim-e-applet_git.bb |   17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7b11e1d..42598c1 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -172,7 +172,7 @@ SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
 SRCREV_pn-maemo-mapper ?= "118"
 SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9"
-SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04"
+SRCREV_pn-mamonaim-e-applet ?= "a1ba7e8a388ffce3cca92bad059cd801e7733a7a"
 SRCREV_pn-matchbox-config-gtk ?= "1614"
 SRCREV_pn-matchbox-desktop-2 ?= "2096"
 SRCREV_pn-matchbox-keyboard ?= "1910"
diff --git a/recipes/mamona/mamonaim-e-applet_git.bb b/recipes/mamona/mamonaim-e-applet_git.bb
index 6f45a45..c858dfc 100644
--- a/recipes/mamona/mamonaim-e-applet_git.bb
+++ b/recipes/mamona/mamonaim-e-applet_git.bb
@@ -5,15 +5,18 @@ DESCRIPTION = "Mamona-IM Enlightenment Applet"
 HOMEPAGE = "http://dev.openbossa.org/trac/mamona/wiki"
 LICENSE = "MIT BSD"
 DEPENDS = "mamona-input-methods e-wm"
-PR = "r0"
+PV = "0.1-${PR}+gitr${SRCREV}"
+PR = "r1"
+PE = "1"
 
-PV = "0.1+git"
+SRC_URI = "git://dev.openbossa.org/mamona/projects/mamonaim_e_applet.git;protocol=http"
+S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
-SRC_URI = "git://dev.openbossa.org/mamona/projects/mamonaim_e_applet.git;protocol=http"
-
-S = "${WORKDIR}/git"
+do_configure_prepend() {
+        ./autogen.sh
+}
 
 # E Applet
 FILES_${PN} = "\
@@ -30,7 +33,3 @@ FILES_${PN}-dev = "\
 FILES_${PN}-dbg = "\
             ${libdir}/enlightenment/modules/mamonaim/*/.debug \
         "
-
-do_configure_prepend() {
-    ./autogen.sh
-}
-- 
1.6.5

[PATCH 2/2] mamona-input-methods-git: bumping rev, fixing PV and using oe-stylize

[Ricardo Salveti de Araujo]

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@openbossa.org>
---
 conf/distro/include/sane-srcrevs.inc       |    2 +-
 recipes/mamona/mamona-input-methods_git.bb |   58 ++++++++++++----------------
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 42598c1..fa9795d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -171,7 +171,7 @@ SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
 SRCREV_pn-maemo-mapper ?= "118"
-SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9"
+SRCREV_pn-mamona-input-methods ?= "4a8f11973021b8b4f157f5743e00f9f9a3c4802b"
 SRCREV_pn-mamonaim-e-applet ?= "a1ba7e8a388ffce3cca92bad059cd801e7733a7a"
 SRCREV_pn-matchbox-config-gtk ?= "1614"
 SRCREV_pn-matchbox-desktop-2 ?= "2096"
diff --git a/recipes/mamona/mamona-input-methods_git.bb b/recipes/mamona/mamona-input-methods_git.bb
index ca89453..6b82697 100644
--- a/recipes/mamona/mamona-input-methods_git.bb
+++ b/recipes/mamona/mamona-input-methods_git.bb
@@ -3,21 +3,30 @@
 
 DESCRIPTION = "Mamona input methods"
 HOMEPAGE = "http://dev.openbossa.org/trac/mamona/wiki"
-LICENSE = "GPL"
 SECTION = "libs/inputmethods"
+LICENSE = "GPL"
 DEPENDS = "ecore gtk+"
-PR = "r4"
-
-PV = "0.1+git"
-
-inherit autotools pkgconfig lib_package
+RPROVIDES_${PN} = "libmamona-im0"
+RPROVIDES_${PN}-ecore = "libmamona-im-ecore"
+RPROVIDES_${PN}-gtk = "libmamona-im-gtk"
+PV = "0.1-${PR}+gitr${SRCREV}"
+PR = "r5"
+PE = "1"
 
 SRC_URI = "git://dev.openbossa.org/mamona/projects/mamona_input_methods.git;protocol=http"
 
 S = "${WORKDIR}/git"
 
-# Mamona IM
-RPROVIDES_${PN} = "libmamona-im0"
+inherit autotools_stage pkgconfig lib_package
+
+EXTRA_OECONF = "\
+        --enable-ecore-im \
+        --enable-gtk-im \
+        "
+
+do_configure_prepend() {
+        ./autogen.sh
+}
 
 # Ecore
 PACKAGES += "\
@@ -25,10 +34,13 @@ PACKAGES += "\
             ${PN}-ecore-dev \
             ${PN}-ecore-dbg \
         "
-RPROVIDES_${PN}-ecore = "libmamona-im-ecore"
-EXTRA_OECONF = "\
-            --enable-ecore-im \
+# GTK
+PACKAGES += "\
+            ${PN}-gtk \
+            ${PN}-gtk-dev \
+            ${PN}-gtk-dbg \
         "
+
 FILES_${PN}-ecore = "\
             ${libdir}/ecore/immodules/mamona-im-ecore-module.so \
         "
@@ -39,17 +51,6 @@ FILES_${PN}-ecore-dev = "\
 FILES_${PN}-ecore-dbg = "\
             ${libdir}/ecore/immodules/.debug \
         "
-
-# GTK
-PACKAGES += "\
-            ${PN}-gtk \
-            ${PN}-gtk-dev \
-            ${PN}-gtk-dbg \
-        "
-RPROVIDES_${PN}-gtk = "libmamona-im-gtk"
-EXTRA_OECONF += "\
-            --enable-gtk-im \
-        "
 FILES_${PN}-gtk = "\
             ${libdir}/gtk-2.0/*/immodules/mamona-im-gtk-module.so \
         "
@@ -61,18 +62,9 @@ FILES_${PN}-gtk-dbg = "\
             ${libdir}/gtk-2.0/*/immodules/.debug \
         "
 
-do_configure_prepend() {
-    ./autogen.sh
-}
-
-do_stage() {
-    autotools_stage_all
-}
-
 pkg_postinst_${PN}-gtk() {
-    gtk-query-immodules-2.0 > ${sysconfdir}/gtk-2.0/gtk.immodules
+        gtk-query-immodules-2.0 > ${sysconfdir}/gtk-2.0/gtk.immodules
 }
-
 pkg_postrm_${PN}-gtk() {
-    gtk-query-immodules-2.0 > ${sysconfdir}/gtk-2.0/gtk.immodules
+        gtk-query-immodules-2.0 > ${sysconfdir}/gtk-2.0/gtk.immodules
 }
-- 
1.6.5

Re: [PATCHES] Fixing Mamona-related packages.

[Ricardo Salveti de Araujo]

Anyone?

Or should I ask for commit access to push the modifications we're
creating for mamona?

Cheers,

On Mon, Nov 23, 2009 at 3:06 PM, Ricardo Salveti de Araujo
<ricardo.salveti@openbossa.org> wrote:
> Patches:
> [PATCH 1/2] mamonaim-e-applet-git: bumping rev, fixing PV and using oe-stylize
> [PATCH 2/2] mamona-input-methods-git: bumping rev, fixing PV and using oe-stylize
>
> Both patches are basically to fix broken Mamona-related packages at current OE. When Rodrigo Vivi started
> to merge some Mamona commits, he actually got the wrong ones for these recipes, so this basically fix
> something that didn't actually work.
>
> As current Rodrigo Vivi is not working at Mamona and OE anymore (at least not directly related as before),
> I'm basically maintaining it with Alecrim and Willer, but as none of us have commit access, I'm asking
> for anyone to please apply both pathes at OE tree.
>
> We are currently working at Mamona Overlay and probably until the end of this week I'll submit many other
> commits for review and merge.
>
> Thanks,
>
> Ricardo
>
>



-- 
Ricardo Salveti de Araujo

Re: [PATCHES] Fixing Mamona-related packages.

[Koen Kooi]

On 25-11-09 18:24, Ricardo Salveti de Araujo wrote:
> Anyone?

I was planning to look at them later this week but...

> Or should I ask for commit access to push the modifications we're
> creating for mamona?

...having commit access won't hurt :)

>
> Cheers,
>
> On Mon, Nov 23, 2009 at 3:06 PM, Ricardo Salveti de Araujo
> <ricardo.salveti@openbossa.org>  wrote:
>> Patches:
>> [PATCH 1/2] mamonaim-e-applet-git: bumping rev, fixing PV and using oe-stylize
>> [PATCH 2/2] mamona-input-methods-git: bumping rev, fixing PV and using oe-stylize
>>
>> Both patches are basically to fix broken Mamona-related packages at current OE. When Rodrigo Vivi started
>> to merge some Mamona commits, he actually got the wrong ones for these recipes, so this basically fix
>> something that didn't actually work.
>>
>> As current Rodrigo Vivi is not working at Mamona and OE anymore (at least not directly related as before),
>> I'm basically maintaining it with Alecrim and Willer, but as none of us have commit access, I'm asking
>> for anyone to please apply both pathes at OE tree.
>>
>> We are currently working at Mamona Overlay and probably until the end of this week I'll submit many other
>> commits for review and merge.
>>
>> Thanks,
>>
>> Ricardo
>>
>>
>
>
>

Re: [PATCHES] Fixing Mamona-related packages.

[Ricardo Salveti de Araujo]

On Wed, Nov 25, 2009 at 3:16 PM, Koen Kooi <k.kooi@student.utwente.nl> wrote:
> On 25-11-09 18:24, Ricardo Salveti de Araujo wrote:
>>
>> Anyone?
>
> I was planning to look at them later this week but...
>
>> Or should I ask for commit access to push the modifications we're
>> creating for mamona?
>
> ...having commit access won't hurt :)

Ok, send the email asking commit access :-)

Then I can apply these patches later.

Thanks,
-- 
Ricardo Salveti de Araujo