diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-25 12:45:53 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-27 14:38:15 -0400 |
| commit | 316dfdd917bec6a218f431211d28bf8df6b6fb0f (patch) | |
| tree | 5541073f9851f44c2bd67b4959dc776ee3c3810f /import-layers/meta-openembedded/meta-xfce | |
| parent | 36acd3e888044dea2ac0b2946f15616f968388c9 (diff) | |
| download | blackbird-openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.tar.gz blackbird-openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.zip | |
Yocto 2.5
Move OpenBMC to Yocto 2.5(sumo)
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: I5c5ad6904a16e14c1c397f0baf10c9d465594a78
Diffstat (limited to 'import-layers/meta-openembedded/meta-xfce')
47 files changed, 895 insertions, 367 deletions
diff --git a/import-layers/meta-openembedded/meta-xfce/README b/import-layers/meta-openembedded/meta-xfce/README index 33677973d..7431e8b7c 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: rocko +branch: master revision: HEAD URI: git://github.com/openembedded/meta-oe.git -branch: rocko +branch: master revision: HEAD meta-xfce depends on meta-oe, meta-gnome and meta-multimedia in this repository. @@ -14,10 +14,9 @@ this to local.conf: BBMASK = "meta-xfce/recipes-multimedia" -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce][rocko]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce]' in the subject' When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-xfce][rocko][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-xfce][PATCH' -rocko Branch Maintainer: -Armin Kuster <akuster808@gmail.com> +Layer maintainer: Andreas Müller <schnitzeltony@googlemail.com> diff --git a/import-layers/meta-openembedded/meta-xfce/conf/layer.conf b/import-layers/meta-openembedded/meta-xfce/conf/layer.conf index ad25dcb13..bee8e7044 100644 --- a/import-layers/meta-openembedded/meta-xfce/conf/layer.conf +++ b/import-layers/meta-openembedded/meta-xfce/conf/layer.conf @@ -18,6 +18,8 @@ LAYERDEPENDS_xfce-layer += "gnome-layer" LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" +LAYERSERIES_COMPAT_xfce-layer = "sumo" + SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ xfce4-session->machine-host \ " 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 deleted file mode 100644 index fb2dfc90a..000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0001-add_launcher-Exit-early-if-no-row-is-selected.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index b63d4dc3b..000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0002-setup.py-avoid-usr-share-share-paths.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 deleted file mode 100644 index 1e92088e1..000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/files/0003-MenulibreXdg.py-fix-loading-of-desktop-files.patch +++ /dev/null @@ -1,36 +0,0 @@ -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.5.bb index 69e52fe4a..d1f3471d6 100644 --- 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.5.bb @@ -4,21 +4,25 @@ SECTION = "x11/graphics" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "python3-distutils-extra-native intltool-native" +DEPENDS = " \ + python3-distutils-extra-native \ + intltool-native \ +" -inherit distutils3 gtk-icon-cache +inherit distutils3 gtk-icon-cache distro_features_check -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" +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "https://launchpad.net/menulibre/2.1/${PV}/+download/${PN}-${PV}.tar.gz" +SRC_URI[md5sum] = "efc7edb49bb0e5fea49e158b40573334" +SRC_URI[sha256sum] = "ef05b2722bab2acb7070d6c8ed0e7bd58bd4a4540bf498af9e889944f9da08b5" + +do_compile() { +} do_install_append() { sed -i 's:${D}::g' ${D}${datadir}/applications/menulibre.desktop + sed -i 's:share/share:share:g' ${D}${PYTHON_SITEPACKAGES_DIR}/menulibre_lib/menulibreconfig.py } FILES_${PN} += " \ @@ -29,6 +33,7 @@ FILES_${PN} += " \ RDEPENDS_${PN} += " \ gtk+3 \ + gtksourceview3 \ python3-pygobject \ gnome-menus3 \ python3-unixadmin \ 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 e275af031..a27c8f553 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 @@ -12,7 +12,9 @@ SRCREV = "5a26dd8ceab0af71b30c83286d7c7398a858c814" PV = "0.5.3" S = "${WORKDIR}/git" -inherit xfce-git gettext pkgconfig autotools gtk-icon-cache +inherit xfce-git gettext pkgconfig autotools gtk-icon-cache distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" # install tap files for thunar-archive-plugin in ${libdir}/thunar-archive-plugin EXTRA_OECONF += "--libexecdir=${libdir}" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch new file mode 100644 index 000000000..e872249d5 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch @@ -0,0 +1,34 @@ +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/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb index 1fb4a5be2..54bf7c752 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb @@ -6,6 +6,9 @@ DEPENDS = "libxfce4ui polkit" inherit xfce-app -SRC_URI = "git://github.com/ncopa/${BPN}.git" +SRC_URI = " \ + git://github.com/ncopa/${BPN}.git \ + file://0001-fix-Name-Comment-fields.patch \ +" SRCREV = "6ad1ee833c9e22e4dd72a8f7d54562d046965283" S = "${WORKDIR}/git" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.3.6.bb b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.3.6.bb deleted file mode 100644 index ac2360ae4..000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.3.6.bb +++ /dev/null @@ -1,23 +0,0 @@ -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 \ - dbus-glib-native \ -" - -inherit xfce-app - -SRC_URI[md5sum] = "19e602fa5e33afaf7563f069261ae1db" -SRC_URI[sha256sum] = "f4ca7c0dadd3d4cdf8cd3c8ae60ccea77b8cf409f8517161796364eb1d766cf9" - -do_compile_prepend() { - mkdir -p xfce4-notifyd -} - -FILES_${PN} += " \ - ${systemd_user_unitdir} \ - ${libdir}/xfce4/notifyd \ - ${datadir}/themes \ - ${datadir}/dbus-1 \ -" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.2.bb b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.2.bb new file mode 100644 index 000000000..15ec51b2b --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.2.bb @@ -0,0 +1,35 @@ +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 = " \ + dbus \ + dbus-glib \ + dbus-glib-native \ + libnotify \ + libxfce4util \ + libxfce4ui \ + xfconf \ + xfce4-panel \ +" + +inherit xfce-app + +SRC_URI[md5sum] = "ecb930ef6ae6e1f310a5afe5f638eff8" +SRC_URI[sha256sum] = "f6f28af47fdfb41db84bd003f0d76f5f4abf2137d1e27e9d378f063bb8f82356" + +# Avoid trouble with other desktops e.g KDE which also ships dbus service named +# org.freedesktop.Notifications +EXTRA_OECONF = "--disable-dbus-start-daemon" + +do_compile_prepend() { + mkdir -p xfce4-notifyd xfce4-notifyd-config +} + +FILES_${PN} += " \ + ${systemd_user_unitdir} \ + ${datadir}/xfce4 \ + ${datadir}/themes \ + ${datadir}/dbus-1 \ + ${libdir}/xfce4 \ +" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.6.bb b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb index f42edb672..7630abc6b 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.6.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb @@ -8,5 +8,5 @@ inherit xfce-app FILES_${PN} += "${datadir}/xfce4 \ ${datadir}/gnome-control-center" -SRC_URI[md5sum] = "92f5a3366e30f5f8238d8250f730b6af" -SRC_URI[sha256sum] = "bc2a560409a0f0b666d1c557e991748b986ec27572a45ae88b0ee5a480d881d7" +SRC_URI[md5sum] = "f014d613438848b452f1f9eecbf7027d" +SRC_URI[sha256sum] = "dafa155177934fc7dce2d4efb33402f74b1a593a17ff17d2187a6429f599dfd6" 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 d0a0598cd..28f9cde97 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 @@ -3,13 +3,15 @@ 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 +inherit xfce pkgconfig distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71" SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b" -EXTRA_OECONF = "-with-vala-api=0.36" +EXTRA_OECONF = "-with-vala-api=0.38" FILES_${PN} += "${datadir}/vala-*/vapi" 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 deleted file mode 100644 index d77ce4d25..000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/0001-Rename-use-of-stdout-and-stderr.patch +++ /dev/null @@ -1,72 +0,0 @@ -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/gtk-is-required-by-notify.patch b/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch deleted file mode 100644 index d42358d69..000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch +++ /dev/null @@ -1,18 +0,0 @@ -gtk+ is required by linnotify. So make sure gtk be linked before libnotify - -Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> - -diff -Nurp imsettings-1.6.7.orig/configure.ac imsettings-1.6.7/configure.ac ---- imsettings-1.6.7.orig/configure.ac 2013-11-26 16:09:09.000000000 +0800 -+++ imsettings-1.6.7/configure.ac 2014-12-30 11:27:44.370003209 +0800 -@@ -93,8 +93,8 @@ PKG_CHECK_MODULES(LIBNOTIFY, libnotify, - has_old_libnotify=yes - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) - AC_DEFINE(HAS_OLD_LIBNOTIFY,, [Using older libnotify]) -- IMDAEMON_CFLAGS="$GTK_CFLAGS $LIBNOTIFY_OLD_CFLAGS" -- IMDAEMON_LIBS="$GTK_LIBS $LIBNOTIFY_OLD_LIBS"],[ -+ IMDAEMON_CFLAGS="$LIBNOTIFY_OLD_CFLAGS $GTK_CFLAGS" -+ IMDAEMON_LIBS="$LIBNOTIFY_OLD_LIBS $GTK_LIBS"],[ - has_old_libnotify=no - IMDAEMON_CFLAGS="$LIBNOTIFY_CFLAGS" - IMDAEMON_LIBS="$LIBNOTIFY_LIBS"]) diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch b/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch deleted file mode 100644 index d5ac87dc0..000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch +++ /dev/null @@ -1,19 +0,0 @@ -multi-line ACLOCAL_AMFLAGS isn't supported by autoreconf. -It will cause configure error as follow. - - aclocal: error: non-option arguments are not accepted: '\'. - -Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> - -diff -Nurp imsettings-1.7.1.orig/Makefile.am imsettings-1.7.1/Makefile.am ---- imsettings-1.7.1.orig/Makefile.am 2013-02-08 11:33:59.000000000 +0900 -+++ imsettings-1.7.1/Makefile.am 2015-06-24 14:15:32.070000007 +0900 -@@ -1,7 +1,7 @@ - NULL = - SUBDIRS = data imsettings imsettings-daemon backends utils po tests docs - --ACLOCAL_AMFLAGS = -Im4macros -+ACLOCAL_AMFLAGS = -I m4macros $(NULL) - - CONFIGURE_DEPENDENCIES = \ - requires \ diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.2.bb b/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb index 7a4ce05bf..8f622bf6f 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.2.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb @@ -7,16 +7,15 @@ 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 +inherit autotools gtk-doc gobject-introspection distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" 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://0001-Rename-use-of-stdout-and-stderr.patch \ " -SRC_URI[md5sum] = "8153b0583a9f47d8a62af1f92fb9d3bf" -SRC_URI[sha256sum] = "41addf0458f760212b6b6100835066e16deb3a8a50eb005a0fc17fbac0a2ae66" +SRC_URI[md5sum] = "c6c65a2b2654fe9dfe9ab2e8b80c079a" +SRC_URI[sha256sum] = "196d3a74cef254ff812c32682d1818d740e36a68b976fef9e99748d23a71a71a" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch b/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch new file mode 100644 index 000000000..2b5eda0d1 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch @@ -0,0 +1,27 @@ +From f39bcd5af79aa3efe2cecb2212793c5b596890a8 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 18 Feb 2016 17:40:45 +0200 +Subject: [PATCH] Makefile.am: use $(LIBTOOL) instead of hardcoded libtool name + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + unique/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unique/Makefile.am b/unique/Makefile.am +index 6475a87..734f431 100644 +--- a/unique/Makefile.am ++++ b/unique/Makefile.am +@@ -114,7 +114,7 @@ Unique-1.0.gir: $(INTROSPECTION_SCANNER) libunique-1.0.la + --include=GObject-2.0 \ + --include=Gtk-2.0 \ + --library=libunique-1.0.la \ +- --libtool="$(top_builddir)/libtool" \ ++ --libtool="$(LIBTOOL)" \ + --pkg gobject-2.0 \ + --pkg gtk+-2.0 \ + --output $@ \ +-- +2.7.0 + diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch b/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch new file mode 100644 index 000000000..7f9fdf397 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch @@ -0,0 +1,32 @@ +From 37632aca00d48c53e91f08bc7435c721ba81b2cd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 30 Mar 2017 14:32:55 -0700 +Subject: [PATCH] test-unique: Add format qualifier %s for string + +Fixes potential security issues that compiler flags + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/test-unique.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test-unique.c b/tests/test-unique.c +index b7cde45..82ee81b 100644 +--- a/tests/test-unique.c ++++ b/tests/test-unique.c +@@ -82,10 +82,10 @@ app_message_cb (UniqueApp *app, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_CLOSE, +- title); ++ "%s",title); + if (message) + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), +- message); ++ "%s",message); + + gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE); + +-- +2.12.1 + diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch b/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch new file mode 100644 index 000000000..46a5c62e4 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch @@ -0,0 +1,421 @@ +Upstream-Status: Backport [http://git.gnome.org/browse/unique/commit/?h=unique-1.1&id=f75ca2d7aad7d27686acca6090c1c569a79d7e63] +Signed-off-By: Ross Burton <ross.burton@intel.com> + +From f75ca2d7aad7d27686acca6090c1c569a79d7e63 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi <ebassi@gnome.org> +Date: Sat, 08 May 2010 11:17:21 +0000 +Subject: build: Update the build environment + +Require autoconf 2.63, automake 1.11 and libtool 2.2.6 to remove Shave. + +Also bump up the requirement for gobject-introspection to 0.6.7. +--- +diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am +index 5f35b85..b78428f 100644 +--- a/build/autotools/Makefile.am ++++ b/build/autotools/Makefile.am +@@ -1,7 +1,4 @@ + EXTRA_DIST = \ +- shave-libtool.in \ +- shave.in \ +- shave.m4 \ + as-compiler-flag.m4 \ + introspection.m4 \ + Makefile.am.enums \ +diff --git a/build/autotools/Makefile.am.silent b/build/autotools/Makefile.am.silent +index 249f6af..8576846 100644 +--- a/build/autotools/Makefile.am.silent ++++ b/build/autotools/Makefile.am.silent +@@ -1,10 +1,5 @@ + # custom rules for quiet builds + +-if USE_SHAVE +-QUIET_GEN = $(Q:@=@echo ' GEN '$@;) +-QUIET_LN = $(Q:@=@echo ' LN '$@;) +-QUIET_RM = $(Q:@=@echo ' RM '$@;) +-else + QUIET_GEN = $(AM_V_GEN) + + QUIET_LN = $(QUIET_LN_$(V)) +@@ -14,4 +9,3 @@ QUIET_LN_0 = @echo ' LN '$@; + QUIET_RM = $(QUIET_RM_$(V)) + QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY)) + QUIET_RM_0 = @echo ' RM '$@; +-endif # USE_SHAVE +diff --git a/build/autotools/introspection.m4 b/build/autotools/introspection.m4 +index f9ce49c..589721c 100644 +--- a/build/autotools/introspection.m4 ++++ b/build/autotools/introspection.m4 +@@ -59,12 +59,18 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" ++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` ++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` ++ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) ++ AC_SUBST(INTROSPECTION_CFLAGS) ++ AC_SUBST(INTROSPECTION_LIBS) ++ AC_SUBST(INTROSPECTION_MAKEFILE) + + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") + ]) +diff --git a/build/autotools/shave-libtool.in b/build/autotools/shave-libtool.in +deleted file mode 100644 +index 1f3a720..0000000 +--- a/build/autotools/shave-libtool.in ++++ b/dev/null +@@ -1,69 +0,0 @@ +-#!/bin/sh +- +-# we need sed +-SED=@SED@ +-if test -z "$SED" ; then +-SED=sed +-fi +- +-lt_unmangle () +-{ +- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` +-} +- +-# the real libtool to use +-LIBTOOL="$1" +-shift +- +-# if 1, don't print anything, the underlaying wrapper will do it +-pass_though=0 +- +-# scan the arguments, keep the right ones for libtool, and discover the mode +-preserved_args= +-while test "$#" -gt 0; do +- opt="$1" +- shift +- +- case $opt in +- --mode=*) +- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` +- preserved_args="$preserved_args $opt" +- ;; +- -o) +- lt_output="$1" +- preserved_args="$preserved_args $opt" +- ;; +- *) +- preserved_args="$preserved_args $opt" +- ;; +- esac +-done +- +-case "$mode" in +-compile) +- # shave will be called and print the actual CC/CXX/LINK line +- preserved_args="$preserved_args --shave-mode=$mode" +- pass_though=1 +- ;; +-link) +- preserved_args="$preserved_args --shave-mode=$mode" +- Q=" LINK " +- ;; +-*) +- # let's u +- # echo "*** libtool: Unimplemented mode: $mode, fill a bug report" +- ;; +-esac +- +-lt_unmangle "$lt_output" +-output=$last_result +- +-if test -z $V; then +- if test $pass_though -eq 0; then +- echo "$Q$output" +- fi +- $LIBTOOL --silent $preserved_args +-else +- echo $LIBTOOL $preserved_args +- $LIBTOOL $preserved_args +-fi +diff --git a/build/autotools/shave.in b/build/autotools/shave.in +deleted file mode 100644 +index 5c16f27..0000000 +--- a/build/autotools/shave.in ++++ b/dev/null +@@ -1,79 +0,0 @@ +-#!/bin/sh +- +-# we need sed +-SED=@SED@ +-if test -z "$SED" ; then +-SED=sed +-fi +- +-lt_unmangle () +-{ +- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` +-} +- +-# the tool to wrap (cc, cxx, ar, ranlib, ..) +-tool="$1" +-shift +- +-# the reel tool (to call) +-REEL_TOOL="$1" +-shift +- +-pass_through=0 +-preserved_args= +-while test "$#" -gt 0; do +- opt="$1" +- shift +- +- case $opt in +- --shave-mode=*) +- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` +- ;; +- -o) +- lt_output="$1" +- preserved_args="$preserved_args $opt" +- ;; +- *) +- preserved_args="$preserved_args $opt" +- ;; +- esac +-done +- +-# mode=link is handled in the libtool wrapper +-case "$mode,$tool" in +-link,*) +- pass_through=1 +- ;; +-*,cxx) +- Q=" CXX " +- ;; +-*,cc) +- Q=" CC " +- ;; +-*,fc) +- Q=" FC " +- ;; +-*,f77) +- Q=" F77 " +- ;; +-*,objc) +- Q=" OBJC " +- ;; +-*,*) +- # should not happen +- Q=" CC " +- ;; +-esac +- +-lt_unmangle "$lt_output" +-output=$last_result +- +-if test -z $V; then +- if test $pass_through -eq 0; then +- echo "$Q$output" +- fi +- $REEL_TOOL $preserved_args +-else +- echo $REEL_TOOL $preserved_args +- $REEL_TOOL $preserved_args +-fi +diff --git a/build/autotools/shave.m4 b/build/autotools/shave.m4 +deleted file mode 100644 +index 0a3509e..0000000 +--- a/build/autotools/shave.m4 ++++ b/dev/null +@@ -1,77 +0,0 @@ +-dnl Make automake/libtool output more friendly to humans +-dnl Damien Lespiau <damien.lespiau@gmail.com> +-dnl +-dnl SHAVE_INIT([shavedir],[default_mode]) +-dnl +-dnl shavedir: the directory where the shave scripts are, it defaults to +-dnl $(top_builddir) +-dnl default_mode: (enable|disable) default shave mode. This parameter +-dnl controls shave's behaviour when no option has been +-dnl given to configure. It defaults to disable. +-dnl +-dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just +-dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and +-dnl LIBTOOL, you don't want the configure tests to have these variables +-dnl re-defined. +-dnl * This macro requires GNU make's -s option. +- +-AC_DEFUN([_SHAVE_ARG_ENABLE], +-[ +- AC_ARG_ENABLE([shave], +- AS_HELP_STRING( +- [--enable-shave], +- [use shave to make the build pretty [[default=$1]]]),, +- [enable_shave=$1] +- ) +-]) +- +-AC_DEFUN([SHAVE_INIT], +-[ +- dnl you can tweak the default value of enable_shave +- m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) +- +- if test x"$enable_shave" = xyes; then +- dnl where can we find the shave scripts? +- m4_if([$1],, +- [shavedir="$ac_pwd"], +- [shavedir="$ac_pwd/$1"]) +- AC_SUBST(shavedir) +- +- dnl make is now quiet +- AC_SUBST([MAKEFLAGS], [-s]) +- AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) +- +- dnl we need sed +- AC_CHECK_PROG(SED,sed,sed,false) +- +- dnl substitute libtool +- SHAVE_SAVED_LIBTOOL=$LIBTOOL +- LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" +- AC_SUBST(LIBTOOL) +- +- dnl substitute cc/cxx +- SHAVE_SAVED_CC=$CC +- SHAVE_SAVED_CXX=$CXX +- SHAVE_SAVED_FC=$FC +- SHAVE_SAVED_F77=$F77 +- SHAVE_SAVED_OBJC=$OBJC +- CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" +- CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" +- FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" +- F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" +- OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}" +- AC_SUBST(CC) +- AC_SUBST(CXX) +- AC_SUBST(FC) +- AC_SUBST(F77) +- AC_SUBST(OBJC) +- +- V=@ +- else +- V=1 +- fi +- Q='$(V:1=)' +- AC_SUBST(V) +- AC_SUBST(Q) +-]) +- +diff --git a/configure.ac b/configure.ac +index a3ed3ee..bc3163a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,7 +14,7 @@ m4_define([unique_api_version], [1.0]) + # This is the X.Y used in the protocol negotiation + m4_define([unique_protocol_version], [1.0]) + +-AC_PREREQ([2.59]) ++AC_PREREQ([2.63]) + + AC_INIT([unique], [unique_version], + [http://bugzilla.gnome.org/enter_bug.cgi?product=libunique], +@@ -23,9 +23,21 @@ AC_INIT([unique], [unique_version], + AC_CONFIG_SRCDIR([unique/unique.h]) + AC_CONFIG_MACRO_DIR([build/autotools]) + +-AM_INIT_AUTOMAKE([1.10]) ++AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability dist-bzip2]) + AM_CONFIG_HEADER([config.h]) + ++AM_SILENT_RULES([yes]) ++ ++AC_PROG_CC_C_O ++ ++AM_PATH_GLIB_2_0 ++ ++LT_PREREQ([2.2.6]) ++LT_INIT([disable-static]) ++ ++# Honor aclocal flags ++ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" ++ + # version symbols + UNIQUE_MAJOR_VERSION=unique_major_version + UNIQUE_MINOR_VERSION=unique_minor_version +@@ -49,21 +61,6 @@ UNIQUE_LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age) + AC_SUBST(UNIQUE_LT_VERSION_INFO) + AC_SUBST(UNIQUE_LT_CURRENT_MINUS_AGE) + +-AC_ISC_POSIX +-AC_PROG_CC +-AC_PROG_INSTALL +-AC_PROG_MAKE_SET +-AC_C_CONST +-AC_PROG_LIBTOOL +-AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums]) +-AC_PATH_PROG(GLIB_GENMARSHAL, [glib-genmarshal]) +- +-AM_SANITY_CHECK +-AM_PROG_CC_STDC +- +-# Honor aclocal flags +-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" +- + m4_define([glib_required], [2.12.0]) + m4_define([gtk_required], [2.11.0]) + m4_define([dbus_required], [0.70]) +@@ -122,7 +119,6 @@ AM_CONDITIONAL([HAVE_DBUS], [test "x$have_dbus" = "xyes"]) + dnl Bacon backend + dnl This is the fallback backend, so we *need* these headers and functions + dnl even if we end up using D-Bus +-dnl D-Bus backend dependencies + m4_define([have_bacon_default], [yes]) + AC_ARG_ENABLE([bacon], + [AC_HELP_STRING([--enable-bacon=@<:@yes/no@:>@], +@@ -178,9 +174,9 @@ AC_ARG_ENABLE([maintainer-flags], + AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"], + [ + AS_COMPILER_FLAGS([MAINTAINER_CFLAGS], +- ["-Werror -Wall -Wshadow -Wcast-align +- -Wno-uninitialized -Wempty-body -Wformat-security +- -Winit-self"]) ++ ["-Wall -Wshadow -Wcast-align ++ -Wno-uninitialized -Wempty-body ++ -Wformat-security -Winit-self"]) + ] + ) + +@@ -230,27 +226,10 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], + AM_GLIB_DEFINE_LOCALEDIR(UNIQUE_LOCALEDIR) + + # introspection +-GOBJECT_INTROSPECTION_CHECK([0.6.3]) ++GOBJECT_INTROSPECTION_CHECK([0.6.7]) + + # gtk-doc +-GTK_DOC_CHECK([1.11]) +- +-# nice builds +-m4_ifdef([AM_SILENT_RULES], +- [ +- AM_SILENT_RULES([yes]) +- use_shave=no +- ], +- [ +- SHAVE_INIT([build/autotools], [enable]) +- AC_CONFIG_FILES([ +- build/autotools/shave-libtool +- build/autotools/shave +- ]) +- use_shave=yes +- ]) +- +-AM_CONDITIONAL([USE_SHAVE], [test "x$use_shave" = "xyes"]) ++GTK_DOC_CHECK([1.13]) + + AC_CONFIG_FILES([ + Makefile +-- +cgit v0.9.0.2 diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch b/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch new file mode 100644 index 000000000..d75de93fc --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch @@ -0,0 +1,36 @@ +Upstream-Status: Pending + +Fix Following compilation errors with gcc 4.6.0 + +Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10 + +| uniquebackend-dbus.c: In function 'unique_backend_dbus_request_name': +| uniquebackend-dbus.c:87:22: error: variable 'backend_dbus' set but not used [-Werror=unused-but-set-variable] +| uniquebackend-dbus.c: In function 'unique_backend_dbus_send_message': +| uniquebackend-dbus.c:189:12: error: variable 'res' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make[5]: *** [libunique_dbus_la-uniquebackend-dbus.lo] Error 1 + +Index: libunique-1.1.6/unique/dbus/uniquebackend-dbus.c +=================================================================== +--- libunique-1.1.6.orig/unique/dbus/uniquebackend-dbus.c ++++ libunique-1.1.6/unique/dbus/uniquebackend-dbus.c +@@ -84,7 +84,7 @@ unique_backend_dbus_register_proxy (Uniq + static gboolean + unique_backend_dbus_request_name (UniqueBackend *backend) + { +- UniqueBackendDBus *backend_dbus; ++ UniqueBackendDBus __attribute__((__unused__)) *backend_dbus; + const gchar *name; + DBusGConnection *connection; + DBusGProxy *proxy; +@@ -186,7 +186,7 @@ unique_backend_dbus_send_message (Unique + GValueArray *data; + gchar *cmd; + gchar *resp; +- gboolean res; ++ gboolean __attribute__((__unused__)) res; + GError *error; + UniqueResponse response; + diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch b/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch new file mode 100644 index 000000000..2cc03473c --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch @@ -0,0 +1,130 @@ +G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid +build failures. + +RP 2011/10/12 + +Upstream-Status: Pending + +Index: libunique-1.1.6/unique/uniqueapp.c +=================================================================== +--- libunique-1.1.6.orig/unique/uniqueapp.c 2011-10-12 01:21:25.842046488 +0100 ++++ libunique-1.1.6/unique/uniqueapp.c 2011-10-12 01:21:55.062046796 +0100 +@@ -781,7 +781,7 @@ + } + + +-G_CONST_RETURN gchar * ++const gchar * + unique_command_to_string (UniqueApp *app, + gint command) + { +@@ -863,7 +863,7 @@ + return retval; + } + +-G_CONST_RETURN gchar * ++const gchar * + unique_response_to_string (UniqueResponse response) + { + GEnumClass *enum_class; +Index: libunique-1.1.6/unique/uniquebackend.c +=================================================================== +--- libunique-1.1.6.orig/unique/uniquebackend.c 2011-10-12 01:21:25.742046323 +0100 ++++ libunique-1.1.6/unique/uniquebackend.c 2011-10-12 01:21:55.062046796 +0100 +@@ -111,7 +111,7 @@ + * + * Return value: FIXME + */ +-G_CONST_RETURN gchar * ++const gchar * + unique_backend_get_name (UniqueBackend *backend) + { + g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); +@@ -154,7 +154,7 @@ + * + * Return value: FIXME + */ +-G_CONST_RETURN gchar * ++const gchar * + unique_backend_get_startup_id (UniqueBackend *backend) + { + g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); +Index: libunique-1.1.6/unique/uniquebackend.h +=================================================================== +--- libunique-1.1.6.orig/unique/uniquebackend.h 2011-10-12 01:21:25.992046521 +0100 ++++ libunique-1.1.6/unique/uniquebackend.h 2011-10-12 01:21:56.512047875 +0100 +@@ -94,10 +94,10 @@ + + UniqueBackend * unique_backend_create (void); + +-G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend); ++const gchar *unique_backend_get_name (UniqueBackend *backend); + void unique_backend_set_name (UniqueBackend *backend, + const gchar *name); +-G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend); ++const gchar *unique_backend_get_startup_id (UniqueBackend *backend); + void unique_backend_set_startup_id (UniqueBackend *backend, + const gchar *startup_id); + GdkScreen * unique_backend_get_screen (UniqueBackend *backend); +Index: libunique-1.1.6/unique/uniqueinternals.h +=================================================================== +--- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-10-12 01:21:25.892046532 +0100 ++++ libunique-1.1.6/unique/uniqueinternals.h 2011-10-12 01:21:56.512047875 +0100 +@@ -44,11 +44,11 @@ + * and then back into an id + */ + UniqueResponse unique_response_from_string (const gchar *response); +-G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response); ++const gchar *unique_response_to_string (UniqueResponse response); + + gint unique_command_from_string (UniqueApp *app, + const gchar *command); +-G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app, ++const gchar *unique_command_to_string (UniqueApp *app, + gint command); + + G_END_DECLS +Index: libunique-1.1.6/unique/uniquemessage.c +=================================================================== +--- libunique-1.1.6.orig/unique/uniquemessage.c 2011-10-12 01:21:25.942046524 +0100 ++++ libunique-1.1.6/unique/uniquemessage.c 2011-10-12 01:21:55.072046595 +0100 +@@ -185,7 +185,7 @@ + * + * Since: 1.0.2 + */ +-G_CONST_RETURN guchar * ++const guchar * + unique_message_data_get (UniqueMessageData *message_data, + gsize *length) + { +@@ -525,7 +525,7 @@ + * owned by the #UniqueMessageData structure and should not be + * modified or freed + */ +-G_CONST_RETURN gchar * ++const gchar * + unique_message_data_get_startup_id (UniqueMessageData *message_data) + { + g_return_val_if_fail (message_data != NULL, NULL); +Index: libunique-1.1.6/unique/uniquemessage.h +=================================================================== +--- libunique-1.1.6.orig/unique/uniquemessage.h 2011-10-12 01:21:25.792046596 +0100 ++++ libunique-1.1.6/unique/uniquemessage.h 2011-10-12 01:21:56.512047875 +0100 +@@ -48,7 +48,7 @@ + void unique_message_data_set (UniqueMessageData *message_data, + const guchar *data, + gsize length); +-G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data, ++const guchar *unique_message_data_get (UniqueMessageData *message_data, + gsize *length); + + gboolean unique_message_data_set_text (UniqueMessageData *message_data, +@@ -63,7 +63,7 @@ + gchar * unique_message_data_get_filename (UniqueMessageData *message_data); + + GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data); +-G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); ++const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); + guint unique_message_data_get_workspace (UniqueMessageData *message_data); + + G_END_DECLS diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb b/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb new file mode 100644 index 000000000..49ed07ad9 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb @@ -0,0 +1,30 @@ +SUMMARY = "Library for supporting single instance GTK+ applications" +DESCRIPTION = "Unique is a library for writing single instance GTK+ applications. If you launch a single instance application twice, the second instance will either just quit or will send a message to the running instance." +HOMEPAGE = "https://wiki.gnome.org/Attic/LibUnique" +BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique" + +SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \ + file://fix_for_compile_with_gcc-4.6.0.patch \ + file://noconst.patch \ + file://build.patch \ + file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ + file://0001-test-unique-Add-format-qualifier-s-for-string.patch \ + " + +SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d" +SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb" + +PR = "r7" + +DEPENDS = "dbus-glib-native glib-2.0 gtk+" + +PACKAGECONFIG ??= "dbus" +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + + +inherit autotools pkgconfig gobject-introspection distro_features_check gtk-doc + +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_0.8.1.bb b/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.0.bb index 824611abe..479f1a4df 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_0.8.1.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.0.bb @@ -19,8 +19,8 @@ DEPENDS += " \ taglib \ " -SRC_URI[md5sum] = "361e3059f1263c76a3711db2c7c1a97b" -SRC_URI[sha256sum] = "4b216f5200490f8d2a9bf1b3fcd9a8b20834c95249bf13b9170c82e1fcbd80f4" +SRC_URI[md5sum] = "d00d3ca571900826bf5e1f6986e42992" +SRC_URI[sha256sum] = "6666b335aeb690fb527f77b62c322baf34834b593659fdcd21d21ed3f1e14010" RDEPENDS_${PN} += "gstreamer1.0-plugins-good" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.2.4.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.0.bb index 4c7ca706d..f5417a1a1 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.2.4.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.0.bb @@ -8,8 +8,8 @@ REQUIRED_DISTRO_FEATURES = "pulseaudio x11" DEPENDS += "pulseaudio" -SRC_URI[md5sum] = "e0ffde419fa030f1f9bd0b56e3264a1c" -SRC_URI[sha256sum] = "8d9330ddf1d44a864a36d566cce4b76d4f859c5984bba7653d7dc39aa24d5c3e" +SRC_URI[md5sum] = "12f3dd97e02c604e2023b5baf30d4a6c" +SRC_URI[sha256sum] = "aef9ad68a0b604a6aeca4c08146f3eb42bedb4fe1c8b65b82679cec0e2fc1cb3" PACKAGECONFIG ??= "" PACKAGECONFIG[libnotify] = "--enable-libnotify,--disable-libnotify,libnotify" 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 deleted file mode 100644 index 3f0bb05af..000000000 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin/0001-Specify-string-format-explicitly.patch +++ /dev/null @@ -1,32 +0,0 @@ -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.7.0.bb index 961519285..2ddc6f67c 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.7.0.bb @@ -6,7 +6,5 @@ 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" +SRC_URI[md5sum] = "32e6a14e80bf9a93db2f2b3bfd7de920" +SRC_URI[sha256sum] = "2e4e5343e39926230cc981d5fe56cd58a2f3817d2e9b6089b5673a2e39bf7e9b" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.9.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.10.bb index d9ed2ce37..649eaaafb 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.9.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.10.bb @@ -7,7 +7,7 @@ inherit xfce-panel-plugin DEPENDS += "libsoup-2.4 dbus-glib upower" -SRC_URI[md5sum] = "0c56c057e1c354b30409b7871ab6f314" -SRC_URI[sha256sum] = "0e15d14b3e18c3da46ad23ee3158a25220f1474a48b611de96edb56221aecee5" +SRC_URI[md5sum] = "bba7f750b97c8fc3656715268edad792" +SRC_URI[sha256sum] = "ee6d43c444904631c240470e15e96215c2ce451158bfdbf234bce892bf60eab8" FILES_${PN} += "${datadir}/xfce4/weather" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.3.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.6.bb index 3c67a2f54..762cff0f6 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.3.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.6.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "032a2bb0a0d4a2e3c8c136910c8b551d" -SRC_URI[sha256sum] = "e8918c1255f7ab86b950ebd13555fe87046c01a1a4cb0b5d460024b6efc01769" +SRC_URI[md5sum] = "b2b2bacc8d5f3c3119a0f317b6074276" +SRC_URI[sha256sum] = "8b2a8ee1445df39a2cda139e353f2e9ec3720a780296dc41b7d4aebde57371fc" RRECOMMENDS_${PN} += "menulibre" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.1.bb index 5e62c033d..8ee374035 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.1.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=496f09f084b0f7e6f02f769a84490c6b" inherit xfce-panel-plugin -SRC_URI[md5sum] = "e4e897741ebe2827192971c2aaad835d" -SRC_URI[sha256sum] = "3b0d3b9f4b7c3e3e7be668e2f7c845b89b16e0ed3db2bacb544a17272682ced0" +SRC_URI[md5sum] = "72530bf59d7cd902326469e5a7a9892b" +SRC_URI[sha256sum] = "c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1" DEPENDS += "libxklavier libwnck3 librsvg garcon" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-support/vim/vim_%.bbappend b/import-layers/meta-openembedded/meta-xfce/recipes-support/vim/vim_%.bbappend index 25403e6cb..7b449630e 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-support/vim/vim_%.bbappend +++ b/import-layers/meta-openembedded/meta-xfce/recipes-support/vim/vim_%.bbappend @@ -1,6 +1 @@ -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 -} +require ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${BPN}_xfce.inc', '', d)} diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-support/vim/vim_xfce.inc b/import-layers/meta-openembedded/meta-xfce/recipes-support/vim/vim_xfce.inc new file mode 100644 index 000000000..25403e6cb --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-support/vim/vim_xfce.inc @@ -0,0 +1,6 @@ +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/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/configure.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/configure.patch index ef27e423b..89cc1f387 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/configure.patch +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/configure.patch @@ -1,6 +1,20 @@ ---- a/configure.ac 2007-12-02 10:37:06.000000000 -0200 -+++ b/configure.ac 2008-06-05 17:21:42.000000000 -0300 -@@ -127,22 +127,24 @@ +From 13a74582ffd7f81dbd66a7296fc76007718e9d4d Mon Sep 17 00:00:00 2001 +From: Andreas Mueller <schnitzeltony@gmx.de> +Date: Mon, 1 Aug 2011 17:16:29 +0200 + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + +--- + configure.ac | 34 ++++++++++++++++++---------------- + 1 file changed, 18 insertions(+), 16 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0de5ceb..3f92d1b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -143,22 +143,24 @@ AC_FUNC_MMAP() dnl *************************************** dnl *** Check for strftime() extensions *** dnl *************************************** diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch index ac8bca5f3..348e147cf 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch @@ -1,22 +1,24 @@ -From 5f1e19860d89647488bdd32a02fb332f69434405 Mon Sep 17 00:00:00 2001 +From 9231a2d5b9c5406f33aef3ab4de2dbec9b08ed13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> Date: Fri, 18 May 2012 21:13:00 +0200 Subject: [PATCH] Do not run tests at build time MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Not-Applicable + +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + --- - Makefile.am | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 0ab3853..3e72391 100644 +index 226e79d..62ad18d 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -8,8 +8,7 @@ SUBDIRS = \ +@@ -9,8 +9,7 @@ SUBDIRS = \ docs \ icons \ pixmaps \ @@ -24,8 +26,5 @@ index 0ab3853..3e72391 100644 - tests + po - AUTOMAKE_OPTIONS = \ - 1.9 \ --- -1.7.4.4 - + distclean-local: + rm -rf *.cache *~ diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch index 99318d5aa..076477581 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch @@ -10,9 +10,10 @@ exo-csource creates c-header files from glade resource output files. When building xfce-packages from git instead of tarball this exo-csource-native is required. -Upstream-Status: Inappropriate [configuration] +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + --- Makefile.am | 10 +--------- configure.ac | 22 ---------------------- @@ -40,7 +41,7 @@ index 62ad18d..bdc5fae 100644 distclean-local: rm -rf *.cache *~ diff --git a/configure.ac b/configure.ac -index ba5395d..2605067 100644 +index 3f92d1b..0d4cc38 100644 --- a/configure.ac +++ b/configure.ac @@ -116,15 +116,6 @@ AC_PROG_CC() @@ -65,9 +66,9 @@ index ba5395d..2605067 100644 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.20.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.10.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]) @@ -80,5 +81,5 @@ index ba5395d..2605067 100644 dnl ************************* dnl *** Check for gtk-doc *** -- -2.9.4 +2.14.3 diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.11.5.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.0.bb index d5508c0a5..d256b5769 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.11.5.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.0.bb @@ -20,8 +20,8 @@ SRC_URI_append_class-native = " \ file://reduce-build-to-exo-csource-only.patch \ " -SRC_URI[md5sum] = "2e560edfa8ddf77e21c4787a6f600171" -SRC_URI[sha256sum] = "8e8629f33783eba1ce6d092a42c28217458a0cc3d1ad7474097b9187054955c1" +SRC_URI[md5sum] = "724afcca224f5fb22b510926d2740e52" +SRC_URI[sha256sum] = "64b88271a37d0ec7dca062c7bc61ca323116f7855092ac39698c421a2f30a18f" PACKAGES =+ "exo-csource" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch new file mode 100644 index 000000000..fb8910204 --- /dev/null +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch @@ -0,0 +1,23 @@ +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/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb index ae7f99f5a..ef4f4bfa8 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb @@ -8,6 +8,8 @@ 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" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch index b8c917883..6d107b1b6 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch @@ -9,6 +9,7 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + --- libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) @@ -17,8 +18,8 @@ diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-priv index 723a10d..e6502f3 100644 --- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -@@ -66,4 +66,8 @@ - <property name="<Control>F12" type="string" value="workspace_12_key"/> +@@ -75,4 +75,8 @@ + <property name="<Primary>F12" type="string" value="workspace_12_key"/> </property> </property> + <property name="providers" type="array"> diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index cc231b4bd..b73c9ee16 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda PR = "r10" -inherit packagegroup +inherit packagegroup distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" # mandatory RDEPENDS_${PN} = " \ diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.12.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb index 8f1b23e36..170e25070 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.12.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.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] = "1bdf3c4a57ff886c512341f24b5e0e88" -SRC_URI[sha256sum] = "fb22091f07ec6de2c9d9d89c61289d2bc3436b36c8c53ccbc9c32ca8a99f2086" +SRC_URI[md5sum] = "8fea2af69c3acbb273fd1a177d3d8e47" +SRC_URI[sha256sum] = "e81291a8519f495e0a059ff1f2d29608bc6d37c0be83b1f38f3c9aa25f8d252d" 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.2.0.bb index 1f5419ad1..7e0c555a4 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.2.0.bb @@ -6,8 +6,8 @@ DEPENDS = "dbus-glib dbus-glib-native freetype gdk-pixbuf poppler curl xfce4-dev inherit xfce gtk-doc -SRC_URI[md5sum] = "0067054e6f1f90a13f90faadfca1e89e" -SRC_URI[sha256sum] = "d0fd329273ff6ac98885eade4c3d8c87a4dd0816f713646130808bfa90b87173" +SRC_URI[md5sum] = "dd5f9bae6a2470eb5fff0dc9edd3ea09" +SRC_URI[sha256sum] = "4e27a59694b0a5cc69ebccbdb00c724e670b5b7c30bc4dc0b461aac93f234fac" SRC_URI += "file://0001-configure-use-pkg-config-for-freetype2.patch" INSANE_SKIP_${PN} = "dev-so" @@ -15,6 +15,12 @@ INSANE_SKIP_${PN} = "dev-so" PACKAGECONFIG ??= "" PACKAGECONFIG[gstreamer-thumbnailer] = "--enable-gstreamer-thumbnailer,--disable-gstreamer-thumbnailer,gstreamer1.0 gstreamer1.0-plugins-base" +do_install_append() { + # Makefile seems to race on creation of symlink. So ensure creation here + # until fixed properly + ln -sf tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so +} + FILES_${PN} += "${datadir}/dbus-1/services \ ${libdir}/tumbler-1/tumblerd \ ${libdir}/tumbler-1/plugins/*.so \ diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.12.0.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb index 175a82707..7e7391167 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.12.0.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb @@ -2,13 +2,13 @@ DESCRIPTION="Xfce4 Application Finder" SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS="glib-2.0 gtk+ libxfce4util libxfce4ui garcon dbus-glib xfconf" +DEPENDS="glib-2.0 gtk+3 libxfce4util libxfce4ui garcon dbus-glib xfconf" inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "0b238b30686388c507c119b12664f1a1" -SRC_URI[sha256sum] = "2ad4a58019a76a6b64a816050db25f96854917c2f2e89d6a9df6c18e6c84c567" +SRC_URI[md5sum] = "6b6cf080c891f7945953f8084a901552" +SRC_URI[sha256sum] = "c0eb3b29eba3cfa9175ed35174e83a21faa2a2423ddb79501fe8846cc430e3ae" FILES_${PN} += "${datadir}/appdata" diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.1.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb index 80332cebe..9cc9a4bbc 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.1.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb @@ -4,12 +4,12 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" DEPENDS = "libxfce4util garcon libxfce4ui xfconf exo gtk+ gtk+3 dbus cairo virtual/libx11 libxml2 libwnck" -inherit xfce gtk-doc distro_features_check +inherit xfce gtk-doc distro_features_check gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "0b943f2e72a3693dddb1af559826cb62" -SRC_URI[sha256sum] = "93d58b80cca9c9eb58adb281bc75404df7cf6cae89f7f98bb9f38690009aa2e8" +SRC_URI[md5sum] = "803c9aabc2925dc97f96de125c52ba2e" +SRC_URI[sha256sum] = "42058abb81b8f87691d3999627447de71c3285bcf055f308aab5cefab2de0ce9" SRC_URI += " \ 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 \ @@ -39,5 +39,6 @@ FILES_${PN}-gtk3 = " \ ${libdir}/libxfce4panel-2.0${SOLIBS} \ ${libdir}/xfce4/panel/wrapper-2.0 \ " -FILES_${PN}-dbg += "${libdir}/xfce4/panel/plugins/.debug \ +FILES_${PN}-dbg += " \ + ${libdir}/xfce4/panel/plugins/.debug \ " 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.1.bb index 08d00df72..ed117b0a6 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.1.bb @@ -12,8 +12,8 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "gtk+3 glib-2.0 dbus-glib xfconf libxfce4ui libxfce4util libnotify \ libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" -SRC_URI[md5sum] = "2e2e24a1a22912d6a561ba6155887503" -SRC_URI[sha256sum] = "bde3157e06ab31ff23648d163d53ee5095f7819544a9f48d3a96d57829857f2b" +SRC_URI[md5sum] = "17f0e6464ad6b3bc6a657f595bf91430" +SRC_URI[sha256sum] = "1ea825452343b895566068018b6d5078608f8f46ce8075ba6bbb4b848f48656b" EXTRA_OECONF = " \ --enable-network-manager \ diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb index 771da2c66..bf9bd3102 100644 --- a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb +++ b/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb @@ -13,12 +13,12 @@ REQUIRED_DISTRO_FEATURES = "x11" # + 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.0-1 \ + git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.3 \ file://0001-xsettings.xml-Set-default-themes.patch \ " -SRCREV = "c6683cb2cff489c16c2c7b5eab4017bb461f07f1" +SRCREV = "b701ac8b66b83c17469dd5009da51eeb59eba442" S = "${WORKDIR}/git" -PV = "4.12.0+git${SRCPV}" +PV = "4.12.3+git${SRCPV}" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" 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.4.bb index daecf828e..d9cbe7196 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.4.bb @@ -8,8 +8,8 @@ inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "cb34f4f333d7d122f1688d2f155202c8" -SRC_URI[sha256sum] = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac" +SRC_URI[md5sum] = "7571889368be72df185ce2d470f37198" +SRC_URI[sha256sum] = "098a35510562907e1431d5adbfa8307484a235c1dec6a43e2d58d2ac4241f1cb" PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" |
