[meta-xfce/meta-gnome/V2 00/10] various updates

[meta-xfce/meta-gnome/V2 00/10] various updates

[Andreas Müller]

V1->V2:

* mousepad: add gtksourceview2 to depends
* exo: correct version 0.10.2 in commit message
* xfce4-terminal: V1 was 0.6.0 / V2 is 0.6.1

All patches were built from scratch and run tested on gumstix overo

The following changes since commit 1de21e56eeefdcfe4972900cf9f651ba1d8c9f0b:

  imagemagick: disable opencl (2012-12-27 16:14:23 +0100)

are available in the git repository at:
  git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git patches

Andreas Müller (10):
      exo: update to 0.10.2
      tumbler: update to 0.1.26
      thunar: update to 1.6.2
      xfce4-terminal: update to 0.6.1
      packagegroup-xfce-base: xfce-terminal -> xfce4-terminal
      mousepad: initial add 0.3.0
      xfce4-mixer: update to 4.10.0
      xfce4-places-plugin: update to 1.5.0
      midori: update to 0.4.7
      xfce4-session: fix build on X11-less hosts

 .../midori/{midori_0.4.6.bb => midori_0.4.7.bb}    |    7 +--
 meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb  |   10 +++++
 .../xfce-terminal/xfce-terminal_0.4.8.bb           |   20 ----------
 ...{xfce4-mixer_4.8.0.bb => xfce4-mixer_4.10.0.bb} |    6 +-
 .../xfce4-terminal/xfce4-terminal_0.6.1.bb         |   12 ++++++
 ...lugin_1.4.0.bb => xfce4-places-plugin_1.5.0.bb} |    4 +-
 meta-xfce/recipes-xfce/exo/exo/configure.patch     |    4 +-
 .../exo/{exo_0.8.0.bb => exo_0.10.2.bb}            |    4 +-
 .../packagegroups/packagegroup-xfce-base.bb        |    4 +-
 .../thunar/{thunar_1.4.0.bb => thunar_1.6.2.bb}    |    5 +-
 .../{tumbler_0.1.25.bb => tumbler_0.1.26.bb}       |    4 +-
 ...03-configure.in-hard-code-path-to-iceauth.patch |   40 ++++++++++++++++++++
 .../xfce4-session/xfce4-session_4.10.0.bb          |    6 ++-
 13 files changed, 83 insertions(+), 43 deletions(-)
 rename meta-gnome/recipes-connectivity/midori/{midori_0.4.6.bb => midori_0.4.7.bb} (86%)
 create mode 100644 meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb
 delete mode 100644 meta-xfce/recipes-apps/xfce-terminal/xfce-terminal_0.4.8.bb
 rename meta-xfce/recipes-apps/xfce4-mixer/{xfce4-mixer_4.8.0.bb => xfce4-mixer_4.10.0.bb} (53%)
 create mode 100644 meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.6.1.bb
 rename meta-xfce/recipes-panel-plugins/places/{xfce4-places-plugin_1.4.0.bb => xfce4-places-plugin_1.5.0.bb} (68%)
 rename meta-xfce/recipes-xfce/exo/{exo_0.8.0.bb => exo_0.10.2.bb} (87%)
 rename meta-xfce/recipes-xfce/thunar/{thunar_1.4.0.bb => thunar_1.6.2.bb} (84%)
 rename meta-xfce/recipes-xfce/tumbler/{tumbler_0.1.25.bb => tumbler_0.1.26.bb} (89%)
 create mode 100644 meta-xfce/recipes-xfce/xfce4-session/files/0003-configure.in-hard-code-path-to-iceauth.patch

-- 
1.7.4.4

[meta-xfce/meta-gnome/V2 01/10] exo: update to 0.10.2

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-xfce/recipes-xfce/exo/exo/configure.patch     |    4 ++--
 .../exo/{exo_0.8.0.bb => exo_0.10.2.bb}            |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta-xfce/recipes-xfce/exo/{exo_0.8.0.bb => exo_0.10.2.bb} (87%)

