diff options
Diffstat (limited to 'meta-xfce')
163 files changed, 1272 insertions, 2498 deletions
diff --git a/meta-xfce/README b/meta-xfce/README.md index 84b019896e..3d6158628f 100644 --- a/meta-xfce/README +++ b/meta-xfce/README.md @@ -1,12 +1,11 @@ This layer depends on: -URI: git://github.com/openembedded/oe-core.git +URI: git://git.openembedded.org/openembedded-core branch: master -revision: HEAD -URI: git://github.com/openembedded/meta-oe.git +URI: git://git.openembedded.org/meta-openembedded branch: master -revision: HEAD + meta-xfce depends on meta-oe, meta-gnome and meta-multimedia in this repository. To avoid dependencies on meta-multimedia you need to mask recipes by adding @@ -17,5 +16,7 @@ BBMASK = "meta-xfce/recipes-multimedia" Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce]' in the subject' When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-xfce][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][PATCH' +Layer maintainer: Kai Kang <kai.kang@windriver.com> +Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> diff --git a/meta-xfce/classes/thunar-plugin.bbclass b/meta-xfce/classes/thunar-plugin.bbclass index 76b0e72332..3719cba219 100644 --- a/meta-xfce/classes/thunar-plugin.bbclass +++ b/meta-xfce/classes/thunar-plugin.bbclass @@ -1,11 +1,13 @@ -inherit xfce distro_features_check +inherit xfce features_check -REQUIRED_DISTRO_FEATURES = "x11" +# 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}" DEPENDS += "thunar" SRC_URI = "http://archive.xfce.org/src/thunar-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" -FILES_${PN} += "${libdir}/thunarx-3/*.so" +FILES:${PN} += "${libdir}/thunarx-3/*.so" -FILES_${PN}-dev += "${libdir}/thunarx-3/*.la" +FILES:${PN}-dev += "${libdir}/thunarx-3/*.la" diff --git a/meta-xfce/classes/xfce-app.bbclass b/meta-xfce/classes/xfce-app.bbclass index 1c31c2faa6..d1b07d7457 100644 --- a/meta-xfce/classes/xfce-app.bbclass +++ b/meta-xfce/classes/xfce-app.bbclass @@ -1,4 +1,4 @@ -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-xfce/classes/xfce-git.bbclass b/meta-xfce/classes/xfce-git.bbclass index 3fc18d275d..d301dcb119 100644 --- a/meta-xfce/classes/xfce-git.bbclass +++ b/meta-xfce/classes/xfce-git.bbclass @@ -1,4 +1,4 @@ -do_configure_prepend() { +do_configure:prepend() { cd ${S} NOCONFIGURE=yes ./autogen.sh cd ${B} diff --git a/meta-xfce/classes/xfce-panel-plugin.bbclass b/meta-xfce/classes/xfce-panel-plugin.bbclass index 29c1245caa..b43f9e3125 100644 --- a/meta-xfce/classes/xfce-panel-plugin.bbclass +++ b/meta-xfce/classes/xfce-panel-plugin.bbclass @@ -1,14 +1,14 @@ -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "libxfce4ui libxfce4util xfce4-panel" -SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" -FILES_${PN} += "${datadir}/xfce4/panel-plugins/" -FILES_${PN} += "${datadir}/xfce4/panel/plugins/" -FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so" -FILES_${PN} += "${libdir}/xfce4/panel/plugins/*.so" +FILES:${PN} += "${datadir}/xfce4/panel-plugins/" +FILES:${PN} += "${datadir}/xfce4/panel/plugins/" +FILES:${PN} += "${libdir}/xfce4/panel-plugins/*.so" +FILES:${PN} += "${libdir}/xfce4/panel/plugins/*.so" -FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la"
\ No newline at end of file +FILES:${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" diff --git a/meta-xfce/classes/xfce.bbclass b/meta-xfce/classes/xfce.bbclass index 7abe46f712..913202be59 100644 --- a/meta-xfce/classes/xfce.bbclass +++ b/meta-xfce/classes/xfce.bbclass @@ -1,6 +1,6 @@ def xfce_verdir(v): import re - m = re.match("^([0-9]+)\.([0-9]+)", v) + m = re.match(r"^([0-9]+)\.([0-9]+)", v) return "%s.%s" % (m.group(1), m.group(2)) HOMEPAGE = "http://www.xfce.org" @@ -10,5 +10,5 @@ inherit autotools gettext gtk-icon-cache pkgconfig DEPENDS += "intltool-native" -FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*" -FILES_${PN}-doc += "${datadir}/xfce4/doc" +FILES:${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*" +FILES:${PN}-doc += "${datadir}/xfce4/doc" diff --git a/meta-xfce/conf/include/non-repro-meta-xfce.inc b/meta-xfce/conf/include/non-repro-meta-xfce.inc new file mode 100755 index 0000000000..aad6b0c24d --- /dev/null +++ b/meta-xfce/conf/include/non-repro-meta-xfce.inc @@ -0,0 +1,7 @@ +# List of known non-reproducible package of the meta-xfce layer +# Please keep this list sorted +KNOWN_NON_REPRO_META_XFCE = " \ + catfish \ + libsamba-util0 \ + samba-dbg \ +" diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf index da07f8e163..0c7990e8e0 100644 --- a/meta-xfce/conf/layer.conf +++ b/meta-xfce/conf/layer.conf @@ -6,7 +6,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "xfce-layer" BBFILE_PATTERN_xfce-layer := "^${LAYERDIR}/" -BBFILE_PRIORITY_xfce-layer = "7" +BBFILE_PRIORITY_xfce-layer = "5" # This should only be incremented on significant changes that will # cause compatibility issues with other layers @@ -19,4 +19,11 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" LAYERDEPENDS_xfce-layer += "networking-layer" -LAYERSERIES_COMPAT_xfce-layer = "thud warrior" +LAYERSERIES_COMPAT_xfce-layer = "scarthgap styhead" + +SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ + openzone->gdk-pixbuf \ + openzone->gtk+3 \ + rodent-icon-theme->gdk-pixbuf \ + rodent-icon-theme->gtk+3 \ +" diff --git a/meta-xfce/recipes-apps/catfish/catfish_1.4.7.bb b/meta-xfce/recipes-apps/catfish/catfish_1.4.7.bb deleted file mode 100644 index 84d5692ef8..0000000000 --- a/meta-xfce/recipes-apps/catfish/catfish_1.4.7.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Catfish is a handy file searching tool for linux and unix" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" - -inherit xfce-app distutils3 gtk-icon-cache - -DEPENDS += "python3-distutils-extra-native" - -B = "${S}" - -SRC_URI[md5sum] = "f4c1c2b2c560824cab8d7f6c7bd624ca" -SRC_URI[sha256sum] = "48caaac872d29e2762e31e59ade1310cb860af55f1a36f2520ce1d90c39227e9" - -FILES_${PN} += "${datadir}/metainfo" - -RDEPENDS_${PN} += "python3-pygobject" diff --git a/meta-xfce/recipes-apps/catfish/catfish_4.18.0.bb b/meta-xfce/recipes-apps/catfish/catfish_4.18.0.bb new file mode 100644 index 0000000000..6b93928721 --- /dev/null +++ b/meta-xfce/recipes-apps/catfish/catfish_4.18.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Catfish is a handy file searching tool for linux and unix" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" + +inherit xfce-app python_setuptools_build_meta gtk-icon-cache mime-xdg features_check + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" + +DEPENDS += "python3-distutils-extra-native" + +SRC_URI[sha256sum] = "fdae9b73cc754a50716bb04b958aa31dbd7e94047068b7207f2ae313a7d58b99" + +FILES:${PN} += "${datadir}/metainfo" + +RDEPENDS:${PN} += "python3-pygobject python3-dbus" + +do_install:append() { + # + # Until catfish upstream figures out a way to overcome this buildpath issue, we need to do such adjustments here. + # + sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' ${D}${datadir}/applications/org.xfce.Catfish.desktop + sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' ${D}${PYTHON_SITEPACKAGES_DIR}/catfish_lib/catfishconfig.py + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/catfish_lib/__pycache__/catfishconfig.*.pyc +} diff --git a/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb b/meta-xfce/recipes-apps/gigolo/gigolo_0.5.3.bb index c846e7802f..4692f18294 100644 --- a/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb +++ b/meta-xfce/recipes-apps/gigolo/gigolo_0.5.3.bb @@ -1,11 +1,10 @@ SUMMARY = "Gigolo is a frontend to easily manage connections to remote filesystems using GIO/GVfs" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "gtk+ intltool-native xfce4-dev-tools-native" +DEPENDS = "gtk+3 intltool-native xfce4-dev-tools-native" inherit xfce-app -SRC_URI[md5sum] = "4abc6fde56572adf3ec3a0181092584c" -SRC_URI[sha256sum] = "553fc78fe4e7bd2f01f3851baea7e63f6414fe652dfb4b08c60b5c4b2b909164" +SRC_URI[sha256sum] = "d25984f65744665e2433335249f9547a38cead45440027af0c397ebf254d2fd0" diff --git a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb b/meta-xfce/recipes-apps/menulibre/menulibre_2.3.2.bb index 1e9e5f1a1e..7491b509cc 100644 --- a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb +++ b/meta-xfce/recipes-apps/menulibre/menulibre_2.3.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "An advanced menu editor" -HOMEPAGE = "https://launchpad.net/menulibre" +HOMEPAGE = "https://bluesabre.org/menulibre/" SECTION = "x11/graphics" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = " \ @@ -9,33 +9,31 @@ DEPENDS = " \ intltool-native \ " -inherit distutils3 gtk-icon-cache distro_features_check +inherit setuptools3_legacy gtk-icon-cache features_check +REQUIRED_DISTRO_FEATURES = "x11 gobject-introspection-data" -REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI = "git://github.com/bluesabre/menulibre.git;protocol=https;branch=master" +SRCREV = "94bef4060714fa65c7246c25b87410b52a149f94" +S = "${WORKDIR}/git" -SRC_URI = "https://launchpad.net/menulibre/2.2/${PV}/+download/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "9690848dbf9196c3f7baa574e90378d8" -SRC_URI[sha256sum] = "546fec87f451c8f5c220d02b1f36dd850f4ce9ab607f8e9711ed8f2009e349fe" +do_compile[noexec] = "1" -do_compile() { -} - -do_install_append() { +do_install:append() { sed -i 's:${D}::g' ${D}${datadir}/applications/menulibre.desktop sed -i 's:share/share:share:g' ${D}${PYTHON_SITEPACKAGES_DIR}/menulibre_lib/menulibreconfig.py } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/applications \ - ${datadir}/menulibre \ + ${datadir}/metainfo \ ${datadir}/icons \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ gtk+3 \ gtksourceview3 \ python3-pygobject \ - gnome-menus3 \ + gnome-menus \ python3-unixadmin \ python3-psutil \ " diff --git a/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb b/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb deleted file mode 100644 index d122bfe379..0000000000 --- a/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A simple text editor for Xfce" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -# intltool to provide intltool.m4 with AC_PROG_INTLTOOL -# xfce4-dev-tools-native for XDT_I18N macro and more importantly XDT_CHECK_OPTIONAL_PACKAGE -# which fixes mousepad/Makefile.am:72: error: HAVE_DBUS does not appear in AM_CONDITIONAL -DEPENDS = "gtk+ dbus dbus-glib gtksourceview2 intltool-native xfce4-dev-tools-native" - -inherit xfce-app gsettings - -SRC_URI[md5sum] = "fb85c23bcb096a46aee9ec22b4e4fdf5" -SRC_URI[sha256sum] = "39a7379b929d964665299c385b2cf705e32e8760698ccc34f91c990bb733518b" - -# we have no gtksourceview 3.x around -EXTRA_OECONF = "--disable-gtk3" - -FILES_${PN} += "${datadir}/glib-2.0/schemas" diff --git a/meta-xfce/recipes-apps/mousepad/mousepad_0.6.1.bb b/meta-xfce/recipes-apps/mousepad/mousepad_0.6.1.bb new file mode 100644 index 0000000000..dc75a4b220 --- /dev/null +++ b/meta-xfce/recipes-apps/mousepad/mousepad_0.6.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "A simple text editor for Xfce" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "gtk+3 gtksourceview4 xfconf xfce4-dev-tools-native" + +inherit xfce-app gsettings mime-xdg + +SRC_URI[sha256sum] = "560c5436c7bc7de33fbf3e9f6cc545280772ad898dfb73257d86533880ffff36" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[spell] = "--enable-plugin-gspell,--disable-plugin-gspell,gspell" + +FILES:${PN} += " \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/metainfo \ + ${datadir}/polkit-1 \ +" diff --git a/meta-xfce/recipes-apps/orage/orage_4.12.1.bb b/meta-xfce/recipes-apps/orage/orage_4.12.1.bb deleted file mode 100644 index eb9da2dffa..0000000000 --- a/meta-xfce/recipes-apps/orage/orage_4.12.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Xfce Calender" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" -DEPENDS = "gtk+ xfce4-panel libical popt" - -inherit xfce-app - -SRC_URI[md5sum] = "2b7f5d38cb5c6edbcc65d0f52a742e46" -SRC_URI[sha256sum] = "3cf9aa441ae83c8688865f82217025cdf3ebaa152cce4571777b8c2aa8dd9062" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" - -PACKAGES =+ "xfce4-orageclock-plugin" -FILES_${PN} += "${datadir}/dbus-1" -FILES_xfce4-orageclock-plugin = "${libdir}/xfce4/panel/plugins/*.so ${datadir}/xfce4/panel/plugins" -FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" diff --git a/meta-xfce/recipes-apps/orage/orage_4.18.0.bb b/meta-xfce/recipes-apps/orage/orage_4.18.0.bb new file mode 100644 index 0000000000..83a65885ac --- /dev/null +++ b/meta-xfce/recipes-apps/orage/orage_4.18.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "Xfce Calender" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "gtk+ xfce4-panel libical popt" + +inherit xfce-app mime-xdg + +SRC_URI[sha256sum] = "6313b49b26cfa39fc5e99468f3fbcfe0fa1c0f3f74273f03674f1a7d6141a3ec" + +PACKAGECONFIG ??= "notify" +PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" + +PACKAGES =+ "xfce4-orageclock-plugin" +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" +FILES:xfce4-orageclock-plugin = "${libdir}/xfce4/panel/plugins/*.so ${datadir}/xfce4/panel/plugins" +FILES:${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" diff --git a/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch b/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch deleted file mode 100644 index 5cdc8c7282..0000000000 --- a/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 2b6bdb860ef53975c7e866f393b61d253c00754d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Mon, 22 Jan 2018 15:52:09 +0100 -Subject: [PATCH] Fix build after update of xfconf -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -xfconf stopped using dbus-glib so required flags must be included here - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - src/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 36a31dc..3dd56bc 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -30,6 +30,7 @@ ristretto_CFLAGS = \ - $(GIO_UNIX_CFLAGS) \ - $(LIBEXIF_CFLAGS) \ - $(XFCONF_CFLAGS) \ -+ $(DBUS_GLIB_CFLAGS) \ - $(EXO_CFLAGS) \ - $(CAIRO_CFLAGS) \ - $(LIBXFCE4UTIL_CFLAGS) \ -@@ -48,6 +49,7 @@ ristretto_LDADD = \ - $(GIO_UNIX_LIBS) \ - $(LIBEXIF_LIBS) \ - $(XFCONF_LIBS) \ -+ $(DBUS_GLIB_LIBS) \ - $(EXO_LIBS) \ - $(CAIRO_LIBS) \ - $(LIBXFCE4UTIL_LIBS) \ --- -2.14.3 - diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.13.1.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.13.1.bb new file mode 100644 index 0000000000..dcae982cee --- /dev/null +++ b/meta-xfce/recipes-apps/ristretto/ristretto_0.13.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "Tiny image-viewer" +HOMEPAGE = "https://docs.xfce.org/apps/ristretto/start" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" + +DEPENDS = "exo libexif libxfce4ui libxfce4util xfconf cairo file glib-2.0-native python3-packaging-native" + +inherit xfce-app mime-xdg python3native + +RRECOMMENDS:${PN} += "tumbler" + +SRC_URI[sha256sum] = "d71affbf15245067124725b153c908a53208c4ca1ba2d4df1ec5a1308d53791e" + +FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb deleted file mode 100644 index 416ac2adc9..0000000000 --- a/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Tiny image-viewer" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/ristretto" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" -DEPENDS = "exo libexif gtk+ dbus-glib libxfce4ui libxfce4util xfconf cairo file" - -inherit xfce-app - -RRECOMMENDS_${PN} += "tumbler" - -SRC_URI[md5sum] = "0142c8b9c492cf447e563b00c6204359" -SRC_URI[sha256sum] = "3a0be4526c93ec0ebbf2e63e69dd0c98f16b20b863d3b6426272592e5b00cea2" -SRC_URI += "file://0001-Fix-build-after-update-of-xfconf.patch" - -FILES_${PN} += "${datadir}/appdata" diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.4.21.bb index 7445cd7c53..abb5c14e64 100644 --- a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.4.21.bb @@ -2,17 +2,17 @@ SUMMARY = "Lightweight, desktop independent GTK+ archive manager" HOMEPAGE = "http://xarchiver.sourceforge.net" SECTION = "x11" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gtk+3 glib-2.0 xfce4-dev-tools-native intltool-native" -SRC_URI = "git://github.com/ib/xarchiver.git" -SRCREV = "9ab958a4023b62b43972c55a3143ff0722bd88a6" -PV = "0.5.4.14" +SRC_URI = "git://github.com/ib/xarchiver.git;branch=master;protocol=https" +SRCREV = "55f923ebc623bcc8f53368543847350a23688189" + S = "${WORKDIR}/git" -inherit gettext pkgconfig autotools gtk-icon-cache distro_features_check +inherit gettext pkgconfig autotools gtk-icon-cache features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" @@ -24,10 +24,10 @@ EXTRA_OECONF += " \ --disable-doc \ " -do_configure_prepend() { +do_configure:prepend() { touch ${S}/NEWS ${S}/AUTHORS } -FILES_${PN} += "${libdir}/thunar-archive-plugin" +FILES:${PN} += "${libdir}/thunar-archive-plugin" -RRECOMMENDS_${PN} = "lzop zip tar bzip2 unzip xz p7zip" +RRECOMMENDS:${PN} = "lzop zip tar bzip2 unzip xz p7zip" diff --git a/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch b/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch deleted file mode 100644 index e872249d52..0000000000 --- a/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fb1f83c04dd5262897b09e60fa8b39090d0d4619 Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@math.unl.edu> -Date: Thu, 12 Nov 2015 13:53:03 -0600 -Subject: [PATCH] fix Name/Comment fields - -Validate as a valid .desktop file per -http://standards.freedesktop.org/desktop-entry-spec/latest/ - -See also issue #2 - -Upstream-Status: Applied [1] - -[1] https://github.com/ncopa/xfce-polkit/commit/fb1f83c04dd5262897b09e60fa8b39090d0d4619 ---- - xfce-polkit.desktop.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xfce-polkit.desktop.in b/xfce-polkit.desktop.in -index 8575896..dd9f09c 100644 ---- a/xfce-polkit.desktop.in -+++ b/xfce-polkit.desktop.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - Type=Application --_Name=XFCE PolKit --_Comment=Policykit Authentication Agent -+Name=XFCE PolKit -+Comment=Policykit Authentication Agent - Exec=@xfce_polkit_libexecdir@/xfce-polkit - Icon=gtk-dialog-authentication - NotShowIn=GNOME;KDE; --- -2.14.3 - diff --git a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb deleted file mode 100644 index 54bf7c7529..0000000000 --- a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "A simple PolicyKit authentication agent for XFCE" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=758b03f872a88c99fc36d50c5932091c" - -DEPENDS = "libxfce4ui polkit" - -inherit xfce-app - -SRC_URI = " \ - git://github.com/ncopa/${BPN}.git \ - file://0001-fix-Name-Comment-fields.patch \ -" -SRCREV = "6ad1ee833c9e22e4dd72a8f7d54562d046965283" -S = "${WORKDIR}/git" diff --git a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb new file mode 100644 index 0000000000..3e3301f748 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "A simple PolicyKit authentication agent for XFCE" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=758b03f872a88c99fc36d50c5932091c" + +DEPENDS = "libxfce4ui polkit" + +inherit xfce-app features_check +REQUIRED_DISTRO_FEATURES = "polkit" + +SRC_URI = " \ + git://github.com/ncopa/${BPN}.git;branch=master;protocol=https \ +" +SRCREV = "6d3282cc1734c305850d48f5bf4b4d94e88885e9" +S = "${WORKDIR}/git" diff --git a/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch new file mode 100644 index 0000000000..617d175579 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch @@ -0,0 +1,26 @@ +From d463b7e9abbbc87ec0e25216a24d9a40d347f1a6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 24 Jan 2022 09:59:02 -0800 +Subject: [PATCH] Fix build with meson >= 0.61 + +Upstream-Status: Submitted [https://github.com/schnitzeltony/xfce4-datetime-setter/pull/3] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + panels/datetime/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build +index 241e177..4356907 100644 +--- a/panels/datetime/meson.build ++++ b/panels/datetime/meson.build +@@ -10,7 +10,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: 'xfce-datetime.desktop', +-- +2.34.1 + diff --git a/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch new file mode 100644 index 0000000000..9cccb892fa --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch @@ -0,0 +1,28 @@ +It fails to compile xfce4-datetime-setter occasionally when system load is high: + +| ../git/xfce/main.c:42:10: fatal error: cc-datetime-resources.h: No such file or directory +| 42 | #include "cc-datetime-resources.h" +| | ^~~~~~~~~~~~~~~~~~~~~~~~~ +| compilation terminated. + +Update datetime_panel_dep to make sure cc-datetime-resources.h be generated +before including. + +Upstream-Status: Submitted [https://github.com/schnitzeltony/xfce4-datetime-setter/pull/2] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- +diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build +index c5bf39c..241e177 100644 +--- a/panels/datetime/meson.build ++++ b/panels/datetime/meson.build +@@ -175,7 +175,8 @@ datetime_panel_lib = static_library( + + datetime_panel_dep = declare_dependency( + include_directories: [ common_inc, include_directories('.') ], +- link_with: datetime_panel_lib ++ link_with: datetime_panel_lib, ++ sources: resources + ) + + subdir('po-timezones') diff --git a/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb new file mode 100644 index 0000000000..6bcfc4ba43 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "A fork of (early) gnome-control-center datetime panel for XFCE. \ +It is based upon GTK3 and embedds into recent xfce4-settings." +HOMEPAGE = "https://github.com/schnitzeltony/xfce4-datetime-setter" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +DEPENDS = "glib-2.0-native libxfce4ui" + +SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https;branch=master \ + file://fix-inner-dependency.patch \ + file://0001-Fix-build-with-meson-0.61.patch \ +" +SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f" + +S = "${WORKDIR}/git" + +inherit gettext meson features_check pkgconfig + +REQUIRED_DISTRO_FEATURES = "systemd x11" + +FILES:${PN} += "${datadir}/icons/hicolor" + +RDEPENDS:${PN} = "tzdata" diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch b/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch new file mode 100644 index 0000000000..719267fd16 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch @@ -0,0 +1,41 @@ +Native pkg_config only return basename of the variable queried. Invoke `which` +to get the absolute path. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0f49e2b..a589147 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -116,7 +116,7 @@ AC_MSG_CHECKING([for gdbus-codegen]) + if test x"$GDBUS_CODEGEN" = x""; then + GDBUS_CODEGEN=`$PKG_CONFIG --variable=gdbus_codegen gio-2.0` + fi +-if test -x "$GDBUS_CODEGEN"; then ++if test -x "$(which $GDBUS_CODEGEN)"; then + AC_MSG_RESULT([$GDBUS_CODEGEN]) + else + AC_MSG_ERROR([could not find gdbus-codegen in \$PATH. You can run +@@ -129,7 +129,7 @@ AC_MSG_CHECKING([for glib-compile-resources]) + if test x"$GLIB_COMPILE_RESOURCES" = x""; then + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + fi +-if test -x "$GLIB_COMPILE_RESOURCES"; then ++if test -x "$(which $GLIB_COMPILE_RESOURCES)"; then + AC_MSG_RESULT([$GLIB_COMPILE_RESOURCES]) + else + AC_MSG_ERROR([could not find glib-compile-resources in \$PATH. You can run +@@ -142,7 +142,7 @@ AC_MSG_CHECKING([for glib-genmarshal]) + if test x"$GLIB_GENMARSHAL" = x""; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + fi +-if test -x "$GLIB_GENMARSHAL"; then ++if test -x "$(which $GLIB_GENMARSHAL)"; then + AC_MSG_RESULT([$GLIB_GENMARSHAL]) + else + AC_MSG_ERROR([could not find glib-genmarshal in \$PATH. You can run diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.4.bb b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb index 06ab0dfeb4..96cfd32f7b 100644 --- a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.4.bb +++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb @@ -1,31 +1,34 @@ SUMMARY = "Easily themable notification daemon with transparency effects" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +HOMEPAGE = "https://docs.xfce.org/apps/notifyd/start" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + DEPENDS = " \ - dbus \ - dbus-glib \ + glib-2.0-native \ libnotify \ libxfce4util \ libxfce4ui \ xfconf \ xfce4-panel \ + python3-packaging-native \ " inherit xfce-app +inherit python3native + +SRC_URI:append = " file://xfce4-notifyd-get-var-abs-path.patch" -SRC_URI[md5sum] = "9614d4f7c0790e8ab24e55896a44a8ac" -SRC_URI[sha256sum] = "090571acf94c423003426cb779fb23e8545c68bab6485563b589c7def8a21b55" +SRC_URI[sha256sum] = "e3a28adb08daa1411135142a0d421e4d6050c4035a4e513a673a59460ff2ae84" # Avoid trouble with other desktops e.g KDE which also ships dbus service named # org.freedesktop.Notifications EXTRA_OECONF = "--disable-dbus-start-daemon" -do_compile_prepend() { +do_compile:prepend() { mkdir -p xfce4-notifyd xfce4-notifyd-config } -FILES_${PN} += " \ +FILES:${PN} += " \ ${systemd_user_unitdir} \ ${datadir}/xfce4 \ ${datadir}/themes \ diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.14.bb index 5fa2a7bce5..38f6eb6ebc 100644 --- a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb +++ b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.14.bb @@ -1,17 +1,16 @@ SUMMARY = "Backup, restore, import, and export panel layouts" SECTION = "x11/application" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -inherit python3native gettext distro_features_check +inherit python3native gettext gtk-icon-cache features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 gobject-introspection-data" DEPENDS += "intltool-native" -SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "bc75a143423fba3a82f114f47e86580c" -SRC_URI[sha256sum] = "a69e20f5e637319e14898b5c13ff7ba31d001a6e38e7516d70dbfd7600ad72db" +SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BP}.tar.bz2" +SRC_URI[sha256sum] = "6d08354e8c44d4b0370150809c1ed601d09c8b488b68986477260609a78be3f9" do_configure() { # special configure - no autotools... @@ -23,6 +22,6 @@ do_install() { sed -i 's:${PYTHON}:python3:g' ${D}${bindir}/xfce4-panel-profiles } -FILES_${PN} += "${datadir}/metainfo" +FILES:${PN} += "${datadir}/metainfo" -RDEPENDS_${PN} += "python3-pygobject python3-pexpect" +RDEPENDS:${PN} += "python3-pygobject python3-pexpect" diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch index f726064e21..eabcaaae69 100644 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch @@ -6,11 +6,15 @@ Upstream-Status: Inappropriate [cross compile specific] Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + diff --git a/configure.ac b/configure.ac -index f0ec537..05c393d 100644 +index 6f149bb..3890677 100644 --- a/configure.ac +++ b/configure.ac -@@ -230,9 +230,9 @@ dnl --------------------------------------------------------------------------- +@@ -237,9 +237,9 @@ dnl --------------------------------------------------------------------------- # AC_DEFUN([AC_CHECK_X_HEADER], [ ac_save_CPPFLAGS="$CPPFLAGS" @@ -23,7 +27,7 @@ index f0ec537..05c393d 100644 CPPFLAGS="$CPPFLAGS $X_CFLAGS" AC_CHECK_HEADER([$1],[$2],[$3],[$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) -@@ -241,9 +241,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [ +@@ -248,9 +248,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [ # AC_DEFUN([AC_TRY_X_COMPILE], [ ac_save_CPPFLAGS="$CPPFLAGS" @@ -34,9 +38,9 @@ index f0ec537..05c393d 100644 +# CPPFLAGS="$CPPFLAGS -I$includedir" +# fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" - AC_TRY_COMPILE([$1], [$2], [$3], [$4]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) -@@ -257,15 +257,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [ +@@ -264,15 +264,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [ ac_save_LDFLAGS="$LDFLAGS" # ac_save_LIBS="$LIBS" diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.1.bb index fb2be6609c..2c5cba0d8f 100644 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.1.bb @@ -3,17 +3,22 @@ DESCRIPTION = "Xfce screensaver is a screen saver and locker that aims to have s HOMEPAGE = "https://git.xfce.org/apps/xfce4-screensaver/about/" SECTION = "x11/application" -LICENSE = "GPLv2+ & LGPLv2+ " +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later " LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ " -DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf" +DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3" inherit xfce-app -SRC_URI_append = " file://fix-cross-compile.patch" -SRC_URI[md5sum] = "18a619849f85c24d784c7fa27279ca4b" -SRC_URI[sha256sum] = "ed04ae32034b8e13a78495ca2bd7789a20ec7f67891ab9e92826a944371eabef" +SRC_URI:append = " file://fix-cross-compile.patch" +SRC_URI[sha256sum] = "b731e8abd68a18cc5d3b523351aa8f9f293c9f63290c1781c9155259deb04a5c" -FILES_${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" +do_install:append() { + install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver +} + +FILES:${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" + +RDEPENDS:${PN} += "python3-core" diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.4.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.4.bb new file mode 100644 index 0000000000..7c2ecd30d4 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.4.bb @@ -0,0 +1,21 @@ +SUMMARY = "Application to take screenshots" +HOMEPAGE = "https://docs.xfce.org/apps/xfce4-screenshooter/start" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11 libxml-parser-perl-native" + +inherit xfce-app perlnative + +SRC_URI[sha256sum] = "a2f199687e54e16a936d5636d660d42b6b9a5d548cdd0f04bd69213554806494" + +do_compile:prepend() { + mkdir -p lib + mkdir -p src panel-plugin +} + +FILES:${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/xfce4/panel/plugins \ + ${libdir}/xfce4/panel/plugins \ +" 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.5.bb deleted file mode 100644 index 9f8f61a4a7..0000000000 --- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.5.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Application to take screenshots" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" - -inherit xfce-app - -SRC_URI[md5sum] = "0354811cd2622d3de92e342c7eaa184d" -SRC_URI[sha256sum] = "bf35b5432cb920987c6d7ff193600e5dd4d73422b6aa02b4ec5288744053b38c" - -do_compile_prepend() { - mkdir -p lib - mkdir -p src panel-plugin -} - -FILES_${PN} += " \ - ${datadir}/appdata \ - ${datadir}/xfce4/panel/plugins \ - ${libdir}/xfce4/panel/plugins \ -" diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.2.bb b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.2.bb deleted file mode 100644 index f3a59c96ce..0000000000 --- a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Easy to use task manager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit xfce-app - -DEPENDS += "gtk+3 cairo libwnck libxmu xfce4-dev-tools-native exo-native" - -SRC_URI[md5sum] = "6578625ffbe069b138533ff5e77df734" -SRC_URI[sha256sum] = "e49a61c819a4fd9286a65ae61605984f327c8b26cf939289f644e656bfa20e13" diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.6.bb b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.6.bb new file mode 100644 index 0000000000..4eddc9fcfc --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.6.bb @@ -0,0 +1,9 @@ +SUMMARY = "Easy to use task manager" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-app + +DEPENDS += "gtk+3 cairo libwnck libxfce4ui libxmu xfce4-dev-tools-native" + +SRC_URI[sha256sum] = "20979000761a41faed4f7f63f27bd18bb36fb27db4f7ecc8784a460701fb4abb" diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb deleted file mode 100644 index 426282e145..0000000000 --- a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Terminal emulator for the Xfce desktop environment" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui" - -inherit xfce-app - -FILES_${PN} += "${datadir}/xfce4 \ - ${datadir}/gnome-control-center" - -SRC_URI[md5sum] = "c861540dd1dd05f56e62382b3851cf66" -SRC_URI[sha256sum] = "a88f98af4da72394f2cfbd7f14b0f053ec0a3b58a4f6a577836357c60a6c42ab" - -RRECOMMENDS_${PN} += "vte-prompt" diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.4.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.4.bb new file mode 100644 index 0000000000..edb0c614ec --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "Terminal emulator for the Xfce desktop environment" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui gtk-doc-native" + +inherit xfce-app + +FILES:${PN} += " \ + ${datadir}/xfce4 \ + ${datadir}/gnome-control-center \ +" + +SRC_URI[sha256sum] = "78e55957af7c6fc1f283e90be33988661593a4da98383da1b0b54fdf6554baf4" + +RRECOMMENDS:${PN} += "vte-prompt" diff --git a/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb b/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb index df0ed50c7b..dc62a1c722 100644 --- a/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb +++ b/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb @@ -22,10 +22,12 @@ do_install() { done } -python populate_packages_prepend () { +python populate_packages:prepend () { icondir = bb.data.expand('${datadir}/icons', d) do_split_packages(d, icondir, '^(.*)', '%s', 'Open Zone cursors %s', allow_dirs=True) } +FILES:${PN} += "${datadir}/icons" + PACKAGES_DYNAMIC += "^openzone-.*" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb b/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb index 40ba340f22..532980d967 100644 --- a/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb +++ b/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Rodent-icon-theme (was xfce4-icon-theme) is a svg icon theme" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" inherit allarch autotools gtk-icon-cache @@ -8,9 +8,9 @@ SRC_URI = "http://sourceforge.net/projects/xffm/files/${BPN}/${BPN}-${PV}.tar.gz SRC_URI[md5sum] = "4b097d344a160d6497c6498985c8df15" SRC_URI[sha256sum] = "6ed00d16faa1f55b3bb7b13862de1d7f5cfd978b93e42487ded21595d0dbe208" -FILES_${PN} += "${datadir}/icons" +FILES:${PN} += "${datadir}/icons" -RREPLACES_${PN} += "xfce4-icon-theme" -RPROVIDES_${PN} += "xfce4-icon-theme" -RCONFLICTS_${PN} += "xfce4-icon-theme" +RREPLACES:${PN} += "xfce4-icon-theme" +RPROVIDES:${PN} += "xfce4-icon-theme" +RCONFLICTS:${PN} += "xfce4-icon-theme" diff --git a/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb b/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb index b05c748529..4cbdb4e083 100644 --- a/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb +++ b/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb @@ -1,10 +1,10 @@ SUMMARY = "Modified version of the xfce-dusk theme to support also gtk 3.x too" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=8f0e2cd40e05189ec81232da84bd6e1a" inherit allarch -SRC_URI = "http://xfce-look.org/CONTENT/content-files/141404-xfce_dusk_gtk3-1_3.tar.gz;subdir=${BPN}-${PV}" +SRC_URI = "http://sources.openembedded.org/141404-xfce_dusk_gtk3-1_3.tar.gz;subdir=${BPN}-${PV}" SRC_URI[md5sum] = "b3ad37ad8173b14ec090e60a80e65d8f" SRC_URI[sha256sum] = "bfa8a88607d1a1da5bd0b9e4e075767c54400a3c5a0fae88b619ed71532f30b4" @@ -16,4 +16,4 @@ do_install() { cp -r Xfce-dusk-gtk3 ${D}${datadir}/themes/Xfce-dusk-gtk3 } -FILES_${PN} = "${datadir}/themes" +FILES:${PN} = "${datadir}/themes" diff --git a/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb b/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb index 7030f7a267..272f83c01b 100644 --- a/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb +++ b/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Additional (old) themes for Xfwm4" SECTION = "x11/wm" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit xfce @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "3214d5f00e9703b5e8c9e7c3287d606dedec7285ceb4d5db332e93ada6 # using xfwm4-theme as in xfwm4 might cause warnings of packages supplied by # multiple providers. So we use xfwm4-old-theme here. -python populate_packages_prepend () { +python populate_packages:prepend () { themedir = d.expand('${datadir}/themes') do_split_packages(d, themedir, '^(.*)', 'xfwm4-old-theme-%s', 'XFWM4 theme %s', allow_dirs=True) } diff --git a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb index 68dbc69afc..0a65bd94a2 100644 --- a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb +++ b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb @@ -1,9 +1,9 @@ SUMMARY = "Xfce4 Vala provides bindings for the Xfce framework" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" DEPENDS = "libxfce4util garcon xfconf libxfce4ui xfce4-panel exo vala xfce4-dev-tools-native" -inherit xfce pkgconfig distro_features_check +inherit xfce pkgconfig features_check REQUIRED_DISTRO_FEATURES = "x11" @@ -14,6 +14,6 @@ SRC_URI = " \ SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71" SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b" -FILES_${PN} += "${datadir}/vala-*/vapi" +FILES:${PN} += "${datadir}/vala-*/vapi" -RDEPENDS_${PN} = "vala" +RDEPENDS:${PN} = "vala" diff --git a/meta-xfce/recipes-connectivity/blueman/blueman_%.bbappend b/meta-xfce/recipes-connectivity/blueman/blueman_%.bbappend deleted file mode 100644 index c47522379e..0000000000 --- a/meta-xfce/recipes-connectivity/blueman/blueman_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG_append = " thunar" diff --git a/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb b/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb index 21930ba147..9d997cf57c 100644 --- a/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb +++ b/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb @@ -6,7 +6,7 @@ IMAGE_INSTALL = "packagegroup-core-boot \ kernel-modules \ " -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "x11" IMAGE_LINGUAS ?= " " @@ -16,3 +16,5 @@ LICENSE = "MIT" export IMAGE_BASENAME = "core-image-minimal-xfce" inherit core-image + +SYSTEMD_DEFAULT_TARGET = "graphical.target" diff --git a/meta-xfce/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch b/meta-xfce/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch deleted file mode 100644 index 03cb762ce0..0000000000 --- a/meta-xfce/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fcf29abe59607b5791f9de18ddb86b9ae3c9b7cc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 26 Aug 2017 23:50:05 -0700 -Subject: [PATCH] Add G_GNUC_PRINTF on functions with format strings - -This allows compilation with clang without errors, even when --Wformat-nonliteral is active (as long as there are no real cases of -non literal formatting). - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gladeui/glade-command.c | 4 ++-- - gladeui/glade-utils.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gladeui/glade-command.c b/gladeui/glade-command.c -index 9819766..4ac40ee 100644 ---- a/gladeui/glade-command.c -+++ b/gladeui/glade-command.c -@@ -266,7 +266,7 @@ glade_command_collapse (GladeCommand *command, - * - * Marks the begining of a group. - */ --void -+G_GNUC_PRINTF(1, 2) void - glade_command_push_group (const gchar *fmt, ...) - { - va_list args; -@@ -655,7 +655,7 @@ glade_command_set_properties_list (GladeProject *project, GList *props) - - multiple = g_list_length (me->sdata) > 1; - if (multiple) -- glade_command_push_group (cmd->description); -+ glade_command_push_group ("%s", cmd->description); - - - glade_command_check_group (GLADE_COMMAND (me)); -diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c -index ae52501..c51ae59 100644 ---- a/gladeui/glade-utils.c -+++ b/gladeui/glade-utils.c -@@ -197,7 +197,7 @@ glade_utils_get_pspec_from_funcname (const gchar *funcname) - * selected "OK", True if the @type was GLADE_UI_YES_OR_NO and - * the user selected "YES"; False otherwise. - */ --gint -+G_GNUC_PRINTF(4, 5) gint - glade_util_ui_message (GtkWidget *parent, - GladeUIMessageType type, - GtkWidget *widget, -@@ -320,7 +320,7 @@ remove_message_timeout (FlashInfo * fi) - * - * Flash a temporary message on the statusbar. - */ --void -+G_GNUC_PRINTF(3, 4) void - glade_util_flash_message (GtkWidget *statusbar, guint context_id, gchar *format, ...) - { - va_list args; --- -2.14.1 - diff --git a/meta-xfce/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch b/meta-xfce/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch deleted file mode 100644 index 1b24c39ce8..0000000000 --- a/meta-xfce/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch +++ /dev/null @@ -1,51 +0,0 @@ -From aed002cd9ff9e8f972120fbac33b4a65aba952e1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 25 Sep 2012 10:28:33 +0200 -Subject: [PATCH] gnome-doc-utils.make: sysrooted pkg-config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -same approach as used used in gnome-disk-utility: - -In cross environment we have to prepend the sysroot to the path found by -pkgconfig since the path returned from pkgconfig does not have sysroot prefixed -it ends up using the files from host system. Now usually people have gnome installed -so the build succeeds but if you dont have gnome installed on build host then -it wont find the files on host system and packages using gnome-doc-utils wont -compile. - -This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR -will be empty - -Upstream-Status: pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - gnome-doc-utils.make | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make -index 42d9df3..f71bbfa 100644 ---- a/gnome-doc-utils.make -+++ b/gnome-doc-utils.make -@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@ - _xml2po ?= `which xml2po` - _xml2po_mode = $(if $(DOC_ID),mallard,docbook) - --_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` --_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` --_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl --_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl --_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl -+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` -+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl -+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl -+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl - - if ENABLE_SK - _ENABLE_SK = true --- -1.7.6.5 - diff --git a/meta-xfce/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch b/meta-xfce/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch deleted file mode 100644 index f735ff8190..0000000000 --- a/meta-xfce/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5aa3d2abb905fa8594f6c6572a87809da54c9342 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Mon, 5 Sep 2016 11:25:27 +0200 -Subject: [PATCH] fix gcc-6 build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - gladeui/glade-editor-property.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c -index a0c1039..5e9ac38 100644 ---- a/gladeui/glade-editor-property.c -+++ b/gladeui/glade-editor-property.c -@@ -2703,6 +2703,8 @@ glade_eprop_object_view (gboolean radio) - } - - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - static gchar * - glade_eprop_object_dialog_title (GladeEditorProperty *eprop) - { -@@ -2731,6 +2733,7 @@ glade_eprop_object_dialog_title (GladeEditorProperty *eprop) - return g_strdup_printf (format, g_type_name - (eprop->klass->pspec->value_type)); - } -+#pragma GCC diagnostic pop - - - gboolean --- -2.5.5 - diff --git a/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb b/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb deleted file mode 100644 index c3da3e9b90..0000000000 --- a/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Glade - A User Interface Designer" -HOMEPAGE = "http://www.gnu.org/software/gnash" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ - file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ - file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native" - -inherit distro_features_check autotools pkgconfig pythonnative gtk-icon-cache - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \ - file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch \ - file://0002-fix-gcc-6-build.patch \ - file://0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch \ - " -SRC_URI[md5sum] = "4e4b4f5ee34a03e017e4cef97d796c1f" -SRC_URI[sha256sum] = "58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735" - -EXTRA_OECONF += "--disable-scrollkeeper" - -FILES_${PN} += "${datadir}/icons" diff --git a/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch b/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch new file mode 100644 index 0000000000..35f1cfec43 --- /dev/null +++ b/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch @@ -0,0 +1,19 @@ +Fix build with -fno-common + +Imported from https://src.fedoraproject.org/rpms/imsettings/raw/master/f/imsettings-gcc10.patch + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +diff -pruN imsettings-1.8.2.orig/imsettings-daemon/imsettings-server.c imsettings-1.8.2/imsettings-daemon/imsettings-server.c +--- imsettings-1.8.2.orig/imsettings-daemon/imsettings-server.c 2019-11-14 14:08:03.000000000 +0900 ++++ imsettings-1.8.2/imsettings-daemon/imsettings-server.c 2020-01-29 13:32:50.827832726 +0900 +@@ -91,7 +91,7 @@ GDBusInterfaceVTable __iface_vtable = { + NULL, + NULL, + }; +-guint signals[LAST_SIGNAL]; ++static guint signals[LAST_SIGNAL]; + + G_DEFINE_TYPE_WITH_PRIVATE (IMSettingsServer, imsettings_server, G_TYPE_OBJECT); + G_LOCK_DEFINE_STATIC (logger); diff --git a/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb index 8f622bf6f8..21e9b3908f 100644 --- a/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb +++ b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb @@ -7,25 +7,28 @@ 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 = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -REQUIRED_DISTRO_FEATURES = "x11" +inherit autotools gtk-doc gobject-introspection gettext features_check -SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ - " +DEPENDS = "autoconf-archive-native 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 \ + file://imsettings-gcc10.patch \ + " +SRC_URI[sha256sum] = "45986b9ca1b87b760a5dbaecd9a2b77d080adc47868a0512826077175d5b3ee3" 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" +RDEPENDS:${PN} += "bash" -FILES_${PN} += "${datadir}/dbus-1/* ${datadir}/gir-1.0/* ${libdir}/girepository-1.0/*" +FILES:${PN} += "${datadir}/dbus-1/*" diff --git a/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch b/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch deleted file mode 100644 index 2b5eda0d13..0000000000 --- a/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f39bcd5af79aa3efe2cecb2212793c5b596890a8 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 18 Feb 2016 17:40:45 +0200 -Subject: [PATCH] Makefile.am: use $(LIBTOOL) instead of hardcoded libtool name - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - unique/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/unique/Makefile.am b/unique/Makefile.am -index 6475a87..734f431 100644 ---- a/unique/Makefile.am -+++ b/unique/Makefile.am -@@ -114,7 +114,7 @@ Unique-1.0.gir: $(INTROSPECTION_SCANNER) libunique-1.0.la - --include=GObject-2.0 \ - --include=Gtk-2.0 \ - --library=libunique-1.0.la \ -- --libtool="$(top_builddir)/libtool" \ -+ --libtool="$(LIBTOOL)" \ - --pkg gobject-2.0 \ - --pkg gtk+-2.0 \ - --output $@ \ --- -2.7.0 - diff --git a/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch b/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch deleted file mode 100644 index 7f9fdf3971..0000000000 --- a/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 37632aca00d48c53e91f08bc7435c721ba81b2cd Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 30 Mar 2017 14:32:55 -0700 -Subject: [PATCH] test-unique: Add format qualifier %s for string - -Fixes potential security issues that compiler flags - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/test-unique.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/test-unique.c b/tests/test-unique.c -index b7cde45..82ee81b 100644 ---- a/tests/test-unique.c -+++ b/tests/test-unique.c -@@ -82,10 +82,10 @@ app_message_cb (UniqueApp *app, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, - GTK_BUTTONS_CLOSE, -- title); -+ "%s",title); - if (message) - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), -- message); -+ "%s",message); - - gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE); - --- -2.12.1 - diff --git a/meta-xfce/recipes-extended/libunique/libunique/build.patch b/meta-xfce/recipes-extended/libunique/libunique/build.patch deleted file mode 100644 index 46a5c62e4f..0000000000 --- a/meta-xfce/recipes-extended/libunique/libunique/build.patch +++ /dev/null @@ -1,421 +0,0 @@ -Upstream-Status: Backport [http://git.gnome.org/browse/unique/commit/?h=unique-1.1&id=f75ca2d7aad7d27686acca6090c1c569a79d7e63] -Signed-off-By: Ross Burton <ross.burton@intel.com> - -From f75ca2d7aad7d27686acca6090c1c569a79d7e63 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi <ebassi@gnome.org> -Date: Sat, 08 May 2010 11:17:21 +0000 -Subject: build: Update the build environment - -Require autoconf 2.63, automake 1.11 and libtool 2.2.6 to remove Shave. - -Also bump up the requirement for gobject-introspection to 0.6.7. ---- -diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am -index 5f35b85..b78428f 100644 ---- a/build/autotools/Makefile.am -+++ b/build/autotools/Makefile.am -@@ -1,7 +1,4 @@ - EXTRA_DIST = \ -- shave-libtool.in \ -- shave.in \ -- shave.m4 \ - as-compiler-flag.m4 \ - introspection.m4 \ - Makefile.am.enums \ -diff --git a/build/autotools/Makefile.am.silent b/build/autotools/Makefile.am.silent -index 249f6af..8576846 100644 ---- a/build/autotools/Makefile.am.silent -+++ b/build/autotools/Makefile.am.silent -@@ -1,10 +1,5 @@ - # custom rules for quiet builds - --if USE_SHAVE --QUIET_GEN = $(Q:@=@echo ' GEN '$@;) --QUIET_LN = $(Q:@=@echo ' LN '$@;) --QUIET_RM = $(Q:@=@echo ' RM '$@;) --else - QUIET_GEN = $(AM_V_GEN) - - QUIET_LN = $(QUIET_LN_$(V)) -@@ -14,4 +9,3 @@ QUIET_LN_0 = @echo ' LN '$@; - QUIET_RM = $(QUIET_RM_$(V)) - QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY)) - QUIET_RM_0 = @echo ' RM '$@; --endif # USE_SHAVE -diff --git a/build/autotools/introspection.m4 b/build/autotools/introspection.m4 -index f9ce49c..589721c 100644 ---- a/build/autotools/introspection.m4 -+++ b/build/autotools/introspection.m4 -@@ -59,12 +59,18 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) -+ AC_SUBST(INTROSPECTION_CFLAGS) -+ AC_SUBST(INTROSPECTION_LIBS) -+ AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") - ]) -diff --git a/build/autotools/shave-libtool.in b/build/autotools/shave-libtool.in -deleted file mode 100644 -index 1f3a720..0000000 ---- a/build/autotools/shave-libtool.in -+++ b/dev/null -@@ -1,69 +0,0 @@ --#!/bin/sh -- --# we need sed --SED=@SED@ --if test -z "$SED" ; then --SED=sed --fi -- --lt_unmangle () --{ -- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` --} -- --# the real libtool to use --LIBTOOL="$1" --shift -- --# if 1, don't print anything, the underlaying wrapper will do it --pass_though=0 -- --# scan the arguments, keep the right ones for libtool, and discover the mode --preserved_args= --while test "$#" -gt 0; do -- opt="$1" -- shift -- -- case $opt in -- --mode=*) -- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` -- preserved_args="$preserved_args $opt" -- ;; -- -o) -- lt_output="$1" -- preserved_args="$preserved_args $opt" -- ;; -- *) -- preserved_args="$preserved_args $opt" -- ;; -- esac --done -- --case "$mode" in --compile) -- # shave will be called and print the actual CC/CXX/LINK line -- preserved_args="$preserved_args --shave-mode=$mode" -- pass_though=1 -- ;; --link) -- preserved_args="$preserved_args --shave-mode=$mode" -- Q=" LINK " -- ;; --*) -- # let's u -- # echo "*** libtool: Unimplemented mode: $mode, fill a bug report" -- ;; --esac -- --lt_unmangle "$lt_output" --output=$last_result -- --if test -z $V; then -- if test $pass_though -eq 0; then -- echo "$Q$output" -- fi -- $LIBTOOL --silent $preserved_args --else -- echo $LIBTOOL $preserved_args -- $LIBTOOL $preserved_args --fi -diff --git a/build/autotools/shave.in b/build/autotools/shave.in -deleted file mode 100644 -index 5c16f27..0000000 ---- a/build/autotools/shave.in -+++ b/dev/null -@@ -1,79 +0,0 @@ --#!/bin/sh -- --# we need sed --SED=@SED@ --if test -z "$SED" ; then --SED=sed --fi -- --lt_unmangle () --{ -- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` --} -- --# the tool to wrap (cc, cxx, ar, ranlib, ..) --tool="$1" --shift -- --# the reel tool (to call) --REEL_TOOL="$1" --shift -- --pass_through=0 --preserved_args= --while test "$#" -gt 0; do -- opt="$1" -- shift -- -- case $opt in -- --shave-mode=*) -- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` -- ;; -- -o) -- lt_output="$1" -- preserved_args="$preserved_args $opt" -- ;; -- *) -- preserved_args="$preserved_args $opt" -- ;; -- esac --done -- --# mode=link is handled in the libtool wrapper --case "$mode,$tool" in --link,*) -- pass_through=1 -- ;; --*,cxx) -- Q=" CXX " -- ;; --*,cc) -- Q=" CC " -- ;; --*,fc) -- Q=" FC " -- ;; --*,f77) -- Q=" F77 " -- ;; --*,objc) -- Q=" OBJC " -- ;; --*,*) -- # should not happen -- Q=" CC " -- ;; --esac -- --lt_unmangle "$lt_output" --output=$last_result -- --if test -z $V; then -- if test $pass_through -eq 0; then -- echo "$Q$output" -- fi -- $REEL_TOOL $preserved_args --else -- echo $REEL_TOOL $preserved_args -- $REEL_TOOL $preserved_args --fi -diff --git a/build/autotools/shave.m4 b/build/autotools/shave.m4 -deleted file mode 100644 -index 0a3509e..0000000 ---- a/build/autotools/shave.m4 -+++ b/dev/null -@@ -1,77 +0,0 @@ --dnl Make automake/libtool output more friendly to humans --dnl Damien Lespiau <damien.lespiau@gmail.com> --dnl --dnl SHAVE_INIT([shavedir],[default_mode]) --dnl --dnl shavedir: the directory where the shave scripts are, it defaults to --dnl $(top_builddir) --dnl default_mode: (enable|disable) default shave mode. This parameter --dnl controls shave's behaviour when no option has been --dnl given to configure. It defaults to disable. --dnl --dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just --dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and --dnl LIBTOOL, you don't want the configure tests to have these variables --dnl re-defined. --dnl * This macro requires GNU make's -s option. -- --AC_DEFUN([_SHAVE_ARG_ENABLE], --[ -- AC_ARG_ENABLE([shave], -- AS_HELP_STRING( -- [--enable-shave], -- [use shave to make the build pretty [[default=$1]]]),, -- [enable_shave=$1] -- ) --]) -- --AC_DEFUN([SHAVE_INIT], --[ -- dnl you can tweak the default value of enable_shave -- m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) -- -- if test x"$enable_shave" = xyes; then -- dnl where can we find the shave scripts? -- m4_if([$1],, -- [shavedir="$ac_pwd"], -- [shavedir="$ac_pwd/$1"]) -- AC_SUBST(shavedir) -- -- dnl make is now quiet -- AC_SUBST([MAKEFLAGS], [-s]) -- AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) -- -- dnl we need sed -- AC_CHECK_PROG(SED,sed,sed,false) -- -- dnl substitute libtool -- SHAVE_SAVED_LIBTOOL=$LIBTOOL -- LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" -- AC_SUBST(LIBTOOL) -- -- dnl substitute cc/cxx -- SHAVE_SAVED_CC=$CC -- SHAVE_SAVED_CXX=$CXX -- SHAVE_SAVED_FC=$FC -- SHAVE_SAVED_F77=$F77 -- SHAVE_SAVED_OBJC=$OBJC -- CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" -- CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" -- FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" -- F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" -- OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}" -- AC_SUBST(CC) -- AC_SUBST(CXX) -- AC_SUBST(FC) -- AC_SUBST(F77) -- AC_SUBST(OBJC) -- -- V=@ -- else -- V=1 -- fi -- Q='$(V:1=)' -- AC_SUBST(V) -- AC_SUBST(Q) --]) -- -diff --git a/configure.ac b/configure.ac -index a3ed3ee..bc3163a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,7 +14,7 @@ m4_define([unique_api_version], [1.0]) - # This is the X.Y used in the protocol negotiation - m4_define([unique_protocol_version], [1.0]) - --AC_PREREQ([2.59]) -+AC_PREREQ([2.63]) - - AC_INIT([unique], [unique_version], - [http://bugzilla.gnome.org/enter_bug.cgi?product=libunique], -@@ -23,9 +23,21 @@ AC_INIT([unique], [unique_version], - AC_CONFIG_SRCDIR([unique/unique.h]) - AC_CONFIG_MACRO_DIR([build/autotools]) - --AM_INIT_AUTOMAKE([1.10]) -+AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability dist-bzip2]) - AM_CONFIG_HEADER([config.h]) - -+AM_SILENT_RULES([yes]) -+ -+AC_PROG_CC_C_O -+ -+AM_PATH_GLIB_2_0 -+ -+LT_PREREQ([2.2.6]) -+LT_INIT([disable-static]) -+ -+# Honor aclocal flags -+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -+ - # version symbols - UNIQUE_MAJOR_VERSION=unique_major_version - UNIQUE_MINOR_VERSION=unique_minor_version -@@ -49,21 +61,6 @@ UNIQUE_LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age) - AC_SUBST(UNIQUE_LT_VERSION_INFO) - AC_SUBST(UNIQUE_LT_CURRENT_MINUS_AGE) - --AC_ISC_POSIX --AC_PROG_CC --AC_PROG_INSTALL --AC_PROG_MAKE_SET --AC_C_CONST --AC_PROG_LIBTOOL --AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums]) --AC_PATH_PROG(GLIB_GENMARSHAL, [glib-genmarshal]) -- --AM_SANITY_CHECK --AM_PROG_CC_STDC -- --# Honor aclocal flags --ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -- - m4_define([glib_required], [2.12.0]) - m4_define([gtk_required], [2.11.0]) - m4_define([dbus_required], [0.70]) -@@ -122,7 +119,6 @@ AM_CONDITIONAL([HAVE_DBUS], [test "x$have_dbus" = "xyes"]) - dnl Bacon backend - dnl This is the fallback backend, so we *need* these headers and functions - dnl even if we end up using D-Bus --dnl D-Bus backend dependencies - m4_define([have_bacon_default], [yes]) - AC_ARG_ENABLE([bacon], - [AC_HELP_STRING([--enable-bacon=@<:@yes/no@:>@], -@@ -178,9 +174,9 @@ AC_ARG_ENABLE([maintainer-flags], - AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"], - [ - AS_COMPILER_FLAGS([MAINTAINER_CFLAGS], -- ["-Werror -Wall -Wshadow -Wcast-align -- -Wno-uninitialized -Wempty-body -Wformat-security -- -Winit-self"]) -+ ["-Wall -Wshadow -Wcast-align -+ -Wno-uninitialized -Wempty-body -+ -Wformat-security -Winit-self"]) - ] - ) - -@@ -230,27 +226,10 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], - AM_GLIB_DEFINE_LOCALEDIR(UNIQUE_LOCALEDIR) - - # introspection --GOBJECT_INTROSPECTION_CHECK([0.6.3]) -+GOBJECT_INTROSPECTION_CHECK([0.6.7]) - - # gtk-doc --GTK_DOC_CHECK([1.11]) -- --# nice builds --m4_ifdef([AM_SILENT_RULES], -- [ -- AM_SILENT_RULES([yes]) -- use_shave=no -- ], -- [ -- SHAVE_INIT([build/autotools], [enable]) -- AC_CONFIG_FILES([ -- build/autotools/shave-libtool -- build/autotools/shave -- ]) -- use_shave=yes -- ]) -- --AM_CONDITIONAL([USE_SHAVE], [test "x$use_shave" = "xyes"]) -+GTK_DOC_CHECK([1.13]) - - AC_CONFIG_FILES([ - Makefile --- -cgit v0.9.0.2 diff --git a/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch b/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch deleted file mode 100644 index d75de93fc2..0000000000 --- a/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Pending - -Fix Following compilation errors with gcc 4.6.0 - -Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10 - -| uniquebackend-dbus.c: In function 'unique_backend_dbus_request_name': -| uniquebackend-dbus.c:87:22: error: variable 'backend_dbus' set but not used [-Werror=unused-but-set-variable] -| uniquebackend-dbus.c: In function 'unique_backend_dbus_send_message': -| uniquebackend-dbus.c:189:12: error: variable 'res' set but not used [-Werror=unused-but-set-variable] -| cc1: all warnings being treated as errors -| -| make[5]: *** [libunique_dbus_la-uniquebackend-dbus.lo] Error 1 - -Index: libunique-1.1.6/unique/dbus/uniquebackend-dbus.c -=================================================================== ---- libunique-1.1.6.orig/unique/dbus/uniquebackend-dbus.c -+++ libunique-1.1.6/unique/dbus/uniquebackend-dbus.c -@@ -84,7 +84,7 @@ unique_backend_dbus_register_proxy (Uniq - static gboolean - unique_backend_dbus_request_name (UniqueBackend *backend) - { -- UniqueBackendDBus *backend_dbus; -+ UniqueBackendDBus __attribute__((__unused__)) *backend_dbus; - const gchar *name; - DBusGConnection *connection; - DBusGProxy *proxy; -@@ -186,7 +186,7 @@ unique_backend_dbus_send_message (Unique - GValueArray *data; - gchar *cmd; - gchar *resp; -- gboolean res; -+ gboolean __attribute__((__unused__)) res; - GError *error; - UniqueResponse response; - diff --git a/meta-xfce/recipes-extended/libunique/libunique/noconst.patch b/meta-xfce/recipes-extended/libunique/libunique/noconst.patch deleted file mode 100644 index 2cc03473c5..0000000000 --- a/meta-xfce/recipes-extended/libunique/libunique/noconst.patch +++ /dev/null @@ -1,130 +0,0 @@ -G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid -build failures. - -RP 2011/10/12 - -Upstream-Status: Pending - -Index: libunique-1.1.6/unique/uniqueapp.c -=================================================================== ---- libunique-1.1.6.orig/unique/uniqueapp.c 2011-10-12 01:21:25.842046488 +0100 -+++ libunique-1.1.6/unique/uniqueapp.c 2011-10-12 01:21:55.062046796 +0100 -@@ -781,7 +781,7 @@ - } - - --G_CONST_RETURN gchar * -+const gchar * - unique_command_to_string (UniqueApp *app, - gint command) - { -@@ -863,7 +863,7 @@ - return retval; - } - --G_CONST_RETURN gchar * -+const gchar * - unique_response_to_string (UniqueResponse response) - { - GEnumClass *enum_class; -Index: libunique-1.1.6/unique/uniquebackend.c -=================================================================== ---- libunique-1.1.6.orig/unique/uniquebackend.c 2011-10-12 01:21:25.742046323 +0100 -+++ libunique-1.1.6/unique/uniquebackend.c 2011-10-12 01:21:55.062046796 +0100 -@@ -111,7 +111,7 @@ - * - * Return value: FIXME - */ --G_CONST_RETURN gchar * -+const gchar * - unique_backend_get_name (UniqueBackend *backend) - { - g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); -@@ -154,7 +154,7 @@ - * - * Return value: FIXME - */ --G_CONST_RETURN gchar * -+const gchar * - unique_backend_get_startup_id (UniqueBackend *backend) - { - g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); -Index: libunique-1.1.6/unique/uniquebackend.h -=================================================================== ---- libunique-1.1.6.orig/unique/uniquebackend.h 2011-10-12 01:21:25.992046521 +0100 -+++ libunique-1.1.6/unique/uniquebackend.h 2011-10-12 01:21:56.512047875 +0100 -@@ -94,10 +94,10 @@ - - UniqueBackend * unique_backend_create (void); - --G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend); -+const gchar *unique_backend_get_name (UniqueBackend *backend); - void unique_backend_set_name (UniqueBackend *backend, - const gchar *name); --G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend); -+const gchar *unique_backend_get_startup_id (UniqueBackend *backend); - void unique_backend_set_startup_id (UniqueBackend *backend, - const gchar *startup_id); - GdkScreen * unique_backend_get_screen (UniqueBackend *backend); -Index: libunique-1.1.6/unique/uniqueinternals.h -=================================================================== ---- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-10-12 01:21:25.892046532 +0100 -+++ libunique-1.1.6/unique/uniqueinternals.h 2011-10-12 01:21:56.512047875 +0100 -@@ -44,11 +44,11 @@ - * and then back into an id - */ - UniqueResponse unique_response_from_string (const gchar *response); --G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response); -+const gchar *unique_response_to_string (UniqueResponse response); - - gint unique_command_from_string (UniqueApp *app, - const gchar *command); --G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app, -+const gchar *unique_command_to_string (UniqueApp *app, - gint command); - - G_END_DECLS -Index: libunique-1.1.6/unique/uniquemessage.c -=================================================================== ---- libunique-1.1.6.orig/unique/uniquemessage.c 2011-10-12 01:21:25.942046524 +0100 -+++ libunique-1.1.6/unique/uniquemessage.c 2011-10-12 01:21:55.072046595 +0100 -@@ -185,7 +185,7 @@ - * - * Since: 1.0.2 - */ --G_CONST_RETURN guchar * -+const guchar * - unique_message_data_get (UniqueMessageData *message_data, - gsize *length) - { -@@ -525,7 +525,7 @@ - * owned by the #UniqueMessageData structure and should not be - * modified or freed - */ --G_CONST_RETURN gchar * -+const gchar * - unique_message_data_get_startup_id (UniqueMessageData *message_data) - { - g_return_val_if_fail (message_data != NULL, NULL); -Index: libunique-1.1.6/unique/uniquemessage.h -=================================================================== ---- libunique-1.1.6.orig/unique/uniquemessage.h 2011-10-12 01:21:25.792046596 +0100 -+++ libunique-1.1.6/unique/uniquemessage.h 2011-10-12 01:21:56.512047875 +0100 -@@ -48,7 +48,7 @@ - void unique_message_data_set (UniqueMessageData *message_data, - const guchar *data, - gsize length); --G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data, -+const guchar *unique_message_data_get (UniqueMessageData *message_data, - gsize *length); - - gboolean unique_message_data_set_text (UniqueMessageData *message_data, -@@ -63,7 +63,7 @@ - gchar * unique_message_data_get_filename (UniqueMessageData *message_data); - - GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data); --G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); -+const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); - guint unique_message_data_get_workspace (UniqueMessageData *message_data); - - G_END_DECLS diff --git a/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb b/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb deleted file mode 100644 index a6475cef6d..0000000000 --- a/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Library for supporting single instance GTK+ applications" -DESCRIPTION = "Unique is a library for writing single instance GTK+ applications. If you launch a single instance application twice, the second instance will either just quit or will send a message to the running instance." -HOMEPAGE = "https://wiki.gnome.org/Attic/LibUnique" -BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique" - -SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \ - file://fix_for_compile_with_gcc-4.6.0.patch \ - file://noconst.patch \ - file://build.patch \ - file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ - file://0001-test-unique-Add-format-qualifier-s-for-string.patch \ - " - -SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d" -SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb" - -PR = "r7" - -DEPENDS = "dbus-glib-native glib-2.0 gtk+" - -PACKAGECONFIG ??= "dbus" -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - - -inherit autotools pkgconfig gobject-introspection distro_features_check gtk-doc - -REQUIRED_DISTRO_FEATURES = "x11" - -do_install_append () { - rmdir --ignore-fail-on-non-empty ${D}${datadir} -} diff --git a/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb b/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb index 19a6e2b04c..93e5bbf71d 100644 --- a/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb +++ b/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb @@ -1,14 +1,15 @@ SUMMARY = "All packages multimedia packages available for XFCE" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -inherit packagegroup +inherit packagegroup features_check + +# parole needs x11 +REQUIRED_DISTRO_FEATURES = "pam x11" # While this item does not require it, it depends on xfmpc and xfc4-mpc-plugin # that wants mpd which does LICENSE_FLAGS = "commercial" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ parole \ xfmpc \ xfce4-mpc-plugin \ diff --git a/meta-xfce/recipes-multimedia/parole/parole_1.0.2.bb b/meta-xfce/recipes-multimedia/parole/parole_4.18.0.bb index a286a5adb7..e2c7a012c7 100644 --- a/meta-xfce/recipes-multimedia/parole/parole_1.0.2.bb +++ b/meta-xfce/recipes-multimedia/parole/parole_4.18.0.bb @@ -1,15 +1,12 @@ DESCRIPTION = "Parole is a modern simple media player based on the GStreamer framework" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/parole" -LICENSE = "GPLv2" +HOMEPAGE = "https://docs.xfce.org/apps/parole/start" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -inherit xfce-app gtk-doc mime +inherit xfce-app gtk-doc mime mime-xdg DEPENDS += " \ - glib-2.0 \ dbus-glib \ - gtk+3 \ - \ xfce4-dev-tools-native \ libxfce4util \ libxfce4ui \ @@ -19,18 +16,17 @@ DEPENDS += " \ taglib \ " -SRC_URI[md5sum] = "cd22ab579470c5728db0aa6c0b9d4c7d" -SRC_URI[sha256sum] = "bff0fc846d0d7b8f435ac5514976f1cd1d82b62dbf1b7d470e253a5b439407da" +SRC_URI[sha256sum] = "bbe52fbc4d3abe30f6c79fc7ac57bd9de9cf74ce1a79b508a1d7de83dc4f3771" -RDEPENDS_${PN} += "gstreamer1.0-plugins-good" +RDEPENDS:${PN} += "gstreamer1.0-plugins-good" -EXTRA_OECONF = "--disable-gtk-doc" +EXTRA_OECONF = "--disable-gtk-doc DATADIRNAME=share" PACKAGECONFIG ??= "notify" PACKAGECONFIG[clutter] = "--enable-clutter, --disable-clutter, clutter" PACKAGECONFIG[notify] = "--enable-notify-plugin, --disable-notify-plugin, libnotify" -FILES_${PN} += " \ - ${datadir}/appdata \ +FILES:${PN} += " \ + ${datadir}/metainfo \ ${libdir}/parole-0/*.so \ " diff --git a/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.1.bb b/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.3.bb index 85235490ca..cd868c243b 100644 --- a/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.1.bb +++ b/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.3.bb @@ -1,7 +1,7 @@ SUMMARY = "Simple client plugin for Music Player Daemon" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin" SECTION = "x11/application" -LICENSE = "BSD" +LICENSE = "0BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=3604d987e6dfdfc672c754d08953b0e0" inherit xfce-panel-plugin @@ -12,7 +12,6 @@ DEPENDS += "libmpd" LICENSE_FLAGS = "commercial" # for now we recommend our own mpd-server -RRECOMMENDS_${PN} = "mpd" +RRECOMMENDS:${PN} = "mpd" -SRC_URI[md5sum] = "305dfdacb2b2198e1f1673d61f86e4f5" -SRC_URI[sha256sum] = "635e678c9729663e9eaadfcf58426f7cea37e6d3fda5e818955fbc8ade00de01" +SRC_URI[sha256sum] = "0467fb4d1acd982d3c3e0b89cb41019946850524ff19ed0f658a8d56c7b7664d" diff --git a/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb b/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb deleted file mode 100644 index 869435d68a..0000000000 --- a/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Music Player Daemon (MPD) client written in GTK+" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfmpc" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "gtk+ libxfce4util libxfce4ui libmpd vala-native" - -# While this item does not require it, it depends on mpd which does -LICENSE_FLAGS = "commercial" - -# for now we recommend our own mpd-server -RRECOMMENDS_${PN} = "mpd" - -inherit xfce-app - -SRC_URI[md5sum] = "e2d2faeb7a6f62813e287f3d12522b71" -SRC_URI[sha256sum] = "4189c0c82b66b758a6d5bc651493b675d3d46329e5f1a76ff26c448125f4fcb0" diff --git a/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.1.bb b/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.1.bb new file mode 100644 index 0000000000..1e02bbe54f --- /dev/null +++ b/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "Music Player Daemon (MPD) client written in GTK+" +HOMEPAGE = "https://goodies.xfce.org/projects/applications/xfmpc" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "libxfce4util libxfce4ui libmpd vala-native" + +# While this item does not require it, it depends on mpd which does +LICENSE_FLAGS = "commercial" + +# for now we recommend our own mpd-server +RRECOMMENDS:${PN} = "mpd" + +inherit xfce-app + +SRC_URI[sha256sum] = "4867d5dd100fa42ab39ebde6c784ec21ee31717f1adb3f4da070dafb3848d96d" diff --git a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.2.bb b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.2.bb deleted file mode 100644 index 5de1ce5e03..0000000000 --- a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "A battery monitor panel plugin for Xfce4, compatible with APM and ACP" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "ba1cfe619046373f9af5b903c77d1858" -SRC_URI[sha256sum] = "d601349fa9a979dae99ace39b24d99b97f62b80f42ac5dea5a99e5af3e88d7db" diff --git a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.5.bb b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.5.bb new file mode 100644 index 0000000000..ce119bb6da --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.5.bb @@ -0,0 +1,8 @@ +SUMMARY = "A battery monitor panel plugin for Xfce4, compatible with APM and ACP" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "752233bfb320ee1e26104a656cbb868299f562733063e2b9a18f0966585ce213" diff --git a/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.0.bb b/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.2.bb index 1216456b45..0c464930e1 100644 --- a/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.0.bb +++ b/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.2.bb @@ -1,9 +1,8 @@ SUMMARY = "A calculator plugin for the Xfce panel" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-calculator-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=909430f63fddd63f120ba29e8979f65c" inherit xfce-panel-plugin gtk-icon-cache -SRC_URI[md5sum] = "1ae192a69834ee2f51f34a0a981181f4" -SRC_URI[sha256sum] = "7b50ab947ab058e1c079113e7f0f8b38ef242fec36ec9f31bb4e3c19cb3f9de9" +SRC_URI[sha256sum] = "d1f622bea41a90c1686bf9f13c488ab28e995e2762b84712dea9027e0c94028b" diff --git a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.3.bb b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.2.bb index a1ac05729d..39a8f2edfe 100644 --- a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.3.bb +++ b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.2.bb @@ -1,17 +1,16 @@ SUMMARY = "Clipman is a clipboard manager for Xfce" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" inherit xfce-panel-plugin DEPENDS += "xfconf xorgproto libxtst" -SRC_URI[md5sum] = "fa0acd5f5e3298e56ebd47d2944cd02b" -SRC_URI[sha256sum] = "29cdb85efb54bd5c9c04cc695b7c4914d6dff972b9fd969cbfb5504e9c632ad2" +SRC_URI[sha256sum] = "ab8a5fe6f68fb1789190e498243a1d1385de3f64e984f470cbd3d1eb779399b8" PACKAGECONFIG ??= "" PACKAGECONFIG[qrencode] = "--enable-libqrencode,--disable-libqrencode,qrencode" -FILES_${PN} += "${datadir}/appdata" +FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb index 3cd4ee65ee..2384682ecb 100644 --- a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb +++ b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb @@ -1,18 +1,18 @@ SUMMARY = "Plugin displaying close button for application currently active" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" inherit xfce-panel-plugin xfce-git gtk-icon-cache perlnative -DEPENDS += "exo-native libwnck xfconf" +DEPENDS += "xfce4-dev-tools-native libwnck3 xfconf" -PV = "0.1.0+gitr${SRCPV}" +PV = "4.16.0" -SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master" -SRCREV = "02b74f13ad6f639234c8db1854963038b2780a2c" +SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master;protocol=https" +SRCREV = "538f9acfc5d5019f5cde734d056bcc0c95da9b4c" S = "${WORKDIR}/git" EXTRA_OECONF += "--enable-maintainer-mode" -FILES_${PN} += "${datadir}/xfce4/closebutton/themes" +FILES:${PN} += "${datadir}/xfce4/closebutton/themes" diff --git a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch deleted file mode 100644 index 92a6e8384d..0000000000 --- a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch +++ /dev/null @@ -1,121 +0,0 @@ -From f86486e128f62ed5a531163535d11f0aa0268928 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sun, 5 May 2019 20:45:26 +0200 -Subject: [PATCH] Fix memory-leak and reduce cpu-load slightly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* when setting font remove old css provider befor setting new - -> fix memory leak -* do call cpufreq_label_set_font only on init and when font was changed - -> reduce cpu-load - -Fixes https://bugzilla.xfce.org/show_bug.cgi?id=15218 - -Upstream-Status: Submitted [1] - -[1] https://bugzilla.xfce.org/attachment.cgi?id=8492 - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - panel-plugin/xfce4-cpufreq-configure.c | 4 ++++ - panel-plugin/xfce4-cpufreq-plugin.c | 13 +++++++++++-- - panel-plugin/xfce4-cpufreq-plugin.h | 2 ++ - 3 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/panel-plugin/xfce4-cpufreq-configure.c b/panel-plugin/xfce4-cpufreq-configure.c -index 1205fc9..48e72ff 100644 ---- a/panel-plugin/xfce4-cpufreq-configure.c -+++ b/panel-plugin/xfce4-cpufreq-configure.c -@@ -85,7 +85,10 @@ button_fontname_update(GtkWidget *button, gboolean update_plugin) - } - - if (update_plugin) -+ { -+ cpufreq_label_set_font (); - cpufreq_update_plugin (TRUE); -+ } - } - - -@@ -155,6 +158,7 @@ button_fontcolor_clicked (GtkWidget *button, void *data) - gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), color); - cpuFreq->options->fontcolor = gdk_rgba_to_string (color); - g_free (color); -+ cpufreq_label_set_font (); - cpufreq_update_plugin (TRUE); - } - -diff --git a/panel-plugin/xfce4-cpufreq-plugin.c b/panel-plugin/xfce4-cpufreq-plugin.c -index e886121..8d7c9e5 100644 ---- a/panel-plugin/xfce4-cpufreq-plugin.c -+++ b/panel-plugin/xfce4-cpufreq-plugin.c -@@ -44,6 +44,7 @@ cpufreq_label_set_font (void) - { - gchar *css = NULL, *css_font = NULL, *css_color = NULL; - GtkCssProvider *provider; -+ GtkStyleContext *context; - PangoFontDescription *font; - - if (G_UNLIKELY (cpuFreq->label == NULL)) -@@ -76,11 +77,17 @@ cpufreq_label_set_font (void) - if (css) - { - provider = gtk_css_provider_new (); -+ context = GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (cpuFreq->label))); -+ -+ if (currentProvider) -+ gtk_style_context_remove_provider (context, currentProvider); - - gtk_css_provider_load_from_data (provider, css, -1, NULL); - gtk_style_context_add_provider ( -- GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (cpuFreq->label))), -+ context, - GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); -+ -+ currentProvider = provider; - } - - g_free (css); -@@ -420,7 +427,6 @@ cpufreq_update_plugin (gboolean reset_label_size) - - if (cpuFreq->layout_changed) - { -- cpufreq_label_set_font (); - cpufreq_widgets_layout (); - } - -@@ -601,6 +607,7 @@ cpufreq_widgets (void) - - gtk_widget_show_all (cpuFreq->button); - -+ cpufreq_label_set_font (); - cpufreq_update_plugin (TRUE); - } - -@@ -775,6 +782,8 @@ cpufreq_construct (XfcePanelPlugin *plugin) - { - xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); - -+ currentProvider = NULL; -+ - cpuFreq = g_new0 (CpuFreqPlugin, 1); - cpuFreq->options = g_new0 (CpuFreqPluginOptions, 1); - cpuFreq->plugin = plugin; -diff --git a/panel-plugin/xfce4-cpufreq-plugin.h b/panel-plugin/xfce4-cpufreq-plugin.h -index a6895e4..6338698 100644 ---- a/panel-plugin/xfce4-cpufreq-plugin.h -+++ b/panel-plugin/xfce4-cpufreq-plugin.h -@@ -95,6 +95,8 @@ typedef struct - - CpuFreqPlugin *cpuFreq; - -+GtkCssProvider *currentProvider; -+ - G_BEGIN_DECLS - - void --- -2.20.1 - diff --git a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb deleted file mode 100644 index 6addc3b65d..0000000000 --- a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Panel plugin to display frequency of all cpus" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "ccd8f0f7aef51bc4caf1049986d9614f" -SRC_URI[sha256sum] = "c5e044c0dc401d2066f208a3df82a588b3e51ff01425f155d0a1d0f8fce8f5b5" -SRC_URI += "file://0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch" diff --git a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.8.bb b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.8.bb new file mode 100644 index 0000000000..8ddf48d6ef --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.8.bb @@ -0,0 +1,8 @@ +SUMMARY = "Panel plugin to display frequency of all cpus" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36" + +inherit xfce-panel-plugin perlnative + +SRC_URI[sha256sum] = "07e458d9f4725e572001fb7eb66b9e931792311146e0f75ad5d87b9ae19573e9" diff --git a/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb b/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb deleted file mode 100644 index 83e2bb5c08..0000000000 --- a/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Panel plugin with graphical representation of the cpu frequency" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "f0ebfabb273adf69361b37a3fa4b7912" -SRC_URI[sha256sum] = "85da0ec89aacfd31e0bbafcefea37cdca618d62e681c1c9da8bdd492f028f4c7" diff --git a/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.8.bb b/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.8.bb new file mode 100644 index 0000000000..8e58175615 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.8.bb @@ -0,0 +1,8 @@ +SUMMARY = "Panel plugin with graphical representation of the cpu frequency" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "bfb438ce21f37d57241b2596d72aa4bf47587cd5a8833fc30a9599616f75d4bf" diff --git a/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.1.bb b/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.1.bb deleted file mode 100644 index 97aa184b01..0000000000 --- a/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Panel plugin displaying date and time and a calendar when left-clicked" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "c42149ec71836fe83085511429e638dc" -SRC_URI[sha256sum] = "e0c7321346ded2539c4688c593f650696ed0ddca0a5f9d4e404d0e7fc42ae256" diff --git a/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.3.bb b/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.3.bb new file mode 100644 index 0000000000..f292a6deaf --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.3.bb @@ -0,0 +1,8 @@ +SUMMARY = "Panel plugin displaying date and time and a calendar when left-clicked" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "6b2eeb79fb586868737426cbd2a4cd43c7f8c58507d8a2f578e0150187cc00b0" diff --git a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin/0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin/0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch deleted file mode 100644 index 007d3e5852..0000000000 --- a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin/0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c35a8cb24e8adafb11cbc261de37d97244e55927 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 11 Aug 2018 10:08:27 -0700 -Subject: [PATCH] panel-plugin: Include sys/sysmacros.h for major/minor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -glibc 2.28+ needs it - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Cc: Andreas Müller <schnitzeltony@googlemail.com> ---- - panel-plugin/devperf.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/panel-plugin/devperf.c b/panel-plugin/devperf.c -index 175fd44..cb2e88a 100644 ---- a/panel-plugin/devperf.c -+++ b/panel-plugin/devperf.c -@@ -34,6 +34,7 @@ - #include <errno.h> - #include <sys/time.h> - /* for major() and minor() */ -+#include <sys/sysmacros.h> - #define _BSD_SOURCE - #include <sys/types.h> - diff --git a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb deleted file mode 100644 index dc7f1fcd9a..0000000000 --- a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Panel plugin displaying instant disk/partition performance" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" - -inherit xfce-panel-plugin - -SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2 \ - file://0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch \ - " -SRC_URI[md5sum] = "63d5f03934c2dbddb3ad7bf7f535cc23" -SRC_URI[sha256sum] = "212ddc742be3eecb6ad5554e1b1df03d5685cb71f48a558d5f895de37c57e4fa" diff --git a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.7.0.bb b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.7.0.bb new file mode 100644 index 0000000000..25a57f3233 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.7.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin displaying instant disk/partition performance" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" + +inherit xfce-panel-plugin + +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" +SRC_URI[sha256sum] = "5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9" diff --git a/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.6.0.bb b/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.6.0.bb deleted file mode 100644 index 387b183f1b..0000000000 --- a/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.6.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "A panel plugin that embeds arbitrary windows (or GtkPlug widgets) into the panel." -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -inherit xfce-panel-plugin - -# DEPENDS += "xfconf xorgproto libxtst" - -SRC_URI[md5sum] = "6870b116b85e4fa68d1b9ef76bd1d279" -SRC_URI[sha256sum] = "c767df6360e8194b32bc24823dd000975edba0cafe525c23d7854029359ee228" diff --git a/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.1.bb b/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.1.bb deleted file mode 100644 index 8b24e98b04..0000000000 --- a/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Equake XFCE is a panel plugin for the XFCE panel which monitors earthquakes and displays an update each time a new earthquake occurs." -HOMEPAGE = "http://freecode.com/projects/equake-xfce" -SECTION = "x11/application" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -inherit xfce-panel-plugin - -DEPENDS += "curl" - -SRC_URI[md5sum] = "07d42b8a3d440d6f1861048a6cc3a15a" -SRC_URI[sha256sum] = "eff9cfd604d1bd998c5208176fbe2c6da705c250dce572f5e30b2c77f4ec741c" - -FILES_${PN} += "${libdir}/xfce4/panel-plugins/xfce4-equake-plugin" diff --git a/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.0.bb b/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.6.0.bb index e5c21a1ac7..0c796534ab 100644 --- a/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.0.bb +++ b/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.6.0.bb @@ -1,11 +1,10 @@ SUMMARY = "Panel plugin with graphical representation of the cpu frequency" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin -SRC_URI[md5sum] = "6e274ceda37c7a8ae0821d9d49e965e9" -SRC_URI[sha256sum] = "fdae00036383105a15d12e9809abd5945a8f2152b17e16ccdfbfe5bd9733f29d" +SRC_URI[sha256sum] = "ad0ff05d88ba393b7c8922f8233edd33fc0a4e8b000b61de1f8f3a10c5ae5324" -FILES_${PN} += "${datadir}/xfce4/eyes" +FILES:${PN} += "${datadir}/xfce4/eyes" diff --git a/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb b/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb deleted file mode 100644 index 8b924ac759..0000000000 --- a/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "The FSGuard panel plugin checks free space on a chosen mount point frequently and displays a message when a limit is reached" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin?&#recet_releases" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "c9fcc1ff37f38e6ed518eca3b9887aa8" -SRC_URI[sha256sum] = "6b038322b49d29625219e6a54497085b8f834b9c1fd15282ce286a6529d7c445" diff --git a/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.3.bb b/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.3.bb new file mode 100644 index 0000000000..380d2e19e3 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.3.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "The FSGuard panel plugin checks free space on a chosen mount point frequently and displays a message when a limit is reached" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=3434d79d62df09abf5f78bb76d6cd21b" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "84ef8bb4752292d64c0ef101badf7b14448790bfa0a85de644dbfa22986ec258" diff --git a/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.1.bb b/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.2.0.bb index 002e93da40..31ad5e7ced 100644 --- a/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.1.bb +++ b/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.2.0.bb @@ -1,9 +1,8 @@ DESCRIPTION = "This plugin cyclically spawns the indicated script/program, captures its output (stdout) and displays the resulting string into the panel." HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" inherit xfce-panel-plugin -SRC_URI[md5sum] = "9dd0681c179302d56d92bbda5765bd09" -SRC_URI[sha256sum] = "4c6ce37fbe71094548b44862587c2813da991aeaaecff8e572724dbbec83ab86" +SRC_URI[sha256sum] = "948d08ee5f2140847f109b531bc1d4cc6268496913ea7600d3c5ad89025a0362" diff --git a/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin/0001-CMakeLists.txt-fix-library-install-path.patch b/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin/0001-CMakeLists.txt-fix-library-install-path.patch deleted file mode 100644 index df348dc852..0000000000 --- a/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin/0001-CMakeLists.txt-fix-library-install-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status: Submitted [https://github.com/brianhsu/xfce4-hotcorner-plugin/pull/8] - -The library install path may be ${CMAKE_INSTALL_PREFIX}/lib64 rather -than fixed ${CMAKE_INSTALL_PREFIX}/lib. Provide a variable to make it -could override by cmake command line. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - CMakeLists.txt | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e193787..84cb52d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,8 +10,9 @@ include(GNUInstallDirs) - - PKG_CHECK_MODULES(GTK REQUIRED libxfce4panel-1.0 libxfce4ui-1 libwnck-3.0) - --set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) --set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) -+set(BASE_LIB_PATH "lib" CACHE STRING "base library install path") -+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BASE_LIB_PATH}) -+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BASE_LIB_PATH}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - - INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS}) -@@ -28,7 +29,7 @@ ADD_LIBRARY(hotcorner SHARED src/hotcorner.c src/util.c) - - TARGET_LINK_LIBRARIES(hotcorner ${GTK_LIBRARIES}) - --INSTALL(TARGETS hotcorner LIBRARY DESTINATION lib/xfce4/panel/plugins/) -+INSTALL(TARGETS hotcorner LIBRARY DESTINATION ${BASE_LIB_PATH}/xfce4/panel/plugins/) - INSTALL(FILES hotcorner.desktop DESTINATION share/xfce4/panel/plugins/) - GETTEXT_CREATE_TRANSLATIONS(po/xfce4-hotcorner-plugin.pot ALL po/zh_TW.po) - --- -2.11.0 - diff --git a/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb b/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb deleted file mode 100644 index 57a815b1b5..0000000000 --- a/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Plugin providing hotcorners" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://README.md;beginline=48;endline=53;md5=2c694b8e0f73274b13465b509e4f5427" - -inherit xfce-panel-plugin cmake - -DEPENDS += "libwnck3" - -SRC_URI = "https://github.com/brianhsu/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-CMakeLists.txt-fix-library-install-path.patch" -SRC_URI[md5sum] = "ac31b45cda1867cb6bd69bb285638263" -SRC_URI[sha256sum] = "942684c92f96a158e1417e597947f822769ac56aa1993a8c9f166ee633ef2b8d" - -EXTRA_OECMAKE = "-DBASE_LIB_PATH=${baselib}" diff --git a/meta-xfce/recipes-panel-plugins/kbdleds/xfce4-kbdleds-plugin_0.0.6.bb b/meta-xfce/recipes-panel-plugins/kbdleds/xfce4-kbdleds-plugin_0.0.6.bb deleted file mode 100644 index caf55084f2..0000000000 --- a/meta-xfce/recipes-panel-plugins/kbdleds/xfce4-kbdleds-plugin_0.0.6.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "XFCE panel plugin displaying status of keyboard LEDs" -DESCRIPTION = "This plugin shows the state of your keyboard LEDs: Caps, Scroll and Num Lock in Xfce panel" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-kbdleds-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=252890d9eee26aab7b432e8b8a616475 \ -" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "db6ad8e3502f3373f087ba2034141552" -SRC_URI[sha256sum] = "6d280ad7207bcb9cc87c279dc3ab9084fd93325e87f67858e8917729b50201cd" - -FILES_${PN} += "${libdir}/xfce4/panel-plugins/xfce4-kbdleds-plugin" diff --git a/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb b/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.3.1.bb index c8224148ba..6ea260765f 100644 --- a/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb +++ b/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.3.1.bb @@ -1,14 +1,13 @@ SUMMARY = "Multi-protocol, multi-mailbox mail watcher for the Xfce4 panel" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin -DEPENDS += "gnutls libgcrypt" +DEPENDS += "gnutls" -SRC_URI[md5sum] = "7263114ec0f2987a3aff15afeeb45577" -SRC_URI[sha256sum] = "624acc8229a8593c0dfeb28f883f4958119a715cc81cecdbaf29efc8ab1edcad" +SRC_URI[sha256sum] = "054964e9fe4ca668486400991ce1ea01d07aac7ba235f4b14d4a8f7d9800046a" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch index e2165c2fa5..64f06cebb5 100644 --- a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch +++ b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch @@ -9,43 +9,44 @@ plugin Makes it compile/build with musl +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> Patch Reworked for xfce4-mount-plugin 0.6.4->1.1.2 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- - configure.ac | 1 + + configure.ac | 2 + panel-plugin/devices.c | 22 +++++++++++++++++++--- - 2 files changed, 20 insertions(+), 3 deletions(-) + 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index b131117..c633fef 100644 +index 375e64a..590b7ad 100644 --- a/configure.ac +++ b/configure.ac -@@ -69,6 +69,7 @@ AC_CHECK_HEADERS([sys/socket.h]) - AC_CHECK_HEADERS([sys/time.h]) - AC_CHECK_HEADERS([unistd.h]) - AC_CHECK_HEADERS([sys/sockio.h]) +@@ -65,6 +65,9 @@ dnl param.h is part of libc6 on Linux, but important for old-style Unix and espe + AC_CHECK_HEADERS([sys/param.h]) + AC_CHECK_HEADERS([sys/mount.h]) + ++dnl make musl happy +AC_CHECK_HEADERS([fstab.h]) - AC_HEADER_SYS_WAIT - AC_PROG_GCC_TRADITIONAL - AC_TYPE_SIZE_T ++ + dnl Add -traditional to output variable CC if using the GNU C compiler and ioctl does not work properly without -traditional. That usually happens when the fixed header files have not been installed on an old system. Leave here commented out to comment in if some older *NIX systems might require it as was recently written on the ML. + dnl AC_PROG_GCC_TRADITIONAL + diff --git a/panel-plugin/devices.c b/panel-plugin/devices.c index 797b079..d29df56 100644 --- a/panel-plugin/devices.c +++ b/panel-plugin/devices.c -@@ -24,8 +24,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - #ifdef HAVE_CONFIG_H +@@ -25,7 +25,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include <config.h> #endif -- + +#if HAVE_FSTAB_H #include <fstab.h> +#endif -+ #include <glib.h> #include <stdio.h> - #include <string.h> + #include <stdlib.h> @@ -468,11 +470,12 @@ disks_new (gboolean include_NFSs, gboolean *showed_fstab_dialog, gint length) { GPtrArray * pdisks; /* to be returned */ diff --git a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.3.bb b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb index 4600104ad1..3a6baf21f9 100644 --- a/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.3.bb +++ b/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb @@ -1,11 +1,11 @@ SUMMARY = "Mount/umount utility for the xfce panel" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin SRC_URI += "file://0001-check-for-fstab.h-during-configure.patch" -SRC_URI[md5sum] = "2f1f903d0bdf6ee6776afd8af73497ac" -SRC_URI[sha256sum] = "aae5bd6b984bc78daf6b5fb9d15817a27253674a4264ad60f62ccb1aa194911e" + +SRC_URI[sha256sum] = "584cd954929e542b3da0ff8d69e0325d8838dc39e7b32a509d1074ce3bb58ec2" diff --git a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch deleted file mode 100644 index e354181927..0000000000 --- a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7fcc7352ec11644ac8be4e9ec1584a5be3333684 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 12 Jul 2017 18:18:30 -0700 -Subject: [PATCH] Do not include sys/sysctl.h its unused on linux port - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - panel-plugin/os.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/panel-plugin/os.h b/panel-plugin/os.h -index 473c2a4..9a5c544 100644 ---- a/panel-plugin/os.h -+++ b/panel-plugin/os.h -@@ -170,7 +170,6 @@ - #elif __linux__ /* L I N U X */ - # include <stdio.h> - # include <sys/param.h> --# include <sys/sysctl.h> - # include <stdlib.h> - # include <stdarg.h> - # include <unistd.h> --- -2.13.2 - diff --git a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb deleted file mode 100644 index 35c8861bcf..0000000000 --- a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Panel plugin displaying current load of the network interfaces" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=35a7203c41b86d15546dddc05995f97f" - -inherit xfce-panel-plugin - -SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2 \ - file://0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch \ - " -SRC_URI[md5sum] = "f25aa3242e3119b49f259a3e4a1af08b" -SRC_URI[sha256sum] = "99762781099d1e0ab9aa6a7b30c2bd94d8f658dbe61c760410d5d42d0766391c" diff --git a/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.4.1.bb b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.4.1.bb new file mode 100644 index 0000000000..c30f17a7d4 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.4.1.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin displaying current load of the network interfaces" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2b6065ae7d3696cdad6869dd8627a9fe" + +inherit xfce-panel-plugin + +SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2" +SRC_URI[sha256sum] = "9fac3a3ad52e18584bfb127cd1721d56de1004b9fdd140915fded89704ccb44e" diff --git a/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch b/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch deleted file mode 100644 index e1ede27c42..0000000000 --- a/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0218e5ebf38f94d58b908fca451ba3789efa8899 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 20 Sep 2013 23:09:25 +0200 -Subject: [PATCH] main-status-icon.c remove deprecated g_type_init -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -this file was auto created by valac and xfce-vala when creating tarball. So - -Upstream-Status: Inappropriate [other] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - src/main-status-icon.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/main-status-icon.c b/src/main-status-icon.c -index c6d73f8..f7db773 100644 ---- a/src/main-status-icon.c -+++ b/src/main-status-icon.c -@@ -290,7 +290,6 @@ gint _vala_main (char** args, int args_length1) { - - - int main (int argc, char ** argv) { -- g_type_init (); - return _vala_main (argv, argc); - } - --- -1.8.3.1 - diff --git a/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch b/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch deleted file mode 100644 index 8066df0041..0000000000 --- a/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch +++ /dev/null @@ -1,53 +0,0 @@ -Fix formatting strings when compiling with Wformat options - -Imported from debian - ---- a/lib/application.c -+++ b/lib/application.c -@@ -352,7 +352,7 @@ static void xnp_application_update_notes - XfconfChannel* _tmp16_; - const gchar* _tmp17_; - _tmp9_ = _ ("Select notes path"); -- _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp9_); -+ _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp9_); - g_object_ref_sink (_tmp10_); - error_dialog = _tmp10_; - _tmp11_ = error_dialog; -@@ -419,7 +419,7 @@ static void xnp_application_update_notes - XfconfChannel* _tmp35_; - const gchar* _tmp36_; - _tmp27_ = _ ("Select notes path"); -- _tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp27_); -+ _tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp27_); - g_object_ref_sink (_tmp28_); - error_dialog = _tmp28_; - _tmp29_ = error_dialog; -@@ -2082,7 +2082,7 @@ static void xnp_application_delete_windo - gint _tmp9_; - _tmp3_ = window; - _tmp4_ = _ ("Are you sure you want to delete this group?"); -- _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp4_); -+ _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _tmp4_); - g_object_ref_sink (_tmp5_); - dialog = _tmp5_; - _tmp6_ = dialog; -@@ -2721,7 +2721,7 @@ void xnp_application_open_settings_dialo - e = _inner_error_; - _inner_error_ = NULL; - _tmp0_ = _ ("Unable to open the settings dialog"); -- _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp0_); -+ _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp0_); - g_object_ref_sink (_tmp1_); - error_dialog = _tmp1_; - _tmp2_ = error_dialog; ---- a/lib/window.c -+++ b/lib/window.c -@@ -3542,7 +3542,7 @@ void xnp_window_delete_note (XnpWindow* - GtkMessageDialog* _tmp13_; - gint _tmp14_; - _tmp9_ = _ ("Are you sure you want to delete this note?"); -- _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp9_); -+ _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _tmp9_); - g_object_ref_sink (_tmp10_); - dialog = _tmp10_; - _tmp11_ = dialog; diff --git a/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.11.0.bb b/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.11.0.bb new file mode 100644 index 0000000000..f7f06077e2 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.11.0.bb @@ -0,0 +1,10 @@ +SUMMARY = "Notes plugin for the Xfce Panel" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin + +DEPENDS += "gtk+3 libxfce4ui xfce4-panel xfconf" + +SRC_URI[sha256sum] = "eb38246deb0fc89535fa9ff9b953c762cece232b5585d8210fab9abbf282aae3" diff --git a/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb b/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb deleted file mode 100644 index fcf98c181b..0000000000 --- a/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Notes plugin for the Xfce Panel" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit xfce-panel-plugin - -DEPENDS += "gtk+ libxfce4ui xfce4-panel xfconf libunique" - -SRC_URI += " \ - file://0001-main-status-icon.c-remove-deprecated-g_type_init.patch \ - file://01_fix_format-string.patch \ -" -SRC_URI[md5sum] = "31cb9520b01512a94344770b4befdb3b" -SRC_URI[sha256sum] = "07a4c3e71431c24f97d2e270452dd0fa51ff0bdb6219a13a20d0bfa8d9de54b2" - -FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so.*" - -# *.so are required for plugin detection -INSANE_SKIP_${PN} = "dev-so" diff --git a/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.0.bb b/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.3.bb index 698152bae3..6400e0d3e4 100644 --- a/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.0.bb +++ b/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.3.bb @@ -1,13 +1,12 @@ SUMMARY = "Menu for quick access to folders, documents and removable media" DESCRIPTION = "Panel plugin displaying menu with quick access to folders, documents and removable media" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin" -LICENSE = "GPLv2" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" inherit xfce-panel-plugin -SRC_URI[md5sum] = "e3a306d927befb8afcb5212f8ab0b8c9" -SRC_URI[sha256sum] = "7ba3f46f88c2845cbf413efeefaed29157f8b98571856c6e2bf35e4de5d8ecce" +SRC_URI[sha256sum] = "f11d0e6d03f22ab02c2e6b507d365b5a918532e8819e50647ee1860eca60c743" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "notify" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb b/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb deleted file mode 100644 index b423707648..0000000000 --- a/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Pulseaudio mixer for the xfce panel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=f5eac6bb0d6ec0dc655e417781d4015f" - -inherit xfce-panel-plugin distro_features_check - -REQUIRED_DISTRO_FEATURES = "pulseaudio x11" - -DEPENDS += "pulseaudio" - -SRC_URI[md5sum] = "7df7280c19c2c8b8c5bc4f4f2136d1dd" -SRC_URI[sha256sum] = "6ca88314dbac3e24c0e1bfc593fad6edb66319766be62e8256c81b0314f049f0" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libnotify] = "--enable-libnotify,--disable-libnotify,libnotify" - -RRECOMMENDS_${PN} = "pavucontrol" diff --git a/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.8.bb b/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.8.bb new file mode 100644 index 0000000000..c01b4966f0 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.8.bb @@ -0,0 +1,16 @@ +SUMMARY = "Pulseaudio mixer for the xfce panel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=f5eac6bb0d6ec0dc655e417781d4015f" + +inherit xfce-panel-plugin features_check + +REQUIRED_DISTRO_FEATURES = "pulseaudio x11" + +DEPENDS += "dbus-glib pulseaudio" + +SRC_URI[sha256sum] = "bd742b207c39c221e91c57c9c9be2839eb802d1b1ee01a02b7427cd02d3f0348" + +PACKAGECONFIG ??= "libnotify" +PACKAGECONFIG[libnotify] = "--enable-libnotify,--disable-libnotify,libnotify" + +RRECOMMENDS:${PN} = "pavucontrol" diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch new file mode 100644 index 0000000000..c4624c6915 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch @@ -0,0 +1,44 @@ +From 9b7e1beca872ca4a5fce8938c58379103787f79a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 23 Feb 2020 22:06:32 +0100 +Subject: [PATCH] Do not check for /sys/class/power_supply - we are cross + compiling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + configure.ac | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c281af9..60ba0c0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -203,19 +203,9 @@ dnl Check for interface for /sys/class/power_supply to be used + AC_ARG_ENABLE([sysfsacpi], [AS_HELP_STRING([--enable-sysfsacpi], [Use /sys/class/power_supply to read your battery value @<:@default=auto@:>@])], + [], + [ +- enable_sysfsacpi=auto ++ enable_sysfsacpi=yes + ]) + +-if test x"$enable_sysfsacpi" = x"auto"; then +- AC_CHECK_FILE([/sys/class/power_supply], +- [ +- enable_sysfsacpi=yes +- ], +- [ +- enable_sysfsacpi=no +- ]) +-fi +- + if test x"$enable_sysfsacpi" = x"yes"; then + AC_DEFINE([HAVE_SYSFS_ACPI], [1], [Define to 1 if /sys/class/power_supply is found]) + enable_procacpi=yes +-- +2.21.0 + diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.4.bb index 4d78bb2bf2..eb1165c578 100644 --- a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.4.bb @@ -1,24 +1,25 @@ SUMMARY = "Sensors plugin for the Xfce Panel" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin -SRC_URI[md5sum] = "0c74c3112c5e6e07647c116cd43ff5a7" -SRC_URI[sha256sum] = "7524ec4534de9ef7f676de2895a41bf70b73b94da5a27fd4a022b16eda56d0f4" +SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" +SRC_URI[sha256sum] = "6c1605a738e5df40e084d08ac93f962cd445093396de1e9bfadc7ab4588c36b6" EXTRA_OECONF = " \ --disable-procacpi \ - --disable-sysfsacpi \ --disable-xnvctrl \ " -do_configure_prepend() { +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=bfd', '', d)}" + +do_configure:prepend() { sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac } -PACKAGECONFIG ??= "libsensors" +PACKAGECONFIG ??= "libnotify" PACKAGECONFIG[libsensors] = "--enable-libsensors,--disable-libsensors, lmsensors" PACKAGECONFIG[hddtemp] = "--enable-hddtemp,--disable-hddtemp, hddtemp" PACKAGECONFIG[netcat] = "--enable-netcat,--disable-netcat, netcat" diff --git a/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb b/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb deleted file mode 100644 index 6289ad31aa..0000000000 --- a/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Panel plugin allowing to send requests directly to browser" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "6f242fe584ee2fdd2b1d3d69ef3d5914" -SRC_URI[sha256sum] = "139539c58d54d878de86ef8a882c793cd909981e6b888f7f9d5e230a8fe310a4" diff --git a/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.2.bb b/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.2.bb new file mode 100644 index 0000000000..fdec598190 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.2.bb @@ -0,0 +1,8 @@ +SUMMARY = "Panel plugin allowing to send requests directly to browser" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "2a279e2f5a54518684e62ad1f3cd8ef950826505b39725f1b5d8f0c43031cdd3" diff --git a/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin/convert-gulong.patch b/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin/convert-gulong.patch new file mode 100644 index 0000000000..30897caab3 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin/convert-gulong.patch @@ -0,0 +1,39 @@ +Fix build on 32bit architectures + +It fails with errors like +| ../../xfce4-systemload-plugin-1.3.2/panel-plugin/network.cc:126:13: error: no matching function for call to 'read_netload_libgtop' +| 126 | if (read_netload_libgtop (&bytes[1]) != 0) +| | ^~~~~~~~~~~~~~~~~~~~ +| ../../xfce4-systemload-plugin-1.3.2/panel-plugin/network.cc:42:1: note: candidate function not viable: no known conversion from 'guint64 *' (aka 'unsigned long long *') to 'gulong *' (aka 'unsigne +d long *') for 1st argument +| 42 | read_netload_libgtop (gulong *bytes) +| | ^ ~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/panel-plugin/network.cc ++++ b/panel-plugin/network.cc +@@ -114,6 +114,7 @@ read_netload_proc (gulong *bytes) + gint + read_netload (gulong *net, gulong *NTotal) + { ++ gulong tbytes[2]; + static guint64 bytes[2]; + static gint64 time[2]; + +@@ -122,10 +123,12 @@ read_netload (gulong *net, gulong *NTota + + time[1] = g_get_monotonic_time (); + +- if (read_netload_proc (&bytes[1]) != 0) +- if (read_netload_libgtop (&bytes[1]) != 0) ++ if (read_netload_proc (&tbytes[1]) != 0) ++ if (read_netload_libgtop (&tbytes[1]) != 0) + return -1; + ++ bytes[0] = tbytes[0]; ++ bytes[1] = tbytes[1]; + if (time[0] != 0 && G_LIKELY (time[1] > time[0]) && G_LIKELY (bytes[1] >= bytes[0])) + { + guint64 diff_bits = 8 * (bytes[1] - bytes[0]); diff --git a/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.2.bb b/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.2.bb deleted file mode 100644 index f9fb2cad7b..0000000000 --- a/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Panel plugin displaying current CPU load, the memory in use, the swap space and the system uptime" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=9acb172a93ff6c43cce2aff790a8aef8" - -inherit xfce-panel-plugin - -DEPENDS += "upower" - -SRC_URI[md5sum] = "c7b9237ec4a421de5dac76449b4b5a78" -SRC_URI[sha256sum] = "3c67dfeb042eaea5aca440de9c6b3ecf99be0fbaa1cf7fdf9e6528233b46c99e" diff --git a/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.3.2.bb b/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.3.2.bb new file mode 100644 index 0000000000..e7a3e9936e --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.3.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Panel plugin displaying current CPU load, the memory in use, the swap space and the system uptime" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=9acb172a93ff6c43cce2aff790a8aef8" + +inherit xfce-panel-plugin + +PACKAGECONFIG ?= "network power" +PACKAGECONFIG[power] = ",,upower" +PACKAGECONFIG[network] = ",,libgtop" + +SRC_URI += "file://convert-gulong.patch" +SRC_URI[sha256sum] = "bb303fc3020e053ad1fa0b8fcbf0d7681c5563bb8f649357d6a95a577802b072" diff --git a/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.2.bb b/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.2.bb deleted file mode 100644 index facbb0d86d..0000000000 --- a/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "This plugin makes it possible to take periodical breaks" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "d7d743794a766ba1b00647828a099053" -SRC_URI[sha256sum] = "c69fb7218c685e516454810291c5245c49a80d774a6bded59c645a1af427c4e5" diff --git a/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.3.bb b/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.3.bb new file mode 100644 index 0000000000..9fa287a1ca --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.3.bb @@ -0,0 +1,9 @@ +SUMMARY = "This plugin makes it possible to take periodical breaks" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "5a1ca36361e95ec718bbd887ea5be6a270ab458d1c2d672186721522a7228ee8" diff --git a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.2.bb index 2ddc6f67cd..33b60438d1 100644 --- a/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb +++ b/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.2.bb @@ -1,10 +1,9 @@ SUMMARY = "XFCE panel plugin to generate alarm messages" DESCRIPTION = "This is a simple plugin that lets the user run an alarm at a specified time or at the end of a specified countdown period" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=ae39271267fd63eb7619432ff24e7ff1" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=f1c52159bdaebd029cb11927cbe709e4" inherit xfce-panel-plugin -SRC_URI[md5sum] = "32e6a14e80bf9a93db2f2b3bfd7de920" -SRC_URI[sha256sum] = "2e4e5343e39926230cc981d5fe56cd58a2f3817d2e9b6089b5673a2e39bf7e9b" +SRC_URI[sha256sum] = "feb3b8c2d39505e816683540a3226bd7bda870ccbcb4c7d0f6abfeeff5c58b7d" diff --git a/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_1.1.0.bb b/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_1.1.0.bb deleted file mode 100644 index 57951608f3..0000000000 --- a/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_1.1.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Verve panel plugin is a comfortable command line plugin for the Xfce panel" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit xfce-panel-plugin - -DEPENDS += "dbus-glib-native" - -SRC_URI[md5sum] = "ddd0190ae56f6117dbcf9ff2bf5a8cbf" -SRC_URI[sha256sum] = "a3196f818c7ad57d19cd6581e168fd2b9f96de070246aea70c35ce2e5f9d9c84" diff --git a/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.3.bb b/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.3.bb new file mode 100644 index 0000000000..9dcaae8ceb --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.3.bb @@ -0,0 +1,9 @@ +SUMMARY = "Verve panel plugin is a comfortable command line plugin for the Xfce panel" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "e1bf121f1bf9cf2a199bf5c0f3aa802f503df9bea50724741e7a92fe6d9fe09e" +DEPENDS += "libpcre" diff --git a/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb b/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb deleted file mode 100644 index 0c94f3c4ba..0000000000 --- a/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Panel plugin displaying stats from a wireless lan interface" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "b163b22f8543e5e5767a68af35c9028e" -SRC_URI[sha256sum] = "4d5bd6654cfd077f3432b08d296f7bd052e765e51b77c629886a9542f4e5ecdc" diff --git a/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.3.bb b/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.3.bb new file mode 100644 index 0000000000..530f52425a --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.3.bb @@ -0,0 +1,8 @@ +SUMMARY = "Panel plugin displaying stats from a wireless lan interface" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "61c0c2f56cb70872d403b770dd76349df9ff24c0dbe905ee1b4f913c34d8f72b" diff --git a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.9.1.bb b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.11.1.bb index c53ca13c88..858bd5459b 100644 --- a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.9.1.bb +++ b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.11.1.bb @@ -1,13 +1,12 @@ SUMMARY = "Panel plugin to display current temperature and weather condition" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin DEPENDS += "libsoup-2.4 dbus-glib upower" -SRC_URI[md5sum] = "e0bde3ba6a7e863022a86a23c7871255" -SRC_URI[sha256sum] = "7cdc18b8df759dee4ceaaf6ce303eff7fda48e247dbc26b78142929213506cfd" +SRC_URI[sha256sum] = "a45146f9a0dcdc95d191c09c64ad279ae289cf8f811c4433e08e31a656845239" -FILES_${PN} += "${datadir}/xfce4/weather" +FILES:${PN} += "${datadir}/xfce4/weather" diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.2.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb index 230a24faf7..3dfc76f246 100644 --- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.2.bb +++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb @@ -1,11 +1,8 @@ SUMMARY = "An alternate menu for the Xfce desktop environment" HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "e9aa6c33463bd564c47e1943c0fc7ac3" -SRC_URI[sha256sum] = "f1bf6be37f7778a486b16ef115d4c05120cc12c87e4af3af9c5001276bdcb7cc" - -RRECOMMENDS_${PN} += "menulibre" +SRC_URI[sha256sum] = "04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e" diff --git a/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.1.bb b/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.2.bb index 8ee374035a..3d935a3d71 100644 --- a/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.1.bb +++ b/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.2.bb @@ -1,16 +1,15 @@ SUMMARY = "XKB layout switching panel plug-in for the Xfce desktop environment" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=496f09f084b0f7e6f02f769a84490c6b" inherit xfce-panel-plugin -SRC_URI[md5sum] = "72530bf59d7cd902326469e5a7a9892b" -SRC_URI[sha256sum] = "c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1" +SRC_URI[sha256sum] = "bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967" DEPENDS += "libxklavier libwnck3 librsvg garcon" -FILES_${PN} += "${datadir}/xfce4/xkb" +FILES:${PN} += "${datadir}/xfce4/xkb" -RDEPENDS_${PN} = "xfce4-settings" +RDEPENDS:${PN} = "xfce4-settings" diff --git a/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.4.0.bb b/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.2.bb index 144e26069e..91b3efa83e 100644 --- a/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.4.0.bb +++ b/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.2.bb @@ -1,12 +1,11 @@ DESCRIPTION = "Thunar Archive Plugin allows you to create and extract archive files using file context menus in Thunar" HOMEPAGE = "http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db" inherit thunar-plugin -SRC_URI[md5sum] = "0a7738a3a5f84bf218ece3ffb5241c63" -SRC_URI[sha256sum] = "bf82fa86a388124eb3c4854249c30712b2922e61789607268ee14548549b3115" +SRC_URI[sha256sum] = "6379f877bcfc0ea85db9f43723b6fb317893050c712bd03c2ae3232fb9d5ade3" # install tap files in ${libdir}/thunar-archive-plugin EXTRA_OECONF += "--libexecdir=${libdir}" diff --git a/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.3.0.bb b/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.3.0.bb deleted file mode 100644 index a61e7648ed..0000000000 --- a/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.3.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Adds ID3/OGG tag support to the Thunar bulk rename dialog" -HOMEPAGE = "http://thunar.xfce.org" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit thunar-plugin - -DEPENDS += "taglib" - -SRC_URI[md5sum] = "5e332113e4b0e548ee7abd87629667f7" -SRC_URI[sha256sum] = "e265c4415abac40337cc5566c6f706efcf0be4e97723abe22ba8b874c93a591b" diff --git a/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.4.0.bb b/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.4.0.bb new file mode 100644 index 0000000000..00afa2bbb2 --- /dev/null +++ b/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.4.0.bb @@ -0,0 +1,10 @@ +SUMMARY = "Adds ID3/OGG tag support to the Thunar bulk rename dialog" +HOMEPAGE = "https://docs.xfce.org/xfce/thunar/media-tags" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit thunar-plugin + +DEPENDS += "taglib" + +SRC_URI[sha256sum] = "9592111e11699e449c1fbd5f72d1633ef39b00f17a988cd251ba228dab4fc90a" diff --git a/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.0.bb b/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.0.bb deleted file mode 100644 index 994c652825..0000000000 --- a/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Quickly share a folder using Samba from Thunar" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit thunar-plugin distro_features_check -REQUIRED_DISTRO_FEATURES = "pam" - -SRC_URI[md5sum] = "a1773168c0b3c7c0f253a339f02e5ae2" -SRC_URI[sha256sum] = "d6adc01ca45a3d2567a2a969a3b16d1799a8975453ab1803a065fa82496b5b65" - -RDEPENDS_${PN} += "samba-server" diff --git a/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.2.bb b/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.2.bb new file mode 100644 index 0000000000..065e89254b --- /dev/null +++ b/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.2.bb @@ -0,0 +1,12 @@ +SUMMARY = "Quickly share a folder using Samba from Thunar" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit thunar-plugin features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "pam" + +SRC_URI[sha256sum] = "1009d5e6c91534fa49a69090c53c54ab9da2e0428d08d8e687528f63a4ac3f07" + +RDEPENDS:${PN} += "samba-server" diff --git a/meta-xfce/recipes-xfce/exo/exo/configure.patch b/meta-xfce/recipes-xfce/exo/exo/configure.patch deleted file mode 100644 index 89cc1f3874..0000000000 --- a/meta-xfce/recipes-xfce/exo/exo/configure.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 13a74582ffd7f81dbd66a7296fc76007718e9d4d Mon Sep 17 00:00:00 2001 -From: Andreas Mueller <schnitzeltony@gmx.de> -Date: Mon, 1 Aug 2011 17:16:29 +0200 - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> - ---- - configure.ac | 34 ++++++++++++++++++---------------- - 1 file changed, 18 insertions(+), 16 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0de5ceb..3f92d1b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -143,22 +143,24 @@ AC_FUNC_MMAP() - dnl *************************************** - dnl *** Check for strftime() extensions *** - dnl *************************************** --AC_TRY_RUN([ -- #include <string.h> -- #include <time.h> -- int -- main (int argc, char **argv) -- { -- struct tm tm; -- char buffer[16]; -- tm.tm_year = 81; -- if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0) -- return 0; -- return 1; -- } --], [ -- AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) --]) -+dnl grrrr... this doesn't work for cross compiling, define it for OE -+AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) -+dnl AC_TRY_RUN([ -+dnl #include <string.h> -+dnl #include <time.h> -+dnl int -+dnl main (int argc, char **argv) -+dnl { -+dnl struct tm tm; -+dnl char buffer[16]; -+dnl tm.tm_year = 81; -+dnl if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0) -+dnl return 0; -+dnl return 1; -+dnl } -+dnl ], [ -+dnl AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) -+dnl ]) - - dnl ****************************** - dnl *** Check for i18n support *** diff --git a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch index 348e147cf9..c5e7a097f0 100644 --- a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch +++ b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch @@ -10,17 +10,20 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +Rebase for xfce4 4.18.0. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 226e79d..62ad18d 100644 +index 513ac36..c395272 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -9,8 +9,7 @@ SUBDIRS = \ +@@ -6,8 +6,7 @@ SUBDIRS = \ + exo-open \ docs \ - icons \ pixmaps \ - po \ - tests diff --git a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch deleted file mode 100644 index 8c950299f7..0000000000 --- a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch +++ /dev/null @@ -1,90 +0,0 @@ -From e710d8d4a3e3480416826c70d56ea3d2598a77e4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sat, 4 May 2019 14:50:11 +0200 -Subject: [PATCH] reduce build to exo-csource only -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -exo-csource creates c-header files from glade resource output files. When -building xfce-packages from git instead of tarball this exo-csource-native is -required. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> - ---- - Makefile.am | 10 +--------- - configure.ac | 20 -------------------- - 2 files changed, 1 insertion(+), 29 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 62ad18d..8934f1f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,15 +1,7 @@ - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - - SUBDIRS = \ -- exo \ -- exo-csource \ -- exo-desktop-item-edit \ -- exo-helper \ -- exo-open \ -- docs \ -- icons \ -- pixmaps \ -- po -+ exo-csource - - distclean-local: - rm -rf *.cache *~ -diff --git a/configure.ac b/configure.ac -index 4e4eb5e..237184c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -120,15 +120,6 @@ AC_PROG_CC() - AM_PROG_CC_C_O() - AC_PROG_INSTALL() - IT_PROG_INTLTOOL([intltool_minimum_version], [no-xml]) --AC_CHECK_PROGS([PERL], [perl5 perl]) -- --dnl *************************************** --dnl *** Check for required Perl modules *** --dnl *************************************** --AC_PROG_PERL_MODULES([URI::Escape URI::file URI::URL], [], --[ -- AC_MSG_ERROR([Atleast one of the required Perl modules (URI::Escape, URI::file and URI::URL) was not found on your system]) --]) - - dnl *************************************** - dnl *** Check for standard header files *** -@@ -175,12 +166,6 @@ dnl *********************************** - dnl *** Check for required packages *** - dnl *********************************** - XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0]) --XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) --XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0]) --XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) --XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) --XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0]) --XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features]) - - dnl *********************************************************** - dnl *** Optional support for a GTK+2 version of the library *** -@@ -190,11 +175,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([GTK2], - [GTK+ 2 support]) - AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"]) - --dnl ********************* --dnl *** Check for X11 *** --dnl ********************* --XDT_CHECK_LIBX11_REQUIRE() -- - dnl ************************* - dnl *** Check for gtk-doc *** - dnl ************************* --- -2.20.1 - diff --git a/meta-xfce/recipes-xfce/exo/exo_0.12.5.bb b/meta-xfce/recipes-xfce/exo/exo_0.12.5.bb deleted file mode 100644 index 7d61e8f83b..0000000000 --- a/meta-xfce/recipes-xfce/exo/exo_0.12.5.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION="Application library for the Xfce desktop environment" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "gtk+ libxfce4util libxfce4ui virtual/libx11 liburi-perl-native cairo" -DEPENDS_class-native = "glib-2.0-native xfce4-dev-tools-native intltool-native" - -inherit xfce pythonnative perlnative gtk-doc distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" -REQUIRED_DISTRO_FEATURES_class-native = "" - -# SRC_URI must follow inherited one -SRC_URI += " \ - file://exo-no-tests-0.8.patch \ - file://configure.patch \ -" - -SRC_URI_append_class-native = " \ - file://reduce-build-to-exo-csource-only.patch \ -" - -SRC_URI[md5sum] = "1de1d539262847d49474d20cbebc78ea" -SRC_URI[sha256sum] = "e8f434d6436ae647dd1614e8a24aba23c83f70cb14037b5bc98652f558be43e8" - -PACKAGES =+ "exo-csource" - -# Note: python bindings did not work in oe-dev and are about to be moved to -# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 -FILES_${PN} += " \ - ${datadir}/xfce4/ \ - ${libdir}/xfce4/exo* \ -" - -FILES_exo-csource += "${bindir}/exo-csource" - -BBCLASSEXTEND = "native" diff --git a/meta-xfce/recipes-xfce/exo/exo_4.19.0.bb b/meta-xfce/recipes-xfce/exo/exo_4.19.0.bb new file mode 100644 index 0000000000..48044240a8 --- /dev/null +++ b/meta-xfce/recipes-xfce/exo/exo_4.19.0.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Application library for the Xfce desktop environment" +SECTION = "x11" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "gtk+3 libxfce4ui liburi-perl-native cairo" + +inherit xfce perlnative gtk-doc features_check mime-xdg + +# 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}" + +# SRC_URI must follow inherited one +SRC_URI += " \ + file://exo-no-tests-0.8.patch \ +" + +SRC_URI[sha256sum] = "a0124108c197efcc576a6deeface381416dc7137b6a7e7dfa3060fad62509fb7" + +# Note: python bindings did not work in oe-dev and are about to be moved to +# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 +FILES:${PN} += " \ + ${datadir}/xfce4/ \ + ${libdir}/xfce4/exo* \ +" diff --git a/meta-xfce/recipes-xfce/garcon/garcon_0.6.2.bb b/meta-xfce/recipes-xfce/garcon/garcon_0.6.2.bb deleted file mode 100644 index 27096da602..0000000000 --- a/meta-xfce/recipes-xfce/garcon/garcon_0.6.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION="Xfce Menu Library" -SECTION = "x11/libs" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" -DEPENDS = "xfce4-dev-tools-native libxfce4util libxfce4ui intltool-native" - -inherit xfce gtk-doc distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" -SRC_URI[md5sum] = "a4b6332ff6f090575d534d6a9d2761d8" -SRC_URI[sha256sum] = "a87f09648ff10d45c524b3bfe618f18622bdd8b205589d35fed2f12d9c79c47c" - -EXTRA_OECONF = "--disable-gtk-doc" - -FILES_${PN} += "${datadir}/desktop-directories" diff --git a/meta-xfce/recipes-xfce/garcon/garcon_4.19.0.bb b/meta-xfce/recipes-xfce/garcon/garcon_4.19.0.bb new file mode 100644 index 0000000000..321f645b01 --- /dev/null +++ b/meta-xfce/recipes-xfce/garcon/garcon_4.19.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Xfce Menu Library" +SECTION = "x11/libs" +LICENSE = "LGPL-2.0-only & GFDL-1.1-no-invariants-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" +DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" + +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}" + +SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" +SRC_URI[sha256sum] = "e692f0d02294984c6b787e810a187c753a16f06ca87c68c0bb3de364ea3f6b0c" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_compile:prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/garcon/.libs" +} + +FILES:${PN} += "${datadir}/desktop-directories" diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch deleted file mode 100644 index fb8910204a..0000000000 --- a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: Fix FTBFS with glib 2.54 - glib-mkenums now expects input files to be UTF-8, - fix the encoding of libgnomeui/gnome-scores.h -Author: Adrian Bunk <bunk@debian.org> - -ported from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870738 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: gtk-xfce-engine-3.2.0/gtk-3.0/xfce_style_types.h -=================================================================== ---- gtk-xfce-engine-3.2.0.orig/gtk-3.0/xfce_style_types.h -+++ gtk-xfce-engine-3.2.0/gtk-3.0/xfce_style_types.h -@@ -19,7 +19,7 @@ - * - * Portions based Thinice port by - * Tim Gerla <timg@rrv.net>, -- * Tomas Ögren <stric@ing.umu.se, -+ * Tomas Ögren <stric@ing.umu.se>, - * Richard Hult <rhult@codefactory.se> - * Portions based on Smooth theme by - * Andrew Johnson <ajgenius@ajgenius.us> diff --git a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb b/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb deleted file mode 100644 index 805e893f79..0000000000 --- a/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "XFCE theme for GTK" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "gtk+ xfce4-dev-tools-native" - -inherit xfce distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += "file://glib-2.54-ftbfs.patch" - -SRC_URI[md5sum] = "363d6c16a48a00e26d45c45c2e1fd739" -SRC_URI[sha256sum] = "875c9c3bda96faf050a2224649cc42129ffb662c4de33add8c0fd1fb860b47ed" - -PACKAGECONFIG ??= "gtk3" -PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3, gtk+3, gtk3-xfce-engine" - -PACKAGES += "${PN}-themes gtk3-xfce-engine" -FILES_${PN} += "${libdir}/gtk-2.0/*/engines/*.so" -FILES_gtk3-xfce-engine += "${libdir}/gtk-3.0/*/theming-engines/*.so" -FILES_${PN}-themes += "${datadir}/themes" - -FILES_${PN}-dev += " \ - ${libdir}/gtk-2.0/*/engines/*.la \ - ${libdir}/gtk-3.0/*/theming-engines/*.la \ -" - -RDEPENDS_${PN} += "${PN}-themes" -RDEPENDS_gtk3-xfce-engine += "${PN}-themes" diff --git a/meta-xfce/recipes-xfce/libxfce4ui/files/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 6d107b1b61..53ba873746 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/files/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 <schnitzeltony@googlemail.com> --- - 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="<Primary>F12" type="string" value="workspace_12_key"/> +@@ -96,4 +96,8 @@ + <property name="<Super>KP_Next" type="string" value="tile_down_right_key"/> </property> </property> + <property name="providers" type="array"> diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb deleted file mode 100644 index df4b25c520..0000000000 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Xfce4 Widget library and X Window System interaction" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "perl-native glib-2.0 gtk+ gtk+3 intltool-native libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice" - -inherit xfce autotools gettext gtk-doc gobject-introspection distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " \ - file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ -" -SRC_URI[md5sum] = "b407cdab73ebd5c33c90db6bdb3ec5ff" -SRC_URI[sha256sum] = "d63fcdb8e5acb6f0d26075ea17d320dbfbec2058567cd67cb99824c7402a1f79" - -EXTRA_OECONF += "--with-vendor-info=${DISTRO}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3" -PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" -PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" - -PACKAGES =+ "${PN}-gtk2 ${PN}-gtk3" -FILES_${PN}-gtk2 += "${libdir}/libxfce4ui-1.so.* ${libdir}/libxfce4kbd-private-2.so.*" -FILES_${PN}-gtk3 += "${libdir}/libxfce4ui-2.so.* ${libdir}/libxfce4kbd-private-3.so.*" - -PACKAGES += "${PN}-glade" -FILES_${PN}-glade = " \ - ${libdir}/glade \ - ${libdir}/glade3 \ - ${datadir}/glade \ - ${datadir}/glade3 \ -" - -RDEPENDS_${PN}-gtk2 = "${PN}" -RDEPENDS_${PN}-gtk3 = "${PN}" diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.19.3.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.19.3.bb new file mode 100644 index 0000000000..e53d01d00c --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.19.3.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] = "16815eef494ba9bac9c854e95c205c0bc5568c8022c31604348f9edadb02f227" + +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/libxfce4util/libxfce4util_4.13.2.bb b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.13.2.bb deleted file mode 100644 index 21cc1dbfcd..0000000000 --- a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.13.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Basic utility library for Xfce4" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" - -inherit xfce gtk-doc gobject-introspection - -SRC_URI[md5sum] = "e3e8b9dd7e12028d3e642345b85d6ef1" -SRC_URI[sha256sum] = "c58275ff650080369e742695862c811cb78402c85f243ea0b5aec186027be361" diff --git a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.19.2.bb b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.19.2.bb new file mode 100644 index 0000000000..b54501cac2 --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.19.2.bb @@ -0,0 +1,9 @@ +SUMMARY = "Basic utility library for Xfce4" +SECTION = "x11/libs" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db" +DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" + +inherit xfce gtk-doc gobject-introspection vala + +SRC_URI[sha256sum] = "d4c7eb021d1c9408190bcfb92c7ce26f51e994674ac3c3b8a119270c1e900ac4" diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb index 140de416b7..c4b7b34cec 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb @@ -1,21 +1,20 @@ SUMMARY = "All packages required for a base installation of XFCE" SECTION = "x11/wm" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -PR = "r5" -inherit packagegroup distro_features_check +# librsvg-gtk gets debian renamed to librsvg-2-gtk +PACKAGE_ARCH = "${TUNE_PKGARCH}" + +inherit packagegroup features_check REQUIRED_DISTRO_FEATURES = "x11" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ xfwm4 \ xfce4-session \ xfconf \ xfdesktop \ xfce4-panel \ \ - gtk-xfce-engine \ librsvg-gtk \ \ xfce4-panel-plugin-actions \ diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index 62b89fd47f..f2e04f7932 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -1,21 +1,18 @@ SUMMARY = "All packages for full XFCE installation" SECTION = "x11/wm" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -PR = "r10" -inherit packagegroup distro_features_check +inherit packagegroup features_check REQUIRED_DISTRO_FEATURES = "x11" # mandatory -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ packagegroup-xfce-base \ " # nice to have -RRECOMMENDS_${PN} = " \ +RRECOMMENDS:${PN} = " \ xfwm4-theme-daloa \ xfwm4-theme-kokodi \ xfwm4-theme-moheli \ @@ -36,27 +33,23 @@ RRECOMMENDS_${PN} = " \ xfce4-systemload-plugin \ xfce4-time-out-plugin \ xfce4-timer-plugin \ - xfce4-embed-plugin \ xfce4-weather-plugin \ xfce4-fsguard-plugin \ xfce4-battery-plugin \ xfce4-mount-plugin \ xfce4-powermanager-plugin \ xfce4-closebutton-plugin \ - xfce4-equake-plugin \ xfce4-notes-plugin \ xfce4-whiskermenu-plugin \ xfce4-mailwatch-plugin \ - xfce4-kbdleds-plugin \ xfce4-smartbookmark-plugin \ - xfce4-hotcorner-plugin \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'xfce4-pulseaudio-plugin', '', d)} \ xfce4-sensors-plugin \ xfce4-calculator-plugin \ xfce4-verve-plugin \ \ - xfce-polkit \ - ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "blueman", "", d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','xfce-polkit','',d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth gobject-introspection", "blueman", "", d)} \ \ thunar-media-tags-plugin \ thunar-archive-plugin \ @@ -69,6 +62,6 @@ RRECOMMENDS_${PN} = " \ xfce4-taskmanager \ gigolo \ mousepad \ - catfish \ - xfce4-panel-profiles \ + ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "catfish", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "xfce4-panel-profiles", "", d)} \ " diff --git a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.1.bb b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.1.bb deleted file mode 100644 index 712453a393..0000000000 --- a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Automatic management of removable drives and media for thunar" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo glib-2.0 libxfce4ui libxfce4util xfconf libnotify libgudev" - -inherit xfce distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[md5sum] = "4992a18f422918c33b562d6e66045754" -SRC_URI[sha256sum] = "cd87291a427e8a561c566dca3aa7e93b56fdce4caefc755dde0f59198f6db359" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" - -RDEPENDS_${PN} = "eject" diff --git a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb new file mode 100644 index 0000000000..a136ba0545 --- /dev/null +++ b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Automatic management of removable drives and media for thunar" +SECTION = "x11" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "exo libnotify libgudev" + +inherit xfce features_check perlnative + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "93b75c7ffbe246a21f4190295acc148e184be8df397e431b258d0d676e87fc65" + +PACKAGECONFIG ??= "notify" +PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" + +RDEPENDS:${PN} = "eject" diff --git a/meta-xfce/recipes-xfce/thunar/thunar_1.8.4.bb b/meta-xfce/recipes-xfce/thunar/thunar_1.8.4.bb deleted file mode 100644 index 57667102ce..0000000000 --- a/meta-xfce/recipes-xfce/thunar/thunar_1.8.4.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "File manager for the Xfce Desktop Environment" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo glib-2.0 gtk+3 gdk-pixbuf libxfce4util libxfce4ui xfconf libsm dbus-glib startup-notification libnotify xfce4-panel udev" - -inherit xfce gobject-introspection distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2" -SRC_URI[md5sum] = "6a5d0f4ddcc653c4791e555f0dc63828" -SRC_URI[sha256sum] = "c2bf51da8ddec8f642d67818184ada2ca6e143151e6a45563991db73387a93b0" - -S = "${WORKDIR}/Thunar-${PV}/" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" - -FILES_${PN} += " \ - ${libdir}/thunarx-3/* \ - ${libdir}/xfce4/panel/plugins/* \ - ${libdir}/Thunar/[Tt]hunar* \ - ${systemd_user_unitdir} \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/polkit-1 \ - ${datadir}/Thunar \ - ${datadir}/xfce4/panel/plugins/* \ -" - -RRECOMMENDS_${PN} = "gvfs gvfsd-trash" diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.19.0.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.19.0.bb new file mode 100644 index 0000000000..e4d8b7b4de --- /dev/null +++ b/meta-xfce/recipes-xfce/thunar/thunar_4.19.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "File manager for the Xfce Desktop Environment" +SECTION = "x11" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "libxml-parser-perl-native exo gdk-pixbuf libxfce4ui libnotify xfce4-panel udev" + +inherit xfce gobject-introspection features_check mime-xdg perlnative gtk-doc + +# 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}" + +SRC_URI[sha256sum] = "684f1422c4d92b00db477ecaa2a0ed38ce688e2a567e5d70b7cf66fc6dd6fd18" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[pcre] = "--enable-pcre2,--disable-pcre2,libpcre2" +PACKAGECONFIG[x11] = ",,libsm startup-notification" + +FILES:${PN} += " \ + ${libdir}/thunarx-3/* \ + ${libdir}/xfce4/panel/plugins/* \ + ${libdir}/Thunar/[Tt]hunar* \ + ${systemd_user_unitdir} \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/polkit-1 \ + ${datadir}/Thunar \ + ${datadir}/xfce4/panel/plugins/* \ +" + +RRECOMMENDS:${PN} = " \ + gvfs \ + gvfsd-trash \ + ${@bb.utils.contains('DISTRO_FEATURES', 'dbus', 'tumbler', '', d)} \ +" diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch b/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch deleted file mode 100644 index 5ecc35e37a..0000000000 --- a/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f5c283b1251ad005da7342e654cd2ec5ae9e5fb2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 26 Sep 2014 13:44:36 +0200 -Subject: [PATCH] configure: use pkg-config for freetype2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - acinclude.m4 | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 66e79d1..4c70b00 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -52,21 +52,7 @@ if test x"$ac_tumbler_font_thumbnailer" = x"yes"; then - PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.14], - [ - dnl Check for FreeType 2.x -- FREETYPE_LIBS="" -- FREETYPE_CFLAGS="" -- AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config], [no]) -- if test x"$FREETYPE_CONFIG" != x"no"; then -- AC_MSG_CHECKING([FREETYPE_CFLAGS]) -- FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`" -- AC_MSG_RESULT([$FREETYPE_CFLAGS]) -- -- AC_MSG_CHECKING([FREETYPE_LIBS]) -- FREETYPE_LIBS="`$FREETYPE_CONFIG --libs`" -- AC_MSG_RESULT([$FREETYPE_LIBS]) -- else -- dnl We can only build the font thumbnailer if FreeType 2.x is available -- ac_tumbler_font_thumbnailer=no -- fi -+ PKG_CHECK_MODULES(FREETYPE, freetype2, , [ac_tumbler_font_thumbnailer=no]) - AC_SUBST([FREETYPE_CFLAGS]) - AC_SUBST([FREETYPE_LIBS]) - ], [ac_tumbler_font_thumbnailer=no]) --- -1.8.3.1 - diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_4.18.0.bb index 9d2669475f..0472d4885f 100644 --- a/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb +++ b/meta-xfce/recipes-xfce/tumbler/tumbler_4.18.0.bb @@ -1,32 +1,31 @@ -DESCRIPTION="Thumbnail service implementing the thumbnail management D-Bus specification" +DESCRIPTION = "Thumbnail service implementing the thumbnail management D-Bus specification" SECTION = "x11/libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "dbus-glib dbus-glib-native freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf" +DEPENDS = "freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf libxfce4util" -inherit xfce gtk-doc +inherit xfce gtk-doc systemd -SRC_URI[md5sum] = "dd5f9bae6a2470eb5fff0dc9edd3ea09" -SRC_URI[sha256sum] = "4e27a59694b0a5cc69ebccbdb00c724e670b5b7c30bc4dc0b461aac93f234fac" -SRC_URI += "file://0001-configure-use-pkg-config-for-freetype2.patch" +SRC_URI[sha256sum] = "4087f3af4ef31271d3f315421a2f1fe67e4fda7ad60bbab1f073627914dfcf00" -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" PACKAGECONFIG ??= "" PACKAGECONFIG[gstreamer-thumbnailer] = "--enable-gstreamer-thumbnailer,--disable-gstreamer-thumbnailer,gstreamer1.0 gstreamer1.0-plugins-base" -do_install_append() { +do_install:append() { # Makefile seems to race on creation of symlink. So ensure creation here # until fixed properly ln -sf tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so } -FILES_${PN} += "${datadir}/dbus-1/services \ +FILES:${PN} += "${datadir}/dbus-1/services \ ${libdir}/tumbler-1/tumblerd \ ${libdir}/tumbler-1/plugins/*.so \ ${libdir}/tumbler-1/plugins/cache/*.so \ + ${systemd_user_unitdir}/tumblerd.service \ " -FILES_${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ +FILES:${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ ${libdir}/tumbler-1/plugins/cache/*.la \ " diff --git a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.2.bb b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.2.bb deleted file mode 100644 index e9f6e28b47..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION="Xfce4 Application Finder" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS="glib-2.0 gtk+3 libxfce4util libxfce4ui garcon dbus-glib xfconf" - -inherit xfce distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[md5sum] = "8b4c2ab413748fcd0cc51444418d5af3" -SRC_URI[sha256sum] = "fd774acbcab08dbb88bcbf28eecf73ec9f55b13e1f2058021b63f703c4989d97" - -FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.19.1.bb b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.19.1.bb new file mode 100644 index 0000000000..0fea41c773 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.19.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Xfce4 Application Finder" +SECTION = "x11" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "glib-2.0 gtk+3 libxfce4util libxfce4ui garcon xfconf" + +inherit xfce features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "d8bd2a1dd9d193eb25e8e5e68b1beae3578a46d1c5eeee30bec7dabbf4330648" + +FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-Run-native-xdt-csource-on-tests.patch b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-Run-native-xdt-csource-on-tests.patch new file mode 100644 index 0000000000..74b1679ab4 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-Run-native-xdt-csource-on-tests.patch @@ -0,0 +1,33 @@ +From b2fcd5c09ee6b4ad03f93ee5e1dd32f2f062cf07 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 3 Jan 2021 15:36:07 +0100 +Subject: [PATCH] Run native xdt-csource on tests +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Tests cannot be opted out so let them pass. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + tests/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index fa0832c..7c46bbf 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -26,7 +26,7 @@ DISTCLEANFILES = test-xdt-csource-data.c + BUILT_SOURCES = test-xdt-csource-data.c + + test-xdt-csource-data.c: Makefile $(srcdir)/data/data.bin $(srcdir)/data/data.txt +- $(top_builddir)/xdt-csource/xdt-csource --extern --build-list data_bin $(srcdir)/data/data.bin data_txt $(srcdir)/data/data.txt > test-xdt-csource-data.c ++ xdt-csource --extern --build-list data_bin $(srcdir)/data/data.bin data_txt $(srcdir)/data/data.txt > test-xdt-csource-data.c + + clean-local: + rm -f *.core core core.* +-- +2.26.2 + diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch new file mode 100644 index 0000000000..43b1eb505a --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch @@ -0,0 +1,35 @@ +From 8f58e1b5c15fc3b6f775207971d078c058d9eb7b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 08:21:56 -0700 +Subject: [PATCH] m4macros: Check for a function provided by libX11 in + AC_CHECK_LIB + +checking for main is not ideal, since its not a function from libX11 +moreover with newer versions of autoconf this will start to fail [1], so +change this to use XFree API which is provided by libX11 and seems more +relevant to check here. + +[1] https://lists.gnu.org/archive/html/autoconf-patches/2022-08/msg00018.html + +Upstream-Status: Submitted [https://gitlab.xfce.org/xfce/xfce4-dev-tools/-/issues/57] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4macros/xdt-depends.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4macros/xdt-depends.m4 b/m4macros/xdt-depends.m4 +index 3c07c90..ce1b272 100644 +--- a/m4macros/xdt-depends.m4 ++++ b/m4macros/xdt-depends.m4 +@@ -213,7 +213,7 @@ AC_DEFUN([XDT_CHECK_LIBX11], + + LIBX11_CFLAGS= LIBX11_LDFLAGS= LIBX11_LIBS= + if test x"$no_x" != x"yes"; then +- AC_CHECK_LIB([X11], [main], ++ AC_CHECK_LIB([X11], [XFree], + [ + AC_DEFINE([HAVE_LIBX11], [1], [Define if libX11 is available]) + LIBX11_CFLAGS="$X_CFLAGS" +-- +2.37.3 + diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.12.0.bb b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.12.0.bb deleted file mode 100644 index 5557f6df9d..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.12.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Xfce4 development tools" -HOMEPAGE = "http://www.xfce.org" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" -DEPENDS = "glib-2.0" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native" - -SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "559202c4d9650e23696c44aa94cfc5a9" -SRC_URI[sha256sum] = "e2e3a654fe9110df81f8c2483c9cbfa6d656fed15d5e5e717d6ef10bd0f5b5cb" - -do_install_append() { - install -d ${D}${datadir}/aclocal - install -m 644 ${S}/m4macros/*.m4 ${D}${datadir}/aclocal/ -} - -FILES_${PN} += "${datadir}/xfce4/dev-tools/m4macros/*.m4" - -RDEPENDS_${PN} = "bash" diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.18.0.bb b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.18.0.bb new file mode 100644 index 0000000000..6ca18b8b33 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.18.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "Xfce4 development tools" +HOMEPAGE = "http://www.xfce.org" +SECTION = "x11/libs" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "glib-2.0" +DEPENDS:append:class-target = " ${BPN}-native" + +SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2 \ + file://0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch \ + " +SRC_URI:append:class-target = " file://0001-Run-native-xdt-csource-on-tests.patch" +SRC_URI[sha256sum] = "eedb4fc955f0e3459c46864ff98579295db2b900743e0ff69cad5970ba76be37" + +inherit autotools pkgconfig + +do_install:append() { + install -d ${D}${datadir}/aclocal + install -m 644 ${S}/m4macros/*.m4 ${D}${datadir}/aclocal/ +} + +FILES:${PN} += "${datadir}/xfce4/dev-tools/m4macros/*.m4" + +RDEPENDS:${PN} = "bash" + +BBCLASSEXTEND = "native" diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch index 1adb14552d..154f72d186 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch +++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch @@ -13,15 +13,19 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + +Rebase for xfce4-panel 4.18.3. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- plugins/windowmenu/windowmenu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c -index f47e993e..061d6544 100644 +index be7dea4..2f432b0 100644 --- a/plugins/windowmenu/windowmenu.c +++ b/plugins/windowmenu/windowmenu.c -@@ -251,7 +251,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) +@@ -262,7 +262,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) g_signal_connect (G_OBJECT (plugin->button), "toggled", G_CALLBACK (window_menu_plugin_menu), plugin); @@ -29,17 +33,15 @@ index f47e993e..061d6544 100644 + plugin->icon = gtk_image_new_from_icon_name (NULL, GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon); gtk_widget_show (plugin->icon); - } -@@ -640,7 +640,7 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, + +@@ -695,19 +695,19 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, /* skip 'fake' windows */ type = wnck_window_get_window_type (window); if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK) - goto show_desktop_icon; + goto show_no_icon; - /* get the window icon and set the tooltip */ - gtk_widget_set_tooltip_text (GTK_WIDGET (icon), -@@ -660,12 +660,12 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, + window_menu_plugin_set_icon (plugin, window); } else { @@ -47,6 +49,7 @@ index f47e993e..061d6544 100644 + show_no_icon: /* desktop is shown right now */ + icon_size = xfce_panel_plugin_get_icon_size (XFCE_PANEL_PLUGIN (plugin)); - gtk_image_set_from_icon_name (GTK_IMAGE (icon), "user-desktop", icon_size); + gtk_image_set_from_icon_name (GTK_IMAGE (icon), NULL, icon_size); gtk_image_set_pixel_size (GTK_IMAGE (icon), icon_size); diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch new file mode 100644 index 0000000000..66a33c722a --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch @@ -0,0 +1,53 @@ +From b80108f01b1425427f98341168ea44c4b1a5a2cf Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 28 Jun 2019 16:02:13 +0800 +Subject: [PATCH] use lxdm to replace dm-tool + +OE does not support lightdm but lxdm, +so use lxdm to replace dm-tool + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Rebase for xfce4-panel 4.18.3. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + plugins/actions/actions.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c +index e1f1fa7..440f430 100644 +--- a/plugins/actions/actions.c ++++ b/plugins/actions/actions.c +@@ -977,12 +977,12 @@ actions_plugin_actions_allowed (void) + GError *error = NULL; + + /* check for commands we use */ +- path = g_find_program_in_path ("dm-tool"); ++ path = g_find_program_in_path ("lxdm"); + if (path != NULL) + PANEL_SET_FLAG (allow_mask, ACTION_TYPE_SWITCH_USER); + else + { +- /* check for gdmflexiserver if dm-tool is not present */ ++ /* check for gdmflexiserver if lxdm is not present */ + g_free (path); + path = g_find_program_in_path ("gdmflexiserver"); + if (path != NULL) +@@ -1099,9 +1099,9 @@ actions_plugin_action_activate (GtkWidget *widget, + break; + + case ACTION_TYPE_SWITCH_USER: +- path = g_find_program_in_path ("dm-tool"); ++ path = g_find_program_in_path ("lxdm"); + if (path != NULL) +- succeed = g_spawn_command_line_async ("dm-tool switch-to-greeter", &error); ++ succeed = g_spawn_command_line_async ("lxdm -c USER_SWITCH", &error); + else + succeed = g_spawn_command_line_async ("gdmflexiserver", &error); + g_free (path); +-- +2.8.1 + diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.4.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.3.bb index 18e054c9d4..7e70754431 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.4.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.3.bb @@ -1,23 +1,27 @@ SUMMARY = "Xfce4 Panel" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" -DEPENDS = "libxfce4util garcon libxfce4ui xfconf exo gtk+ gtk+3 dbus cairo virtual/libx11 libxml2 libwnck3 vala-native" +DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxml2 libwnck3 vala-native" -inherit xfce gtk-doc gobject-introspection distro_features_check gtk-icon-cache remove-libtool +inherit xfce gtk-doc gobject-introspection features_check mime-xdg -REQUIRED_DISTRO_FEATURES = "x11" +# 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}" -SRC_URI[md5sum] = "c0f132fed2110d37f351aadc9e80a034" -SRC_URI[sha256sum] = "36ffd26ef7f5867c01ba310475b4358ff0e588cfd5599a266f0037a6c20052a1" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ + file://0002-use-lxdm-to-replace-dm-tool.patch \ " +SRC_URI[sha256sum] = "4ae0b8615c9811194bbda0172a63567ed7fdb5519ea48f7a4637f4e6e5365e1b" -python populate_packages_prepend() { +EXTRA_OECONF += "--disable-vala" + +python populate_packages:prepend() { plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/') plugin_name = d.expand('${PN}-plugin-%s') - do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, + do_split_packages(d, plugin_dir, r'^lib(.*)\.so$', plugin_name, '${PN} plugin for %s', extra_depends='', prepend=True, aux_files_pattern=['${datadir}/xfce4/panel/plugins/%s.desktop', '${sysconfdir}/xdg/xfce/panel/%s-*', @@ -29,12 +33,12 @@ PACKAGES_DYNAMIC += "^${PN}-plugin-.*" PACKAGES =+ "${PN}-gtk3" -FILES_${PN} += "${libdir}/xfce4/panel/migrate \ +FILES:${PN} += "${libdir}/xfce4/panel/migrate \ ${libdir}/xfce4/panel/wrapper-1.0" -FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" +FILES:${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" -FILES_${PN}-gtk3 = " \ +FILES:${PN}-gtk3 = " \ ${libdir}/libxfce4panel-2.0${SOLIBS} \ ${libdir}/xfce4/panel/wrapper-2.0 \ " diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb deleted file mode 100644 index 1cdcb4160a..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Power manager for the Xfce desktop environment" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-power-manager" -SECTION = "x11" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit xfce distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -DEPENDS += "gtk+3 glib-2.0 dbus-glib xfconf libxfce4ui libxfce4util libnotify \ - libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" - -SRC_URI[md5sum] = "17f0e6464ad6b3bc6a657f595bf91430" -SRC_URI[sha256sum] = "1ea825452343b895566068018b6d5078608f8f46ce8075ba6bbb4b848f48656b" - -EXTRA_OECONF = " \ - --enable-network-manager \ - --enable-panel-plugins \ -" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" -PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" - -PACKAGES += "xfce4-powermanager-plugin" - -FILES_${PN} += " \ - ${datadir}/polkit-1 \ - ${datadir}/appdata \ -" - -FILES_xfce4-powermanager-plugin = " \ - ${libdir}/xfce4 \ - ${datadir}/xfce4 \ -" - -RDEPENDS_xfce4-powermanager-plugin = "${PN}" -RDEPENDS_${PN} = "networkmanager ${@bb.utils.contains('DISTRO_FEATURES','systemd','','consolekit',d)}" - -# xfce4-brightness-plugin was replaced by xfce4-powermanager-plugin -RPROVIDES_xfce4-powermanager-plugin += "xfce4-brightness-plugin" -RREPLACES_xfce4-powermanager-plugin += "xfce4-brightness-plugin" -RCONFLICTS_xfce4-powermanager-plugin += "xfce4-brightness-plugin" diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.1.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.1.bb new file mode 100644 index 0000000000..f7f72356d8 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.1.bb @@ -0,0 +1,42 @@ +SUMMARY = "Power manager for the Xfce desktop environment" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-power-manager" +SECTION = "x11" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" + +SRC_URI[sha256sum] = "6b08b10c4cb7516377dbd32c6cc2296a9faf47022c555f11e75b38fde14aff03" + +EXTRA_OECONF = " \ + --enable-network-manager \ + --enable-panel-plugins \ +" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" +PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" + +PACKAGES += "xfce4-powermanager-plugin" + +FILES:${PN} += " \ + ${datadir}/polkit-1 \ + ${datadir}/metainfo \ +" + +FILES:xfce4-powermanager-plugin = " \ + ${libdir}/xfce4 \ + ${datadir}/xfce4 \ +" + +RDEPENDS:xfce4-powermanager-plugin = "${PN}" +RDEPENDS:${PN} = "networkmanager ${@bb.utils.contains('DISTRO_FEATURES','systemd','','consolekit',d)}" + +# xfce4-brightness-plugin was replaced by xfce4-powermanager-plugin +RPROVIDES:xfce4-powermanager-plugin += "xfce4-brightness-plugin" +RREPLACES:xfce4-powermanager-plugin += "xfce4-brightness-plugin" +RCONFLICTS:xfce4-powermanager-plugin += "xfce4-brightness-plugin" diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.2.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.2.bb deleted file mode 100644 index 1a88e2de7e..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "xfce4-session is a session manager for Xfce 4 Desktop Environment" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" -DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck3 dbus dbus-glib xfconf polkit" -RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth upower" - -inherit xfce update-alternatives distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " \ - file://0001-configure.in-hard-code-path-to-iceauth.patch \ -" -SRC_URI[md5sum] = "1306b6166f47cdf6e0c61259abbb621f" -SRC_URI[sha256sum] = "c0be0c7e602c962d0e8fca63bd86165e60313d07bfb72cf2c3f99ab53e2a22a1" - -ALTERNATIVE_${PN} = "x-session-manager" -ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" -ALTERNATIVE_PRIORITY_${PN} = "100" - -FILES_${PN} += " \ - ${libdir}/xfce4/*/*/*.so \ - ${libdir}/xfce4/session/*-*-* \ - ${datadir}/xsessions \ - ${datadir}/themes/Default/balou/* \ - ${datadir}/polkit-1 \ -" diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.2.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.2.bb new file mode 100644 index 0000000000..4021243e41 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.2.bb @@ -0,0 +1,37 @@ +SUMMARY = "xfce4-session is a session manager for Xfce 4 Desktop Environment" +SECTION = "x11" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libwnck3 libsm libxfce4ui virtual/libx11" + +inherit xfce update-alternatives features_check + +SRC_URI += "file://0001-configure.in-hard-code-path-to-iceauth.patch" +SRC_URI[sha256sum] = "01ff7fe8d4c2091adefc2925c6b7bb93152ba0732e95c9b9e64d8207fdbdeb8a" + +REQUIRED_DISTRO_FEATURES = "x11" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" +PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" + +ALTERNATIVE:${PN} = "x-session-manager" +ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" +ALTERNATIVE_PRIORITY_${PN} = "150" + +FILES:${PN} += " \ + ${libdir}/xfce4/*/*/*.so \ + ${libdir}/xfce4/session/*-*-* \ + ${datadir}/xsessions \ + ${datadir}/themes/Default/balou/* \ + ${datadir}/polkit-1 \ +" + +RDEPENDS:${PN} = " \ + dbus-x11 \ + iceauth \ + netbase \ + upower \ + xinit \ + xrdb \ +" diff --git a/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch b/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch index 67df05a79b..3a4c00913f 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch +++ b/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch @@ -6,24 +6,32 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstram status: Inappropriate [configuration] +Upstream-Status: Inappropriate [configuration] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + +Theme Xfce doesn't work as expected. For example, no layout in start +menu and applications' menu bar. And GtkColorButton is blank in config +tab page from xfce4-terminal -> Edit -> Preference -> Colors. + +So use Adwaita as default theme instead. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- xfsettingsd/xsettings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml -index 65ba1ee..9efb3cd 100644 +index d8fe2ac..0f5246b 100644 --- a/xfsettingsd/xsettings.xml +++ b/xfsettingsd/xsettings.xml -@@ -1,8 +1,8 @@ - <?xml version="1.0" encoding="UTF-8"?> +@@ -6,8 +6,8 @@ + <channel name="xsettings" version="1.0"> <property name="Net" type="empty"> - <property name="ThemeName" type="empty"/> - <property name="IconThemeName" type="empty"/> -+ <property name="ThemeName" type="string" value="Xfce"/> ++ <property name="ThemeName" type="string" value="Adwaita"/> + <property name="IconThemeName" type="string" value="Adwaita"/> <property name="DoubleClickTime" type="int" value="400"/> <property name="DoubleClickDistance" type="int" value="5"/> diff --git a/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch b/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch deleted file mode 100644 index 109b7b1459..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b6e46e6a84e45f7bd954687be703987825a54c1e Mon Sep 17 00:00:00 2001 -From: Eric Koegel <eric.koegel@gmail.com> -Date: Sun, 11 Jun 2017 11:38:26 +0300 -Subject: [PATCH] Fix linking to dbus-glib (bug #13633) - -With xfconf moving to GDBus nothing provides the libs for dbus-glib -that xfce4-settings requires. This patch adds the libs back in until -settings can be ported to GDBus. - -Signed-off-by: Sean Davis <smd.seandavis@gmail.com> - -Upstream-Status: Backport ---- - xfce4-settings-editor/Makefile.am | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/xfce4-settings-editor/Makefile.am b/xfce4-settings-editor/Makefile.am -index 5964366..c2c7c4b 100644 ---- a/xfce4-settings-editor/Makefile.am -+++ b/xfce4-settings-editor/Makefile.am -@@ -28,6 +28,7 @@ xfce4_settings_editor_CFLAGS = \ - $(LIBXFCE4UTIL_CFLAGS) \ - $(LIBXFCE4UI_CFLAGS) \ - $(XFCONF_CFLAGS) \ -+ $(DBUS_GLIB_CFLAGS) \ - $(PLATFORM_CFLAGS) - - xfce4_settings_editor_LDFLAGS = \ -@@ -39,7 +40,8 @@ xfce4_settings_editor_LDADD = \ - $(DBUS_GLIB_LIBS) \ - $(LIBXFCE4UTIL_LIBS) \ - $(LIBXFCE4UI_LIBS) \ -- $(XFCONF_LIBS) -+ $(XFCONF_LIBS) \ -+ $(DBUS_GLIB_LIBS) - - desktopdir = $(datadir)/applications - desktop_in_files = xfce4-settings-editor.desktop.in --- -2.14.3 - diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.2.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.2.bb new file mode 100644 index 0000000000..0a182273bb --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.2.bb @@ -0,0 +1,31 @@ +SUMMARY = "Xfce4 settings" +SECTION = "x11/wm" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "exo garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" + +inherit xfce features_check mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += "file://0001-xsettings.xml-Set-default-themes.patch" +SRC_URI[sha256sum] = "4661361087faae57efb49741ffcf90bf9078760e163bbdef63b924083bdc4f22" + +EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" + +PACKAGECONFIG ??= " \ + notify \ + ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ +" +PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" +PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop" + +FILES:${PN} += " \ + ${libdir}/xfce4 \ + ${datadir}/xfce4 \ +" + +RRECOMMENDS:${PN} += "adwaita-icon-theme" +RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" +RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" +RRECOMMENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','xfce4-datetime-setter','',d)}" diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb deleted file mode 100644 index a4685aed33..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Xfce4 settings" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo exo-native garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libxcursor libxklavier upower" - -inherit xfce xfce-git distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -# schnitzeltony git repo is the mainline repo -# + datetime-setter - sent to mainline but strange response -# + minor bugfixes - sent mainline but no response -# + option to hide mousepointer for a specific (touch) input device - sent mainline but no response -SRC_URI = " \ - git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.4 \ - file://0001-xsettings.xml-Set-default-themes.patch \ - file://0002-Fix-linking-to-dbus-glib-bug-13633.patch \ -" -SRCREV = "75d7c9b15e5ccce12b0864d3659ae9b6de96e245" -S = "${WORKDIR}/git" -PV = "4.12.4+git${SRCPV}" - -EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" - -PACKAGECONFIG ??= " \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','datetime-setter','',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ -" -PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime-settings,, tzdata" -PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" -PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop" - -FILES_${PN} += " \ - ${libdir}/xfce4 \ - ${datadir}/xfce4 \ -" - -RRECOMMENDS_${PN} += "adwaita-icon-theme" -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" diff --git a/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb b/meta-xfce/recipes-xfce/xfconf/xfconf_4.18.0.bb index ded3c44e5a..f5c598b8df 100644 --- a/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb +++ b/meta-xfce/recipes-xfce/xfconf/xfconf_4.18.0.bb @@ -1,20 +1,19 @@ SUMMARY = "Xfce configuration daemon and utilities" SECTION = "x11/wm" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "dbus-glib libxfce4util perl intltool-native xfce4-dev-tools-native" +DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native" -inherit xfce gtk-doc +inherit xfce gtk-doc gobject-introspection bash-completion vala EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" -SRC_URI[md5sum] = "da19df12dbc494c8a4da3974e376d639" -SRC_URI[sha256sum] = "d1a3d442dae188b5a7380b5815377e5488578cdafb03ae363e9426e3b01185df" +SRC_URI[sha256sum] = "2e8c50160bf800a807aea094fc9dad81f9f361f42db56607508ed5b4855d2906" -FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ +FILES:${PN} += "${libdir}/xfce4/xfconf/xfconfd \ ${libdir}/gio/modules/libxfconfgsettingsbackend.so \ ${datadir}/dbus-1/services/org.xfce.Xfconf.service" -FILES_${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la" +FILES:${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la" PACKAGECONFIG[gsettings-backend] = "--enable-gsettings-backend,--disable-gsettings-backend," diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.3.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.3.bb deleted file mode 100644 index 2c70a9c313..0000000000 --- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Xfce4 Desktop Manager" -SECTION = "x11/base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libxfce4util libxfce4ui libwnck xfconf dbus-glib dbus-glib-native thunar garcon exo" - -inherit xfce distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[md5sum] = "f08944f1b69ce1c6e1fbb9d7f4cb1da7" -SRC_URI[sha256sum] = "80f7f28ef17638fe1cf4481db694731c208785a56b6c840005202f9c2db238f5" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" - -FILES_${PN} += "${datadir}/backgrounds" diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.1.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.1.bb new file mode 100644 index 0000000000..f4d5fef8e4 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "Xfce4 Desktop Manager" +SECTION = "x11/base" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = " \ + cairo \ + exo \ + garcon \ + glib-2.0 \ + gtk+3 \ + intltool \ + libwnck3 \ + libxfce4ui \ + libxfce4util \ + thunar \ + xfconf \ +" + +inherit xfce features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[sha256sum] = "ef9268190c25877e22a9ff5aa31cc8ede120239cb0dfca080c174e7eed4ff756" + +PACKAGECONFIG ??= "notify" +PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" + +FILES:${PN} += "${datadir}/backgrounds" diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.1.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.18.0.bb index 64ad9f64ef..839f1c8704 100644 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.1.bb +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.18.0.bb @@ -1,15 +1,14 @@ -DESCRIPTION="Xfce4 Window Manager" +DESCRIPTION = "Xfce4 Window Manager" SECTION = "x11/wm" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "virtual/libx11 libxfce4util libxfce4ui xfconf libwnck3 dbus-glib libxinerama exo-native" +DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama" -inherit xfce update-alternatives distro_features_check +inherit xfce update-alternatives features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "1a78bcc2100c03f6fea0dbce0ca813cf" -SRC_URI[sha256sum] = "75ebc20d313cff4905e76fc320254c30461dbfa985461b8e75dca04770cedf12" +SRC_URI[sha256sum] = "92cd1b889bb25cb4bc06c1c6736c238d96e79c1e706b9f77fad0a89d6e5fc13f" PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ @@ -21,18 +20,18 @@ PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy" PACKAGECONFIG[xpresent] = "--enable-xpresent,--disable-xpresent,libxpresent" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" -python populate_packages_prepend () { +python populate_packages:prepend () { themedir = d.expand('${datadir}/themes') do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) } PACKAGES_DYNAMIC += "^xfwm4-theme-.*" -ALTERNATIVE_${PN} = "x-window-manager" +ALTERNATIVE:${PN} = "x-window-manager" ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" ALTERNATIVE_PRIORITY[x-window-manager] = "30" -RDEPENDS_${PN} = "xfwm4-theme-default" -FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ +RDEPENDS:${PN} = "xfwm4-theme-default" +FILES:${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ ${datadir}/xfwm4/defaults \ " |