diff options
Diffstat (limited to 'external/meta-openembedded/meta-xfce')
111 files changed, 981 insertions, 770 deletions
diff --git a/external/meta-openembedded/meta-xfce/README b/external/meta-openembedded/meta-xfce/README index 4d8dc459..eaa17175 100644 --- a/external/meta-openembedded/meta-xfce/README +++ b/external/meta-openembedded/meta-xfce/README @@ -1,11 +1,11 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: thud +branch: dunfell revision: HEAD URI: git://github.com/openembedded/meta-oe.git -branch: thud +branch: dunfell revision: HEAD meta-xfce depends on meta-oe, meta-gnome and meta-multimedia in this repository. @@ -14,9 +14,9 @@ this to local.conf: BBMASK = "meta-xfce/recipes-multimedia" -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce][thud]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce][dunfell]' 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][thud][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-xfce][dunfell][PATCH' -Thud Maintainer: Armin Kuster <akuster808@gmail.com> +dunfell Maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/external/meta-openembedded/meta-xfce/classes/thunar-plugin.bbclass b/external/meta-openembedded/meta-xfce/classes/thunar-plugin.bbclass index 76b0e723..854d96b3 100644 --- a/external/meta-openembedded/meta-xfce/classes/thunar-plugin.bbclass +++ b/external/meta-openembedded/meta-xfce/classes/thunar-plugin.bbclass @@ -1,4 +1,4 @@ -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/external/meta-openembedded/meta-xfce/classes/xfce-app.bbclass b/external/meta-openembedded/meta-xfce/classes/xfce-app.bbclass index 1c31c2fa..d1b07d74 100644 --- a/external/meta-openembedded/meta-xfce/classes/xfce-app.bbclass +++ b/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass b/external/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass index 29c1245c..594d40d0 100644 --- a/external/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass +++ b/external/meta-openembedded/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}-dev += "${libdir}/xfce4/panel/plugins/*.la"
\ No newline at end of file +FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" diff --git a/external/meta-openembedded/meta-xfce/conf/layer.conf b/external/meta-openembedded/meta-xfce/conf/layer.conf index f5f44d64..199c69e7 100644 --- a/external/meta-openembedded/meta-xfce/conf/layer.conf +++ b/external/meta-openembedded/meta-xfce/conf/layer.conf @@ -17,9 +17,6 @@ LAYERDEPENDS_xfce-layer += "openembedded-layer" LAYERDEPENDS_xfce-layer += "gnome-layer" LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" +LAYERDEPENDS_xfce-layer += "networking-layer" -LAYERSERIES_COMPAT_xfce-layer = "thud" - -SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ - xfce4-session->machine-host \ -" +LAYERSERIES_COMPAT_xfce-layer = "thud warrior zeus dunfell" diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.6.bb b/external/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.13.bb index 229f882d..01a36e1f 100644 --- a/external/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.6.bb +++ b/external/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.13.bb @@ -3,14 +3,14 @@ SECTION = "x11/application" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" -inherit xfce-app distutils3 gtk-icon-cache +inherit xfce-app distutils3 gtk-icon-cache mime-xdg DEPENDS += "python3-distutils-extra-native" B = "${S}" -SRC_URI[md5sum] = "879197c9400be2a80d51abf494bfffb6" -SRC_URI[sha256sum] = "e1caee14c5268ac781434701c0eb26eddfced2c0f1ae066549583ed05f99adbf" +SRC_URI[md5sum] = "750b65401c9445e185e71c808d7509a4" +SRC_URI[sha256sum] = "58c0ea06e5f286019295545fbfd1dbca23aea74c625762bbb4c89a6f484ae839" FILES_${PN} += "${datadir}/metainfo" diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb b/external/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.5.1.bb index c846e780..1233fe06 100644 --- a/external/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb +++ b/external/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.5.1.bb @@ -3,9 +3,9 @@ SECTION = "x11/application" LICENSE = "GPLv2" 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[md5sum] = "94e89ad3fabba7167760004b64062f4a" +SRC_URI[sha256sum] = "ca87badb5871e4844579704704ea9e5ede444f710a3b264c12b60b2a0e48e14e" diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb b/external/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb index b0e4784f..f1d9c04b 100644 --- a/external/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.0.bb +++ b/external/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb @@ -9,13 +9,13 @@ DEPENDS = " \ intltool-native \ " -inherit distutils3 gtk-icon-cache distro_features_check +inherit distutils3 gtk-icon-cache features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "https://launchpad.net/menulibre/2.2/${PV}/+download/${PN}-${PV}.tar.gz" -SRC_URI[md5sum] = "9690848dbf9196c3f7baa574e90378d8" -SRC_URI[sha256sum] = "546fec87f451c8f5c220d02b1f36dd850f4ce9ab607f8e9711ed8f2009e349fe" +SRC_URI = "https://launchpad.net/menulibre/2.2/${PV}/+download/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "8460ea844a5998c5f722bccb5ce8627a" +SRC_URI[sha256sum] = "5b3ef8e6073d584f6accf282fa1eb649185ee42eb22fab70231491c7377d7e8f" do_compile() { } diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb b/external/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.1.bb deleted file mode 100644 index d122bfe3..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb b/external/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb new file mode 100644 index 00000000..29038ac1 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb @@ -0,0 +1,16 @@ +SUMMARY = "A simple text editor for Xfce" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "gtk+3 gtksourceview3 xfconf xfce4-dev-tools-native" + +inherit xfce-app gsettings mime-xdg + +SRC_URI[md5sum] = "98d908842d4a93c35756a67d681c08fe" +SRC_URI[sha256sum] = "84c02adfca7f8b33b9466a306ded72fb9f38f93c9edb78660343854c4a3aded7" + +FILES_${PN} += " \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/polkit-1 \ +" diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch b/external/meta-openembedded/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch new file mode 100644 index 00000000..517de5f9 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch @@ -0,0 +1,77 @@ +From 5bdf11fe3638d279edcad911906f801751e024da Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 23 Jul 2019 14:22:08 -0700 +Subject: [PATCH] drop setting is_utc member of icaltimetype + +This seems to be gone in libical3 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/ical-code.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/src/ical-code.c b/src/ical-code.c +index d583140..d8e5543 100644 +--- a/src/ical-code.c ++++ b/src/ical-code.c +@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_current_local_time() + && (strcmp(g_par.local_timezone, "floating") != 0)) + ctime = icaltime_current_time_with_zone(local_icaltimezone); + else { / * use floating time * / +- ctime.is_utc = 0; + ctime.is_date = 0; + ctime.is_daylight = 0; + ctime.zone = NULL; +@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_alarm_time(xfical_period per + * when counting alarm time. */ + if (rel == ICAL_RELATED_START) { + per.stime.is_date = 0; +- per.stime.is_utc = 1; + per.stime.is_daylight = 0; + per.stime.zone = utc_icaltimezone; + per.stime.hour = 0; +@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_alarm_time(xfical_period per + } + else { + per.etime.is_date = 0; +- per.etime.is_utc = 1; + per.etime.is_daylight = 0; + per.etime.zone = utc_icaltimezone; + per.etime.hour = 0; +@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_alarm_time(struct icaltimetype start_time + /* HACK: convert to UTC time so that we can use time arithmetic + * when counting alarm time. */ + start_time.is_date = 0; +- start_time.is_utc = 1; + start_time.is_daylight = 0; + start_time.zone = utc_icaltimezone; + start_time.hour = 0; +@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigger(icalcomponent *c + */ + if (icaltime_is_date(per.stime)) { + if (local_icaltimezone != utc_icaltimezone) { +- next_alarm_time.is_utc = 0; + next_alarm_time.is_daylight = 0; + next_alarm_time.zone = local_icaltimezone; + } +@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop next_start:%s next_alarm:%s per.stime:%s" + */ + if (icaltime_is_date(per.stime)) { + if (local_icaltimezone != utc_icaltimezone) { +- next_alarm_time.is_utc = 0; + next_alarm_time.is_daylight = 0; + next_alarm_time.zone = local_icaltimezone; + } +@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop Alarm %s %s", icaltime_as_ical_string(ne + */ + if (icaltime_is_date(per.stime)) { + if (local_icaltimezone != utc_icaltimezone) { +- next_alarm_time.is_utc = 0; + next_alarm_time.is_daylight = 0; + next_alarm_time.zone = local_icaltimezone; + } +-- +2.22.0 + diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb b/external/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb index eb9da2df..ae818023 100644 --- a/external/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb +++ b/external/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb @@ -4,7 +4,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" DEPENDS = "gtk+ xfce4-panel libical popt" -inherit xfce-app +inherit xfce-app mime-xdg + +SRC_URI += "file://0001-drop-setting-is_utc-member-of-icaltimetype.patch" SRC_URI[md5sum] = "2b7f5d38cb5c6edbcc65d0f52a742e46" SRC_URI[sha256sum] = "3cf9aa441ae83c8688865f82217025cdf3ebaa152cce4571777b8c2aa8dd9062" diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch b/external/meta-openembedded/meta-xfce/recipes-apps/ristretto/files/0001-Fix-build-after-update-of-xfconf.patch deleted file mode 100644 index 5cdc8c72..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb b/external/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb new file mode 100644 index 00000000..fbca96f6 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Tiny image-viewer" +HOMEPAGE = "https://docs.xfce.org/apps/ristretto/start" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" + +DEPENDS = "exo libexif libxfce4ui libxfce4util xfconf cairo file" + +inherit xfce-app mime-xdg + +RRECOMMENDS_${PN} += "tumbler" + +SRC_URI[md5sum] = "4249e14fba78728481d89ce61a8771fc" +SRC_URI[sha256sum] = "16225dd74245eb6e0f82b9c72c6112f161bb8d8b11f3fc77277b7bc3432d4769" + +FILES_${PN} += "${datadir}/metainfo" diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.3.bb b/external/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.3.bb deleted file mode 100644 index d9b9b2cb..00000000 --- a/external/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.3.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] = "5866b4e11c32a38f72bc737239102544" -SRC_URI[sha256sum] = "8c9c11760816dfd9ed57fb8b9df86c6a98a2604ab551be3133996a1c32ca2665" -SRC_URI += "file://0001-Fix-build-after-update-of-xfconf.patch" - -FILES_${PN} += "${datadir}/appdata" diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/external/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index a27c8f55..64582f28 100644 --- a/external/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/external/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -5,22 +5,29 @@ SECTION = "x11" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "gtk+ glib-2.0 xfce4-dev-tools-native intltool-native" +DEPENDS = "gtk+3 glib-2.0 xfce4-dev-tools-native intltool-native" -SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master" -SRCREV = "5a26dd8ceab0af71b30c83286d7c7398a858c814" -PV = "0.5.3" +SRC_URI = "git://github.com/ib/xarchiver.git" +SRCREV = "9ab958a4023b62b43972c55a3143ff0722bd88a6" +PV = "0.5.4.14" S = "${WORKDIR}/git" -inherit xfce-git gettext pkgconfig autotools gtk-icon-cache distro_features_check +inherit gettext pkgconfig autotools gtk-icon-cache features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" # install tap files for thunar-archive-plugin in ${libdir}/thunar-archive-plugin EXTRA_OECONF += "--libexecdir=${libdir}" -EXTRA_OECONF += "--enable-maintainer-mode" +EXTRA_OECONF += " \ + --enable-maintainer-mode \ + --disable-doc \ +" + +do_configure_prepend() { + touch ${S}/NEWS ${S}/AUTHORS +} FILES_${PN} += "${libdir}/thunar-archive-plugin" -RRECOMMENDS_${PN} = "lzop zip tar bzip2 unzip xz" +RRECOMMENDS_${PN} = "lzop zip tar bzip2 unzip xz p7zip" diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch b/external/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch deleted file mode 100644 index e872249d..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb b/external/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb index 54bf7c75..2ef81f28 100644 --- a/external/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb +++ b/external/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb @@ -4,11 +4,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=758b03f872a88c99fc36d50c5932091c" DEPENDS = "libxfce4ui polkit" -inherit xfce-app +inherit xfce-app features_check +REQUIRED_DISTRO_FEATURES = "polkit" SRC_URI = " \ git://github.com/ncopa/${BPN}.git \ - file://0001-fix-Name-Comment-fields.patch \ " -SRCREV = "6ad1ee833c9e22e4dd72a8f7d54562d046965283" +SRCREV = "6d3282cc1734c305850d48f5bf4b4d94e88885e9" S = "${WORKDIR}/git" diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch new file mode 100644 index 00000000..9cccb892 --- /dev/null +++ b/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb new file mode 100644 index 00000000..2dd3f01d --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb @@ -0,0 +1,22 @@ +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 = "GPLv2" +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 \ + file://fix-inner-dependency.patch \ +" +SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f" + +S = "${WORKDIR}/git" + +inherit gettext meson features_check + +REQUIRED_DISTRO_FEATURES = "systemd x11" + +FILES_${PN} += "${datadir}/icons/hicolor" + +RDEPENDS_${PN} = "tzdata" diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch deleted file mode 100644 index 31216c03..00000000 --- a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/files/0001-Fix-build-after-update-of-xfconf.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 6ecaeced291f935a9d41e9bc33411358c95a5e91 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Mon, 22 Jan 2018 15:35:08 +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> ---- - panel-plugin/Makefile.am | 2 ++ - xfce4-mixer/Makefile.am | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am -index a494682..b094472 100644 ---- a/panel-plugin/Makefile.am -+++ b/panel-plugin/Makefile.am -@@ -27,6 +27,7 @@ libmixer_la_CFLAGS = \ - $(LIBXFCE4UI_CFLAGS) \ - $(LIBXFCE4PANEL_CFLAGS) \ - $(XFCONF_CFLAGS) \ -+ $(DBUS_GLIB_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) \ - $(KEYBINDER_CFLAGS) - -@@ -48,6 +49,7 @@ libmixer_la_LIBADD = \ - $(LIBXFCE4UI_LIBS) \ - $(LIBXFCE4PANEL_LIBS) \ - $(XFCONF_LIBS) \ -+ $(DBUS_GLIB_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-0.10 \ - -lgstinterfaces-0.10 \ -diff --git a/xfce4-mixer/Makefile.am b/xfce4-mixer/Makefile.am -index 4af69e9..e076fc8 100644 ---- a/xfce4-mixer/Makefile.am -+++ b/xfce4-mixer/Makefile.am -@@ -32,6 +32,7 @@ xfce4_mixer_CFLAGS = \ - $(UNIQUE_CFLAGS) \ - $(LIBXFCE4UTIL_CFLAGS) \ - $(LIBXFCE4UI_CFLAGS) \ -+ $(DBUS_GLIB_CFLAGS) \ - $(XFCONF_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) - -@@ -46,6 +47,7 @@ xfce4_mixer_LDFLAGS = \ - $(UNIQUE_LIBS) \ - $(LIBXFCE4UTIL_LIBS) \ - $(LIBXFCE4UI_LIBS) \ -+ $(DBUS_GLIB_LIBS) \ - $(XFCONF_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-0.10 \ --- -2.14.3 - diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb deleted file mode 100644 index 6c057d88..00000000 --- a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "A volume control application based on GStreamer" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit xfce-panel-plugin - -DEPENDS += "glib-2.0 gst-plugins-base gtk+ xfconf libunique" - -SRC_URI = " \ - http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2 \ - file://0001-Fix-build-after-update-of-xfconf.patch \ -" - -SRC_URI[md5sum] = "1b3753b91224867a3a2dfddda239c28d" -SRC_URI[sha256sum] = "fb0c1df201ed1130f54f15b914cbe5a59286e994a137acda5609570c57112de2" - -RDEPENDS_${PN} = "gst-meta-audio" diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.3.bb b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.1.bb index d7719051..aed5ce4d 100644 --- a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.3.bb +++ b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.1.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = " \ dbus \ dbus-glib \ - dbus-glib-native \ libnotify \ libxfce4util \ libxfce4ui \ @@ -15,8 +14,8 @@ DEPENDS = " \ inherit xfce-app -SRC_URI[md5sum] = "4887c62dfcb4c3e4f45c9acfb3def515" -SRC_URI[sha256sum] = "293dda084cfca4887ae740e2725fdfc64412bc10eac7a55a924eb14482dceac0" +SRC_URI[md5sum] = "58e70621d6b9e0e66399ed41ab402a47" +SRC_URI[sha256sum] = "9b5274999c89bf296a7de03b375e8233eef37940b7444502130b92dfb6a089b4" # Avoid trouble with other desktops e.g KDE which also ships dbus service named # org.freedesktop.Notifications diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch new file mode 100644 index 00000000..80cdfb90 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch @@ -0,0 +1,22 @@ +It is useless to create a link to $(PREFIX)/share/locale that there is no +reference to $(PREFIX)/share/$(APPNAME)/locale in source code. + +Upstream-Status: Submitted [https://bugzilla.xfce.org/show_bug.cgi?id=16693] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + Makefile.in.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.in.in b/Makefile.in.in +index c0ce866..c2f26fe 100644 +--- a/Makefile.in.in ++++ b/Makefile.in.in +@@ -61,7 +61,6 @@ install: all xfce4-panel-profiles.1.gz + install data/metainfo/*.xml $(DESTDIR)/$(PREFIX)/share/metainfo + + cp -rf locale $(DESTDIR)/$(PREFIX)/share +- ln -sf $(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale + + install -d $(DESTDIR)/$(PREFIX)/share/man/man1 + install xfce4-panel-profiles.1.gz $(DESTDIR)/$(PREFIX)/share/man/man1 diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.10.bb index 5fa2a7bc..7226b1a0 100644 --- a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb +++ b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.10.bb @@ -3,15 +3,17 @@ SECTION = "x11/application" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -inherit python3native gettext distro_features_check +inherit python3native gettext features_check REQUIRED_DISTRO_FEATURES = "x11" 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 \ + file://not-create-link-to-locale.patch \ + " +SRC_URI[md5sum] = "6190678bc701c197babcb2389ba46182" +SRC_URI[sha256sum] = "a84d5e748d53bc5da269954cc3ad7f5ac0c4f5813acfd3892ea6f9064f17fb68" do_configure() { # special configure - no autotools... diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch new file mode 100644 index 00000000..f726064e --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch @@ -0,0 +1,60 @@ +It adds '-I$includedir' to CPPFLAGS and adds '-L$libdir' to LDFLAGS in +configure.ac which causes 'configure-unsafe' QA error. Don't add them for cross +compile to avoid the QA issues. + +Upstream-Status: Inappropriate [cross compile specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +diff --git a/configure.ac b/configure.ac +index f0ec537..05c393d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -230,9 +230,9 @@ dnl --------------------------------------------------------------------------- + # + AC_DEFUN([AC_CHECK_X_HEADER], [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi ++# if test \! -z "$includedir" ; then ++# CPPFLAGS="$CPPFLAGS -I$includedir" ++# fi + 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], [ + # + AC_DEFUN([AC_TRY_X_COMPILE], [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi ++# if test \! -z "$includedir" ; then ++# CPPFLAGS="$CPPFLAGS -I$includedir" ++# fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_TRY_COMPILE([$1], [$2], [$3], [$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -257,15 +257,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [ + ac_save_LDFLAGS="$LDFLAGS" + # ac_save_LIBS="$LIBS" + +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi ++# if test \! -z "$includedir" ; then ++# CPPFLAGS="$CPPFLAGS -I$includedir" ++# fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + +- if test \! -z "$libdir" ; then +- LDFLAGS="$LDFLAGS -L$libdir" +- fi ++# if test \! -z "$libdir" ; then ++# LDFLAGS="$LDFLAGS -L$libdir" ++# fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $ALL_X_LIBS" + diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch new file mode 100644 index 00000000..94cad23f --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch @@ -0,0 +1,14 @@ +'@include' is not a standard sysntax and not supported by oe. + +Upstream-Status: Submitted [https://bugzilla.xfce.org/show_bug.cgi?id=15626] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- +diff --git a/data/xfce4-screensaver.common-auth b/data/xfce4-screensaver.common-auth +index a9fd9ce..3bfea70 100644 +--- a/data/xfce4-screensaver.common-auth ++++ b/data/xfce4-screensaver.common-auth +@@ -1,2 +1,2 @@ +-@include common-auth ++auth include common-auth + auth optional pam_gnome_keyring.so diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.10.bb b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.10.bb new file mode 100644 index 00000000..62f0640f --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.10.bb @@ -0,0 +1,27 @@ +SUMMARY = "Xfce screensaver Application" +DESCRIPTION = "Xfce screensaver is a screen saver and locker that aims to have simple, sane, secure defaults and be well integrated with the desktop." +HOMEPAGE = "https://git.xfce.org/apps/xfce4-screensaver/about/" +SECTION = "x11/application" + +LICENSE = "GPLv2+ & LGPLv2+ " +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + " + +DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3" + +inherit xfce-app + +SRC_URI_append = " \ + file://fix-cross-compile.patch \ + file://fix-pam-config.patch \ +" +SRC_URI[md5sum] = "1f093cde5af09e9fd9be017774e032ef" +SRC_URI[sha256sum] = "586f1c78dd6745a20e9ce9f12d0117189d597ba7ad0c8ffcfcd25c9bb05f1d57" + +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/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.3.bb b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.7.bb index c6a4cdb9..a0de6300 100644 --- a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.3.bb +++ b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.7.bb @@ -7,8 +7,8 @@ DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup- inherit xfce-app -SRC_URI[md5sum] = "f783eb575e2015f39e1c1aae499b113f" -SRC_URI[sha256sum] = "364ebddc4c9971b4023aa8019d4e3bd08f091b65dc98b218beb55851f69ceda2" +SRC_URI[md5sum] = "9b63c0fa7cbde8ec4e6cacb75fc44b65" +SRC_URI[sha256sum] = "0f7161053a23a6413376f4d17db6b774d4849384a9b1ffe01fdb2b0035a070d1" do_compile_prepend() { mkdir -p lib @@ -16,7 +16,7 @@ do_compile_prepend() { } FILES_${PN} += " \ - ${datadir}/appdata \ + ${datadir}/metainfo \ ${datadir}/xfce4/panel/plugins \ ${libdir}/xfce4/panel/plugins \ " diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.1.bb b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.1.bb deleted file mode 100644 index 8afea1d2..00000000 --- a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.1.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+ cairo libwnck libxmu xfce4-dev-tools-native exo-native" - -SRC_URI[md5sum] = "4a2d0b1e8001fb343139a97d57b56eaa" -SRC_URI[sha256sum] = "22e523e2ee231713f40a48890d8cbae99320ac1173f7c68502f490318e1e0409" diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.3.bb b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.3.bb new file mode 100644 index 00000000..25600948 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.3.bb @@ -0,0 +1,10 @@ +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] = "202928c8ff0678a9df949d22a43f1614" +SRC_URI[sha256sum] = "dcfc44da7c1f61d03e2c4bd1cdc8f92ce0d48b013bd0d140b3745d79b75dc3c4" diff --git a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.9.2.bb index 7fc638e4..ba0f1277 100644 --- a/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb +++ b/external/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.9.2.bb @@ -8,5 +8,7 @@ inherit xfce-app FILES_${PN} += "${datadir}/xfce4 \ ${datadir}/gnome-control-center" -SRC_URI[md5sum] = "c861540dd1dd05f56e62382b3851cf66" -SRC_URI[sha256sum] = "a88f98af4da72394f2cfbd7f14b0f053ec0a3b58a4f6a577836357c60a6c42ab" +SRC_URI[md5sum] = "d0308313def5d7cc51070a6db1cf24dc" +SRC_URI[sha256sum] = "9ba23bf86d350ef8a95d2dfb50bbd1bbb2144d82985a779ec28caf47faaeeeeb" + +RRECOMMENDS_${PN} += "vte-prompt" diff --git a/external/meta-openembedded/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb b/external/meta-openembedded/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb index df0ed50c..5ff48568 100644 --- a/external/meta-openembedded/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb +++ b/external/meta-openembedded/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb @@ -27,5 +27,7 @@ python populate_packages_prepend () { do_split_packages(d, icondir, '^(.*)', '%s', 'Open Zone cursors %s', allow_dirs=True) } +FILES_${PN} += "${datadir}/icons" + PACKAGES_DYNAMIC += "^openzone-.*" ALLOW_EMPTY_${PN} = "1" diff --git a/external/meta-openembedded/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb b/external/meta-openembedded/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb index b05c7485..89dab492 100644 --- a/external/meta-openembedded/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb +++ b/external/meta-openembedded/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb @@ -4,7 +4,7 @@ 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" diff --git a/external/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala/0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch b/external/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala/0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch new file mode 100644 index 00000000..a3a9330e --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala/0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch @@ -0,0 +1,31 @@ +From 35267d995a81263b98f0ad56399ac3e30f9cf152 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Tue, 30 Apr 2019 09:48:08 +0200 +Subject: [PATCH] configure.ac: Detect vala-api version if not set explicitly +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@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 9bf4230..c489385 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,7 +38,7 @@ AC_ARG_WITH([vala-api], + AC_HELP_STRING([--with-vala-api=VERSION], + [Use Vala API version VERSION]), + [vala_api=$withval], +- [vala_api='0.16']) ++ [vala_api=`$PKG_CONFIG --variable=vapidir_versioned vapigen | sed -e 's:.*vala-::' -e s:/vapi::`]) + M8T_CHECK_VALA([$vala_api]) + AC_ARG_WITH([default-vapidir], + AC_HELP_STRING([--with-default-vapidir], +-- +2.20.1 + diff --git a/external/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/external/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb index 97007bec..2f5d820f 100644 --- a/external/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb +++ b/external/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb @@ -3,16 +3,17 @@ LICENSE = "LGPLv2.1" 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" -SRC_URI = "http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" +SRC_URI = " \ + http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2 \ + file://0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch \ +" SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71" SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b" -EXTRA_OECONF = "-with-vala-api=0.42" - FILES_${PN} += "${datadir}/vala-*/vapi" RDEPENDS_${PN} = "vala" diff --git a/external/meta-openembedded/meta-xfce/recipes-connectivity/blueman/blueman_%.bbappend b/external/meta-openembedded/meta-xfce/recipes-connectivity/blueman/blueman_%.bbappend deleted file mode 100644 index c4752237..00000000 --- a/external/meta-openembedded/meta-xfce/recipes-connectivity/blueman/blueman_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG_append = " thunar" diff --git a/external/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb b/external/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb index 21930ba1..8009acdd 100644 --- a/external/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb +++ b/external/meta-openembedded/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 ?= " " diff --git a/external/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb b/external/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb index 8f622bf6..c8f495ed 100644 --- a/external/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb +++ b/external/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb @@ -7,25 +7,27 @@ This package contains the core DBus services and some utilities." HOMEPAGE = "http://code.google.com/p/imsettings/" SECTION = "Applications/System" -inherit autotools gtk-doc gobject-introspection distro_features_check +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -REQUIRED_DISTRO_FEATURES = "x11" +inherit autotools gtk-doc gobject-introspection gettext features_check -SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ - " +DEPENDS = "gtk+3 libnotify" -SRC_URI[md5sum] = "c6c65a2b2654fe9dfe9ab2e8b80c079a" -SRC_URI[sha256sum] = "196d3a74cef254ff812c32682d1818d740e36a68b976fef9e99748d23a71a71a" +REQUIRED_DISTRO_FEATURES = "x11" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" +SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "c04341a008d8c60e1532f033f4020f44" +SRC_URI[sha256sum] = "ebf578299a10c6a1fea9047be6577df6d2b6470d3cc9d40f8a6589a3c13c4c8b" EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \ --disable-static \ " -DEPENDS = "gtk+ gconf libnotify dbus-glib libgxim xfconf intltool-native" +PACKAGECONFIG ??= "xfce" +PACKAGECONFIG[xfce] = ",,xfconf" +PACKAGECONFIG[xim] = ",,libgxim" RDEPENDS_${PN} += "bash" -FILES_${PN} += "${datadir}/dbus-1/* ${datadir}/gir-1.0/* ${libdir}/girepository-1.0/*" +FILES_${PN} += "${datadir}/dbus-1/*" diff --git a/external/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb b/external/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb index a6475cef..a6d335a2 100644 --- a/external/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb +++ b/external/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb @@ -25,7 +25,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit autotools pkgconfig gobject-introspection distro_features_check gtk-doc +inherit autotools pkgconfig gobject-introspection features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11" diff --git a/external/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb b/external/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb index 19a6e2b0..c30c7990 100644 --- a/external/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb +++ b/external/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb @@ -1,6 +1,4 @@ SUMMARY = "All packages multimedia packages available for XFCE" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" inherit packagegroup diff --git a/external/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.1.bb b/external/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.5.bb index 2b4e9749..f55b1945 100644 --- a/external/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.1.bb +++ b/external/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.5.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" +HOMEPAGE = "https://docs.xfce.org/apps/parole/start" LICENSE = "GPLv2" 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,8 +16,8 @@ DEPENDS += " \ taglib \ " -SRC_URI[md5sum] = "46fe86bbe0c4aa02c53244d66e62e90c" -SRC_URI[sha256sum] = "8ad2931fdb35415cc3d7551b5f2207bfaa1aba15545accbacbb4984cdabd7099" +SRC_URI[md5sum] = "74fcde5da018c011e5febd9649817c05" +SRC_URI[sha256sum] = "1adb4bd96c4cc4b4a79eeafe1316e170f506426e3737e8ba8898f7ea6bec572a" RDEPENDS_${PN} += "gstreamer1.0-plugins-good" @@ -31,8 +28,6 @@ PACKAGECONFIG[clutter] = "--enable-clutter, --disable-clutter, clutter" PACKAGECONFIG[notify] = "--enable-notify-plugin, --disable-notify-plugin, libnotify" FILES_${PN} += " \ - ${datadir}/appdata \ + ${datadir}/metainfo \ ${libdir}/parole-0/*.so \ " - -FILES_${PN}-dev += "${libdir}/parole-0/*.la" diff --git a/external/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb b/external/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb index 9f501f79..9d031dd5 100644 --- a/external/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb +++ b/external/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.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 = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=3604d987e6dfdfc672c754d08953b0e0" inherit xfce-panel-plugin @@ -14,5 +14,5 @@ LICENSE_FLAGS = "commercial" # for now we recommend our own mpd-server RRECOMMENDS_${PN} = "mpd" -SRC_URI[md5sum] = "13d5d95ef0c305bac45fde6231258e5d" -SRC_URI[sha256sum] = "f1320916ae3112e6825699652a502cebfa78bb006c649b42d3d331dfe57b6cb0" +SRC_URI[md5sum] = "26a1e8658df2b51967dc2250e23f467d" +SRC_URI[sha256sum] = "eefe78b7b6b95312b3a52814b7f632dc92970c1b3e9535de616315749bf67760" diff --git a/external/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb b/external/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.0.bb index 869435d6..0f5ed895 100644 --- a/external/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb +++ b/external/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.0.bb @@ -1,8 +1,8 @@ SUMMARY = "Music Player Daemon (MPD) client written in GTK+" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfmpc" +HOMEPAGE = "https://goodies.xfce.org/projects/applications/xfmpc" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "gtk+ libxfce4util libxfce4ui libmpd vala-native" +DEPENDS = "libxfce4util libxfce4ui libmpd vala-native" # While this item does not require it, it depends on mpd which does LICENSE_FLAGS = "commercial" @@ -12,5 +12,5 @@ RRECOMMENDS_${PN} = "mpd" inherit xfce-app -SRC_URI[md5sum] = "e2d2faeb7a6f62813e287f3d12522b71" -SRC_URI[sha256sum] = "4189c0c82b66b758a6d5bc651493b675d3d46329e5f1a76ff26c448125f4fcb0" +SRC_URI[md5sum] = "e6ff8563f159d1e727d656fb88964998" +SRC_URI[sha256sum] = "c76e2a88dc3e1d345da7a5c68fa39981494c2b40033748efcac54411c9e65689" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.1.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.1.bb deleted file mode 100644 index af7c65aa..00000000 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.1.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] = "26941c579ebf4143b7e49aa08ee9b30a" -SRC_URI[sha256sum] = "1e94969b93e0c1d6da87364b64c0cdfb40bae5e4a055039be8b67b9e5b3dd44b" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.3.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.3.bb new file mode 100644 index 00000000..ecbdc265 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.3.bb @@ -0,0 +1,9 @@ +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 = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "9f82c7e77de0a417716d68d33367973b" +SRC_URI[sha256sum] = "12be0a44d16bd1e1618513ee64f946814925872db7d1c1188ab1454b00d040a3" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.0.bb index de0d0a06..1216456b 100644 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.0.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=909430f63fddd63f120ba29e8979f65c" inherit xfce-panel-plugin gtk-icon-cache -SRC_URI[md5sum] = "1b956a89693d039a61b4725cefb23a4d" -SRC_URI[sha256sum] = "eb51765580ea4650f9cf062382a820fb6483ee5dbe003aeb6f063929e299f9c2" +SRC_URI[md5sum] = "1ae192a69834ee2f51f34a0a981181f4" +SRC_URI[sha256sum] = "7b50ab947ab058e1c079113e7f0f8b38ef242fec36ec9f31bb4e3c19cb3f9de9" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.3.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.1.bb index a1ac0572..f2a145f5 100644 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.3.bb +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.1.bb @@ -8,8 +8,8 @@ inherit xfce-panel-plugin DEPENDS += "xfconf xorgproto libxtst" -SRC_URI[md5sum] = "fa0acd5f5e3298e56ebd47d2944cd02b" -SRC_URI[sha256sum] = "29cdb85efb54bd5c9c04cc695b7c4914d6dff972b9fd969cbfb5504e9c632ad2" +SRC_URI[md5sum] = "c9306940c0ca7abd838a14c9d19b3a7e" +SRC_URI[sha256sum] = "b3e8317796289196fa78c4526626fe061fd35d11e848cf300ca1ace47febceb4" PACKAGECONFIG ??= "" PACKAGECONFIG[qrencode] = "--enable-libqrencode,--disable-libqrencode,qrencode" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb index 3cd4ee65..8dfb2e62 100644 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb @@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" inherit xfce-panel-plugin xfce-git gtk-icon-cache perlnative -DEPENDS += "exo-native libwnck xfconf" +DEPENDS += "exo-native libwnck3 xfconf" PV = "0.1.0+gitr${SRCPV}" SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master" -SRCREV = "02b74f13ad6f639234c8db1854963038b2780a2c" +SRCREV = "6ed5c3ee1ba7103ca854c5e81fb2c1220b913a40" S = "${WORKDIR}/git" EXTRA_OECONF += "--enable-maintainer-mode" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch new file mode 100644 index 00000000..92a6e838 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch @@ -0,0 +1,121 @@ +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/external/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb index 3f5587d8..6addc3b6 100644 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb @@ -7,3 +7,4 @@ 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/external/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb deleted file mode 100644 index 83e2bb5c..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.1.0.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.1.0.bb new file mode 100644 index 00000000..eeb54b31 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.1.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin with graphical representation of the cpu frequency" +HOMEPAGE = "https://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] = "48ead9dcc019212795637c170d9e2ca2" +SRC_URI[sha256sum] = "3ece0a24e55827e0d9b6314129906da60513acdc1748d9dece9f50526e906ba4" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.0.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.0.bb deleted file mode 100644 index af38ba54..00000000 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.0.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] = "30caaa94c6c267827a31ad69fa472e51" -SRC_URI[sha256sum] = "297f3077f7aee52a237449fbd8595e232267bc600b5b9e7ddc5baab306ed67b9" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.0.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.0.bb new file mode 100644 index 00000000..a1fc139b --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.0.bb @@ -0,0 +1,9 @@ +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 = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "b88e47af4e9e156e43dc993f18218bd3" +SRC_URI[sha256sum] = "cd358bc2ff0707b8ef1504396a19b0a27f802c2ec7bceb5cebe2c7baf6adebd4" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin/0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch b/external/meta-openembedded/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 007d3e58..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb deleted file mode 100644 index dc7f1fcd..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb new file mode 100644 index 00000000..6a72c89a --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.2.bb @@ -0,0 +1,10 @@ +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[md5sum] = "538119ea97a217695b297e2d165b305f" +SRC_URI[sha256sum] = "fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb deleted file mode 100644 index 8b924ac7..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.1.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.1.bb new file mode 100644 index 00000000..183d521a --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.1.bb @@ -0,0 +1,9 @@ +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[md5sum] = "d1e1fda4e80c36741643b1d9eca5c5c1" +SRC_URI[sha256sum] = "d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.1.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.2.bb index 002e93da..3108a776 100644 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.1.bb +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.2.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe" inherit xfce-panel-plugin -SRC_URI[md5sum] = "9dd0681c179302d56d92bbda5765bd09" -SRC_URI[sha256sum] = "4c6ce37fbe71094548b44862587c2813da991aeaaecff8e572724dbbec83ab86" +SRC_URI[md5sum] = "d808fe77a438c95b97ec6feda6162d22" +SRC_URI[sha256sum] = "256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/kbdleds/xfce4-kbdleds-plugin_0.0.6.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/kbdleds/xfce4-kbdleds-plugin_0.0.6.bb deleted file mode 100644 index caf55084..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch b/external/meta-openembedded/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 e3541819..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb deleted file mode 100644 index 35c8861b..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.2.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.2.bb new file mode 100644 index 00000000..13e7b1db --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.2.bb @@ -0,0 +1,10 @@ +SUMMARY = "Panel plugin displaying current load of the network interfaces" +HOMEPAGE = "https://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" +SRC_URI[md5sum] = "ae4652711812a77a58c3dc96650a74dc" +SRC_URI[sha256sum] = "22e40425cfe1e07b01fe275b1afddc7c788af34d9c2c7e2842166963cb41215d" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.7.0.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.7.0.bb deleted file mode 100644 index 16be09dc..00000000 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.7.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -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" -LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "fcae9b38a8affcd82699a94991bba29b" -SRC_URI[sha256sum] = "4175c614749abbb5bcf6f49c88125fb0dd36db69f4c374df23563907b16e2c3f" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb new file mode 100644 index 00000000..c88e8439 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb @@ -0,0 +1,13 @@ +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 = "https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "bde92cbd08f129d517524784e5060816" +SRC_URI[sha256sum] = "f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb index b4237076..f3e4df29 100644 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb @@ -2,14 +2,14 @@ SUMMARY = "Pulseaudio mixer for the xfce panel" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=f5eac6bb0d6ec0dc655e417781d4015f" -inherit xfce-panel-plugin distro_features_check +inherit xfce-panel-plugin features_check REQUIRED_DISTRO_FEATURES = "pulseaudio x11" -DEPENDS += "pulseaudio" +DEPENDS += "dbus-glib pulseaudio" -SRC_URI[md5sum] = "7df7280c19c2c8b8c5bc4f4f2136d1dd" -SRC_URI[sha256sum] = "6ca88314dbac3e24c0e1bfc593fad6edb66319766be62e8256c81b0314f049f0" +SRC_URI[md5sum] = "3d86032acb9364d47e0a144350c63e1a" +SRC_URI[sha256sum] = "5a518237e2137341d8ca6584938950525e20c28a0177e30ecaea3ba8e7a2615b" PACKAGECONFIG ??= "" PACKAGECONFIG[libnotify] = "--enable-libnotify,--disable-libnotify,libnotify" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch b/external/meta-openembedded/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 00000000..ac1d603b --- /dev/null +++ b/external/meta-openembedded/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 +@@ -209,19 +209,9 @@ dnl Check for interface for /sys/class/power_supply to be used + AC_ARG_ENABLE([sysfsacpi], [AC_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/external/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb index 4d78bb2b..3fd0ff6c 100644 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb @@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" inherit xfce-panel-plugin -SRC_URI[md5sum] = "0c74c3112c5e6e07647c116cd43ff5a7" -SRC_URI[sha256sum] = "7524ec4534de9ef7f676de2895a41bf70b73b94da5a27fd4a022b16eda56d0f4" +SRC_URI[md5sum] = "7327c4c316ebd5d93665e77b432b8d89" +SRC_URI[sha256sum] = "3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112" +SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" EXTRA_OECONF = " \ --disable-procacpi \ - --disable-sysfsacpi \ --disable-xnvctrl \ " @@ -18,7 +18,6 @@ do_configure_prepend() { sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac } -PACKAGECONFIG ??= "libsensors" PACKAGECONFIG[libsensors] = "--enable-libsensors,--disable-libsensors, lmsensors" PACKAGECONFIG[hddtemp] = "--enable-hddtemp,--disable-hddtemp, hddtemp" PACKAGECONFIG[netcat] = "--enable-netcat,--disable-netcat, netcat" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb deleted file mode 100644 index 6289ad31..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.1.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.1.bb new file mode 100644 index 00000000..fa2c474d --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.1.bb @@ -0,0 +1,9 @@ +SUMMARY = "Panel plugin allowing to send requests directly to browser" +HOMEPAGE = "https://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] = "f1c97ac62dd9054e8f2b01568fef3ba6" +SRC_URI[sha256sum] = "3e28fb7cd2e2251e89a8715684081b862406e3fb4e6d8c0caa1b798a97703600" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.1.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.3.bb index eeb45186..88d40c49 100644 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.1.bb +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.3.bb @@ -1,5 +1,5 @@ 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" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=9acb172a93ff6c43cce2aff790a8aef8" @@ -7,5 +7,5 @@ inherit xfce-panel-plugin DEPENDS += "upower" -SRC_URI[md5sum] = "550277af9886c47005117110f6e7ec0d" -SRC_URI[sha256sum] = "2bf7d0802534a1eb2e9f251af2bb97abc3f58608c1f01511d302c06111d34812" +SRC_URI[md5sum] = "5d75865be699d0b3d36a5fc17ed02d44" +SRC_URI[sha256sum] = "052407c575203da4de2db6f4a5e997220d95ec655d393dc3875a0d5a20520775" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.2.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.2.bb deleted file mode 100644 index facbb0d8..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb new file mode 100644 index 00000000..c3de5964 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb @@ -0,0 +1,10 @@ +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 = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "afa0ef865a49f28165098d3fe625df44" +SRC_URI[sha256sum] = "ee4a51a35076d50cba3824079f8312585373ff2f0d9ebc740d8f3c0426430a19" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_1.1.0.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.0.bb index 57951608..36e04a43 100644 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_1.1.0.bb +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.0.bb @@ -5,7 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin -DEPENDS += "dbus-glib-native" - -SRC_URI[md5sum] = "ddd0190ae56f6117dbcf9ff2bf5a8cbf" -SRC_URI[sha256sum] = "a3196f818c7ad57d19cd6581e168fd2b9f96de070246aea70c35ce2e5f9d9c84" +SRC_URI[md5sum] = "94429b1be9d66ba9b31e4aafb726a8c7" +SRC_URI[sha256sum] = "9e6510ba6c48fcfc60d1c6ab14613dd7b6ff095cabbf4746f82bf788d8ab4cd2" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb deleted file mode 100644 index 0c94f3c4..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb new file mode 100644 index 00000000..95c1fe4d --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.1.bb @@ -0,0 +1,9 @@ +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[md5sum] = "e4e3d5240297253d242464e77f6145df" +SRC_URI[sha256sum] = "f41f81ea063ae3c7d7904e1ee647a6b5efafc7436f47caed662ee417038eed17" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.9.0.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb index 1663bb9a..ad9b6e9e 100644 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.9.0.bb +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.10.1.bb @@ -7,7 +7,7 @@ inherit xfce-panel-plugin DEPENDS += "libsoup-2.4 dbus-glib upower" -SRC_URI[md5sum] = "25d3d9fb2e688a619201655f6eea51c2" -SRC_URI[sha256sum] = "34368cf2332774ad2a05226b2914ecb60e7550e9b2164be53ebe8f370198bb3d" +SRC_URI[md5sum] = "203ad16e74d4823f6fb6e9a18bb7df55" +SRC_URI[sha256sum] = "afb2af5f3effc2ea6181636ed0e82e6dafd556ec1b8478100802f85a5d167a89" FILES_${PN} += "${datadir}/xfce4/weather" diff --git a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.0.bb b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.4.bb index 24a32fc0..958ee644 100644 --- a/external/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.3.0.bb +++ b/external/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.4.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "d2383c3eb1b54adf5a206973bd20f159" -SRC_URI[sha256sum] = "7e569bb0dff7e3db3d964e23323f54c6de7249741c6a0e33a0fa501d83040b16" +SRC_URI[md5sum] = "7f6faf5ae5ca276d073798a3ff8b0e5b" +SRC_URI[sha256sum] = "624acf6d46484bb35608a76424579571423e2aefa6579f6e444f5cfb5342ff9a" RRECOMMENDS_${PN} += "menulibre" diff --git a/external/meta-openembedded/meta-xfce/recipes-support/vim/vim_%.bbappend b/external/meta-openembedded/meta-xfce/recipes-support/vim/vim_%.bbappend deleted file mode 100644 index 7b449630..00000000 --- a/external/meta-openembedded/meta-xfce/recipes-support/vim/vim_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${BPN}_xfce.inc', '', d)} diff --git a/external/meta-openembedded/meta-xfce/recipes-support/vim/vim_xfce.inc b/external/meta-openembedded/meta-xfce/recipes-support/vim/vim_xfce.inc deleted file mode 100644 index 25403e6c..00000000 --- a/external/meta-openembedded/meta-xfce/recipes-support/vim/vim_xfce.inc +++ /dev/null @@ -1,6 +0,0 @@ -do_install_append() { - # The mouse being autoenabled is just annoying in xfce4-terminal (mouse - # drag make vim go into visual mode and there is no right click menu), - # delete the block. - sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc -} diff --git a/external/meta-openembedded/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.0.bb b/external/meta-openembedded/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb index 994c6528..75ae03a1 100644 --- a/external/meta-openembedded/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.0.bb +++ b/external/meta-openembedded/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb @@ -2,10 +2,10 @@ SUMMARY = "Quickly share a folder using Samba from Thunar" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -inherit thunar-plugin distro_features_check +inherit thunar-plugin features_check REQUIRED_DISTRO_FEATURES = "pam" -SRC_URI[md5sum] = "a1773168c0b3c7c0f253a339f02e5ae2" -SRC_URI[sha256sum] = "d6adc01ca45a3d2567a2a969a3b16d1799a8975453ab1803a065fa82496b5b65" +SRC_URI[md5sum] = "0884855d60cf1031b9013b6f5b125372" +SRC_URI[sha256sum] = "dc1d8c7caa727e76d033d4653dc0742613f57a1711d0050900659c90a84452a0" RDEPENDS_${PN} += "samba-server" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/external/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch index 07647758..8c950299 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch @@ -1,6 +1,6 @@ From e710d8d4a3e3480416826c70d56ea3d2598a77e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Thu, 28 Mar 2013 23:41:03 +0100 +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 @@ -16,11 +16,11 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- Makefile.am | 10 +--------- - configure.ac | 22 ---------------------- - 2 files changed, 1 insertion(+), 31 deletions(-) + configure.ac | 20 -------------------- + 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 62ad18d..bdc5fae 100644 +index 62ad18d..8934f1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,15 +1,7 @@ @@ -41,10 +41,10 @@ index 62ad18d..bdc5fae 100644 distclean-local: rm -rf *.cache *~ diff --git a/configure.ac b/configure.ac -index 3f92d1b..0d4cc38 100644 +index 4e4eb5e..237184c 100644 --- a/configure.ac +++ b/configure.ac -@@ -116,15 +116,6 @@ AC_PROG_CC() +@@ -120,15 +120,6 @@ AC_PROG_CC() AM_PROG_CC_C_O() AC_PROG_INSTALL() IT_PROG_INTLTOOL([intltool_minimum_version], [no-xml]) @@ -60,26 +60,31 @@ index 3f92d1b..0d4cc38 100644 dnl *************************************** dnl *** Check for standard header files *** -@@ -171,19 +162,6 @@ dnl *********************************** +@@ -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([GTK], [gtk+-2.0], [2.24.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([LIBXFCE4UI], [libxfce4ui-1], [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.14.3 +2.20.1 diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.3.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.11.bb index 9c4829bb..4a5a7720 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.3.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.11.bb @@ -1,11 +1,11 @@ -DESCRIPTION="Application library for the Xfce desktop environment" +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 = "gtk+3 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 +inherit xfce perlnative gtk-doc features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" REQUIRED_DISTRO_FEATURES_class-native = "" @@ -20,15 +20,20 @@ SRC_URI_append_class-native = " \ file://reduce-build-to-exo-csource-only.patch \ " -SRC_URI[md5sum] = "da934c5939f2ee4540f5d48991053f01" -SRC_URI[sha256sum] = "b96fe86bb504aa9b3332b96105d755f5d9052c903fd6574b512a5ef76c0ad439" +SRC_URI[md5sum] = "efeb039d64b3257e39a1a38e75eb19b1" +SRC_URI[sha256sum] = "ec892519c08a67f3e0a1f0f8d43446e26871183e5aa6be7f82e214f388d1e5b6" + +PACKAGECONFIG ??= "" +PACKAGECONFIG_class-target ??= "gtk" +PACKAGECONFIG[gtk] = "--enable-gtk2,--disable-gtk2,gtk+" 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-1 \ +FILES_${PN} += " \ + ${datadir}/xfce4/ \ + ${libdir}/xfce4/exo* \ " FILES_exo-csource += "${bindir}/exo-csource" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.6.1.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.6.4.bb index 06e23697..75997de7 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.6.1.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.6.4.bb @@ -1,16 +1,16 @@ -DESCRIPTION="Xfce Menu Library" +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" +DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" -inherit xfce gtk-doc distro_features_check +inherit xfce gtk-doc features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" -SRC_URI[md5sum] = "174690ad19243f7ef9529cb0c24b9080" -SRC_URI[sha256sum] = "41c31ba0498c2cc39de4a8e0c2367510adbf4bc2104c17feee358e51e6acf603" +SRC_URI[md5sum] = "9715aa8214be9c553d9b8c44fde90b9f" +SRC_URI[sha256sum] = "d75e4753037a74733c07b71b8db7a656d869869f0f107f6411a306bbc87a762d" EXTRA_OECONF = "--disable-gtk-doc" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch b/external/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch deleted file mode 100644 index fb891020..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb deleted file mode 100644 index 805e893f..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb index 8a385bae..348b685b 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.14.1.bb @@ -2,22 +2,22 @@ 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" +DEPENDS = "intltool-native perl-native gtk+ gtk+3 libice libsm libxfce4util xfce4-dev-tools xfconf virtual/libx11" -inherit xfce autotools gettext gtk-doc gobject-introspection distro_features_check +inherit xfce gtk-doc gobject-introspection 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" +SRC_URI[md5sum] = "50eae4bab5eeced186bce16fb5f802ac" +SRC_URI[sha256sum] = "c449075eaeae4d1138d22eeed3d2ad7032b87fb8878eada9b770325bed87f2da" 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" @@ -25,8 +25,10 @@ FILES_${PN}-gtk2 += "${libdir}/libxfce4ui-1.so.* ${libdir}/libxfce4kbd-private-2 FILES_${PN}-gtk3 += "${libdir}/libxfce4ui-2.so.* ${libdir}/libxfce4kbd-private-3.so.*" PACKAGES += "${PN}-glade" -FILES_${PN}-glade = "${libdir}/glade3 \ - ${datadir}/glade3" +FILES_${PN}-glade = " \ + ${libdir}/glade \ + ${datadir}/glade \ +" RDEPENDS_${PN}-gtk2 = "${PN}" RDEPENDS_${PN}-gtk3 = "${PN}" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.13.2.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.14.0.bb index 21cc1dbf..1bb5007f 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.13.2.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.14.0.bb @@ -6,5 +6,5 @@ DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" inherit xfce gtk-doc gobject-introspection -SRC_URI[md5sum] = "e3e8b9dd7e12028d3e642345b85d6ef1" -SRC_URI[sha256sum] = "c58275ff650080369e742695862c811cb78402c85f243ea0b5aec186027be361" +SRC_URI[md5sum] = "46f44e36acc3abf1a5ba814c22a773cb" +SRC_URI[sha256sum] = "32ad79b7992ec3fd863e8ff2f03eebda8740363ef9d7d910a35963ac1c1a6324" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb index 140de416..70ef909e 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb @@ -1,10 +1,8 @@ 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 +inherit packagegroup features_check REQUIRED_DISTRO_FEATURES = "x11" @@ -15,7 +13,6 @@ RDEPENDS_${PN} = " \ xfdesktop \ xfce4-panel \ \ - gtk-xfce-engine \ librsvg-gtk \ \ xfce4-panel-plugin-actions \ diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index 5f8c03cc..255d2b5e 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -1,11 +1,9 @@ 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" @@ -47,7 +45,6 @@ RRECOMMENDS_${PN} = " \ 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)} \ @@ -55,16 +52,16 @@ RRECOMMENDS_${PN} = " \ xfce4-calculator-plugin \ xfce4-verve-plugin \ \ - xfce-polkit \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','xfce-polkit','',d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "blueman", "", d)} \ \ thunar-media-tags-plugin \ thunar-archive-plugin \ \ xfce4-appfinder \ + xfce4-screensaver \ xfce4-screenshooter \ xfce4-power-manager \ - xfce4-mixer \ ristretto \ xfce4-taskmanager \ gigolo \ diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.0.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.5.bb index 5a37b69b..d499e22e 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.0.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.5.bb @@ -2,14 +2,14 @@ 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" +DEPENDS = "exo libnotify libgudev" -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "3b403a4f846927391ea4bee765a055df" -SRC_URI[sha256sum] = "e4bffcfee15530e277fa80865eb1de31e63c7effaf8835c9fa7c71e5a0076b2e" +SRC_URI[md5sum] = "f9ef39ed4bbff05eb74058dfff24dd84" +SRC_URI[sha256sum] = "7ea7c6693334f2248cf399586af8974dfb7db9aad685ee31ac100e62e19a1837" PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.2.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.15.bb index d2a0e30c..b1f1c967 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.2.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.8.15.bb @@ -2,17 +2,14 @@ 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" +DEPENDS = "exo gdk-pixbuf libxfce4ui libsm startup-notification libnotify xfce4-panel udev" -inherit xfce gobject-introspection distro_features_check +inherit xfce gobject-introspection features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2" -SRC_URI[md5sum] = "51a0988625a7e2c944377e75d3effc71" -SRC_URI[sha256sum] = "75f91045541eb5983e772a564d97f23e5995256bfb9863e0f4a015393421d428" - -S = "${WORKDIR}/Thunar-${PV}/" +SRC_URI[md5sum] = "303010f4959fa23f7c13c0ccd9b8527e" +SRC_URI[sha256sum] = "7624560cf21f13869804947042610aab22075146b711593f11ceb9e494277c93" PACKAGECONFIG ??= "" PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch b/external/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch deleted file mode 100644 index 5ecc35e3..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.8.bb index 9d266947..e0d4845a 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.8.bb @@ -1,14 +1,13 @@ -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" 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" inherit xfce gtk-doc -SRC_URI[md5sum] = "dd5f9bae6a2470eb5fff0dc9edd3ea09" -SRC_URI[sha256sum] = "4e27a59694b0a5cc69ebccbdb00c724e670b5b7c30bc4dc0b461aac93f234fac" -SRC_URI += "file://0001-configure-use-pkg-config-for-freetype2.patch" +SRC_URI[md5sum] = "5d541608b3962fd2b16e23a266fd7a10" +SRC_URI[sha256sum] = "0999b9a3deb57010956db6630ae7205813999147043171049a7b6c333be93e96" INSANE_SKIP_${PN} = "dev-so" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.1.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.1.bb deleted file mode 100644 index 0336f54b..00000000 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.1.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] = "9e2a1f9b4ae3183c461b79891224c33f" -SRC_URI[sha256sum] = "5cabb27bbe0a0864b785e1a38535a91516763e38d6bff41a3915a61d28254b03" - -FILES_${PN} += "${datadir}/appdata" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.14.0.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.14.0.bb new file mode 100644 index 00000000..e4f35b0f --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.14.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Xfce4 Application Finder" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "glib-2.0 gtk+3 libxfce4util libxfce4ui garcon xfconf" + +inherit xfce features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[md5sum] = "03b226a2ee20f95243e74d1868e94e0e" +SRC_URI[sha256sum] = "7ec175d4954fceb2e76cbfbca76ac4a4f53fe799d097a14117e7de68e88a4d98" + +FILES_${PN} += "${datadir}/metainfo" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.12.0.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.14.0.bb index 5557f6df..0b119661 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.12.0.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.14.0.bb @@ -10,8 +10,8 @@ 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" +SRC_URI[md5sum] = "5f8fc8af73819c08d9e4c26a3ac457e7" +SRC_URI[sha256sum] = "2c9eb8e0fe23e47dc31411a93b683fd1b7a49140e9163f0aab9e94a3d8a0b5fd" do_install_append() { install -d ${D}${datadir}/aclocal diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch new file mode 100644 index 00000000..b06e26e9 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch @@ -0,0 +1,49 @@ +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> +--- + 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 474798e..63eb41d 100644 +--- a/plugins/actions/actions.c ++++ b/plugins/actions/actions.c +@@ -905,12 +905,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) +@@ -1027,9 +1027,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/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.3.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.4.bb index f1abf667..73cb82a1 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.3.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.4.bb @@ -2,16 +2,17 @@ SUMMARY = "Xfce4 Panel" SECTION = "x11" LICENSE = "GPLv2" 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 remove-libtool mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "0ccb448e3792949eb0ae9db8dc22789b" -SRC_URI[sha256sum] = "b467feb7ee9797ad12f56a152570e42a96b94ad63580d45536aabee282440ce8" +SRC_URI[md5sum] = "76efdbf7fb461f3058919c1309da67ca" +SRC_URI[sha256sum] = "8e5ea79412ba84cfada897ff309cbe2cd4aca16b9bd4f93df060229528576fd5" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ + file://0002-use-lxdm-to-replace-dm-tool.patch \ " python populate_packages_prepend() { diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.6.bb index ed117b0a..608990ad 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.6.bb @@ -5,29 +5,28 @@ SECTION = "x11" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -inherit xfce distro_features_check +inherit xfce 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" +DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" -SRC_URI[md5sum] = "17f0e6464ad6b3bc6a657f595bf91430" -SRC_URI[sha256sum] = "1ea825452343b895566068018b6d5078608f8f46ce8075ba6bbb4b848f48656b" +SRC_URI[md5sum] = "19873fc8a6de5e37ed57036a0002a5ce" +SRC_URI[sha256sum] = "1b7bf0d3e8af69b10f7b6a518451e01fc7888e0d9d360bc33f6c89179bb6080b" EXTRA_OECONF = " \ --enable-network-manager \ --enable-panel-plugins \ " -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--enable-polkit, --disable-polkit, polkit" +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 \ + ${datadir}/metainfo \ " FILES_xfce4-powermanager-plugin = " \ diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb deleted file mode 100644 index c7919744..00000000 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Meta package adding machine name to known hosts" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -ALLOW_EMPTY_${PN} = "1" - -LOCALHOSTMACHINE = "127.0.0.1 ${MACHINE}" - -# on some machines starting applications as xfce4-terminal take ages without -# machine name in hosts -pkg_postinst_${PN} () { -if ! grep -q '${LOCALHOSTMACHINE}' $D/etc/hosts ; then - echo '${LOCALHOSTMACHINE}' >> $D/etc/hosts -fi -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.14.2.bb index b11aaa4f..f497b766 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.14.2.bb @@ -2,18 +2,21 @@ 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 +DEPENDS = "libwnck3 libsm libxfce4ui virtual/libx11" + +inherit xfce update-alternatives features_check REQUIRED_DISTRO_FEATURES = "x11" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" +PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" + SRC_URI += " \ file://0001-configure.in-hard-code-path-to-iceauth.patch \ " -SRC_URI[md5sum] = "a47988a2c871a411c19e3af1eefe591e" -SRC_URI[sha256sum] = "c789f0f8234e06f5266f0c6ccdbdcc3c085e8d9eea06a0eafe8f7cfc4fe23af4" +SRC_URI[md5sum] = "5ad23062fd08ef5f5ad9b4389c7b54c6" +SRC_URI[sha256sum] = "fbe3a4a60c91589a2024ce12b2d2667625a8fedcbc90ef031831f56319f597af" ALTERNATIVE_${PN} = "x-session-manager" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" @@ -27,8 +30,11 @@ FILES_${PN} += " \ ${datadir}/polkit-1 \ " -FILES_${PN} += " \ - ${libdir}/xfce4/session/splash-engines/*.la \ +RDEPENDS_${PN} = " \ + dbus-x11 \ + iceauth \ + netbase \ + upower \ + xinit \ + xrdb \ " - -RDEPENDS_${PN} += "machine-host" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch index 67df05a7..0463d2eb 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch @@ -9,6 +9,14 @@ Content-Transfer-Encoding: 8bit Upstram 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(-) @@ -23,7 +31,7 @@ index 65ba1ee..9efb3cd 100644 <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/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch deleted file mode 100644 index 109b7b14..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.3.bb index a4685aed..08c612aa 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.3.bb @@ -2,32 +2,23 @@ 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" +DEPENDS = "exo exo-native garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" -inherit xfce xfce-git distro_features_check +inherit xfce 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 \ +SRC_URI += " \ 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}" +SRC_URI[md5sum] = "fe8f7d4221be1467b85c8539344c3f07" +SRC_URI[sha256sum] = "cab1a4d5351f9871533700523570f86f92bbe6e4055f44e5df950eb4b4f48bb3" 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" @@ -39,3 +30,4 @@ FILES_${PN} += " \ 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/external/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.14.3.bb index 2667ff94..792f8b16 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.14.3.bb @@ -2,17 +2,19 @@ SUMMARY = "Xfce configuration daemon and utilities" SECTION = "x11/wm" LICENSE = "GPLv2" 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 EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" -SRC_URI[md5sum] = "da19df12dbc494c8a4da3974e376d639" -SRC_URI[sha256sum] = "d1a3d442dae188b5a7380b5815377e5488578cdafb03ae363e9426e3b01185df" +SRC_URI[md5sum] = "25c32ed08a43e81f7900c03601dffc02" +SRC_URI[sha256sum] = "589052a0efc6151c5fb5f438da463502a4fd91848cae7b9376d417be4c5a0c02" 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" + +PACKAGECONFIG[gsettings-backend] = "--enable-gsettings-backend,--disable-gsettings-backend," diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.2.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.14.2.bb index 85696a19..a512a62f 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.2.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.14.2.bb @@ -2,14 +2,14 @@ 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" +DEPENDS = "libxfce4ui libwnck thunar garcon exo" -inherit xfce distro_features_check +inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "c05569c1c39ccd314fb5da20d5086909" -SRC_URI[sha256sum] = "387f43d8a4615f44060c019cad212ac12df62c58eea2605813743116f71ad3bd" +SRC_URI[md5sum] = "5db09df39b0808f25bd3a3128f8c9e77" +SRC_URI[sha256sum] = "a30534461fea907f969f608a11c84be0b1aaad687c591c32cd56a9d274ea3e74" PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch b/external/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch new file mode 100644 index 00000000..04fd623e --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch @@ -0,0 +1,92 @@ +From acdceb0b28d86199b8c2233880fa8a04cb24d4d4 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 24 Jul 2019 09:48:04 +0800 +Subject: [PATCH] Revert "compositor: Revert to GLX as default vblank method + (again)" + +This reverts commit e07574d6e7a2dbaa08c3ba4765c6306073d9493e. + +It sets the default vblank method (auto) to GLX from 4.13.2. But it +fails to start xfwm4 on intel-x86-64 boards with error: + +| xfwm4: ../mesa-19.1.1/src/mesa/drivers/dri/i965/intel_mipmap_tree.c:1293: +| intel_miptree_match_image: Assertion `image->TexObject->Target == mt->target' failed. +| Aborted + +There is also a RHEL defect: +https://bugzilla.redhat.com/show_bug.cgi?id=1678334 + +Revert the commit to fix the issue. + +Upstream-Status: Inappropriate [workaround] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + src/compositor.c | 41 +++++++++++++++++++---------------------- + 1 file changed, 19 insertions(+), 22 deletions(-) + +diff --git a/src/compositor.c b/src/compositor.c +index 25615282..daced607 100644 +--- a/src/compositor.c ++++ b/src/compositor.c +@@ -4483,13 +4483,28 @@ compositorManageScreen (ScreenInfo *screen_info) + XClearArea (display_info->dpy, screen_info->output, 0, 0, 0, 0, TRUE); + TRACE ("manual compositing enabled"); + ++#ifdef HAVE_PRESENT_EXTENSION ++ screen_info->use_present = display_info->have_present && ++ (screen_info->vblank_mode == VBLANK_AUTO || ++ screen_info->vblank_mode == VBLANK_XPRESENT); ++ if (screen_info->use_present) ++ { ++ screen_info->present_pending = FALSE; ++ XPresentSelectInput (display_info->dpy, ++ screen_info->output, ++ PresentCompleteNotifyMask); ++ } ++#else /* HAVE_PRESENT_EXTENSION */ ++ screen_info->use_present = FALSE; ++#endif /* HAVE_PRESENT_EXTENSION */ ++ + #ifdef HAVE_EPOXY +- screen_info->use_glx = (screen_info->vblank_mode == VBLANK_AUTO || +- screen_info->vblank_mode == VBLANK_GLX); ++ screen_info->use_glx = !screen_info->use_present && + #ifdef HAVE_XSYNC +- screen_info->use_glx &= display_info->have_xsync; ++ display_info->have_xsync && + #endif /* HAVE_XSYNC */ +- ++ (screen_info->vblank_mode == VBLANK_AUTO || ++ screen_info->vblank_mode == VBLANK_GLX); + if (screen_info->use_glx) + { + screen_info->glx_context = None; +@@ -4503,24 +4518,6 @@ compositorManageScreen (ScreenInfo *screen_info) + screen_info->use_glx = FALSE; + #endif /* HAVE_EPOXY */ + +-#ifdef HAVE_PRESENT_EXTENSION +- screen_info->use_present = display_info->have_present && +-#ifdef HAVE_EPOXY +- !screen_info->use_glx && +-#endif /* HAVE_EPOXY */ +- (screen_info->vblank_mode == VBLANK_AUTO || +- screen_info->vblank_mode == VBLANK_XPRESENT); +- if (screen_info->use_present) +- { +- screen_info->present_pending = FALSE; +- XPresentSelectInput (display_info->dpy, +- screen_info->output, +- PresentCompleteNotifyMask); +- } +-#else /* HAVE_PRESENT_EXTENSION */ +- screen_info->use_present = FALSE; +-#endif /* HAVE_PRESENT_EXTENSION */ +- + if (screen_info->use_present) + { + g_info ("Compositor using XPresent for vsync"); +-- +2.20.1 + diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.1.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb index 64ad9f64..b6066a52 100644 --- a/external/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.1.bb +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb @@ -1,15 +1,16 @@ -DESCRIPTION="Xfce4 Window Manager" +DESCRIPTION = "Xfce4 Window Manager" SECTION = "x11/wm" LICENSE = "GPLv2" 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 exo-native" -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 += "file://0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch" +SRC_URI[md5sum] = "6d61d07b6ea88a429c43e1b9c3293eb8" +SRC_URI[sha256sum] = "b15b40342596a3b6ab5167a58371262adf5484e165cb25a31fef42f0aa8ffd92" PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ |