From 6f6deb59d9e43066cfa67fd013dee5d476dcd3ec Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 27 Dec 2022 21:54:10 +0800 Subject: libxfce4ui: 4.16.1 -> 4.18.0 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. Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- ...-private-xfce4-keyboard-shortcuts.xml-fix.patch | 10 +++---- .../recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb | 31 ---------------------- .../recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb | 31 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb create mode 100644 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb (limited to 'meta-xfce') diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch index 616142761e..53ba873746 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch @@ -11,15 +11,15 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller --- - 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 @@ - +@@ -96,4 +96,8 @@ + + diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb deleted file mode 100644 index 692c79f3c5..0000000000 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Xfce4 Widget library and X Window System interaction" -SECTION = "x11/libs" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "intltool-native perl-native gtk+3 libxfce4util xfce4-dev-tools xfconf" - -inherit xfce gtk-doc gobject-introspection features_check - -# xfce4 depends on libwnck3. gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. -# cairo would at least needed to be built with xlib. -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" - -EXTRA_OECONF += "--with-vendor-info=${DISTRO}" -EXTRA_OECONF += "--disable-vala" - -PACKAGECONFIG ??= " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl','x11', "", d)} \ -" -PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" -PACKAGECONFIG[x11] = "--enable-startup-notification,--disable-startup-notification,libepoxy libice libsm startup-notification" - - -PACKAGES += "${PN}-glade" -FILES:${PN}-glade = " \ - ${libdir}/glade \ - ${datadir}/glade \ -" diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb new file mode 100644 index 0000000000..7ff9d1b124 --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "Xfce4 Widget library and X Window System interaction" +SECTION = "x11/libs" +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 + +# xfce4 depends on libwnck3. gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. +# cairo would at least needed to be built with xlib. +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] = "532247c4387c17bb9ef94a73147039b8d013c3131c95cdbd2fa85fbcc848d06b" + +EXTRA_OECONF += "--with-vendor-info=${DISTRO}" +EXTRA_OECONF += "--disable-vala" + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl','x11', "", d)} \ +" +PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" +PACKAGECONFIG[x11] = "--enable-startup-notification,--disable-startup-notification,libepoxy libice libsm startup-notification" + + +PACKAGES += "${PN}-glade" +FILES:${PN}-glade = " \ + ${libdir}/glade \ + ${datadir}/glade \ +" -- cgit v1.2.3-54-g00ecf