diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-01-30 00:58:13 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-01-30 19:33:11 +0300 |
| commit | eef6386ca7c8a62f37fc84a0a5a68842183cdfb0 (patch) | |
| tree | e6aff1bbab2f0f36edabc31493bcf96e34ce1d6b /meta-openembedded/meta-xfce | |
| parent | c60845c87403beb867c541f4271d05287f38a985 (diff) | |
| download | openbmc-eef6386ca7c8a62f37fc84a0a5a68842183cdfb0.tar.xz | |
meta-openembedded: subtree update:4599fea881..fd123c9bb2
Adrian (1):
networkmanager: add missing readline depends
Adrian Freihofer (2):
nftables: upgrade 0.9.7 -> 0.9.8
firewalld: upgrade 0.9.2 -> 0.9.3
Adrian Herrera (2):
cppunit: add support for native version
protobuf: apply fix for pkg-config pthread flags
Alejandro Enedino Hernandez Samaniego (2):
remmina: Update to 1.4.10
imapfilter: Upgrade 2.6.16 -> 2.7.5
Anatol Belski (1):
xmlsec1: Fix configure QA error caused by host lookup path
Andreas Müller (24):
libunique: remove
xfce4-screenshooter: replace gtk+ -> gtk+3 in DEPENDS
libxfce4ui: Fix sporadic install error
poppler: upgrade 20.12.1 -> 21.01.0
dconf: upgrade 0.36.0 -> 0.38.0
dconf-editor: upgrade 3.36.2 -> 3.38.2
amtk: upgrade 5.1.1 -> 5.2.0
evince: upgrade 3.36.7 -> 3.38.0
catfish: upgrade 1.4.13 -> 4.16.0
xfwm4: upgrade 4.16.0 -> 4.16.1
parole: upgrade 1.0.5 -> 4.16.0
garcon: upgrade 0.8.0 -> 4.16.1
xfce4-whiskermenu-plugin: upgrade 2.5.1 -> 2.5.2
thunar: upgrade 4.16.0 -> 4.16.2
jack: upgrade 1.19.16 -> 1.19.17
networkmanager: upgrade 1.22.14 -> 1.28.0
appstream-glib: upgrade 0.7.17 -> 0.7.18
vlc: upgrade 3.0.11.1 -> 3.0.12
python3-mypy-extensions: Initial add 0.4.3
python3-mypy: initial add 0.800
python3-send2trash_ initial add 1.5.0
python3-asttokens: initial add 2.0.4
python3-typed-ast: Initial add 1.4.1
packagegroup-meta-python: Add asttokens/mypy/mypy-extensions/typed-ast/send2trash
Andrew Jeffery (2):
meta-python: Add hexdump package
meta-python: Add jstyleson
Armin Kuster (3):
wireshark: Several securtiy fixes
ipset: add recipe
lua: update to 5.3.6
Clément Péron (2):
re2: Add recipe for Google RE2 library
abseil-cpp: bump to LTS 2020_09_23 Patch Release 3
Daniel Gomez (2):
zbar: Add support for mchehab/zbar
zbar: Remove support for 0.10 version
Diego Santa Cruz (1):
net-snmp: control smux via PACKAGECONFIG
Gianfranco (2):
vboxguestdrivers: upgrade 6.1.16 -> 6.1.18
vboxguestdrivers: Add patch proposed upstream to fix a build failure on i386
Gianfranco Costamagna (1):
dlt-daemon: update to new release 2.18.6
Harpritkaur Bhandari (1):
rapidjson: Upgrade SRCREV to latest
He Zhe (2):
lmbench: Fix webpage-lm and manual page typos
lmbench: lat_fifo: Fix cleanup sequence
Junjie Mao (1):
python3-xmlschema: Yocto recipes for validating against XSD 1.1
Kai Kang (4):
xfce4-panel-profiles: fix do install failure with dash
xfce4-panel-profiles: update remove-bashisms.patch for centos 7
blueman: refresh patch
mariadb: add package config zstd
Khem Raj (6):
influxdb: Fix build on mips
packagegroup-meta-oe: Add new package influxdb
packagegroup-meta-networking: Add ipset
packagegroup-meta-oe: Add re2
autoconf-2.13-native,xserver-xorg-cvt-native: Move inheriting native to the end
dfu-util-native: Adjust Inherit order
Leon Anavi (75):
python3-aiohttp: Upgrade 3.7.2 -> 3.7.3
python3-coloredlogs: Upgrade 14.0 -> 15.0
python3-jsonrpcserver: Upgrade 4.1.3 -> 4.2.0
python3-pymisp: Upgrade 2.4.133 -> 2.4.135.3
python3-parso: Upgrade 0.8.0 -> 0.8.1
python3-pillow: Upgrade 7.2.0 -> 8.1.0
python3-croniter: Upgrade 0.3.37 -> 1.0.1
python3-pychromecast: Upgrade 7.7.1 -> 7.7.2
python3-hyperlink: Upgrade 20.0.1 -> 21.0.0
python3-dnspython: Upgrade 2.0.0 -> 2.1.0
python3-prompt-toolkit: Upgrade 3.0.9 -> 3.0.10
python3-ptyprocess: Upgrade 0.6.0 -> 0.7.0
python3-certifi: Upgrade 2020.11.8 -> 2020.12.5
python3-jedi: Upgrade 0.17.2 -> 0.18.0
python3-mock: Upgrade 4.0.2 -> 4.0.3
python3-pyscaffold: Upgrade 3.2.3 -> 3.3
python3-cffi: Upgrade 1.14.3 -> 1.14.4
python3-rsa: Upgrade 4.6 -> 4.7
python3-pyjwt: Upgrade 1.7.1 -> 2.0.0
python3-isort: Upgrade 5.6.4 -> 5.7.0
python3-lz4: Upgrade 3.1.0 -> 3.1.1
python3-msgpack: Upgrade 1.0.0 -> 1.0.2
python3-pyopenssl: Upgrade 19.1.0 -> 20.0.1
python3-ecdsa: Upgrade 0.16.0 -> 0.16.1
python3-regex: Upgrade 2020.10.28 -> 2020.11.13
python3-cryptography: Upgrade 3.2 -> 3.3.1
python3-cryptography-vectors: Upgrade 3.2 -> 3.3.1
python3-wheel: Upgrade 0.35.1 -> 0.36.2
python3-pyzmq: Upgrade 19.0.2 -> 20.0.0
python3-greenlet: Upgrade 0.4.17 -> 1.0.0
python3-parse: Upgrade 1.18.0 -> 1.19.0
python3-colorlog: Upgrade 4.6.2 -> 4.7.2
python3-pyephem: Upgrade 3.7.7.0 -> 3.7.7.1
python3-pyperf: Upgrade 2.0.0 -> 2.1.0
python3-cheetah: Upgrade 3.2.5 -> 3.2.6
python3-pyscaffold: Upgrade 3.3 -> 3.3.1
python3-lxml: Upgrade 4.6.1 -> 4.6.2
python3-openpyxl: Upgrade 3.0.5 -> 3.0.6
python3-pymysql: Upgrade 0.10.1 -> 1.0.2
python3-dbus-next: Upgrade 0.1.4 -> 0.2.2
python3-yappi: Upgrade 1.3.0 -> 1.3.2
python3-pyyaml: Upgrade 5.3.1 -> 5.4
python3-google-api-python-client: Upgrade 1.12.5 -> 1.12.8
python3-evdev: Upgrade 1.3.0 -> 1.4.0
python3-pyusb: Upgrade 1.1.0 -> 1.1.1
python3-pyserial: Upgrade 3.4 -> 3.5
python3-pandas: Upgrade 1.2.0 -> 1.2.1
python3-alembic: Upgrade 1.4.3 -> 1.5.1
python3-coverage: Upgrade 5.3 -> 5.3.1
python3-lz4: Upgrade 3.1.1 -> 3.1.3
python3-bitarray: Upgrade 1.6.1 -> 1.6.3
python3-pykwalify: Upgrade 1.7.0 -> 1.8.0
python3-croniter: Upgrade 1.0.1 -> 1.0.2
python3-ujson: Upgrade 4.0.1 -> 4.0.2
python3-smbus2: Upgrade 0.4.0 -> 0.4.1
python3-pyzmq: Upgrade 20.0.0 -> 21.0.1
python3-alembic: Upgrade 1.5.1 -> 1.5.2
python3-prompt-toolkit: Upgrade 3.0.10 -> 3.0.11
python3-pyjwt: Upgrade 2.0.0 -> 2.0.1
python3-pyyaml: Upgrade 5.4 -> 5.4.1
python3-natsort: Upgrade 7.1.0 -> 7.1.1
python3-pymisp: Upgrade 2.4.135.3 -> 2.4.137.1
python3-socketio: Upgrade 4.6.0 -> 5.0.4
python3-lazy-object-proxy: Upgrade 1.5.1 -> 1.5.2
python3-custom-inherit: Upgrade 2.3.0 -> 2.3.1
python3-cachetools: Upgrade 4.2.0 -> 4.2.1
python3-coverage: Upgrade 5.3.1 -> 5.4
python3-diskcache: Upgrade 5.1.0 -> 5.2.1
python3-aenum: Upgrade 2.2.6 -> 3.0.0
python3-xmlschema: Upgrade 1.4.1 -> 1.4.2
python3-intervals: Upgrade 1.10.0 -> 1.10.0.post1
python3-portion: Add recipe
python3-pako: Upgrade 0.2.3 -> 0.3.0
python3-typed-ast: Upgrade 1.4.1 -> 1.4.2
python3-pyzmq: Upgrade 21.0.1 -> 21.0.2
Luca Boccassi (4):
dbus-broker: enable SO_PEERSEC usage by default
fsverity: update to 1.3
fsverity: fix MinGW build
dbus-broker: update to v26
Mario Schuknecht (1):
dnsmasq: Fix systemd service
Mikko Rapeli (3):
fuse: set CVE_PRODUCT to "fuse_project:fuse"
flatbuffers: whitelist CVE-2020-35864
giflib: apply patch for CVE-2019-15133 and set CVE_PRODUCT
Mingli Yu (2):
mcelog: fix the pfa test hang
mariadb: upgrade to 10.5.8
Nicolas Jeker (1):
networkmanager: Add Wireless Extensions to PACKAGECONFIG[wifi]
Oleksiy Obitotskyy (1):
libsmi: set awk as target path
Robert Joslyn (1):
htop: Update to 3.0.4
Ross Burton (1):
libmicrohttpd: allow native/nativesdk builds
S. Lockwood-Childs (1):
sip3: simplify recipe
Shlomi Vaknin (1):
python3-sh: remove python3-tests from RDEPENDS
Stefano Babic (1):
libconfig: split package for C++
Søren Andersen (1):
zram: fix sourcing of zram parameters
Thomas Perrot (1):
influxdb: add new recipe
Trevor Gamblin (2):
packagegroup-meta-python: sort package names, add notes
packagegroup-meta-python: add ptest packages to ptest group
Wang Mingyu (1):
dovecot: upgrade 2.2.36.4 -> 2.3.13
Yi Zhao (1):
nss: upgrade 3.60 -> 3.60.1
Zang Ruochen (9):
c-periphery: upgrade 2.3.0 -> 2.3.1
htop: upgrade 3.0.4 -> 3.0.5
hwdata: upgrade 0.342 -> 0.343
spitools: upgrade 0.8.6 -> 0.8.7
librole-tiny-perl: upgrade 2.001004 -> 2.002003
python3-smbus: upgrade 4.1 -> 4.2
python3-snappy: upgrade 0.5.4 -> 0.6.0
python3-zopeinterface: upgrade 5.1.0 -> 5.2.0
python3-nmap: upgrade 1.4.8 -> 1.5.0
Zheng Ruoqin (7):
cifs-utils: upgrade 6.11 -> 6.12
firewalld: upgrade 0.9.1 -> 0.9.2
igmpproxy: upgrade 0.2.1 -> 0.3
mdns: upgrade 1096.40.7 -> 1310.40.42
opensc: Fix the wrong version number.
python3-djangorestframework: upgrade 3.12.1 -> 3.12.2
python3-ipy: upgrade 1.00 -> 1.01
changqing.li@windriver.com (1):
celt051: update SRC_URI
zangrc (6):
libnftnl: upgrade 1.1.8 -> 1.1.9
czmq: upgrade 4.2.0 -> 4.2.1
dialog: upgrade 1.3-20201126 -> 1.3-20210117
modemanager: upgrade 1.14.8 -> 1.14.10
monit: upgrade 5.27.1 -> 5.27.2
python3-networkmanager: upgrade 2.1 -> 2.2
zhengruoqin (3):
openldap: upgrade 2.4.56 -> 2.4.57
satyr: upgrade 0.35 -> 0.36
zeromq: upgrade 4.3.3 -> 4.3.4
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I2469d162f1db8072fec106f629872618082bbeac
Diffstat (limited to 'meta-openembedded/meta-xfce')
18 files changed, 113 insertions, 693 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.13.bb b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.0.bb index 01a36e1fc..f0391cb23 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_1.4.13.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.0.bb @@ -7,10 +7,7 @@ inherit xfce-app distutils3 gtk-icon-cache mime-xdg DEPENDS += "python3-distutils-extra-native" -B = "${S}" - -SRC_URI[md5sum] = "750b65401c9445e185e71c808d7509a4" -SRC_URI[sha256sum] = "58c0ea06e5f286019295545fbfd1dbca23aea74c625762bbb4c89a6f484ae839" +SRC_URI[sha256sum] = "1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47" FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch new file mode 100644 index 000000000..9738f1a8c --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/0001-Makefile.in.in-remove-bashisms.patch @@ -0,0 +1,56 @@ +Makefile.in.in: remove bashisms + +The brace expansion is bash specific and fails with dash. + +Upstream-Status: Pending [No permission to folk repo and create pull request] + +https://gitlab.xfce.org/apps/xfce4-panel-profiles + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + Makefile.in.in | 15 ++++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in.in b/Makefile.in.in +index 73338f4..e08b218 100644 +--- a/Makefile.in.in ++++ b/Makefile.in.in +@@ -73,8 +73,11 @@ install: all xfce4-panel-profiles.1 + + install -d $(DESTDIR)/$(MANDIR)/man1 + install xfce4-panel-profiles.1 $(DESTDIR)/$(MANDIR)/man1 +- +- install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/{128x128,48x48,16x16,scalable}/apps ++ ++ install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps ++ install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps ++ install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps ++ install -d $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps + install data/icons/128x128/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps + install data/icons/48x48/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps + install data/icons/16x16/org.xfce.PanelProfiles.png $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps +@@ -86,7 +89,9 @@ uninstall: + rm -rf $(DESTDIR)/$(DOCDIR) + # FIXME: Uninstall locales + rm -f $(DESTDIR)/$(PREFIX)/bin/$(APPNAME) +- rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/{128x128,48x48,16x16}/apps/org.xfce.PanelProfiles.png ++ rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/128x128/apps ++ rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/48x48/apps ++ rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/16x16/apps + rm -rf $(DESTDIR)/$(PREFIX)/share/icons/hicolor/scalable/apps/org.xfce.PanelProfiles.svg + + distcheck: all +@@ -106,7 +112,9 @@ clean: + rm -f bin/$(APPNAME) + rm -f data/metainfo/org.xfce.PanelProfiles.appdata.xml + rm -f data/layouts/*.tar.bz2 +- rm -f data/icons/{128x128,48x48,16x16}/org.xfce.panelprofiles.png ++ rm -f data/icons/128x128/org.xfce.panelprofiles.png ++ rm -f data/icons/48x48/org.xfce.panelprofiles.png ++ rm -f data/icons/16x16/org.xfce.panelprofiles.png + rm -f data/icons/scalable/org.xfce.panelprofiles.svg + rm -f org.xfce.PanelProfiles.desktop + rm -f Makefile.in +-- +2.25.1 + diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb index 1fcb7edc0..34162d3cc 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.12.bb @@ -11,6 +11,7 @@ DEPENDS += "intltool-native" SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BP}.tar.bz2 \ file://not-create-link-to-locale.patch \ + file://0001-Makefile.in.in-remove-bashisms.patch \ " SRC_URI[sha256sum] = "246e459d2d2f3f524968440ed7fddb2a891567ebc05f10a800f7f5821b3452a7" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb index 9e2497d43..dbd7a0b40 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" SECTION = "x11/application" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" +DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" inherit xfce-app diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch deleted file mode 100644 index 2b5eda0d1..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f39bcd5af79aa3efe2cecb2212793c5b596890a8 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 18 Feb 2016 17:40:45 +0200 -Subject: [PATCH] Makefile.am: use $(LIBTOOL) instead of hardcoded libtool name - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - unique/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/unique/Makefile.am b/unique/Makefile.am -index 6475a87..734f431 100644 ---- a/unique/Makefile.am -+++ b/unique/Makefile.am -@@ -114,7 +114,7 @@ Unique-1.0.gir: $(INTROSPECTION_SCANNER) libunique-1.0.la - --include=GObject-2.0 \ - --include=Gtk-2.0 \ - --library=libunique-1.0.la \ -- --libtool="$(top_builddir)/libtool" \ -+ --libtool="$(LIBTOOL)" \ - --pkg gobject-2.0 \ - --pkg gtk+-2.0 \ - --output $@ \ --- -2.7.0 - diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch deleted file mode 100644 index 7f9fdf397..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 37632aca00d48c53e91f08bc7435c721ba81b2cd Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 30 Mar 2017 14:32:55 -0700 -Subject: [PATCH] test-unique: Add format qualifier %s for string - -Fixes potential security issues that compiler flags - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/test-unique.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/test-unique.c b/tests/test-unique.c -index b7cde45..82ee81b 100644 ---- a/tests/test-unique.c -+++ b/tests/test-unique.c -@@ -82,10 +82,10 @@ app_message_cb (UniqueApp *app, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, - GTK_BUTTONS_CLOSE, -- title); -+ "%s",title); - if (message) - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), -- message); -+ "%s",message); - - gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE); - --- -2.12.1 - diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch deleted file mode 100644 index 46a5c62e4..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch +++ /dev/null @@ -1,421 +0,0 @@ -Upstream-Status: Backport [http://git.gnome.org/browse/unique/commit/?h=unique-1.1&id=f75ca2d7aad7d27686acca6090c1c569a79d7e63] -Signed-off-By: Ross Burton <ross.burton@intel.com> - -From f75ca2d7aad7d27686acca6090c1c569a79d7e63 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi <ebassi@gnome.org> -Date: Sat, 08 May 2010 11:17:21 +0000 -Subject: build: Update the build environment - -Require autoconf 2.63, automake 1.11 and libtool 2.2.6 to remove Shave. - -Also bump up the requirement for gobject-introspection to 0.6.7. ---- -diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am -index 5f35b85..b78428f 100644 ---- a/build/autotools/Makefile.am -+++ b/build/autotools/Makefile.am -@@ -1,7 +1,4 @@ - EXTRA_DIST = \ -- shave-libtool.in \ -- shave.in \ -- shave.m4 \ - as-compiler-flag.m4 \ - introspection.m4 \ - Makefile.am.enums \ -diff --git a/build/autotools/Makefile.am.silent b/build/autotools/Makefile.am.silent -index 249f6af..8576846 100644 ---- a/build/autotools/Makefile.am.silent -+++ b/build/autotools/Makefile.am.silent -@@ -1,10 +1,5 @@ - # custom rules for quiet builds - --if USE_SHAVE --QUIET_GEN = $(Q:@=@echo ' GEN '$@;) --QUIET_LN = $(Q:@=@echo ' LN '$@;) --QUIET_RM = $(Q:@=@echo ' RM '$@;) --else - QUIET_GEN = $(AM_V_GEN) - - QUIET_LN = $(QUIET_LN_$(V)) -@@ -14,4 +9,3 @@ QUIET_LN_0 = @echo ' LN '$@; - QUIET_RM = $(QUIET_RM_$(V)) - QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY)) - QUIET_RM_0 = @echo ' RM '$@; --endif # USE_SHAVE -diff --git a/build/autotools/introspection.m4 b/build/autotools/introspection.m4 -index f9ce49c..589721c 100644 ---- a/build/autotools/introspection.m4 -+++ b/build/autotools/introspection.m4 -@@ -59,12 +59,18 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) -+ AC_SUBST(INTROSPECTION_CFLAGS) -+ AC_SUBST(INTROSPECTION_LIBS) -+ AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") - ]) -diff --git a/build/autotools/shave-libtool.in b/build/autotools/shave-libtool.in -deleted file mode 100644 -index 1f3a720..0000000 ---- a/build/autotools/shave-libtool.in -+++ b/dev/null -@@ -1,69 +0,0 @@ --#!/bin/sh -- --# we need sed --SED=@SED@ --if test -z "$SED" ; then --SED=sed --fi -- --lt_unmangle () --{ -- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` --} -- --# the real libtool to use --LIBTOOL="$1" --shift -- --# if 1, don't print anything, the underlaying wrapper will do it --pass_though=0 -- --# scan the arguments, keep the right ones for libtool, and discover the mode --preserved_args= --while test "$#" -gt 0; do -- opt="$1" -- shift -- -- case $opt in -- --mode=*) -- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` -- preserved_args="$preserved_args $opt" -- ;; -- -o) -- lt_output="$1" -- preserved_args="$preserved_args $opt" -- ;; -- *) -- preserved_args="$preserved_args $opt" -- ;; -- esac --done -- --case "$mode" in --compile) -- # shave will be called and print the actual CC/CXX/LINK line -- preserved_args="$preserved_args --shave-mode=$mode" -- pass_though=1 -- ;; --link) -- preserved_args="$preserved_args --shave-mode=$mode" -- Q=" LINK " -- ;; --*) -- # let's u -- # echo "*** libtool: Unimplemented mode: $mode, fill a bug report" -- ;; --esac -- --lt_unmangle "$lt_output" --output=$last_result -- --if test -z $V; then -- if test $pass_though -eq 0; then -- echo "$Q$output" -- fi -- $LIBTOOL --silent $preserved_args --else -- echo $LIBTOOL $preserved_args -- $LIBTOOL $preserved_args --fi -diff --git a/build/autotools/shave.in b/build/autotools/shave.in -deleted file mode 100644 -index 5c16f27..0000000 ---- a/build/autotools/shave.in -+++ b/dev/null -@@ -1,79 +0,0 @@ --#!/bin/sh -- --# we need sed --SED=@SED@ --if test -z "$SED" ; then --SED=sed --fi -- --lt_unmangle () --{ -- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` --} -- --# the tool to wrap (cc, cxx, ar, ranlib, ..) --tool="$1" --shift -- --# the reel tool (to call) --REEL_TOOL="$1" --shift -- --pass_through=0 --preserved_args= --while test "$#" -gt 0; do -- opt="$1" -- shift -- -- case $opt in -- --shave-mode=*) -- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` -- ;; -- -o) -- lt_output="$1" -- preserved_args="$preserved_args $opt" -- ;; -- *) -- preserved_args="$preserved_args $opt" -- ;; -- esac --done -- --# mode=link is handled in the libtool wrapper --case "$mode,$tool" in --link,*) -- pass_through=1 -- ;; --*,cxx) -- Q=" CXX " -- ;; --*,cc) -- Q=" CC " -- ;; --*,fc) -- Q=" FC " -- ;; --*,f77) -- Q=" F77 " -- ;; --*,objc) -- Q=" OBJC " -- ;; --*,*) -- # should not happen -- Q=" CC " -- ;; --esac -- --lt_unmangle "$lt_output" --output=$last_result -- --if test -z $V; then -- if test $pass_through -eq 0; then -- echo "$Q$output" -- fi -- $REEL_TOOL $preserved_args --else -- echo $REEL_TOOL $preserved_args -- $REEL_TOOL $preserved_args --fi -diff --git a/build/autotools/shave.m4 b/build/autotools/shave.m4 -deleted file mode 100644 -index 0a3509e..0000000 ---- a/build/autotools/shave.m4 -+++ b/dev/null -@@ -1,77 +0,0 @@ --dnl Make automake/libtool output more friendly to humans --dnl Damien Lespiau <damien.lespiau@gmail.com> --dnl --dnl SHAVE_INIT([shavedir],[default_mode]) --dnl --dnl shavedir: the directory where the shave scripts are, it defaults to --dnl $(top_builddir) --dnl default_mode: (enable|disable) default shave mode. This parameter --dnl controls shave's behaviour when no option has been --dnl given to configure. It defaults to disable. --dnl --dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just --dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and --dnl LIBTOOL, you don't want the configure tests to have these variables --dnl re-defined. --dnl * This macro requires GNU make's -s option. -- --AC_DEFUN([_SHAVE_ARG_ENABLE], --[ -- AC_ARG_ENABLE([shave], -- AS_HELP_STRING( -- [--enable-shave], -- [use shave to make the build pretty [[default=$1]]]),, -- [enable_shave=$1] -- ) --]) -- --AC_DEFUN([SHAVE_INIT], --[ -- dnl you can tweak the default value of enable_shave -- m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) -- -- if test x"$enable_shave" = xyes; then -- dnl where can we find the shave scripts? -- m4_if([$1],, -- [shavedir="$ac_pwd"], -- [shavedir="$ac_pwd/$1"]) -- AC_SUBST(shavedir) -- -- dnl make is now quiet -- AC_SUBST([MAKEFLAGS], [-s]) -- AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) -- -- dnl we need sed -- AC_CHECK_PROG(SED,sed,sed,false) -- -- dnl substitute libtool -- SHAVE_SAVED_LIBTOOL=$LIBTOOL -- LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" -- AC_SUBST(LIBTOOL) -- -- dnl substitute cc/cxx -- SHAVE_SAVED_CC=$CC -- SHAVE_SAVED_CXX=$CXX -- SHAVE_SAVED_FC=$FC -- SHAVE_SAVED_F77=$F77 -- SHAVE_SAVED_OBJC=$OBJC -- CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" -- CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" -- FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" -- F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" -- OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}" -- AC_SUBST(CC) -- AC_SUBST(CXX) -- AC_SUBST(FC) -- AC_SUBST(F77) -- AC_SUBST(OBJC) -- -- V=@ -- else -- V=1 -- fi -- Q='$(V:1=)' -- AC_SUBST(V) -- AC_SUBST(Q) --]) -- -diff --git a/configure.ac b/configure.ac -index a3ed3ee..bc3163a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,7 +14,7 @@ m4_define([unique_api_version], [1.0]) - # This is the X.Y used in the protocol negotiation - m4_define([unique_protocol_version], [1.0]) - --AC_PREREQ([2.59]) -+AC_PREREQ([2.63]) - - AC_INIT([unique], [unique_version], - [http://bugzilla.gnome.org/enter_bug.cgi?product=libunique], -@@ -23,9 +23,21 @@ AC_INIT([unique], [unique_version], - AC_CONFIG_SRCDIR([unique/unique.h]) - AC_CONFIG_MACRO_DIR([build/autotools]) - --AM_INIT_AUTOMAKE([1.10]) -+AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability dist-bzip2]) - AM_CONFIG_HEADER([config.h]) - -+AM_SILENT_RULES([yes]) -+ -+AC_PROG_CC_C_O -+ -+AM_PATH_GLIB_2_0 -+ -+LT_PREREQ([2.2.6]) -+LT_INIT([disable-static]) -+ -+# Honor aclocal flags -+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -+ - # version symbols - UNIQUE_MAJOR_VERSION=unique_major_version - UNIQUE_MINOR_VERSION=unique_minor_version -@@ -49,21 +61,6 @@ UNIQUE_LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age) - AC_SUBST(UNIQUE_LT_VERSION_INFO) - AC_SUBST(UNIQUE_LT_CURRENT_MINUS_AGE) - --AC_ISC_POSIX --AC_PROG_CC --AC_PROG_INSTALL --AC_PROG_MAKE_SET --AC_C_CONST --AC_PROG_LIBTOOL --AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums]) --AC_PATH_PROG(GLIB_GENMARSHAL, [glib-genmarshal]) -- --AM_SANITY_CHECK --AM_PROG_CC_STDC -- --# Honor aclocal flags --ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" -- - m4_define([glib_required], [2.12.0]) - m4_define([gtk_required], [2.11.0]) - m4_define([dbus_required], [0.70]) -@@ -122,7 +119,6 @@ AM_CONDITIONAL([HAVE_DBUS], [test "x$have_dbus" = "xyes"]) - dnl Bacon backend - dnl This is the fallback backend, so we *need* these headers and functions - dnl even if we end up using D-Bus --dnl D-Bus backend dependencies - m4_define([have_bacon_default], [yes]) - AC_ARG_ENABLE([bacon], - [AC_HELP_STRING([--enable-bacon=@<:@yes/no@:>@], -@@ -178,9 +174,9 @@ AC_ARG_ENABLE([maintainer-flags], - AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"], - [ - AS_COMPILER_FLAGS([MAINTAINER_CFLAGS], -- ["-Werror -Wall -Wshadow -Wcast-align -- -Wno-uninitialized -Wempty-body -Wformat-security -- -Winit-self"]) -+ ["-Wall -Wshadow -Wcast-align -+ -Wno-uninitialized -Wempty-body -+ -Wformat-security -Winit-self"]) - ] - ) - -@@ -230,27 +226,10 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], - AM_GLIB_DEFINE_LOCALEDIR(UNIQUE_LOCALEDIR) - - # introspection --GOBJECT_INTROSPECTION_CHECK([0.6.3]) -+GOBJECT_INTROSPECTION_CHECK([0.6.7]) - - # gtk-doc --GTK_DOC_CHECK([1.11]) -- --# nice builds --m4_ifdef([AM_SILENT_RULES], -- [ -- AM_SILENT_RULES([yes]) -- use_shave=no -- ], -- [ -- SHAVE_INIT([build/autotools], [enable]) -- AC_CONFIG_FILES([ -- build/autotools/shave-libtool -- build/autotools/shave -- ]) -- use_shave=yes -- ]) -- --AM_CONDITIONAL([USE_SHAVE], [test "x$use_shave" = "xyes"]) -+GTK_DOC_CHECK([1.13]) - - AC_CONFIG_FILES([ - Makefile --- -cgit v0.9.0.2 diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch deleted file mode 100644 index d75de93fc..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Pending - -Fix Following compilation errors with gcc 4.6.0 - -Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10 - -| uniquebackend-dbus.c: In function 'unique_backend_dbus_request_name': -| uniquebackend-dbus.c:87:22: error: variable 'backend_dbus' set but not used [-Werror=unused-but-set-variable] -| uniquebackend-dbus.c: In function 'unique_backend_dbus_send_message': -| uniquebackend-dbus.c:189:12: error: variable 'res' set but not used [-Werror=unused-but-set-variable] -| cc1: all warnings being treated as errors -| -| make[5]: *** [libunique_dbus_la-uniquebackend-dbus.lo] Error 1 - -Index: libunique-1.1.6/unique/dbus/uniquebackend-dbus.c -=================================================================== ---- libunique-1.1.6.orig/unique/dbus/uniquebackend-dbus.c -+++ libunique-1.1.6/unique/dbus/uniquebackend-dbus.c -@@ -84,7 +84,7 @@ unique_backend_dbus_register_proxy (Uniq - static gboolean - unique_backend_dbus_request_name (UniqueBackend *backend) - { -- UniqueBackendDBus *backend_dbus; -+ UniqueBackendDBus __attribute__((__unused__)) *backend_dbus; - const gchar *name; - DBusGConnection *connection; - DBusGProxy *proxy; -@@ -186,7 +186,7 @@ unique_backend_dbus_send_message (Unique - GValueArray *data; - gchar *cmd; - gchar *resp; -- gboolean res; -+ gboolean __attribute__((__unused__)) res; - GError *error; - UniqueResponse response; - diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch deleted file mode 100644 index 2cc03473c..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch +++ /dev/null @@ -1,130 +0,0 @@ -G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid -build failures. - -RP 2011/10/12 - -Upstream-Status: Pending - -Index: libunique-1.1.6/unique/uniqueapp.c -=================================================================== ---- libunique-1.1.6.orig/unique/uniqueapp.c 2011-10-12 01:21:25.842046488 +0100 -+++ libunique-1.1.6/unique/uniqueapp.c 2011-10-12 01:21:55.062046796 +0100 -@@ -781,7 +781,7 @@ - } - - --G_CONST_RETURN gchar * -+const gchar * - unique_command_to_string (UniqueApp *app, - gint command) - { -@@ -863,7 +863,7 @@ - return retval; - } - --G_CONST_RETURN gchar * -+const gchar * - unique_response_to_string (UniqueResponse response) - { - GEnumClass *enum_class; -Index: libunique-1.1.6/unique/uniquebackend.c -=================================================================== ---- libunique-1.1.6.orig/unique/uniquebackend.c 2011-10-12 01:21:25.742046323 +0100 -+++ libunique-1.1.6/unique/uniquebackend.c 2011-10-12 01:21:55.062046796 +0100 -@@ -111,7 +111,7 @@ - * - * Return value: FIXME - */ --G_CONST_RETURN gchar * -+const gchar * - unique_backend_get_name (UniqueBackend *backend) - { - g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); -@@ -154,7 +154,7 @@ - * - * Return value: FIXME - */ --G_CONST_RETURN gchar * -+const gchar * - unique_backend_get_startup_id (UniqueBackend *backend) - { - g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); -Index: libunique-1.1.6/unique/uniquebackend.h -=================================================================== ---- libunique-1.1.6.orig/unique/uniquebackend.h 2011-10-12 01:21:25.992046521 +0100 -+++ libunique-1.1.6/unique/uniquebackend.h 2011-10-12 01:21:56.512047875 +0100 -@@ -94,10 +94,10 @@ - - UniqueBackend * unique_backend_create (void); - --G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend); -+const gchar *unique_backend_get_name (UniqueBackend *backend); - void unique_backend_set_name (UniqueBackend *backend, - const gchar *name); --G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend); -+const gchar *unique_backend_get_startup_id (UniqueBackend *backend); - void unique_backend_set_startup_id (UniqueBackend *backend, - const gchar *startup_id); - GdkScreen * unique_backend_get_screen (UniqueBackend *backend); -Index: libunique-1.1.6/unique/uniqueinternals.h -=================================================================== ---- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-10-12 01:21:25.892046532 +0100 -+++ libunique-1.1.6/unique/uniqueinternals.h 2011-10-12 01:21:56.512047875 +0100 -@@ -44,11 +44,11 @@ - * and then back into an id - */ - UniqueResponse unique_response_from_string (const gchar *response); --G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response); -+const gchar *unique_response_to_string (UniqueResponse response); - - gint unique_command_from_string (UniqueApp *app, - const gchar *command); --G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app, -+const gchar *unique_command_to_string (UniqueApp *app, - gint command); - - G_END_DECLS -Index: libunique-1.1.6/unique/uniquemessage.c -=================================================================== ---- libunique-1.1.6.orig/unique/uniquemessage.c 2011-10-12 01:21:25.942046524 +0100 -+++ libunique-1.1.6/unique/uniquemessage.c 2011-10-12 01:21:55.072046595 +0100 -@@ -185,7 +185,7 @@ - * - * Since: 1.0.2 - */ --G_CONST_RETURN guchar * -+const guchar * - unique_message_data_get (UniqueMessageData *message_data, - gsize *length) - { -@@ -525,7 +525,7 @@ - * owned by the #UniqueMessageData structure and should not be - * modified or freed - */ --G_CONST_RETURN gchar * -+const gchar * - unique_message_data_get_startup_id (UniqueMessageData *message_data) - { - g_return_val_if_fail (message_data != NULL, NULL); -Index: libunique-1.1.6/unique/uniquemessage.h -=================================================================== ---- libunique-1.1.6.orig/unique/uniquemessage.h 2011-10-12 01:21:25.792046596 +0100 -+++ libunique-1.1.6/unique/uniquemessage.h 2011-10-12 01:21:56.512047875 +0100 -@@ -48,7 +48,7 @@ - void unique_message_data_set (UniqueMessageData *message_data, - const guchar *data, - gsize length); --G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data, -+const guchar *unique_message_data_get (UniqueMessageData *message_data, - gsize *length); - - gboolean unique_message_data_set_text (UniqueMessageData *message_data, -@@ -63,7 +63,7 @@ - gchar * unique_message_data_get_filename (UniqueMessageData *message_data); - - GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data); --G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); -+const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); - guint unique_message_data_get_workspace (UniqueMessageData *message_data); - - G_END_DECLS diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb deleted file mode 100644 index a6d335a2e..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Library for supporting single instance GTK+ applications" -DESCRIPTION = "Unique is a library for writing single instance GTK+ applications. If you launch a single instance application twice, the second instance will either just quit or will send a message to the running instance." -HOMEPAGE = "https://wiki.gnome.org/Attic/LibUnique" -BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique" - -SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \ - file://fix_for_compile_with_gcc-4.6.0.patch \ - file://noconst.patch \ - file://build.patch \ - file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ - file://0001-test-unique-Add-format-qualifier-s-for-string.patch \ - " - -SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d" -SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb" - -PR = "r7" - -DEPENDS = "dbus-glib-native glib-2.0 gtk+" - -PACKAGECONFIG ??= "dbus" -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - - -inherit autotools pkgconfig gobject-introspection features_check gtk-doc - -REQUIRED_DISTRO_FEATURES = "x11" - -do_install_append () { - rmdir --ignore-fail-on-non-empty ${D}${datadir} -} diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.5.bb b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_4.16.0.bb index f55b19459..136e3baa5 100644 --- a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.5.bb +++ b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_4.16.0.bb @@ -16,8 +16,7 @@ DEPENDS += " \ taglib \ " -SRC_URI[md5sum] = "74fcde5da018c011e5febd9649817c05" -SRC_URI[sha256sum] = "1adb4bd96c4cc4b4a79eeafe1316e170f506426e3737e8ba8898f7ea6bec572a" +SRC_URI[sha256sum] = "0d305ad8ccd3974d6b632f74325b1b8a39304c905c6b405b70f52c4cfd55a7e7" RDEPENDS_${PN} += "gstreamer1.0-plugins-good" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.2.bb index 6077fdfc6..366597731 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.2.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[sha256sum] = "b2074f8a9caa766e2d97f0b960ef2f4d1e20dd804497229bc1f0157791896925" +SRC_URI[sha256sum] = "a6f7070afd1c9020257d8ed7483872643a6cddd76d5d73de107c7fbd981fc515" RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb index bbaa6fd6f..3e596323d 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.8.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb @@ -9,7 +9,7 @@ inherit xfce gtk-doc gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" -SRC_URI[sha256sum] = "4811d89ee5bc48dbdeffd69fc3eec6c112bbf01fde98a9e848335b374a4aa1bb" +SRC_URI[sha256sum] = "84914927a2c1fda167f67af26a6640630a744a22940df508aa6c752cdbd3d21d" EXTRA_OECONF = "--disable-gtk-doc" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch index 616142761..616142761 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch new file mode 100644 index 000000000..cd6ca32d0 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch @@ -0,0 +1,44 @@ +From fb7bd8511d55cf0d24f6f93768f51773cf434a59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Fri, 8 Jan 2021 21:59:45 +0100 +Subject: [PATCH] Remove GTK2 leftovers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It seems that these cause install performed twice causing natsy races - +see [1] and search for 'TOPDIR/build/tmpfs/hosttools/install -c -m 644 +../../libxfce4ui-4.16.0/libxfce4ui/libxfce4ui.h' + +[1] https://errors.yoctoproject.org/Errors/Details/540832/ + +Upstream-Status: Submitted [https://gitlab.xfce.org/xfce/libxfce4ui/-/merge_requests/29] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + libxfce4ui/Makefile.am | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am +index 935eece..bc5afac 100644 +--- a/libxfce4ui/Makefile.am ++++ b/libxfce4ui/Makefile.am +@@ -51,15 +51,6 @@ libxfce4ui_sources = \ + xfce-filename-input.c \ + xfce-titled-dialog.c + +-libxfce4ui_includedir = \ +- $(includedir)/xfce4/libxfce4ui-$(LIBXFCE4UI_VERSION_API)/libxfce4ui +- +-libxfce4ui_include_HEADERS = \ +- $(libxfce4ui_headers) +- +- +- +- + ## + ## GTK+ 3 support library + ## +-- +2.26.2 + diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb index 7a269ad66..6fbf1cf25 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb @@ -8,8 +8,11 @@ inherit xfce gtk-doc gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "x11" -# TODO: Check if this can go -SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" +# TODO: Check if 0001-... can go +SRC_URI += " \ + file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ + file://0002-Remove-GTK2-leftovers.patch \ +" SRC_URI[sha256sum] = "8b06c9e94f4be88a9d87c47592411b6cbc32073e7af9cbd64c7b2924ec90ceaa" EXTRA_OECONF += "--with-vendor-info=${DISTRO}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.2.bb index ae05f867f..6b1a6b482 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.2.bb @@ -8,7 +8,7 @@ inherit xfce gobject-introspection features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "6277c448116a91ebfa564972645d8d79ef69864992a02bb164b7b13f98fdfd9b" +SRC_URI[sha256sum] = "67a90b98c436192f9aa6cd18a22a089e713007864aebfa65f36f121c86ba7add" PACKAGECONFIG ??= "" PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb index 3f64365f0..2cbfdadd5 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb @@ -8,7 +8,7 @@ inherit xfce update-alternatives features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "1e22eae1bbb66cebfd1753b0a5606e76ecbf6b09ce4cdfd732d093c936f1feb3" +SRC_URI[sha256sum] = "b5b24ca04bd73c642db0a4b4df81d262381d758f01b51108257d48b391b8718c" PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ |