[meta-xfce][PATCH V2 0/3] meta-xfce upgrades

[meta-xfce][PATCH V2 0/3] meta-xfce upgrades

[Andreas Müller]

V1 -> V2: imsettings dbus-glib from deps

Andreas Müller (3):
  imsettings: upgrade 1.7.3 -> 1.8.1 and rework recipe
  xfce4-settings: upgrade 4.14.0 -> 4.14.1
  xfce4-screenshooter: upgrade 1.9.5 -> 1.9.6

 ..._1.9.5.bb => xfce4-screenshooter_1.9.6.bb} |  6 ++---
 ...msettings_1.7.3.bb => imsettings_1.8.1.bb} | 22 ++++++++++---------
 ...ngs_4.14.0.bb => xfce4-settings_4.14.1.bb} |  4 ++--
 3 files changed, 17 insertions(+), 15 deletions(-)
 rename meta-xfce/recipes-apps/xfce4-screenshooter/{xfce4-screenshooter_1.9.5.bb => xfce4-screenshooter_1.9.6.bb} (76%)
 rename meta-xfce/recipes-extended/imsettings/{imsettings_1.7.3.bb => imsettings_1.8.1.bb} (64%)
 rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_4.14.0.bb => xfce4-settings_4.14.1.bb} (89%)

-- 
2.21.0

[meta-xfce][PATCH V2 1/3] imsettings: upgrade 1.7.3 -> 1.8.1 and rework recipe

[Andreas Müller]

It is more or less a recipe rewrite:

* stylize recipe
* Use gtk3 instead of gtk.
* Drop gconf backend - we should get rid of orphanded gconf
* Add PACKAGECONFIGs for 'xim' and 'xfce' - xfce is set by default
* Drop intltool-native from depends - they moved to gettext
* Remove entries from FILES - gobject-introspection.bbclass takes care
* Remove dbus-glib from depends - they moved to gdbus long time ago (Thanks Kai)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...msettings_1.7.3.bb => imsettings_1.8.1.bb} | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)
 rename meta-xfce/recipes-extended/imsettings/{imsettings_1.7.3.bb => imsettings_1.8.1.bb} (64%)

diff --git a/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb
similarity index 64%
rename from meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb
rename to meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb
index 8f622bf6f..5c94cb6bc 100644
--- a/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb
+++ b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb
@@ -7,25 +7,27 @@ This package contains the core DBus services and some utilities."
 HOMEPAGE = "http://code.google.com/p/imsettings/"
 SECTION = "Applications/System"
 
-inherit autotools gtk-doc gobject-introspection distro_features_check
+LICENSE = "LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
-REQUIRED_DISTRO_FEATURES = "x11"
+inherit autotools gtk-doc gobject-introspection gettext distro_features_check
 
-SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \
-           "
+DEPENDS = "gtk+3 libnotify"
 
-SRC_URI[md5sum] = "c6c65a2b2654fe9dfe9ab2e8b80c079a"
-SRC_URI[sha256sum] = "196d3a74cef254ff812c32682d1818d740e36a68b976fef9e99748d23a71a71a"
+REQUIRED_DISTRO_FEATURES = "x11"
 
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "c04341a008d8c60e1532f033f4020f44"
+SRC_URI[sha256sum] = "ebf578299a10c6a1fea9047be6577df6d2b6470d3cc9d40f8a6589a3c13c4c8b"
 
 EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \
                 --disable-static \
                "
 
-DEPENDS = "gtk+ gconf libnotify dbus-glib libgxim xfconf intltool-native"
+PACKAGECONFIG ??= "xfce"
+PACKAGECONFIG[xfce] = ",,xfconf"
+PACKAGECONFIG[xim] = ",,libgxim"
 
 RDEPENDS_${PN} += "bash"
 
-FILES_${PN} += "${datadir}/dbus-1/* ${datadir}/gir-1.0/* ${libdir}/girepository-1.0/*"
+FILES_${PN} += "${datadir}/dbus-1/*"
-- 
2.21.0

[meta-xfce][PATCH V2 2/3] xfce4-settings: upgrade 4.14.0 -> 4.14.1

[Andreas Müller]