diff --git a/meta-xfce/recipes-xfce/exo/exo/configure.patch b/meta-xfce/recipes-xfce/exo/exo/configure.patch
index 2ccfcfc..ef27e42 100644
--- a/meta-xfce/recipes-xfce/exo/exo/configure.patch
+++ b/meta-xfce/recipes-xfce/exo/exo/configure.patch
@@ -1,5 +1,5 @@
---- exo-0.3.4/configure.in~	2007-12-02 10:37:06.000000000 -0200
-+++ exo-0.3.4/configure.in	2008-06-05 17:21:42.000000000 -0300
+--- a/configure.ac	2007-12-02 10:37:06.000000000 -0200
++++ b/configure.ac	2008-06-05 17:21:42.000000000 -0300
 @@ -127,22 +127,24 @@
  dnl ***************************************
  dnl *** Check for strftime() extensions ***
diff --git a/meta-xfce/recipes-xfce/exo/exo_0.8.0.bb b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
similarity index 87%
rename from meta-xfce/recipes-xfce/exo/exo_0.8.0.bb
rename to meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
index af9103f..4fdfd48 100644
--- a/meta-xfce/recipes-xfce/exo/exo_0.8.0.bb
+++ b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
@@ -13,8 +13,8 @@ SRC_URI += " \
     file://gnome-mount \
 "
 
