Skip to contentSkip to conversation

Fixups for libxfce4ui and thunar-volman

PATCH New [email protected] 1 participant 3 messages Dec 27, 2022

lore
Share & tools
lore
#0 lore raw

v2 cover Fixups for libxfce4ui and thunar-volman

From: Kai Kang <[email protected]>

v2:
* fix fuzzy patch issue for libxfce4ui
* fix configure error for thunar-volman

Other update for xfce4 core recipes are as same as v1.

Kai Kang (2):
libxfce4ui: 4.16.1 -> 4.18.0
thunar-volman: 4.16.0 -> 4.18.0

 ...4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch | 10 +++++-----
 .../{libxfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb}     |  6 +++---
 ...thunar-volman_4.16.0.bb => thunar-volman_4.18.0.bb} |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename meta-xfce/recipes-xfce/libxfce4ui/{libxfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb} (84%)
 rename meta-xfce/recipes-xfce/thunar-volman/{thunar-volman_4.16.0.bb => thunar-volman_4.18.0.bb} (56%)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 1/2 libxfce4ui: 4.16.1 -> 4.18.0

From: Kai Kang <[email protected]>

Update libxfce4ui from 4.16.1 to 4.18.0. And update license which should be LGPL-2.0-or-later according to

https://gitlab.xfce.org/xfce/libxfce4ui/-/commit/797b7a6b

and

https://gitlab.xfce.org/xfce/libxfce4ui/-/blob/master/COPYING#L457
This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.

---
 ...4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch | 10 +++++-----
 .../{libxfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb}     |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename meta-xfce/recipes-xfce/libxfce4ui/{libxfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb} (84%)
meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch +5 -5
index 616142761..53ba87374 100644
@@ -11,15 +11,15 @@ Upstream-Status: Pending
 Signed-off-by: Andreas Müller <[email protected]>
 
 ---
- libxfce4kbd-private/xfce4-keyboard-shortcuts.xml |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
-index 723a10d..e6502f3 100644
+index 32901e3..8189c4c 100644
 --- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
 +++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
-@@ -75,4 +75,8 @@
-       <property name="<Super>KP_Next" type="string" value="tile_down_right_key"/>
+@@ -96,4 +96,8 @@
+       <property name="&lt;Super&gt;KP_Next" type="string" value="tile_down_right_key"/>
      </property>
    </property>
 +  <property name="providers" type="array">
meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb renamed from meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb +3 -3
similarity index 84%
rename from meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb
rename to meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb
index 692c79f3c..7ff9d1b12 100644
@@ -1,7 +1,7 @@
 SUMMARY = "Xfce4 Widget library and X Window System interaction"
 SECTION = "x11/libs"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475"
+LICENSE = "LGPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db"
 DEPENDS = "intltool-native perl-native gtk+3 libxfce4util xfce4-dev-tools xfconf"
 
 inherit xfce gtk-doc gobject-introspection features_check
@@ -12,7 +12,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
 # TODO: Check if 0001-... can go
 SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch"
-SRC_URI[sha256sum] = "d96946ae5af6bf078dda415419e0021909f763ee0020b42f3e26f603e51585f6"
+SRC_URI[sha256sum] = "532247c4387c17bb9ef94a73147039b8d013c3131c95cdbd2fa85fbcc848d06b"
 
 EXTRA_OECONF += "--with-vendor-info=${DISTRO}"
 EXTRA_OECONF += "--disable-vala"
Signature · 1 line
2.34.1
#2 lore raw

PATCH v2 2/2 thunar-volman: 4.16.0 -> 4.18.0

In reply to [email protected]

From: Kai Kang <[email protected]>

Update thunar-volman from 4.16.0 to 4.18.0
* update license with GPL-2.0-or-later
* inherit perlnative to fix error:
| checking for XML::Parser... configure: error:
| XML::Parser perl module is required for intltool

---
 .../{thunar-volman_4.16.0.bb => thunar-volman_4.18.0.bb}  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-xfce/recipes-xfce/thunar-volman/{thunar-volman_4.16.0.bb => thunar-volman_4.18.0.bb} (56%)
meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb renamed from meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb +4 -4
similarity index 56%
rename from meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb
rename to meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb
index 4b72d3a79..a136ba054 100644
@@ -1,14 +1,14 @@
 SUMMARY = "Automatic management of removable drives and media for thunar"
 SECTION = "x11"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "exo libnotify libgudev"
 
-inherit xfce features_check
+inherit xfce features_check perlnative
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI[sha256sum] = "d2c0e719b242b7fd3db70bc6678a2df1abf2cfaa899b775a1591a5efa08a547d"
+SRC_URI[sha256sum] = "93b75c7ffbe246a21f4190295acc148e184be8df397e431b258d0d676e87fc65"
 
 PACKAGECONFIG ??= "notify"
 PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify"
Signature · 1 line
2.34.1