Minor bugfixes & translation updates

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../{xfce4-settings_4.14.0.bb => xfce4-settings_4.14.1.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_4.14.0.bb => xfce4-settings_4.14.1.bb} (89%)

diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.0.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.1.bb
similarity index 89%
rename from meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.0.bb
rename to meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.1.bb
index 902e326de..a24928cf6 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.1.bb
@@ -11,8 +11,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI += " \
     file://0001-xsettings.xml-Set-default-themes.patch \
 "
-SRC_URI[md5sum] = "dcbc673448e1a816b2c47a7ce0ca13aa"
-SRC_URI[sha256sum] = "e03040d623abda0222ad04f226582277a1936507ddfa927ec8e87927debc113c"
+SRC_URI[md5sum] = "2f4171c21db905d9ba0ca9bee3fc7a5b"
+SRC_URI[sha256sum] = "e873e9f6b8e801fd9304ee100c4c76ed9987446c38429d02477c086431c0bf7a"
 
 EXTRA_OECONF += "--enable-maintainer-mode --disable-debug"
 
-- 
2.21.0

[meta-xfce][PATCH V2 3/3] xfce4-screenshooter: upgrade 1.9.5 -> 1.9.6

[Andreas Müller]

This is a bugfix & translation-update release

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 ...-screenshooter_1.9.5.bb => xfce4-screenshooter_1.9.6.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-xfce/recipes-apps/xfce4-screenshooter/{xfce4-screenshooter_1.9.5.bb => xfce4-screenshooter_1.9.6.bb} (76%)

diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.5.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.6.bb
similarity index 76%
rename from meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.5.bb
rename to meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.6.bb
index 9f8f61a4a..7f6756fc9 100644
--- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.5.bb
+++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.6.bb
@@ -7,8 +7,8 @@ DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-
 
 inherit xfce-app
 
-SRC_URI[md5sum] = "0354811cd2622d3de92e342c7eaa184d"
-SRC_URI[sha256sum] = "bf35b5432cb920987c6d7ff193600e5dd4d73422b6aa02b4ec5288744053b38c"
+SRC_URI[md5sum] = "9e4026d9ae7850b290992c9d2aea80dd"
+SRC_URI[sha256sum] = "88c174ce687d1f7ba5470d6ab5784d33dc215f8f220211e892e268189dbea658"
 
 do_compile_prepend() {
     mkdir -p lib
@@ -16,7 +16,7 @@ do_compile_prepend() {
 }
 
 FILES_${PN} += " \
-    ${datadir}/appdata \
+    ${datadir}/metainfo \
     ${datadir}/xfce4/panel/plugins \
     ${libdir}/xfce4/panel/plugins \
 "
-- 
2.21.0

Re: [meta-xfce][PATCH V2 0/3] meta-xfce upgrades

[Kang Kai]

On 2019/9/3 下午2:46, Andreas Müller wrote:
> V1 -> V2: imsettings dbus-glib from deps
>
> Andreas Müller (3):
>    imsettings: upgrade 1.7.3 -> 1.8.1 and rework recipe
>    xfce4-settings: upgrade 4.14.0 -> 4.14.1
>    xfce4-screenshooter: upgrade 1.9.5 -> 1.9.6
>
>   ..._1.9.5.bb => xfce4-screenshooter_1.9.6.bb} |  6 ++---
>   ...msettings_1.7.3.bb => imsettings_1.8.1.bb} | 22 ++++++++++---------
>   ...ngs_4.14.0.bb => xfce4-settings_4.14.1.bb} |  4 ++--
>   3 files changed, 17 insertions(+), 15 deletions(-)
>   rename meta-xfce/recipes-apps/xfce4-screenshooter/{xfce4-screenshooter_1.9.5.bb => xfce4-screenshooter_1.9.6.bb} (76%)
>   rename meta-xfce/recipes-extended/imsettings/{imsettings_1.7.3.bb => imsettings_1.8.1.bb} (64%)
>   rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_4.14.0.bb => xfce4-settings_4.14.1.bb} (89%)
>
Fine with me.

Acked-by: Kai Kang <kai.kang@windriver.com>

Regards,

-- 
Kai Kang