-SRC_URI[md5sum] = "189bd19210e1d7d8601be1cdf27bf259"
-SRC_URI[sha256sum] = "6e21aa30692affcb45fc8283d034da4a02221d26e3e1facb968d04fed4ba05b0"
+SRC_URI[md5sum] = "c70f2a217811bfba2e62f938d4b8f748"
+SRC_URI[sha256sum] = "b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce"
 
 # see http://wiki.xfce.org/gnomemount-replacement
 do_install_append () {
-- 
1.7.4.4

Re: [meta-xfce/meta-gnome/V2 01/10] exo: update to 0.10.2

[Jason Kridner]

On Wed, Jan 2, 2013 at 10:16 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  meta-xfce/recipes-xfce/exo/exo/configure.patch     |    4 ++--
>  .../exo/{exo_0.8.0.bb => exo_0.10.2.bb}            |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
>  rename meta-xfce/recipes-xfce/exo/{exo_0.8.0.bb => exo_0.10.2.bb} (87%)


There seems to be a missing dependency on some Perl modules[1]:

| checking for perl module URI::Escape... no
| checking for perl module URI::file... no
| checking for perl module URI::URL... no
| configure: error: Atleast one of the required Perl modules
(URI::Escape, URI::file and URI::URL) was not found on your system
| Configure failed. The contents of all config.log files follows to
aid debugging

[1] https://s3.amazonaws.com/beagleboard/angstrom-2013-03-30-16%3A24%3A13/build.log

I'm working on a patch.

>
>
> diff --git a/meta-xfce/recipes-xfce/exo/exo/configure.patch b/meta-xfce/recipes-xfce/exo/exo/configure.patch
> index 2ccfcfc..ef27e42 100644
> --- a/meta-xfce/recipes-xfce/exo/exo/configure.patch
> +++ b/meta-xfce/recipes-xfce/exo/exo/configure.patch
> @@ -1,5 +1,5 @@
> ---- exo-0.3.4/configure.in~    2007-12-02 10:37:06.000000000 -0200
> -+++ exo-0.3.4/configure.in     2008-06-05 17:21:42.000000000 -0300
> +--- a/configure.ac     2007-12-02 10:37:06.000000000 -0200
> ++++ b/configure.ac     2008-06-05 17:21:42.000000000 -0300
>  @@ -127,22 +127,24 @@
>   dnl ***************************************
>   dnl *** Check for strftime() extensions ***
> diff --git a/meta-xfce/recipes-xfce/exo/exo_0.8.0.bb b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
> similarity index 87%
> rename from meta-xfce/recipes-xfce/exo/exo_0.8.0.bb
> rename to meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
> index af9103f..4fdfd48 100644
> --- a/meta-xfce/recipes-xfce/exo/exo_0.8.0.bb
> +++ b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
> @@ -13,8 +13,8 @@ SRC_URI += " \
>      file://gnome-mount \
>  "
>
> -SRC_URI[md5sum] = "189bd19210e1d7d8601be1cdf27bf259"
> -SRC_URI[sha256sum] = "6e21aa30692affcb45fc8283d034da4a02221d26e3e1facb968d04fed4ba05b0"
> +SRC_URI[md5sum] = "c70f2a217811bfba2e62f938d4b8f748"
> +SRC_URI[sha256sum] = "b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce"
>
>  # see http://wiki.xfce.org/gnomemount-replacement
>  do_install_append () {
> --
> 1.7.4.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [meta-xfce/meta-gnome/V2 01/10] exo: update to 0.10.2

[Jason Kridner]

On Sat, Mar 30, 2013 at 1:05 PM, Jason Kridner <jkridner@beagleboard.org> wrote:
> On Wed, Jan 2, 2013 at 10:16 AM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> ---
>>  meta-xfce/recipes-xfce/exo/exo/configure.patch     |    4 ++--
>>  .../exo/{exo_0.8.0.bb => exo_0.10.2.bb}            |    4 ++--
>>  2 files changed, 4 insertions(+), 4 deletions(-)
>>  rename meta-xfce/recipes-xfce/exo/{exo_0.8.0.bb => exo_0.10.2.bb} (87%)
>
>
> There seems to be a missing dependency on some Perl modules[1]:
>
> | checking for perl module URI::Escape... no
> | checking for perl module URI::file... no
> | checking for perl module URI::URL... no
> | configure: error: Atleast one of the required Perl modules
> (URI::Escape, URI::file and URI::URL) was not found on your system
> | Configure failed. The contents of all config.log files follows to
> aid debugging
>
> [1] https://s3.amazonaws.com/beagleboard/angstrom-2013-03-30-16%3A24%3A13/build.log
>
> I'm working on a patch.

k, it seems that the builds use the Perl packages in the host system
and not perl-native, so probably the right thing to do is for me to
simply add it to my host system.

For Ubuntu, that is 'sudo apt-get install liburi-perl'.

Is this something we'd want to avoid having as a host dependency in the future?

>
>>
>>
>> diff --git a/meta-xfce/recipes-xfce/exo/exo/configure.patch b/meta-xfce/recipes-xfce/exo/exo/configure.patch
>> index 2ccfcfc..ef27e42 100644
>> --- a/meta-xfce/recipes-xfce/exo/exo/configure.patch
>> +++ b/meta-xfce/recipes-xfce/exo/exo/configure.patch
>> @@ -1,5 +1,5 @@
>> ---- exo-0.3.4/configure.in~    2007-12-02 10:37:06.000000000 -0200
>> -+++ exo-0.3.4/configure.in     2008-06-05 17:21:42.000000000 -0300
>> +--- a/configure.ac     2007-12-02 10:37:06.000000000 -0200
>> ++++ b/configure.ac     2008-06-05 17:21:42.000000000 -0300
>>  @@ -127,22 +127,24 @@
>>   dnl ***************************************
>>   dnl *** Check for strftime() extensions ***
>> diff --git a/meta-xfce/recipes-xfce/exo/exo_0.8.0.bb b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
>> similarity index 87%
>> rename from meta-xfce/recipes-xfce/exo/exo_0.8.0.bb
>> rename to meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
>> index af9103f..4fdfd48 100644
>> --- a/meta-xfce/recipes-xfce/exo/exo_0.8.0.bb
>> +++ b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
>> @@ -13,8 +13,8 @@ SRC_URI += " \
>>      file://gnome-mount \
>>  "
>>
>> -SRC_URI[md5sum] = "189bd19210e1d7d8601be1cdf27bf259"
>> -SRC_URI[sha256sum] = "6e21aa30692affcb45fc8283d034da4a02221d26e3e1facb968d04fed4ba05b0"
>> +SRC_URI[md5sum] = "c70f2a217811bfba2e62f938d4b8f748"
>> +SRC_URI[sha256sum] = "b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce"
>>
>>  # see http://wiki.xfce.org/gnomemount-replacement
>>  do_install_append () {
>> --
>> 1.7.4.4
>>
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [meta-xfce/meta-gnome/V2 01/10] exo: update to 0.10.2

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3805 bytes --]

On Sat, Mar 30, 2013 at 01:14:13PM -0400, Jason Kridner wrote:
> On Sat, Mar 30, 2013 at 1:05 PM, Jason Kridner <jkridner@beagleboard.org> wrote:
> > On Wed, Jan 2, 2013 at 10:16 AM, Andreas Müller
> > <schnitzeltony@googlemail.com> wrote:
> >>
> >> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> >> ---
> >>  meta-xfce/recipes-xfce/exo/exo/configure.patch     |    4 ++--
> >>  .../exo/{exo_0.8.0.bb => exo_0.10.2.bb}            |    4 ++--
> >>  2 files changed, 4 insertions(+), 4 deletions(-)
> >>  rename meta-xfce/recipes-xfce/exo/{exo_0.8.0.bb => exo_0.10.2.bb} (87%)
> >
> >
> > There seems to be a missing dependency on some Perl modules[1]:
> >
> > | checking for perl module URI::Escape... no
> > | checking for perl module URI::file... no
> > | checking for perl module URI::URL... no
> > | configure: error: Atleast one of the required Perl modules
> > (URI::Escape, URI::file and URI::URL) was not found on your system
> > | Configure failed. The contents of all config.log files follows to
> > aid debugging
> >
> > [1] https://s3.amazonaws.com/beagleboard/angstrom-2013-03-30-16%3A24%3A13/build.log
> >
> > I'm working on a patch.
> 
> k, it seems that the builds use the Perl packages in the host system
> and not perl-native, so probably the right thing to do is for me to
> simply add it to my host system.
> 
> For Ubuntu, that is 'sudo apt-get install liburi-perl'.
> 
> Is this something we'd want to avoid having as a host dependency in the future?

I would prefer to inherit perlnative and add it as dependency.

If you managed to build the rest without liburi-perl, then it's not so
common on host..

> 
> >
> >>
> >>
> >> diff --git a/meta-xfce/recipes-xfce/exo/exo/configure.patch b/meta-xfce/recipes-xfce/exo/exo/configure.patch
> >> index 2ccfcfc..ef27e42 100644
> >> --- a/meta-xfce/recipes-xfce/exo/exo/configure.patch
> >> +++ b/meta-xfce/recipes-xfce/exo/exo/configure.patch
> >> @@ -1,5 +1,5 @@
> >> ---- exo-0.3.4/configure.in~    2007-12-02 10:37:06.000000000 -0200
> >> -+++ exo-0.3.4/configure.in     2008-06-05 17:21:42.000000000 -0300
> >> +--- a/configure.ac     2007-12-02 10:37:06.000000000 -0200
> >> ++++ b/configure.ac     2008-06-05 17:21:42.000000000 -0300
> >>  @@ -127,22 +127,24 @@
> >>   dnl ***************************************
> >>   dnl *** Check for strftime() extensions ***
> >> diff --git a/meta-xfce/recipes-xfce/exo/exo_0.8.0.bb b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
> >> similarity index 87%
> >> rename from meta-xfce/recipes-xfce/exo/exo_0.8.0.bb
> >> rename to meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
> >> index af9103f..4fdfd48 100644
> >> --- a/meta-xfce/recipes-xfce/exo/exo_0.8.0.bb
> >> +++ b/meta-xfce/recipes-xfce/exo/exo_0.10.2.bb
> >> @@ -13,8 +13,8 @@ SRC_URI += " \
> >>      file://gnome-mount \
> >>  "
> >>
> >> -SRC_URI[md5sum] = "189bd19210e1d7d8601be1cdf27bf259"
> >> -SRC_URI[sha256sum] = "6e21aa30692affcb45fc8283d034da4a02221d26e3e1facb968d04fed4ba05b0"
> >> +SRC_URI[md5sum] = "c70f2a217811bfba2e62f938d4b8f748"
> >> +SRC_URI[sha256sum] = "b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce"
> >>
> >>  # see http://wiki.xfce.org/gnomemount-replacement
> >>  do_install_append () {
> >> --
> >> 1.7.4.4
> >>
> >>
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-xfce/meta-gnome/V2 01/10] exo: update to 0.10.2

[Otavio Salvador]

On Sat, Mar 30, 2013 at 2:14 PM, Jason Kridner <jkridner@beagleboard.org> wrote:
> On Sat, Mar 30, 2013 at 1:05 PM, Jason Kridner <jkridner@beagleboard.org> wrote:
>> On Wed, Jan 2, 2013 at 10:16 AM, Andreas Müller
>> <schnitzeltony@googlemail.com> wrote:
>>>
>>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>>> ---
>>>  meta-xfce/recipes-xfce/exo/exo/configure.patch     |    4 ++--
>>>  .../exo/{exo_0.8.0.bb => exo_0.10.2.bb}            |    4 ++--
>>>  2 files changed, 4 insertions(+), 4 deletions(-)
>>>  rename meta-xfce/recipes-xfce/exo/{exo_0.8.0.bb => exo_0.10.2.bb} (87%)
>>
>>
>> There seems to be a missing dependency on some Perl modules[1]:
>>
>> | checking for perl module URI::Escape... no
>> | checking for perl module URI::file... no
>> | checking for perl module URI::URL... no
>> | configure: error: Atleast one of the required Perl modules
>> (URI::Escape, URI::file and URI::URL) was not found on your system
>> | Configure failed. The contents of all config.log files follows to
>> aid debugging
>>
>> [1] https://s3.amazonaws.com/beagleboard/angstrom-2013-03-30-16%3A24%3A13/build.log
>>
>> I'm working on a patch.
>
> k, it seems that the builds use the Perl packages in the host system
> and not perl-native, so probably the right thing to do is for me to
> simply add it to my host system.

This is the wrong fix.

> For Ubuntu, that is 'sudo apt-get install liburi-perl'.
>
> Is this something we'd want to avoid having as a host dependency in the future?

As Martin said, add inherit perlnative and the dependency; it should fix it.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

[meta-xfce/meta-gnome/V2 02/10] tumbler: update to 0.1.26

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../{tumbler_0.1.25.bb => tumbler_0.1.26.bb}       |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-xfce/tumbler/{tumbler_0.1.25.bb => tumbler_0.1.26.bb} (89%)

diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.25.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.26.bb
similarity index 89%
rename from meta-xfce/recipes-xfce/tumbler/tumbler_0.1.25.bb
rename to meta-xfce/recipes-xfce/tumbler/tumbler_0.1.26.bb
index 3c2c2b3..a066713 100644
--- a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.25.bb
+++ b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.26.bb
@@ -6,8 +6,8 @@ DEPENDS = "dbus-glib freetype gdk-pixbuf poppler"
 
 inherit xfce
 
-SRC_URI[md5sum] = "d4edc15c172714c7a3eaf3c719b8faf6"
-SRC_URI[sha256sum] = "02d5de508d8c18692a25a832a9280c2043f6b7c90dd3fcbd87f5955337015546"
+SRC_URI[md5sum] = "874621e7820b3bfe0e8ab66d17f1dc31"
+SRC_URI[sha256sum] = "6602ce700160d09edd88ea0b9bcb16abbc28974f372e646709e0ed8fbacc8a78"
 
 INSANE_SKIP_${PN} = "dev-so"
 
-- 
1.7.4.4

[meta-xfce/meta-gnome/V2 03/10] thunar: update to 1.6.2

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../thunar/{thunar_1.4.0.bb => thunar_1.6.2.bb}    |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
 rename meta-xfce/recipes-xfce/thunar/{thunar_1.4.0.bb => thunar_1.6.2.bb} (84%)

diff --git a/meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb b/meta-xfce/recipes-xfce/thunar/thunar_1.6.2.bb
similarity index 84%
rename from meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb
rename to meta-xfce/recipes-xfce/thunar/thunar_1.6.2.bb
index 2d5b767..55b54d4 100644
--- a/meta-xfce/recipes-xfce/thunar/thunar_1.4.0.bb
+++ b/meta-xfce/recipes-xfce/thunar/thunar_1.6.2.bb
@@ -3,12 +3,11 @@ SECTION = "x11"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "exo glib-2.0 gtk+ gdk-pixbuf libxfce4util libxfce4ui libsm dbus-glib startup-notification libnotify xfce4-panel"
-PR = "r1"
 
 inherit xfce
 
-SRC_URI[md5sum] = "737ad2c36ed36b10fef82e860b9e990a"
-SRC_URI[sha256sum] = "2c11a19e64cef708a264fb4d5d933389899c3d132fe7b1e313dd6e37bfe4c8ba"
+SRC_URI[md5sum] = "a446103ab90855cc8ba484dfeedb82d8"
+SRC_URI[sha256sum] = "7dbd172ae396e7a2533f47dc1ff703a9ea1a61af3edfdc6f4877b9b9331abd85"
 SRC_URI = "http://archive.xfce.org/src/xfce/${PN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2"
 
 S = "${WORKDIR}/Thunar-${PV}/"
-- 
1.7.4.4

[meta-xfce/meta-gnome/V2 04/10] xfce4-terminal: update to 0.6.1

[Andreas Müller]

* renamed upstream Terminal -> xfce4-terminal [1]
* dependencies changed [1]

[1] http://mail.xfce.org/pipermail/xfce/2012-December/031872.html

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../xfce-terminal/xfce-terminal_0.4.8.bb           |   20 --------------------
 .../xfce4-terminal/xfce4-terminal_0.6.1.bb         |   12 ++++++++++++
 2 files changed, 12 insertions(+), 20 deletions(-)
 delete mode 100644 meta-xfce/recipes-apps/xfce-terminal/xfce-terminal_0.4.8.bb
 create mode 100644 meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.6.1.bb

diff --git a/meta-xfce/recipes-apps/xfce-terminal/xfce-terminal_0.4.8.bb b/meta-xfce/recipes-apps/xfce-terminal/xfce-terminal_0.4.8.bb
deleted file mode 100644
index 697c5c6..0000000
--- a/meta-xfce/recipes-apps/xfce-terminal/xfce-terminal_0.4.8.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Terminal emulator for the Xfce desktop environment"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
-DEPENDS = "virtual/libx11 exo gtk+ vte dbus-glib"
-
-PR = "r0"
-
-inherit xfce
-
-# SRC_URI must follow inherited one
-SRC_URI = "http://archive.xfce.org/src/apps/terminal//${@'${PV}'[0:3]}/Terminal-${PV}.tar.bz2 \
-"
-
-S = "${WORKDIR}/Terminal-${PV}"
-
-FILES_${PN} += "${datadir}/Terminal \
-                ${datadir}/gnome-control-center/default-apps/Terminal-default-apps.xml"
-
-SRC_URI[md5sum] = "8dff62234da14e1a5e542fb56560ebe2"
-SRC_URI[sha256sum] = "fe5db0b7127ce87efa1e10f44d8915be88005b6ce4f0bfea6b64533e25cc788d"
diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.6.1.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.6.1.bb
new file mode 100644
index 0000000..a8cff39
--- /dev/null
+++ b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.6.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Terminal emulator for the Xfce desktop environment"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+DEPENDS = "glib-2.0 gtk+ vte libxfce4ui"
+
+inherit xfce-app
+
+FILES_${PN} += "${datadir}/xfce4 \
+                ${datadir}/gnome-control-center"
+
+SRC_URI[md5sum] = "98613ce500fef2ed62cdbe788084acca"
+SRC_URI[sha256sum] = "61346427e55af79e86511572bfabb2e025cb13720879226ea1b98a92f0bcd4c8"
-- 
1.7.4.4

[meta-xfce/meta-gnome/V2 05/10] packagegroup-xfce-base: xfce-terminal -> xfce4-terminal

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../packagegroups/packagegroup-xfce-base.bb        |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
index e42ea3c..3d8b062 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "All packages required for a base installation of XFCE"
 SECTION = "x11/wm"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r4"
+PR = "r5"
 
 inherit packagegroup
 
@@ -33,7 +33,7 @@ RDEPENDS_${PN} = " \
     xfce4-settings \
     \
     xfce4-notifyd \
-    xfce-terminal \
+    xfce4-terminal \
     thunar \
     thunar-volman \
 "
-- 
1.7.4.4

[meta-xfce/meta-gnome/V2 06/10] mousepad: initial add 0.3.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb

diff --git a/meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb b/meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb
new file mode 100644
index 0000000..859c90e
--- /dev/null
+++ b/meta-xfce/recipes-apps/mousepad/mousepad_0.3.0.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "A simple text editor for Xfce"
+SECTION = "x11/application"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+DEPENDS = "gtk+ dbus-glib gtksourceview2"
+
+inherit xfce-app
+
+SRC_URI[md5sum] = "dcfcdfaa8a19c89f35d5f6f64753e6e1"
+SRC_URI[sha256sum] = "10f27506994d0d0b8f9e02555404a144babedab97517abe3b6be8b2d21ff046d"
-- 
1.7.4.4

[meta-xfce/meta-gnome/V2 07/10] xfce4-mixer: update to 4.10.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...{xfce4-mixer_4.8.0.bb => xfce4-mixer_4.10.0.bb} |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-xfce/recipes-apps/xfce4-mixer/{xfce4-mixer_4.8.0.bb => xfce4-mixer_4.10.0.bb} (53%)

diff --git a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb b/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.10.0.bb
similarity index 53%
rename from meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb
rename to meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.10.0.bb
index 23a8ba5..1884860 100644
--- a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.8.0.bb
+++ b/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.10.0.bb
@@ -6,9 +6,9 @@ inherit xfce-panel-plugin
 
 DEPENDS += "glib-2.0 gst-plugins-base gtk+ xfconf"
 
-SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2"
+SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "3fa3a9973e18c04da26709a654e242ff"
-SRC_URI[sha256sum] = "9f9f48fdd0d3f6b1e46694b93a44d15b800db72a96d831b5111d9ac976970fab"
+SRC_URI[md5sum] = "e47d5b3e873fdee3fa80d309a5f53e9c"
+SRC_URI[sha256sum] = "a8c589001b438171ea5a6b46ce9895c3ffbc5081ab67805ab9870e540068dade"
 
 RDEPENDS_${PN} = "gst-meta-audio"
-- 
1.7.4.4

[meta-xfce/meta-gnome/V2 08/10] xfce4-places-plugin: update to 1.5.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...lugin_1.4.0.bb => xfce4-places-plugin_1.5.0.bb} |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/places/{xfce4-places-plugin_1.4.0.bb => xfce4-places-plugin_1.5.0.bb} (68%)

diff --git a/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.4.0.bb b/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.5.0.bb
similarity index 68%
rename from meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.4.0.bb
rename to meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.5.0.bb
index 1f6c231..2e0b810 100644
--- a/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.4.0.bb
+++ b/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.5.0.bb
@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f"
 
 inherit xfce-panel-plugin
 
-SRC_URI[md5sum] = "cdb5c966c7a93ca29f2ce50223782133"
-SRC_URI[sha256sum] = "d2a451a35096ecb8b6ca96ab0af3ebca3f163a7c8dc08627518940a633cce5e5"
+SRC_URI[md5sum] = "84c39fb123e07e1c7caaf006d9383656"
+SRC_URI[sha256sum] = "6996051669a13d4791a5a453747801dc2f7f6fa5546785622d80b34966283d44"
-- 
1.7.4.4

[meta-xfce/meta-gnome/V2 09/10] midori: update to 0.4.7

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../midori/{midori_0.4.6.bb => midori_0.4.7.bb}    |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
 rename meta-gnome/recipes-connectivity/midori/{midori_0.4.6.bb => midori_0.4.7.bb} (86%)

diff --git a/meta-gnome/recipes-connectivity/midori/midori_0.4.6.bb b/meta-gnome/recipes-connectivity/midori/midori_0.4.7.bb
similarity index 86%
rename from meta-gnome/recipes-connectivity/midori/midori_0.4.6.bb
rename to meta-gnome/recipes-connectivity/midori/midori_0.4.7.bb
index db2c5e6..5b1a959 100644
--- a/meta-gnome/recipes-connectivity/midori/midori_0.4.6.bb
+++ b/meta-gnome/recipes-connectivity/midori/midori_0.4.7.bb
@@ -4,12 +4,10 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 DEPENDS = "webkit-gtk libsoup-2.4 libsexy openssl python-native python-docutils-native librsvg-native libnotify"
 
-PR = "r2"
-
 SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
           "
-SRC_URI[midori.md5sum] = "3c3f0030611d9126ab90be48d44cab57"
-SRC_URI[midori.sha256sum] = "910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea"
+SRC_URI[midori.md5sum] = "06db7b88a41e9b2265728960d5e98f35"
+SRC_URI[midori.sha256sum] = "65bf9976733597c405492ce91aa664fd10547cb7df16e0a70f260c7a3e97ea5d"
 
 inherit gtk-icon-cache pkgconfig vala
 
@@ -33,7 +31,6 @@ do_configure() {
 }
 
 PARALLEL_MAKE = ""
-LDFLAGS_append = " -ljavascriptcoregtk-1.0 "
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_install() {
-- 
1.7.4.4

[meta-xfce/meta-gnome/V2 10/10] xfce4-session: fix build on X11-less hosts

[Andreas Müller]

error message was:
| checking for iceauth... no
| configure: error: iceauth missing, please check your X11 installation

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...03-configure.in-hard-code-path-to-iceauth.patch |   40 ++++++++++++++++++++
 .../xfce4-session/xfce4-session_4.10.0.bb          |    6 ++-
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 meta-xfce/recipes-xfce/xfce4-session/files/0003-configure.in-hard-code-path-to-iceauth.patch

diff --git a/meta-xfce/recipes-xfce/xfce4-session/files/0003-configure.in-hard-code-path-to-iceauth.patch b/meta-xfce/recipes-xfce/xfce4-session/files/0003-configure.in-hard-code-path-to-iceauth.patch
new file mode 100644
index 0000000..41a527c
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-session/files/0003-configure.in-hard-code-path-to-iceauth.patch
@@ -0,0 +1,40 @@
+From a629b051f4e5462150c77b95574bbc7a33bc9666 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 31 Dec 2012 16:35:29 +0100
+Subject: [PATCH] configure.in: hard code path to iceauth
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+workaround AC_PATH_PROG which was meant to find programs required at build-time
+not at run-time.
+
+Upstream-Status: Inappropriate [config]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.in |    8 +-------
+ 1 files changed, 1 insertions(+), 7 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 3cf3510..505e744 100644
+--- a/configure.in
++++ b/configure.in
+@@ -111,13 +111,7 @@ XDT_FEATURE_DEBUG([xfsm_debug_default])
+ dnl Check for linker optimizations
+ XDT_FEATURE_LINKER_OPTS()
+ 
+-dnl Check for iceauth
+-AC_PATH_PROG([ICEAUTH], [iceauth])
+-if test x"$ICEAUTH" != x""; then
+-  AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$ICEAUTH"], [path to iceauth])
+-else
+-  AC_MSG_ERROR([iceauth missing, please check your X11 installation])
+-fi
++AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$bindir/iceauth"], [path to iceauth])
+ 
+ dnl Find a location for the session desktop file
+ AC_MSG_CHECKING([what xsession-prefix to use])
+-- 
+1.7.4.4
+
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
index 3bd3743..6ad834d 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
@@ -4,14 +4,16 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
 DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf"
 RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower"
-PR = "r1"
+PR = "r2"
 
 inherit xfce
 
 SRC_URI[md5sum] = "4768e1a41a0287af6aad18b329a0f230"
 SRC_URI[sha256sum] = "bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce"
 SRC_URI += "file://0001-Handle-multiple-interactive-session-save-bug-5379.patch \
-            file://0002-Remove-gnome-keyring-remains.patch"
+            file://0002-Remove-gnome-keyring-remains.patch \
+            file://0003-configure.in-hard-code-path-to-iceauth.patch \
+"
 
 # protect from frightening message that xfce might not work correctly
 pkg_postinst_${PN} () {
-- 
1.7.4.4

Re: [meta-xfce/meta-gnome/V2 00/10] various updates

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

On Wed, Jan 02, 2013 at 04:16:04PM +0100, Andreas Müller wrote:
> V1->V2:
> 
> * mousepad: add gtksourceview2 to depends
> * exo: correct version 0.10.2 in commit message
> * xfce4-terminal: V1 was 0.6.0 / V2 is 0.6.1

Merged, thanks!


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]