diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-01 18:27:11 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-13 05:51:39 +0300 |
commit | 6e60e8b2b2bab889379b380a28a167a0edd9d1d3 (patch) | |
tree | f12f54d5ba8e74e67e5fad3651a1e125bb8f4191 /import-layers/meta-openembedded/meta-xfce | |
parent | 509842add85b53e13164c1569a1fd43d5b8d91c5 (diff) | |
download | openbmc-6e60e8b2b2bab889379b380a28a167a0edd9d1d3.tar.xz |
Yocto 2.3
Move OpenBMC to Yocto 2.3(pyro).
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I50744030e771f4850afc2a93a10d3507e76d36bc
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Resolves: openbmc/openbmc#2461
Diffstat (limited to 'import-layers/meta-openembedded/meta-xfce')
59 files changed, 587 insertions, 846 deletions
diff --git a/import-layers/meta-openembedded/meta-xfce/README b/import-layers/meta-openembedded/meta-xfce/README index 5291c82f2a..a8e21a9b02 100644 --- a/import-layers/meta-openembedded/meta-xfce/README +++ b/import-layers/meta-openembedded/meta-xfce/README @@ -1,11 +1,11 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: morty +branch: pyro revision: HEAD URI: git://github.com/openembedded/meta-oe.git -branch: morty +branch: pyro revision: HEAD meta-xfce depends on meta-oe, meta-gnome and meta-multimedia in this repository. @@ -14,10 +14,10 @@ this to local.conf: BBMASK = "meta-xfce/recipes-multimedia" -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce][pyro]' 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][morty][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-xfce][pyro][PATCH' -morty branch maintainer(s): +pyro Branch Maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0001-add_launcher-Exit-early-if-no-row-is-selected.patch b/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0001-add_launcher-Exit-early-if-no-row-is-selected.patch new file mode 100644 index 0000000000..fb2dfc90af --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0001-add_launcher-Exit-early-if-no-row-is-selected.patch @@ -0,0 +1,37 @@ +From 1060e7ac8a63b93d56006718f0e9b1d9382b2226 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Mon, 31 Oct 2016 08:33:16 +0100 +Subject: [PATCH] add_launcher: Exit early if no row is selected +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Stolen from [1] + +[1] http://pkgs.fedoraproject.org/cgit/rpms/menulibre.git/tree/menulibre-add-launcher-none-check.patch + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + menulibre/MenulibreApplication.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/menulibre/MenulibreApplication.py b/menulibre/MenulibreApplication.py +index e234800..ac73b03 100644 +--- a/menulibre/MenulibreApplication.py ++++ b/menulibre/MenulibreApplication.py +@@ -1418,6 +1418,10 @@ class MenulibreWindow(Gtk.ApplicationWindow): + model, parent_data = self.treeview.get_parent_row_data() + model, row_data = self.treeview.get_selected_row_data() + ++ # Exit early if no row is selected ++ if not row_data: ++ return ++ + # Currently selected item is a directory, take its categories. + if row_data[2] == MenuItemTypes.DIRECTORY: + self.treeview.add_child(new_row_data) +-- +2.5.5 + diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0002-setup.py-avoid-usr-share-share-paths.patch b/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0002-setup.py-avoid-usr-share-share-paths.patch new file mode 100644 index 0000000000..b63d4dc3bb --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0002-setup.py-avoid-usr-share-share-paths.patch @@ -0,0 +1,40 @@ +From 99788b4557543c490493ce1b827538c49142c25d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Mon, 31 Oct 2016 09:08:51 +0100 +Subject: [PATCH] setup.py: avoid /usr/share/share paths +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 5fc237d..c4fbf7c 100644 +--- a/setup.py ++++ b/setup.py +@@ -143,7 +143,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto): + + if self.root: + target_data = os.path.relpath(self.install_data, self.root) + os.sep +- target_pkgdata = os.path.join(target_data, 'share', 'menulibre', '') ++ target_pkgdata = os.path.join(target_data, 'menulibre', '') + target_scripts = os.path.join(self.install_scripts, '') + + data_dir = os.path.join(self.prefix, 'share', 'menulibre', '') +@@ -152,7 +152,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto): + # --user install + self.root = '' + target_data = os.path.relpath(self.install_data) + os.sep +- target_pkgdata = os.path.join(target_data, 'share', 'menulibre', '') ++ target_pkgdata = os.path.join(target_data, 'menulibre', '') + target_scripts = os.path.join(self.install_scripts, '') + + # Use absolute paths +-- +2.5.5 + diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0003-MenulibreXdg.py-fix-loading-of-desktop-files.patch b/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0003-MenulibreXdg.py-fix-loading-of-desktop-files.patch new file mode 100644 index 0000000000..1e92088e18 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0003-MenulibreXdg.py-fix-loading-of-desktop-files.patch @@ -0,0 +1,36 @@ +From 90098d835b62b38ac396d55b80a684770dbaacde Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Mon, 31 Oct 2016 15:50:52 +0100 +Subject: [PATCH] MenulibreXdg.py: fix loading of desktop files +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +fixes: +| UnicodeDecodeError: 'ascii' codec can't decode byet 0xd9 in position 235: ordinal not in range(128) + +and information display not properly filled. + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + menulibre/MenulibreXdg.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/menulibre/MenulibreXdg.py b/menulibre/MenulibreXdg.py +index e04c5e6..14b2593 100644 +--- a/menulibre/MenulibreXdg.py ++++ b/menulibre/MenulibreXdg.py +@@ -74,7 +74,7 @@ class MenulibreDesktopEntry: + + def load_properties(self, filename): + """Load the properties.""" +- input_file = open(filename) ++ input_file = open(filename, 'rt', encoding='utf-8') + self.load_properties_from_text(input_file.read()) + input_file.close() + +-- +2.5.5 + diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.1.3.bb b/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.1.3.bb new file mode 100644 index 0000000000..69e52fe4a0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.1.3.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "An advanced menu editor" +HOMEPAGE = "https://launchpad.net/menulibre" +SECTION = "x11/graphics" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "python3-distutils-extra-native intltool-native" + +inherit distutils3 gtk-icon-cache + +SRC_URI = " \ + https://launchpad.net/menulibre/2.1/${PV}/+download/${PN}-${PV}.tar.gz \ + file://0001-add_launcher-Exit-early-if-no-row-is-selected.patch \ + file://0002-setup.py-avoid-usr-share-share-paths.patch \ + file://0003-MenulibreXdg.py-fix-loading-of-desktop-files.patch \ +" +SRC_URI[md5sum] = "19d9d3337322eb5513454bb8cdfb739b" +SRC_URI[sha256sum] = "bdd69740119902f1b1f8c7831155f4428403792a0a6c4287bcbb395c4e71fb31" + +do_install_append() { + sed -i 's:${D}::g' ${D}${datadir}/applications/menulibre.desktop +} + +FILES_${PN} += " \ + ${datadir}/applications \ + ${datadir}/menulibre \ + ${datadir}/icons \ +" + +RDEPENDS_${PN} += " \ + gtk+3 \ + python3-pygobject \ + gnome-menus3 \ + python3-unixadmin \ + python3-psutil \ +" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.0.bb index e87dea79e1..4ca21a6bce 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.0.bb @@ -17,4 +17,3 @@ SRC_URI[sha256sum] = "60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd6198 EXTRA_OECONF = "--disable-gtk3" FILES_${PN} += "${datadir}/glib-2.0/schemas" - diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.2.bb index 66399cfb17..c4baa727e5 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.2.bb @@ -3,13 +3,13 @@ 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" +DEPENDS = "exo libexif gtk+ dbus-glib libxfce4ui libxfce4util xfconf cairo file" inherit xfce-app RRECOMMENDS_${PN} += "tumbler" -SRC_URI[md5sum] = "94c778850325a4e5a12e3433c8a05432" -SRC_URI[sha256sum] = "71625324cecda7199acbc95a3ea5132d0dcbf808771e7a209ea2b9503ae4f328" +SRC_URI[md5sum] = "a8d8bb6b8fa7f868cfa3ae778630946e" +SRC_URI[sha256sum] = "f8f3b77ca6fc77ddf8cff1bb52e5c5802c462663f72f324393b3a0360f6901b8" FILES_${PN} += "${datadir}/appdata" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index ca299223db..e275af0314 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "gtk+ glib-2.0 xfce4-dev-tools-native intltool-native" SRC_URI = "git://github.com/schnitzeltony/xarchiver.git;branch=master" -SRCREV = "e80e90528c9aab2fe36d9078b945b44c05cc20d3" +SRCREV = "5a26dd8ceab0af71b30c83286d7c7398a858c814" PV = "0.5.3" S = "${WORKDIR}/git" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.3.2.bb b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.3.6.bb index 2894af489f..ac2360ae43 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.3.2.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.3.6.bb @@ -2,12 +2,14 @@ SUMMARY = "Easily themable notification daemon with transparency effects" HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libxfce4util libxfce4ui xfconf gtk+ dbus dbus-glib libnotify" +DEPENDS = "libxfce4util libxfce4ui xfconf gtk+ dbus dbus-glib libnotify \ + dbus-glib-native \ +" inherit xfce-app -SRC_URI[md5sum] = "9ee9bd823710c8753cb99f5a8028d528" -SRC_URI[sha256sum] = "c554db55d9d759c32115e9e5da029bd68b07628438ef2bac7ae4b458567c85a4" +SRC_URI[md5sum] = "19e602fa5e33afaf7563f069261ae1db" +SRC_URI[sha256sum] = "f4ca7c0dadd3d4cdf8cd3c8ae60ccea77b8cf409f8517161796364eb1d766cf9" do_compile_prepend() { mkdir -p xfce4-notifyd diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.1.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.1.0.bb deleted file mode 100644 index cb1be677eb..0000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.1.0.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 xfce4-dev-tools-native exo-native" - -SRC_URI[md5sum] = "7da465a4798629ebd8650fef62770ab7" -SRC_URI[sha256sum] = "2e1eb161f966cbfbd68bd029fb59115bc5ab0c0704cb500d20e7d73967e59ecb" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.0.bb new file mode 100644 index 0000000000..f9555852d2 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.0.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+ cairo libwnck libxmu xfce4-dev-tools-native exo-native" + +SRC_URI[md5sum] = "6f30ce3c688454812008281065a6e05c" +SRC_URI[sha256sum] = "5746d473ad428b13db7c05cfcbc8099fbea13da6be26d3a9359bcb4de971ba69" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.6.3.bb b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.4.bb index 98ffec2ba5..bc1d216205 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.6.3.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.4.bb @@ -1,13 +1,12 @@ SUMMARY = "Terminal emulator for the Xfce desktop environment" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "glib-2.0 gtk+ vte9 libxfce4ui" -RDEPENDS_${PN} += "vte9-termcap" +DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui" inherit xfce-app FILES_${PN} += "${datadir}/xfce4 \ ${datadir}/gnome-control-center" -SRC_URI[md5sum] = "6a2816d8b0933cd707ed456ceb731399" -SRC_URI[sha256sum] = "912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08" +SRC_URI[md5sum] = "7d9ea57301d6a770e5db8e7ecd6e4cda" +SRC_URI[sha256sum] = "c5c1163b30e7a43d56ff92a25193bf9f29ce60e6cf43e5988530df79c84cfdc8" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb b/import-layers/meta-openembedded/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb index 9547736bdd..df0ed50c7b 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb @@ -3,9 +3,8 @@ HOMEPAGE = "http://xfce-look.org/content/show.php/OpenZone?content=111343" SECTION = "x11/wm" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=a2f562fb8fb1e138b810d69521c4bcd7" -DEPENDS = "icon-slicer-native xcursorgen-native" -inherit allarch +inherit allarch gtk-icon-cache SRC_URI = "http://xfce-look.org/CONTENT/content-files/111343-OpenZone-${PV}.tar.xz" SRC_URI[md5sum] = "4dae968cbd525072664ef7a4fc7c4154" @@ -13,6 +12,9 @@ SRC_URI[sha256sum] = "dc20f97a49e1ff1becf7853ef5f137ed30a4c27490540e755021d78d33 S = "${WORKDIR}/OpenZone" +do_compile() { +} + do_install() { install -d ${D}${datadir}/icons for theme in `find -name '*.tar.xz'`; do diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/import-layers/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb index 77fff637cf..c9eace8399 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb @@ -9,7 +9,7 @@ SRC_URI = "http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/ SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71" SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b" -EXTRA_OECONF = "-with-vala-api=0.32" +EXTRA_OECONF = "-with-vala-api=0.34" FILES_${PN} += "${datadir}/vala-*/vapi" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb b/import-layers/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb index a683c2dd4c..f5c5c26aeb 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb @@ -1,7 +1,6 @@ DESCRIPTION = "A XFCE minimal demo image." IMAGE_INSTALL = "packagegroup-core-boot \ - ${ROOTFS_PKGMANAGE_BOOTSTRAP} \ packagegroup-core-x11 \ packagegroup-xfce-base \ kernel-modules \ diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch b/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch new file mode 100644 index 0000000000..d77ce4d25d --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch @@ -0,0 +1,72 @@ +From 7ee62ef0083844ab2fffcd106e3ee2e5f29b2a91 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 12 Jul 2017 18:53:56 -0700 +Subject: [PATCH] Rename use of stdout and stderr + +Since it shadow the standard definitions especially +seen on musl where libc defines these as macros they +cause all short of compilation errors on musl, using +a leading underscore makes it unique + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + imsettings-daemon/imsettings-proc.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/imsettings-daemon/imsettings-proc.c b/imsettings-daemon/imsettings-proc.c +index 915e78b..b78fcff 100644 +--- a/imsettings-daemon/imsettings-proc.c ++++ b/imsettings-daemon/imsettings-proc.c +@@ -39,8 +39,8 @@ + #define MAXRESTART 3 + + typedef struct _IMSettingsProcInfo { +- GIOChannel *stdout; +- GIOChannel *stderr; ++ GIOChannel *_stdout; ++ GIOChannel *_stderr; + GPid pid; + GTimeVal started_time; + guint id; +@@ -368,12 +368,12 @@ _start_process(IMSettingsProc *proc, + &ofd, &efd, + error)) { + pinfo->pid = pid; +- pinfo->stdout = g_io_channel_unix_new(ofd); +- pinfo->stderr = g_io_channel_unix_new(efd); +- g_io_channel_set_close_on_unref(pinfo->stdout, TRUE); +- g_io_channel_set_close_on_unref(pinfo->stderr, TRUE); +- pinfo->oid = g_io_add_watch(pinfo->stdout, G_IO_IN, _log_write_cb, proc); +- pinfo->eid = g_io_add_watch(pinfo->stderr, G_IO_IN, _log_write_cb, proc); ++ pinfo->_stdout = g_io_channel_unix_new(ofd); ++ pinfo->_stderr = g_io_channel_unix_new(efd); ++ g_io_channel_set_close_on_unref(pinfo->_stdout, TRUE); ++ g_io_channel_set_close_on_unref(pinfo->_stderr, TRUE); ++ pinfo->oid = g_io_add_watch(pinfo->_stdout, G_IO_IN, _log_write_cb, proc); ++ pinfo->eid = g_io_add_watch(pinfo->_stderr, G_IO_IN, _log_write_cb, proc); + g_get_current_time(&pinfo->started_time); + pinfo->id = g_child_watch_add(pid, _watch_im_status_cb, proc); + +@@ -521,13 +521,13 @@ imsettings_proc_get_property(GObject *object, + static void + imsettings_proc_info_finalize(IMSettingsProcInfo *pinfo) + { +- if (pinfo->stdout) { +- g_io_channel_unref(pinfo->stdout); +- pinfo->stdout = NULL; ++ if (pinfo->_stdout) { ++ g_io_channel_unref(pinfo->_stdout); ++ pinfo->_stdout = NULL; + } +- if (pinfo->stderr) { +- g_io_channel_unref(pinfo->stderr); +- pinfo->stderr = NULL; ++ if (pinfo->_stderr) { ++ g_io_channel_unref(pinfo->_stderr); ++ pinfo->_stderr = NULL; + } + if (pinfo->oid > 0) { + g_source_remove(pinfo->oid); +-- +2.13.2 + diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.1.bb b/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.1.bb index 8c04db6c01..c3e15db9cc 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.1.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.1.bb @@ -7,11 +7,13 @@ This package contains the core DBus services and some utilities." HOMEPAGE = "http://code.google.com/p/imsettings/" SECTION = "Applications/System" -inherit autotools gtk-doc +inherit autotools gtk-doc gobject-introspection SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ file://gtk-is-required-by-notify.patch \ - file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch" + file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch \ + file://0001-Rename-use-of-stdout-and-stderr.patch \ + " SRC_URI[md5sum] = "ab439e21a7d86fa99fbc04586c755349" SRC_URI[sha256sum] = "12c35352386057ba68d69a0b7d9a1d0d01ebbd893aafe0a094c3158c8079ac9a" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.4.5.bb b/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb index 964f5d3d20..f709e4da95 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.4.5.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb @@ -11,5 +11,5 @@ DEPENDS += "libmpd" # for now we recommend our own mpd-server RRECOMMENDS_${PN} = "mpd" -SRC_URI[md5sum] = "718e64748e46908a44cd0b96eacbda28" -SRC_URI[sha256sum] = "e71f57a28915c57459d6ce0eeeee1d0934f523c0ed083158c3d3b3836fc06fcf" +SRC_URI[md5sum] = "13d5d95ef0c305bac45fde6231258e5d" +SRC_URI[sha256sum] = "f1320916ae3112e6825699652a502cebfa78bb006c649b42d3d331dfe57b6cb0" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.2.bb b/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb index b1cabd682e..3d902a17bf 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.2.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb @@ -9,5 +9,5 @@ RRECOMMENDS_${PN} = "mpd" inherit xfce-app -SRC_URI[md5sum] = "e4e198850c2467c47783969ac9c16ec0" -SRC_URI[sha256sum] = "ed0cc2940bd5928bb30fab1531c22185a97bd0cc5beacd9e3be4d4cd994a6862" +SRC_URI[md5sum] = "e2d2faeb7a6f62813e287f3d12522b71" +SRC_URI[sha256sum] = "4189c0c82b66b758a6d5bc651493b675d3d46329e5f1a76ff26c448125f4fcb0" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin/fix-build-on-aarch64.patch b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin/fix-build-on-aarch64.patch deleted file mode 100644 index ed4eec01fa..0000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin/fix-build-on-aarch64.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Backport from - -http://git.xfce.org/panel-plugins/xfce4-battery-plugin/commit/?id=0f6926479728ca784a20b63d7c146a91e37d98fb - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From 0f6926479728ca784a20b63d7c146a91e37d98fb Mon Sep 17 00:00:00 2001 -From: Landry Breuil <landry@xfce.org> -Date: Thu, 19 Mar 2015 20:42:24 +0100 -Subject: Fix build on aarch64 (bug #11724) - - -diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c -index 530194d..efb5c9c 100644 ---- a/panel-plugin/libacpi.c -+++ b/panel-plugin/libacpi.c -@@ -29,6 +29,7 @@ - #include <sys/types.h> - #include <dirent.h> - #include <glob.h> -+#include <unistd.h> - - #ifdef __FreeBSD__ - #include <fcntl.h> -@@ -52,7 +53,6 @@ static int acpifd; - #include <sys/sysctl.h> - #include <err.h> - #include <errno.h> --#include <unistd.h> - - #endif - --- -cgit v0.10.1 diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.0.bb index 5293c9e468..9d2d954f02 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.0.bb @@ -5,7 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin -SRC_URI += "file://fix-build-on-aarch64.patch" - -SRC_URI[md5sum] = "ca2d394e411a20442a519efa0d14f8ec" -SRC_URI[sha256sum] = "f659b1af40ab72c93448affaa693ab551827a5600ce9b97a799b7c2419bdeb11" +SRC_URI[md5sum] = "f78d8d0cc13d40753a207a836869b953" +SRC_URI[sha256sum] = "8c9deec8d95da4cc39d6d9091433e5822b6bbe07d80117045dd4dd3480427ece" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.1.bb index 988fbb098f..aa6a5bc900 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.1.bb @@ -8,8 +8,8 @@ inherit xfce-panel-plugin DEPENDS += "xfconf xproto libxtst" -SRC_URI[md5sum] = "cd9c05e54e0fcc3f8d774cacdf18f42c" -SRC_URI[sha256sum] = "a97671540663df1d90503f73695ac36e16fa2c832be8845ad9402529b8148294" +SRC_URI[md5sum] = "5a5c01c347f4503c58902977e671ea09" +SRC_URI[sha256sum] = "341cce9665a89e5930e754ef3e27ff97594da22b82b1403099ebcf5c18a5351f" PACKAGECONFIG ??= "" PACKAGECONFIG[qrencode] = "--enable-libqrencode,--disable-libqrencode,qrencode" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb index 341107fa10..3cd4ee65ee 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb @@ -10,7 +10,7 @@ DEPENDS += "exo-native libwnck xfconf" PV = "0.1.0+gitr${SRCPV}" SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master" -SRCREV = "bd76154afe26ba8a5251a1887d88f9d855301850" +SRCREV = "02b74f13ad6f639234c8db1854963038b2780a2c" S = "${WORKDIR}/git" EXTRA_OECONF += "--enable-maintainer-mode" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.6.2.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.0.bb index a97ba6c7db..af38ba543d 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.6.2.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.0.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit xfce-panel-plugin -SRC_URI[md5sum] = "fe604a251eadbc5b0f2b4737b85d92c8" -SRC_URI[sha256sum] = "9734da671e8d1d7de5fae92093a05d653c9245b838542fb9aff3e10368cc9e2c" +SRC_URI[md5sum] = "30caaa94c6c267827a31ad69fa472e51" +SRC_URI[sha256sum] = "297f3077f7aee52a237449fbd8595e232267bc600b5b9e7ddc5baab306ed67b9" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.5.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb index 801699c19f..161b2bb2b2 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.5.5.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1" inherit xfce-panel-plugin -SRC_URI[md5sum] = "199e4365cb3a1fcd5f6164044aedba17" -SRC_URI[sha256sum] = "cbeb0c00f97362eef3f135afb77947aef73e938bae0386250a122ac6644b521b" +SRC_URI[md5sum] = "63d5f03934c2dbddb3ad7bf7f535cc23" +SRC_URI[sha256sum] = "212ddc742be3eecb6ad5554e1b1df03d5685cb71f48a558d5f895de37c57e4fa" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.1.bb index 76d25f85e4..8b24e98b04 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.1.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit xfce-panel-plugin -SRC_URI[md5sum] = "c8f6cb2aec62513c343281eacc4fc395" -SRC_URI[sha256sum] = "431575da3d49fea3afa60f02e83c8d74e20e9a229c9c4ec82c21d45e2c986925" +DEPENDS += "curl" + +SRC_URI[md5sum] = "07d42b8a3d440d6f1861048a6cc3a15a" +SRC_URI[sha256sum] = "eff9cfd604d1bd998c5208176fbe2c6da705c250dce572f5e30b2c77f4ec741c" FILES_${PN} += "${libdir}/xfce4/panel-plugins/xfce4-equake-plugin" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.0.2.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb index 0f9199da4d..8b924ac759 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.0.2.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb @@ -1,9 +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 = "http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin?&#recet_releases" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit xfce-panel-plugin -SRC_URI[md5sum] = "db7741d1827e428b005e94d25e2ec00a" -SRC_URI[sha256sum] = "a2c8d59386ae3d23cf6bdd06a1cdd7a1b9473cf6f38ae106600b194c601040ae" +SRC_URI[md5sum] = "c9fcc1ff37f38e6ed518eca3b9887aa8" +SRC_URI[sha256sum] = "6b038322b49d29625219e6a54497085b8f834b9c1fd15282ce286a6529d7c445" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/files/0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/files/0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch deleted file mode 100644 index 28c0eb1443..0000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/files/0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2d5fa307827a7b32af4f7b2ae0604f943e3a6e99 Mon Sep 17 00:00:00 2001 -From: John Lindgren <john.lindgren@aol.com> -Date: Tue, 21 Aug 2012 19:33:45 -0400 -Subject: [PATCH] Allow timer period to be set at 250ms resolution. Patch - from Miguel Guedes. Closes: #9102. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Applied [1] - -[1] http://git.xfce.org/panel-plugins/xfce4-genmon-plugin/commit/?id=2d5fa307827a7b32af4f7b2ae0604f943e3a6e99 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - panel-plugin/config_gui.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c -index a4c891d..90e55c1 100644 ---- a/panel-plugin/config_gui.c -+++ b/panel-plugin/config_gui.c -@@ -106,8 +106,8 @@ int genmon_CreateConfigGUI (GtkWidget *vbox1, - gtk_widget_show (alignment1); - gtk_container_add (GTK_CONTAINER (eventbox1), alignment1); - -- wSc_Period_adj = gtk_adjustment_new (15, 1, 60*60*24, 1, 1, 0); -- wSc_Period = gtk_spin_button_new (GTK_ADJUSTMENT (wSc_Period_adj), 1, 0); -+ wSc_Period_adj = gtk_adjustment_new (15, .25, 60*60*24, .25, 1, 0); -+ wSc_Period = gtk_spin_button_new (GTK_ADJUSTMENT (wSc_Period_adj), .25, 2); - gtk_widget_show (wSc_Period); - gtk_container_add (GTK_CONTAINER (alignment1), wSc_Period); - gtk_tooltips_set_tip (tooltips, wSc_Period, --- -1.7.6.5 - diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.4.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.0.bb index a13db62a3c..0624fe96db 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_3.4.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.0.bb @@ -5,9 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe" inherit xfce-panel-plugin -SRC_URI += "file://0001-Allow-timer-period-to-be-set-at-250ms-resolution.-Pa.patch" - -SRC_URI[md5sum] = "24108b339bb040ed360266f53a245224" -SRC_URI[sha256sum] = "b0a5337b49c85623dc89f3c9e47c7374b1d466af2418033d2d6dfc57a9790387" - -S = "${WORKDIR}/xfce4-genmon-plugin-3.4" +SRC_URI[md5sum] = "f28cfbf9c82e758a236c1f5fcbcb8a35" +SRC_URI[sha256sum] = "a7db4f786166643076323dcde99ad12e92383cc29b4b806862d5483ec468c3e3" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb index 8d4e77ee8f..c8224148ba 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb @@ -10,5 +10,5 @@ DEPENDS += "gnutls libgcrypt" SRC_URI[md5sum] = "7263114ec0f2987a3aff15afeeb45577" SRC_URI[sha256sum] = "624acc8229a8593c0dfeb28f883f4958119a715cc81cecdbaf29efc8ab1edcad" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch new file mode 100644 index 0000000000..e2165c2fa5 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch @@ -0,0 +1,87 @@ +From 09e325f8296eb9e63dc57ed137f4a9940f164563 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 21 Mar 2017 17:11:46 -0700 +Subject: [PATCH] check for fstab.h during configure + +fstab.h is not universally available, checking it during +configure creates a knob to disable fstab reads in the +plugin + +Makes it compile/build with musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Patch Reworked for xfce4-mount-plugin 0.6.4->1.1.2 +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + configure.ac | 1 + + panel-plugin/devices.c | 22 +++++++++++++++++++--- + 2 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b131117..c633fef 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,6 +69,7 @@ AC_CHECK_HEADERS([sys/socket.h]) + AC_CHECK_HEADERS([sys/time.h]) + AC_CHECK_HEADERS([unistd.h]) + AC_CHECK_HEADERS([sys/sockio.h]) ++AC_CHECK_HEADERS([fstab.h]) + AC_HEADER_SYS_WAIT + AC_PROG_GCC_TRADITIONAL + AC_TYPE_SIZE_T +diff --git a/panel-plugin/devices.c b/panel-plugin/devices.c +index 797b079..d29df56 100644 +--- a/panel-plugin/devices.c ++++ b/panel-plugin/devices.c +@@ -24,8 +24,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + #ifdef HAVE_CONFIG_H + #include <config.h> + #endif +- ++#if HAVE_FSTAB_H + #include <fstab.h> ++#endif ++ + #include <glib.h> + #include <stdio.h> + #include <string.h> +@@ -468,11 +470,12 @@ disks_new (gboolean include_NFSs, gboolean *showed_fstab_dialog, gint length) + { + GPtrArray * pdisks; /* to be returned */ + t_disk * pdisk; +- struct fstab *pfstab; + gboolean has_valid_mount_device; + + pdisks = g_ptr_array_new(); + ++#if HAVE_FSTAB_H ++ struct fstab *pfstab; + /* open fstab */ + if (setfsent()!=1) + { +@@ -526,7 +529,20 @@ disks_new (gboolean include_NFSs, gboolean *showed_fstab_dialog, gint length) + } /* end for */ + + endfsent(); /* close file */ +- ++#else ++ /* popup notification dialog */ ++ if (! (*showed_fstab_dialog) ) { ++ xfce_message_dialog (NULL, ++ _("Xfce 4 Mount Plugin"), ++ "dialog-info", ++ _("Your /etc/fstab could not be read because fstab is not supported. This will severely degrade the plugin's abilities."), ++ NULL, ++ "gtk-ok", ++ GTK_RESPONSE_OK, ++ NULL); ++ *showed_fstab_dialog = TRUE; ++ } ++#endif + return pdisks; + } + +-- +2.9.3 + diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_0.6.4.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.2.bb index 6dc2c1721d..67009377e8 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_0.6.4.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.2.bb @@ -6,5 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin -SRC_URI[md5sum] = "f5917e9aa2a06bc6a872cc10d2ee4f6f" -SRC_URI[sha256sum] = "541d7af84d7d0b00ae547aa1f438e2fac51ee4195c4d0a17173c4f72accb227d" +SRC_URI += "file://0001-check-for-fstab.h-during-configure.patch" +SRC_URI[md5sum] = "7eba9696d82433a5577741214d34b588" +SRC_URI[sha256sum] = "54578447abaf9da630a750d64acdc37d4fd20dda6460208d6d1ffaa9e43ee1a6" diff --git a/import-layers/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/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch new file mode 100644 index 0000000000..e354181927 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch @@ -0,0 +1,25 @@ +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/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.2.4.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.2.4.bb deleted file mode 100644 index c9f7a2a661..0000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.2.4.bb +++ /dev/null @@ -1,9 +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[md5sum] = "ce53e1135e4bff5afcd899627110bd11" -SRC_URI[sha256sum] = "fface918822c012d806717116566e54947ad7613b9290b45a18e2d5ffb8730d3" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb new file mode 100644 index 0000000000..35c8861bcf --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb @@ -0,0 +1,12 @@ +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/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch new file mode 100644 index 0000000000..8066df0041 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch @@ -0,0 +1,53 @@ +Fix formatting strings when compiling with Wformat options + +Imported from debian + +--- a/lib/application.c ++++ b/lib/application.c +@@ -352,7 +352,7 @@ static void xnp_application_update_notes + XfconfChannel* _tmp16_; + const gchar* _tmp17_; + _tmp9_ = _ ("Select notes path"); +- _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp9_); ++ _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp9_); + g_object_ref_sink (_tmp10_); + error_dialog = _tmp10_; + _tmp11_ = error_dialog; +@@ -419,7 +419,7 @@ static void xnp_application_update_notes + XfconfChannel* _tmp35_; + const gchar* _tmp36_; + _tmp27_ = _ ("Select notes path"); +- _tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp27_); ++ _tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp27_); + g_object_ref_sink (_tmp28_); + error_dialog = _tmp28_; + _tmp29_ = error_dialog; +@@ -2082,7 +2082,7 @@ static void xnp_application_delete_windo + gint _tmp9_; + _tmp3_ = window; + _tmp4_ = _ ("Are you sure you want to delete this group?"); +- _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp4_); ++ _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _tmp4_); + g_object_ref_sink (_tmp5_); + dialog = _tmp5_; + _tmp6_ = dialog; +@@ -2721,7 +2721,7 @@ void xnp_application_open_settings_dialo + e = _inner_error_; + _inner_error_ = NULL; + _tmp0_ = _ ("Unable to open the settings dialog"); +- _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp0_); ++ _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp0_); + g_object_ref_sink (_tmp1_); + error_dialog = _tmp1_; + _tmp2_ = error_dialog; +--- a/lib/window.c ++++ b/lib/window.c +@@ -3542,7 +3542,7 @@ void xnp_window_delete_note (XnpWindow* + GtkMessageDialog* _tmp13_; + gint _tmp14_; + _tmp9_ = _ ("Are you sure you want to delete this note?"); +- _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp9_); ++ _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _tmp9_); + g_object_ref_sink (_tmp10_); + dialog = _tmp10_; + _tmp11_ = dialog; diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb index 313534b219..fcf98c181b 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb @@ -9,6 +9,7 @@ DEPENDS += "gtk+ libxfce4ui xfce4-panel xfconf libunique" SRC_URI += " \ file://0001-main-status-icon.c-remove-deprecated-g_type_init.patch \ + file://01_fix_format-string.patch \ " SRC_URI[md5sum] = "31cb9520b01512a94344770b4befdb3b" SRC_URI[sha256sum] = "07a4c3e71431c24f97d2e270452dd0fa51ff0bdb6219a13a20d0bfa8d9de54b2" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.6.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb index c2e0ed9125..4d78bb2bf2 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.6.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" inherit xfce-panel-plugin -SRC_URI[md5sum] = "33c2e343c1224d9c4ae757a70cbe08eb" -SRC_URI[sha256sum] = "235ef842bd45e701bceebb21a384ab09f21afceea8ed95f91bb4c6cf3abe1bc0" +SRC_URI[md5sum] = "0c74c3112c5e6e07647c116cd43ff5a7" +SRC_URI[sha256sum] = "7524ec4534de9ef7f676de2895a41bf70b73b94da5a27fd4a022b16eda56d0f4" EXTRA_OECONF = " \ --disable-procacpi \ diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.4.6.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb index 3f47f06a27..6289ad31aa 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.4.6.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin -SRC_URI[md5sum] = "01b7735d4d9ab0150d4ddd3becb94d5f" -SRC_URI[sha256sum] = "3bed2b322cd39ce5845d6da07938c702260f3f1a9700b690ef377fba752ba24f" +SRC_URI[md5sum] = "6f242fe584ee2fdd2b1d3d69ef3d5914" +SRC_URI[sha256sum] = "139539c58d54d878de86ef8a882c793cd909981e6b888f7f9d5e230a8fe310a4" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.2.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.1.bb index c212f889b0..eeb4518634 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.1.2.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.1.bb @@ -7,5 +7,5 @@ inherit xfce-panel-plugin DEPENDS += "upower" -SRC_URI[md5sum] = "68c9d20b352c13f3eb6b39a0d9fe2ba2" -SRC_URI[sha256sum] = "b469b6b3a08ec29b9061151950d876d36bf25a3106ec77256923fdd6b5d18a7c" +SRC_URI[md5sum] = "550277af9886c47005117110f6e7ec0d" +SRC_URI[sha256sum] = "2bf7d0802534a1eb2e9f251af2bb97abc3f58608c1f01511d302c06111d34812" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch new file mode 100644 index 0000000000..3f0bb05af4 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch @@ -0,0 +1,32 @@ +From 6b786e1c161026ab5486ac218891a85db65bf3ba Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 22 Mar 2017 15:28:24 -0700 +Subject: [PATCH] Specify string format explicitly + +Avoids below errors when compiling with -Wformat-security + +error: format string is not a string literal (potentially insecure) + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + src/xfcetimer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xfcetimer.c b/src/xfcetimer.c +index 601772f..4b89682 100644 +--- a/src/xfcetimer.c ++++ b/src/xfcetimer.c +@@ -190,7 +190,7 @@ static gboolean update_function (gpointer data){ + + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, + GTK_MESSAGE_WARNING, +- GTK_BUTTONS_NONE, dialog_message); ++ GTK_BUTTONS_NONE, "%s", dialog_message); + + gtk_window_set_title ((GtkWindow *) dialog, dialog_title); + +-- +2.12.0 + diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb index d61235fe0e..9615192858 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.6.0.bb @@ -6,5 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae39271267fd63eb7619432ff24e7ff1" inherit xfce-panel-plugin +SRC_URI += "file://0001-Specify-string-format-explicitly.patch" + SRC_URI[md5sum] = "3be2a4ccfb2af20441b1d25c2cea5f28" SRC_URI[sha256sum] = "39d7d21f099bc4219f6a6156142f0bbb8374986ee1970a9c0c8dc138b87f867c" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_1.1.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_1.1.0.bb index 65503a4b3d..57951608f3 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_1.1.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_1.1.0.bb @@ -5,5 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin +DEPENDS += "dbus-glib-native" + SRC_URI[md5sum] = "ddd0190ae56f6117dbcf9ff2bf5a8cbf" SRC_URI[sha256sum] = "a3196f818c7ad57d19cd6581e168fd2b9f96de070246aea70c35ce2e5f9d9c84" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.12.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb index 1ccd557689..0c94f3c4ba 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.5.12.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920" inherit xfce-panel-plugin -SRC_URI[md5sum] = "3ba5ee0626612942d249d4a80a1a67b7" -SRC_URI[sha256sum] = "67dce45739f063b95e2bc2232c625277685887b1f84088316d919671b5500ac4" +SRC_URI[md5sum] = "b163b22f8543e5e5767a68af35c9028e" +SRC_URI[sha256sum] = "4d5bd6654cfd077f3432b08d296f7bd052e765e51b77c629886a9542f4e5ecdc" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.8.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.9.bb index 28d3bda073..d9ed2ce376 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.8.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.9.bb @@ -7,7 +7,7 @@ inherit xfce-panel-plugin DEPENDS += "libsoup-2.4 dbus-glib upower" -SRC_URI[md5sum] = "29fe8892bb4c6b1e639862a63110618e" -SRC_URI[sha256sum] = "651b722714fdafde3f548f183958c34e1539cf563193d7e51f28bfb6933d6d3f" +SRC_URI[md5sum] = "0c56c057e1c354b30409b7871ab6f314" +SRC_URI[sha256sum] = "0e15d14b3e18c3da46ad23ee3158a25220f1474a48b611de96edb56221aecee5" FILES_${PN} += "${datadir}/xfce4/weather" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.0.1.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.2.bb index 7cf1e43ea9..46b508a8c5 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.0.1.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.2.bb @@ -5,5 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "0718eb713809df0049fcc5b7ddd9b533" -SRC_URI[sha256sum] = "ced25394512d102090a504b95f19dffad8bf38754c3ddad85c765b184a7eb616" +SRC_URI[md5sum] = "eb07c2107c9d1276e9b1bec01f7347a1" +SRC_URI[sha256sum] = "efd95c330055fd7901a59a48569d14885c168017c5fdb2e233976a78bccb8923" + +RRECOMMENDS_${PN} += "menulibre" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/0001-Probable-fix-for-Thunar-detailed-view-Xfce-12916.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/0001-Probable-fix-for-Thunar-detailed-view-Xfce-12916.patch deleted file mode 100644 index 16f12feaf3..0000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/0001-Probable-fix-for-Thunar-detailed-view-Xfce-12916.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fea2619e6d07ac72b2eff6f408bb3daa2dbdf671 Mon Sep 17 00:00:00 2001 -From: Sean Davis <smd.seandavis@gmail.com> -Date: Thu, 27 Oct 2016 20:31:36 -0400 -Subject: [PATCH] Probable fix for Thunar detailed view (Xfce #12916) - -Upstream-Status: Pending [1-2] - -[1] https://git.xfce.org/xfce/exo/commit/?id=fea2619e6d07ac72b2eff6f408bb3daa2dbdf671 -[2] https://bugzilla.xfce.org/show_bug.cgi?id=12916 - ---- - exo/exo-tree-view.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/exo/exo-tree-view.c b/exo/exo-tree-view.c -index 8c8564f..2d0fc04 100644 ---- a/exo/exo-tree-view.c -+++ b/exo/exo-tree-view.c -@@ -385,13 +385,9 @@ exo_tree_view_button_press_event (GtkWidget *widget, - } - } - -- /* see bug http://bugzilla.xfce.org/show_bug.cgi?id=6230 for more information */ - if (G_LIKELY (gtk_tree_selection_get_select_function (selection) == (GtkTreeSelectionFunc) exo_noop_false)) - { -- /* just reset the select function (previously set to exo_noop_false), -- * there's no clean way to do this, so what the heck. -- */ -- gtk_tree_selection_set_select_function (selection, NULL, NULL, NULL); -+ gtk_tree_selection_set_select_function (selection, (GtkTreeSelectionFunc) exo_noop_true, NULL, NULL); - } - - /* release the path (if any) */ --- -2.5.5 - diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.11.1.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.11.2.bb index c145ce0925..cb29c34a48 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.11.1.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.11.2.bb @@ -14,15 +14,14 @@ REQUIRED_DISTRO_FEATURES_class-native = "" SRC_URI += " \ file://exo-no-tests-0.8.patch \ file://configure.patch \ - file://0001-Probable-fix-for-Thunar-detailed-view-Xfce-12916.patch \ " SRC_URI_append_class-native = " \ file://reduce-build-to-exo-csource-only.patch \ " -SRC_URI[md5sum] = "866292556586facb034191aa66431697" -SRC_URI[sha256sum] = "c70c47f690284a5cb4f507dd89088efbdd8123506f924e33a5f97aab74eb97d4" +SRC_URI[md5sum] = "0b036c8042a2ed5d3767d1177a4213a2" +SRC_URI[sha256sum] = "76bd1c4229503ff3c301485de3a41c55dec93e98de1a9eef1be77fe502ca4f77" PACKAGES =+ "exo-csource" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.10.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.11.bb index 90fd788b2b..c750e8c0fb 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.10.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.11.bb @@ -9,8 +9,8 @@ inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2" -SRC_URI[md5sum] = "3089e1dca6e408641b07cd9c759dea5e" -SRC_URI[sha256sum] = "7e9d24067268900e5e44d3325e60a1a2b2f8f556ec238ec12574fbea15fdee8a" +SRC_URI[md5sum] = "9749be8247cb19ed0fd36e4118c6236a" +SRC_URI[sha256sum] = "b1c7c3121827f59610900ef1cc19aa10a50ab2cc3ae38eee15181b64256e8b42" S = "${WORKDIR}/Thunar-${PV}/" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb index 66385a41ff..1f5419ad11 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.31.bb @@ -2,7 +2,7 @@ DESCRIPTION="Thumbnail service implementing the thumbnail management D-Bus speci SECTION = "x11/libs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "dbus-glib freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf" +DEPENDS = "dbus-glib dbus-glib-native freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf" inherit xfce gtk-doc diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-Fix-compiler-warning-in-clock-plugin-about-shadowed-.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-Fix-compiler-warning-in-clock-plugin-about-shadowed-.patch deleted file mode 100644 index d971fca053..0000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-Fix-compiler-warning-in-clock-plugin-about-shadowed-.patch +++ /dev/null @@ -1,606 +0,0 @@ -From 5a9e94ab7bd628f5bf6b46ea7ea91cf40b4aee98 Mon Sep 17 00:00:00 2001 -From: Matt Thirtytwo <matt.59491@gmail.com> -Date: Mon, 2 Mar 2015 21:18:41 +0100 -Subject: [PATCH] Fix compiler warning in clock plugin about shadowed 'time' - variable - -Upstream-Status: Backport [1] - -[1] http://git.xfce.org/xfce/xfce4-panel/commit/?id=5a9e94ab7bd628f5bf6b46ea7ea91cf40b4aee98 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> - ---- - plugins/clock/clock-analog.c | 20 ++++++------- - plugins/clock/clock-binary.c | 28 +++++++++--------- - plugins/clock/clock-digital.c | 8 ++--- - plugins/clock/clock-fuzzy.c | 6 ++-- - plugins/clock/clock-lcd.c | 34 +++++++++++----------- - plugins/clock/clock-time.c | 68 +++++++++++++++++++++---------------------- - plugins/clock/clock.c | 12 ++++---- - 7 files changed, 88 insertions(+), 88 deletions(-) - -diff --git a/plugins/clock/clock-analog.c b/plugins/clock/clock-analog.c -index 2e96a09..910450d 100644 ---- a/plugins/clock/clock-analog.c -+++ b/plugins/clock/clock-analog.c -@@ -216,7 +216,7 @@ xfce_clock_analog_expose_event (GtkWidget *widget, - gdouble xc, yc; - gdouble angle, radius; - cairo_t *cr; -- GDateTime *time; -+ GDateTime *date_time; - - panel_return_val_if_fail (XFCE_CLOCK_IS_ANALOG (analog), FALSE); - -@@ -239,7 +239,7 @@ xfce_clock_analog_expose_event (GtkWidget *widget, - cairo_clip (cr); - - /* get the local time */ -- time = clock_time_get_time (analog->time); -+ date_time = clock_time_get_time (analog->time); - - /* set the line properties */ - cairo_set_line_width (cr, 1); -@@ -251,20 +251,20 @@ xfce_clock_analog_expose_event (GtkWidget *widget, - if (analog->show_seconds) - { - /* second pointer */ -- angle = TICKS_TO_RADIANS (g_date_time_get_second (time)); -+ angle = TICKS_TO_RADIANS (g_date_time_get_second (date_time)); - xfce_clock_analog_draw_pointer (cr, xc, yc, radius, angle, 0.7, TRUE); - } - - /* minute pointer */ -- angle = TICKS_TO_RADIANS (g_date_time_get_minute (time)); -+ angle = TICKS_TO_RADIANS (g_date_time_get_minute (date_time)); - xfce_clock_analog_draw_pointer (cr, xc, yc, radius, angle, 0.8, FALSE); - - /* hour pointer */ -- angle = HOURS_TO_RADIANS (g_date_time_get_hour (time), g_date_time_get_minute (time)); -+ angle = HOURS_TO_RADIANS (g_date_time_get_hour (date_time), g_date_time_get_minute (date_time)); - xfce_clock_analog_draw_pointer (cr, xc, yc, radius, angle, 0.5, FALSE); - - /* cleanup */ -- g_date_time_unref (time); -+ g_date_time_unref (date_time); - cairo_destroy (cr); - } - -@@ -347,12 +347,12 @@ xfce_clock_analog_draw_pointer (cairo_t *cr, - - static gboolean - xfce_clock_analog_update (XfceClockAnalog *analog, -- ClockTime *time) -+ ClockTime *clock_time) - { - GtkWidget *widget = GTK_WIDGET (analog); - - panel_return_val_if_fail (XFCE_CLOCK_IS_ANALOG (analog), FALSE); -- panel_return_val_if_fail (XFCE_IS_CLOCK_TIME (time), FALSE); -+ panel_return_val_if_fail (XFCE_IS_CLOCK_TIME (clock_time), FALSE); - - /* update if the widget if visible */ - if (G_LIKELY (GTK_WIDGET_VISIBLE (widget))) -@@ -364,11 +364,11 @@ xfce_clock_analog_update (XfceClockAnalog *analog, - - - GtkWidget * --xfce_clock_analog_new (ClockTime *time) -+xfce_clock_analog_new (ClockTime *clock_time) - { - XfceClockAnalog *analog = g_object_new (XFCE_CLOCK_TYPE_ANALOG, NULL); - -- analog->time = time; -+ analog->time = clock_time; - analog->timeout = clock_time_timeout_new (CLOCK_INTERVAL_MINUTE, - analog->time, - G_CALLBACK (xfce_clock_analog_update), analog); -diff --git a/plugins/clock/clock-binary.c b/plugins/clock/clock-binary.c -index 4751c51..46b852c 100644 ---- a/plugins/clock/clock-binary.c -+++ b/plugins/clock/clock-binary.c -@@ -262,7 +262,7 @@ xfce_clock_binary_expose_event_true_binary (XfceClockBinary *binary, - GtkAllocation *alloc) - { - GdkColor *active, *inactive; -- GDateTime *time; -+ GDateTime *date_time; - gint row, rows; - static gint binary_table[] = { 32, 16, 8, 4, 2, 1 }; - gint col, cols = G_N_ELEMENTS (binary_table); -@@ -282,7 +282,7 @@ xfce_clock_binary_expose_event_true_binary (XfceClockBinary *binary, - active = &(GTK_WIDGET (binary)->style->dark[GTK_STATE_SELECTED]); - } - -- time = clock_time_get_time (binary->time); -+ date_time = clock_time_get_time (binary->time); - - /* init sizes */ - remain_h = alloc->height; -@@ -293,11 +293,11 @@ xfce_clock_binary_expose_event_true_binary (XfceClockBinary *binary, - { - /* get the time this row represents */ - if (row == 0) -- ticks = g_date_time_get_hour (time); -+ ticks = g_date_time_get_hour (date_time); - else if (row == 1) -- ticks = g_date_time_get_minute (time); -+ ticks = g_date_time_get_minute (date_time); - else -- ticks = g_date_time_get_second (time); -+ ticks = g_date_time_get_second (date_time); - - /* reset sizes */ - remain_w = alloc->width; -@@ -336,7 +336,7 @@ xfce_clock_binary_expose_event_true_binary (XfceClockBinary *binary, - offset_y += h; - } - -- g_date_time_unref (time); -+ g_date_time_unref (date_time); - } - - -@@ -348,7 +348,7 @@ xfce_clock_binary_expose_event_binary (XfceClockBinary *binary, - { - GdkColor *active, *inactive; - static gint binary_table[] = { 80, 40, 20, 10, 8, 4, 2, 1 }; -- GDateTime *time; -+ GDateTime *date_time; - gint row, rows = G_N_ELEMENTS (binary_table) / 2; - gint col, cols; - gint digit; -@@ -368,7 +368,7 @@ xfce_clock_binary_expose_event_binary (XfceClockBinary *binary, - active = &(GTK_WIDGET (binary)->style->dark[GTK_STATE_SELECTED]); - } - -- time = clock_time_get_time (binary->time); -+ date_time = clock_time_get_time (binary->time); - - remain_w = alloc->width; - offset_x = alloc->x; -@@ -379,11 +379,11 @@ xfce_clock_binary_expose_event_binary (XfceClockBinary *binary, - { - /* get the time this row represents */ - if (col == 0) -- ticks = g_date_time_get_hour (time); -+ ticks = g_date_time_get_hour (date_time); - else if (col == 2) -- ticks = g_date_time_get_minute (time); -+ ticks = g_date_time_get_minute (date_time); - else if (col == 4) -- ticks = g_date_time_get_second (time); -+ ticks = g_date_time_get_second (date_time); - - /* reset sizes */ - remain_h = alloc->height; -@@ -520,7 +520,7 @@ xfce_clock_binary_expose_event (GtkWidget *widget, - - static gboolean - xfce_clock_binary_update (XfceClockBinary *binary, -- ClockTime *time) -+ ClockTime *clock_time) - { - GtkWidget *widget = GTK_WIDGET (binary); - -@@ -536,11 +536,11 @@ xfce_clock_binary_update (XfceClockBinary *binary, - - - GtkWidget * --xfce_clock_binary_new (ClockTime *time) -+xfce_clock_binary_new (ClockTime *clock_time) - { - XfceClockBinary *binary = g_object_new (XFCE_CLOCK_TYPE_BINARY, NULL); - -- binary->time = time; -+ binary->time = clock_time; - binary->timeout = clock_time_timeout_new (CLOCK_INTERVAL_MINUTE, - binary->time, - G_CALLBACK (xfce_clock_binary_update), binary); -diff --git a/plugins/clock/clock-digital.c b/plugins/clock/clock-digital.c -index c293ed2..34e7019 100644 ---- a/plugins/clock/clock-digital.c -+++ b/plugins/clock/clock-digital.c -@@ -194,12 +194,12 @@ xfce_clock_digital_finalize (GObject *object) - - static gboolean - xfce_clock_digital_update (XfceClockDigital *digital, -- ClockTime *time) -+ ClockTime *clock_time) - { - gchar *string; - - panel_return_val_if_fail (XFCE_CLOCK_IS_DIGITAL (digital), FALSE); -- panel_return_val_if_fail (XFCE_IS_CLOCK_TIME (time), FALSE); -+ panel_return_val_if_fail (XFCE_IS_CLOCK_TIME (clock_time), FALSE); - - /* set time string */ - string = clock_time_strdup_strftime (digital->time, digital->format); -@@ -212,11 +212,11 @@ xfce_clock_digital_update (XfceClockDigital *digital, - - - GtkWidget * --xfce_clock_digital_new (ClockTime *time) -+xfce_clock_digital_new (ClockTime *clock_time) - { - XfceClockDigital *digital = g_object_new (XFCE_CLOCK_TYPE_DIGITAL, NULL); - -- digital->time = time; -+ digital->time = clock_time; - digital->timeout = clock_time_timeout_new (clock_time_interval_from_format (digital->format), - digital->time, - G_CALLBACK (xfce_clock_digital_update), digital); -diff --git a/plugins/clock/clock-fuzzy.c b/plugins/clock/clock-fuzzy.c -index 7b0aa41..4b361dd 100644 ---- a/plugins/clock/clock-fuzzy.c -+++ b/plugins/clock/clock-fuzzy.c -@@ -275,7 +275,7 @@ xfce_clock_fuzzy_finalize (GObject *object) - - static gboolean - xfce_clock_fuzzy_update (XfceClockFuzzy *fuzzy, -- ClockTime *time) -+ ClockTime *clock_time) - { - GDateTime *date_time; - gint sector; -@@ -353,11 +353,11 @@ xfce_clock_fuzzy_update (XfceClockFuzzy *fuzzy, - - - GtkWidget * --xfce_clock_fuzzy_new (ClockTime *time) -+xfce_clock_fuzzy_new (ClockTime *clock_time) - { - XfceClockFuzzy *fuzzy = g_object_new (XFCE_CLOCK_TYPE_FUZZY, NULL); - -- fuzzy->time = time; -+ fuzzy->time = clock_time; - fuzzy->timeout = clock_time_timeout_new (CLOCK_INTERVAL_MINUTE, - fuzzy->time, - G_CALLBACK (xfce_clock_fuzzy_update), fuzzy); -diff --git a/plugins/clock/clock-lcd.c b/plugins/clock/clock-lcd.c -index 84e74e6..b180d30 100644 ---- a/plugins/clock/clock-lcd.c -+++ b/plugins/clock/clock-lcd.c -@@ -285,7 +285,7 @@ xfce_clock_lcd_expose_event (GtkWidget *widget, - gint ticks, i; - gdouble size; - gdouble ratio; -- GDateTime *time; -+ GDateTime *date_time; - - panel_return_val_if_fail (XFCE_CLOCK_IS_LCD (lcd), FALSE); - -@@ -317,10 +317,10 @@ xfce_clock_lcd_expose_event (GtkWidget *widget, - cairo_set_line_width (cr, MAX (size * 0.05, 1.5)); - - /* get the local time */ -- time = clock_time_get_time (lcd->time); -+ date_time = clock_time_get_time (lcd->time); - - /* draw the hours */ -- ticks = g_date_time_get_hour (time); -+ ticks = g_date_time_get_hour (date_time); - - /* convert 24h clock to 12h clock */ - if (!lcd->show_military && ticks > 12) -@@ -333,8 +333,8 @@ xfce_clock_lcd_expose_event (GtkWidget *widget, - * because we might miss the exact second (due to slightly delayed - * timeout) we queue a resize the first 3 seconds or anything in - * the first minute */ -- if ((ticks == 10 || ticks == 0) && g_date_time_get_minute (time) == 0 -- && (!lcd->show_seconds || g_date_time_get_second (time) < 3)) -+ if ((ticks == 10 || ticks == 0) && g_date_time_get_minute (date_time) == 0 -+ && (!lcd->show_seconds || g_date_time_get_second (date_time) < 3)) - g_object_notify (G_OBJECT (lcd), "size-ratio"); - - if (ticks >= 10) -@@ -352,7 +352,7 @@ xfce_clock_lcd_expose_event (GtkWidget *widget, - if (i == 0) - { - /* get the minutes */ -- ticks = g_date_time_get_minute (time); -+ ticks = g_date_time_get_minute (date_time); - } - else - { -@@ -361,11 +361,11 @@ xfce_clock_lcd_expose_event (GtkWidget *widget, - break; - - /* get the seconds */ -- ticks = g_date_time_get_second (time); -+ ticks = g_date_time_get_second (date_time); - } - - /* draw the dots */ -- if (lcd->flash_separators && (g_date_time_get_second (time) % 2) == 1) -+ if (lcd->flash_separators && (g_date_time_get_second (date_time) % 2) == 1) - offset_x += size * RELATIVE_SPACE * 2; - else - offset_x = xfce_clock_lcd_draw_dots (cr, size, offset_x, offset_y); -@@ -380,14 +380,14 @@ xfce_clock_lcd_expose_event (GtkWidget *widget, - if (lcd->show_meridiem) - { - /* am or pm? */ -- ticks = g_date_time_get_hour (time) >= 12 ? 11 : 10; -+ ticks = g_date_time_get_hour (date_time) >= 12 ? 11 : 10; - - /* draw the digit */ - offset_x = xfce_clock_lcd_draw_digit (cr, ticks, size, offset_x, offset_y); - } - - /* drop the pushed group */ -- g_date_time_unref (time); -+ g_date_time_unref (date_time); - cairo_pop_group_to_source (cr); - cairo_paint (cr); - cairo_destroy (cr); -@@ -403,16 +403,16 @@ xfce_clock_lcd_get_ratio (XfceClockLcd *lcd) - { - gdouble ratio; - gint ticks; -- GDateTime *time; -+ GDateTime *date_time; - - /* get the local time */ -- time = clock_time_get_time (lcd->time); -+ date_time = clock_time_get_time (lcd->time); - - /* 8:8(space)8 */ - ratio = (3 * RELATIVE_DIGIT) + RELATIVE_DOTS + RELATIVE_SPACE; - -- ticks = g_date_time_get_hour (time); -- g_date_time_unref (time); -+ ticks = g_date_time_get_hour (date_time); -+ g_date_time_unref (date_time); - - if (!lcd->show_military && ticks > 12) - ticks -= 12; -@@ -584,7 +584,7 @@ xfce_clock_lcd_draw_digit (cairo_t *cr, - - static gboolean - xfce_clock_lcd_update (XfceClockLcd *lcd, -- ClockTime *time) -+ ClockTime *clock_time) - { - GtkWidget *widget = GTK_WIDGET (lcd); - -@@ -600,11 +600,11 @@ xfce_clock_lcd_update (XfceClockLcd *lcd, - - - GtkWidget * --xfce_clock_lcd_new (ClockTime *time) -+xfce_clock_lcd_new (ClockTime *clock_time) - { - XfceClockLcd *lcd = g_object_new (XFCE_CLOCK_TYPE_LCD, NULL); - -- lcd->time = time; -+ lcd->time = clock_time; - lcd->timeout = clock_time_timeout_new (CLOCK_INTERVAL_MINUTE, - lcd->time, - G_CALLBACK (xfce_clock_lcd_update), lcd); -diff --git a/plugins/clock/clock-time.c b/plugins/clock/clock-time.c -index 16b0f89..b015b13 100644 ---- a/plugins/clock/clock-time.c -+++ b/plugins/clock/clock-time.c -@@ -107,10 +107,10 @@ clock_time_class_init (ClockTimeClass *klass) - - - static void --clock_time_init (ClockTime *time) -+clock_time_init (ClockTime *clock_time) - { -- time->timezone_name = g_strdup (DEFAULT_TIMEZONE); -- time->timezone = g_time_zone_new_local (); -+ clock_time->timezone_name = g_strdup (DEFAULT_TIMEZONE); -+ clock_time->timezone = g_time_zone_new_local (); - } - - -@@ -118,11 +118,11 @@ clock_time_init (ClockTime *time) - static void - clock_time_finalize (GObject *object) - { -- ClockTime *time = XFCE_CLOCK_TIME (object); -+ ClockTime *clock_time = XFCE_CLOCK_TIME (object); - -- g_free (time->timezone_name); -+ g_free (clock_time->timezone_name); - -- g_time_zone_unref (time->timezone); -+ g_time_zone_unref (clock_time->timezone); - - G_OBJECT_CLASS (clock_time_parent_class)->finalize (object); - } -@@ -135,12 +135,12 @@ clock_time_get_property (GObject *object, - GValue *value, - GParamSpec *pspec) - { -- ClockTime *time = XFCE_CLOCK_TIME (object); -+ ClockTime *clock_time = XFCE_CLOCK_TIME (object); - - switch (prop_id) - { - case PROP_TIMEZONE: -- g_value_set_string (value, time->timezone_name); -+ g_value_set_string (value, clock_time->timezone_name); - break; - - default: -@@ -157,29 +157,29 @@ clock_time_set_property (GObject *object, - const GValue *value, - GParamSpec *pspec) - { -- ClockTime *time = XFCE_CLOCK_TIME (object); -+ ClockTime *clock_time = XFCE_CLOCK_TIME (object); - const gchar *str_value; - - switch (prop_id) - { - case PROP_TIMEZONE: - str_value = g_value_get_string (value); -- if (g_strcmp0 (time->timezone_name, str_value) != 0) -+ if (g_strcmp0 (clock_time->timezone_name, str_value) != 0) - { -- g_free (time->timezone_name); -- g_time_zone_unref (time->timezone); -+ g_free (clock_time->timezone_name); -+ g_time_zone_unref (clock_time->timezone); - if (str_value == NULL || g_strcmp0 (str_value, "") == 0) - { -- time->timezone_name = g_strdup (DEFAULT_TIMEZONE); -- time->timezone = g_time_zone_new_local (); -+ clock_time->timezone_name = g_strdup (DEFAULT_TIMEZONE); -+ clock_time->timezone = g_time_zone_new_local (); - } - else - { -- time->timezone_name = g_strdup (str_value); -- time->timezone = g_time_zone_new (str_value); -+ clock_time->timezone_name = g_strdup (str_value); -+ clock_time->timezone = g_time_zone_new (str_value); - } - -- g_signal_emit (G_OBJECT (time), clock_time_signals[TIME_CHANGED], 0); -+ g_signal_emit (G_OBJECT (clock_time), clock_time_signals[TIME_CHANGED], 0); - } - break; - -@@ -192,14 +192,14 @@ clock_time_set_property (GObject *object, - - - GDateTime * --clock_time_get_time (ClockTime *time) -+clock_time_get_time (ClockTime *clock_time) - { - GDateTime *date_time; - -- panel_return_val_if_fail (XFCE_IS_CLOCK_TIME (time), NULL); -+ panel_return_val_if_fail (XFCE_IS_CLOCK_TIME (clock_time), NULL); - -- if (time->timezone != NULL) -- date_time = g_date_time_new_now (time->timezone); -+ if (clock_time->timezone != NULL) -+ date_time = g_date_time_new_now (clock_time->timezone); - else - date_time = g_date_time_new_now_local (); - -@@ -209,15 +209,15 @@ clock_time_get_time (ClockTime *time) - - - gchar * --clock_time_strdup_strftime (ClockTime *time, -+clock_time_strdup_strftime (ClockTime *clock_time, - const gchar *format) - { - GDateTime *date_time; - gchar *str; - -- panel_return_val_if_fail (XFCE_IS_CLOCK_TIME (time), NULL); -+ panel_return_val_if_fail (XFCE_IS_CLOCK_TIME (clock_time), NULL); - -- date_time = clock_time_get_time (time); -+ date_time = clock_time_get_time (clock_time); - str = g_date_time_format (date_time, format); - - g_date_time_unref (date_time); -@@ -262,7 +262,7 @@ static gboolean - clock_time_timeout_running (gpointer user_data) - { - ClockTimeTimeout *timeout = user_data; -- GDateTime *time; -+ GDateTime *date_time; - - g_signal_emit (G_OBJECT (timeout->time), clock_time_signals[TIME_CHANGED], 0); - -@@ -270,8 +270,8 @@ clock_time_timeout_running (gpointer user_data) - if (timeout->interval == CLOCK_INTERVAL_MINUTE) - { - /* sync again when we don't run on time */ -- time = clock_time_get_time (timeout->time); -- timeout->restart = (g_date_time_get_second (time) != 0); -+ date_time = clock_time_get_time (timeout->time); -+ timeout->restart = (g_date_time_get_second (date_time) != 0); - } - - return !timeout->restart; -@@ -312,13 +312,13 @@ clock_time_timeout_sync (gpointer user_data) - - ClockTimeTimeout * - clock_time_timeout_new (guint interval, -- ClockTime *time, -+ ClockTime *clock_time, - GCallback c_handler, - gpointer gobject) - { - ClockTimeTimeout *timeout; - -- panel_return_val_if_fail (XFCE_IS_CLOCK_TIME (time), NULL); -+ panel_return_val_if_fail (XFCE_IS_CLOCK_TIME (clock_time), NULL); - - panel_return_val_if_fail (interval > 0, NULL); - -@@ -326,10 +326,10 @@ clock_time_timeout_new (guint interval, - timeout->interval = 0; - timeout->timeout_id = 0; - timeout->restart = FALSE; -- timeout->time = time; -+ timeout->time = clock_time; - - timeout->time_changed_id = -- g_signal_connect_swapped (G_OBJECT (time), "time-changed", -+ g_signal_connect_swapped (G_OBJECT (clock_time), "time-changed", - c_handler, gobject); - - g_object_ref (G_OBJECT (timeout->time)); -@@ -345,7 +345,7 @@ void - clock_time_timeout_set_interval (ClockTimeTimeout *timeout, - guint interval) - { -- GDateTime *time; -+ GDateTime *date_time; - guint next_interval; - gboolean restart; - -@@ -372,8 +372,8 @@ clock_time_timeout_set_interval (ClockTimeTimeout *timeout, - /* get the seconds to the next internal */ - if (interval == CLOCK_INTERVAL_MINUTE) - { -- time = clock_time_get_time (timeout->time); -- next_interval = 60 - g_date_time_get_second (time); -+ date_time = clock_time_get_time (timeout->time); -+ next_interval = 60 - g_date_time_get_second (date_time); - } - else - { -diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c -index 6c80978..e07c17b 100644 ---- a/plugins/clock/clock.c -+++ b/plugins/clock/clock.c -@@ -1113,17 +1113,17 @@ static void - clock_plugin_calendar_show_event (GtkWidget *calendar_window, - ClockPlugin *plugin) - { -- GDateTime *time; -+ GDateTime *date_time; - - panel_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin)); - - clock_plugin_reposition_calendar (plugin); - -- time = clock_time_get_time (plugin->time); -- gtk_calendar_select_month (GTK_CALENDAR (plugin->calendar), g_date_time_get_month (time) - 1, -- g_date_time_get_year (time)); -- gtk_calendar_select_day (GTK_CALENDAR (plugin->calendar), g_date_time_get_day_of_month (time)); -- g_date_time_unref (time); -+ date_time = clock_time_get_time (plugin->time); -+ gtk_calendar_select_month (GTK_CALENDAR (plugin->calendar), g_date_time_get_month (date_time) - 1, -+ g_date_time_get_year (date_time)); -+ gtk_calendar_select_day (GTK_CALENDAR (plugin->calendar), g_date_time_get_day_of_month (date_time)); -+ g_date_time_unref (date_time); - } - - --- -2.5.0 - diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-clock-time-make-change-of-system-s-timezone-change-t.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-clock-time-make-change-of-system-s-timezone-change-t.patch index 9dca3ba57d..9dca3ba57d 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-clock-time-make-change-of-system-s-timezone-change-t.patch +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-clock-time-make-change-of-system-s-timezone-change-t.patch diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch new file mode 100644 index 0000000000..b2d960c003 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch @@ -0,0 +1,60 @@ +From 0651f228cef01a6c3e4758a991cace1cd7721031 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Mon, 24 Sep 2012 09:57:46 +0200 +Subject: [PATCH] windowmenu: do not display desktop icon when no window is + active +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* desktop icon is of no use +* desktop icon confuses when using showdesktop plugin + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + plugins/windowmenu/windowmenu.c | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c +index c96123a..9404021 100644 +--- a/plugins/windowmenu/windowmenu.c ++++ b/plugins/windowmenu/windowmenu.c +@@ -256,7 +256,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) + g_signal_connect (G_OBJECT (plugin->button), "toggled", + G_CALLBACK (window_menu_plugin_menu), plugin); + +- plugin->icon = xfce_panel_image_new_from_source ("user-desktop"); ++ plugin->icon = xfce_panel_image_new_from_source (NULL); + gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon); + gtk_widget_show (plugin->icon); + } +@@ -634,7 +634,7 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, + /* skip 'fake' windows */ + type = wnck_window_get_window_type (window); + if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK) +- goto show_desktop_icon; ++ goto show_no_icon; + + /* get the window icon and set the tooltip */ + gtk_widget_set_tooltip_text (GTK_WIDGET (icon), +@@ -648,11 +648,11 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, + } + else + { +- show_desktop_icon: ++ show_no_icon: + +- /* desktop is shown right now */ +- xfce_panel_image_set_from_source (icon, "user-desktop"); +- gtk_widget_set_tooltip_text (GTK_WIDGET (icon), _("Desktop")); ++ /* no icon is shown right now */ ++ xfce_panel_image_set_from_source (icon, NULL); ++ gtk_widget_set_tooltip_text (GTK_WIDGET (icon), _("No Windows")); + } + } + } +-- +1.7.6.5 + diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.1.bb index 18f5ab7ffe..80332cebe5 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.1.bb @@ -8,11 +8,11 @@ inherit xfce gtk-doc distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "5a333af704e386c90ad829b6baf1a758" -SRC_URI[sha256sum] = "30920fc2e2fc26279a82b5261a155c2cc15ab2aa1ced2275684a6ff8261b97b0" +SRC_URI[md5sum] = "0b943f2e72a3693dddb1af559826cb62" +SRC_URI[sha256sum] = "93d58b80cca9c9eb58adb281bc75404df7cf6cae89f7f98bb9f38690009aa2e8" SRC_URI += " \ - file://0001-Fix-compiler-warning-in-clock-plugin-about-shadowed-.patch \ - file://0002-clock-time-make-change-of-system-s-timezone-change-t.patch \ + file://0001-clock-time-make-change-of-system-s-timezone-change-t.patch \ + file://0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ " EXTRA_OECONF += "--enable-gtk3" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.0.bb index e69118c83f..08d00df721 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.0.bb @@ -20,7 +20,7 @@ EXTRA_OECONF = " \ --enable-panel-plugins \ " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "--enable-polkit, --disable-polkit, polkit" PACKAGES += "xfce4-powermanager-plugin" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.12.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.12.1.bb index ff1dfa440c..a42426fa1a 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.12.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.12.1.bb @@ -8,8 +8,8 @@ inherit xfce gtk-doc EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" -SRC_URI[md5sum] = "8ebfac507b4d6ce3f4bac9d257c2853b" -SRC_URI[sha256sum] = "9910eaea8405336415d4d7f3056403f8c67bc23ba0dce251eac35205c603b156" +SRC_URI[md5sum] = "20dc8d2bfd80ba136bf4964021b32757" +SRC_URI[sha256sum] = "35f48564e5694faa54fdc180cd3268e16fc2352946a89a3c2fc12cbe400ada36" FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ ${datadir}/dbus-1/services/org.xfce.Xfconf.service" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.3.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.3.bb index e951343997..daecf828ea 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.3.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.3.bb @@ -2,7 +2,7 @@ SUMMARY = "Xfce4 Desktop Manager" SECTION = "x11/base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "glib-2.0 gtk+ libxfce4util libxfce4ui libwnck xfconf dbus-glib thunar garcon exo" +DEPENDS = "glib-2.0 gtk+ libxfce4util libxfce4ui libwnck xfconf dbus-glib dbus-glib-native thunar garcon exo" inherit xfce distro_features_check diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch deleted file mode 100644 index 08fd76bb29..0000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e87977696f03b0c9f72884f8e3e3ec3248dfd80a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 18 Jun 2013 12:46:42 +0200 -Subject: [PATCH] don't block display events when time is set backwards -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Submitted [1] - -[1] https://bugzilla.xfce.org/show_bug.cgi?id=10184 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - src/display.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/display.c b/src/display.c -index 00318d5..651bc7a 100644 ---- a/src/display.c -+++ b/src/display.c -@@ -733,7 +733,7 @@ myDisplayUpdateCurrentTime (DisplayInfo *display, XEvent *ev) - break; - } - -- if ((timestamp != (guint32) CurrentTime) && TIMESTAMP_IS_BEFORE(display->current_time, timestamp)) -+ if ((timestamp != (guint32) CurrentTime) /*&& TIMESTAMP_IS_BEFORE(display->current_time, timestamp)*/) - { - display->current_time = timestamp; - } --- -1.7.6.5 - diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb index ad70860c0f..2aa68e3fde 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.3.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb @@ -8,9 +8,8 @@ inherit xfce update-alternatives distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += "file://0001-don-t-block-display-events-when-time-is-set-backward.patch" -SRC_URI[md5sum] = "197ef087ca6a263627f1bea6d5a79d6f" -SRC_URI[sha256sum] = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac" +SRC_URI[md5sum] = "3ec136efc5387fd3b53cd66b684f52d7" +SRC_URI[sha256sum] = "fa74048a75649a6e92df763a3cfb706d3fed1e1a6adf567f6693325a5a6efb36" python populate_packages_prepend () { themedir = d.expand('${datadir}/themes') |