Upgrade to xfce 4.14 pre2
v2 cover Upgrade to xfce 4.14 pre2
From: Kai Kang <[email protected]>
Hi Khem,
It seems v1 have not been merged, so I send v2.
v2:
* update xfce4-settings
* remove dependency dbus-glib
* clean DEPENDS and inherited classes
Kai Kang (15):
libxfce4util: 4.13.3 -> 4.13.4
libxfce4ui: 4.13.5 -> 4.13.6
exo: 0.12.5 -> 0.12.6
xfconf: 4.13.7 -> 4.13.8
thunar: 1.8.6 -> 1.8.7
xfce4-session: 4.13.2 -> 4.13.3
xfwm4: 4.13.2 -> 4.13.3
xfdesktop: 4.13.4 -> 4.13.5
xfce4-power-manager: 1.6.2 -> 1.6.3
xfce4-panel: 4.13.5 -> 4.13.6
xfce4-dev-tools: 4.12.0 -> 4.13.0
thunar-volman: 0.9.2 -> 0.9.3
garcon: 0.6.2 -> 0.6.3
xfce4-settings: 4.12.4 -> 4.13.7
xfce4-pulseaudio-plugin: add dependency dbus-glib
.../xfce4-pulseaudio-plugin_0.4.1.bb | 2 +-
.../exo/{exo_0.12.5.bb => exo_0.12.6.bb} | 6 +--
.../{garcon_0.6.2.bb => garcon_0.6.3.bb} | 6 +--
...xfce4ui_4.13.5.bb => libxfce4ui_4.13.6.bb} | 8 ++--
...4util_4.13.3.bb => libxfce4util_4.13.4.bb} | 4 +-
...volman_0.9.2.bb => thunar-volman_0.9.3.bb} | 6 +--
.../{thunar_1.8.6.bb => thunar_1.8.7.bb} | 6 +--
...ls_4.12.0.bb => xfce4-dev-tools_4.13.0.bb} | 4 +-
...-panel_4.13.5.bb => xfce4-panel_4.13.6.bb} | 8 ++--
..._1.6.2.bb => xfce4-power-manager_1.6.3.bb} | 7 ++--
...sion_4.13.2.bb => xfce4-session_4.13.3.bb} | 16 ++------
...2-Fix-linking-to-dbus-glib-bug-13633.patch | 41 -------------------
...ttings_git.bb => xfce4-settings_4.13.7.bb} | 19 +++------
.../{xfconf_4.13.7.bb => xfconf_4.13.8.bb} | 8 ++--
...fdesktop_4.13.4.bb => xfdesktop_4.13.5.bb} | 6 +--
.../{xfwm4_4.13.2.bb => xfwm4_4.13.3.bb} | 6 +--
16 files changed, 46 insertions(+), 107 deletions(-)
rename meta-xfce/recipes-xfce/exo/{exo_0.12.5.bb => exo_0.12.6.bb} (80%)
rename meta-xfce/recipes-xfce/garcon/{garcon_0.6.2.bb => garcon_0.6.3.bb} (64%)
rename meta-xfce/recipes-xfce/libxfce4ui/{libxfce4ui_4.13.5.bb => libxfce4ui_4.13.6.bb} (75%)
rename meta-xfce/recipes-xfce/libxfce4util/{libxfce4util_4.13.3.bb => libxfce4util_4.13.4.bb} (64%)
rename meta-xfce/recipes-xfce/thunar-volman/{thunar-volman_0.9.2.bb => thunar-volman_0.9.3.bb} (63%)
rename meta-xfce/recipes-xfce/thunar/{thunar_1.8.6.bb => thunar_1.8.7.bb} (74%)
rename meta-xfce/recipes-xfce/xfce4-dev-tools/{xfce4-dev-tools_4.12.0.bb => xfce4-dev-tools_4.13.0.bb} (79%)
rename meta-xfce/recipes-xfce/xfce4-panel/{xfce4-panel_4.13.5.bb => xfce4-panel_4.13.6.bb} (81%)
rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_1.6.2.bb => xfce4-power-manager_1.6.3.bb} (79%)
rename meta-xfce/recipes-xfce/xfce4-session/{xfce4-session_4.13.2.bb => xfce4-session_4.13.3.bb} (76%)
delete mode 100644 meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch
rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_git.bb => xfce4-settings_4.13.7.bb} (52%)
rename meta-xfce/recipes-xfce/xfconf/{xfconf_4.13.7.bb => xfconf_4.13.8.bb} (69%)
rename meta-xfce/recipes-xfce/xfdesktop/{xfdesktop_4.13.4.bb => xfdesktop_4.13.5.bb} (60%)
rename meta-xfce/recipes-xfce/xfwm4/{xfwm4_4.13.2.bb => xfwm4_4.13.3.bb} (82%)Signature · 1 line
2.20.0
PATCH v2 1/15 libxfce4util: 4.13.3 -> 4.13.4
From: Kai Kang <[email protected]>
---
.../{libxfce4util_4.13.3.bb => libxfce4util_4.13.4.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-xfce/libxfce4util/{libxfce4util_4.13.3.bb => libxfce4util_4.13.4.bb} (64%)meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.13.4.bb renamed from meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.13.3.bb +2 -2
@@ -6,5 +6,5 @@ DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" inherit xfce gtk-doc gobject-introspection -SRC_URI[md5sum] = "f39185afe5f612bd2c9b3dfbaf50b4d2" -SRC_URI[sha256sum] = "724b523a4a9ec8cada727950ab2173be30f256fa332a891ccd28b46f4b91b67e" +SRC_URI[md5sum] = "ebb1d229a7a7f86a969a72b8d97c8531" +SRC_URI[sha256sum] = "57dd4ba226432afdf98cea4700a4679bb1b57ce80713167f99fde50ad87d0863"
Signature · 1 line
2.20.0
PATCH v2 2/15 libxfce4ui: 4.13.5 -> 4.13.6
In reply to [email protected]From: Kai Kang <[email protected]>
* dependency glib-2.0 is required by libxfce4util, so remove it from DEPENDS to make it more clean. And sort DEPENDS at same time.
* not inherit autotools and gettext which have been inherited in xfce.bbclass already
---
.../{libxfce4ui_4.13.5.bb => libxfce4ui_4.13.6.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta-xfce/recipes-xfce/libxfce4ui/{libxfce4ui_4.13.5.bb => libxfce4ui_4.13.6.bb} (75%)meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.6.bb renamed from meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.5.bb +4 -4
@@ -2,17 +2,17 @@ SUMMARY = "Xfce4 Widget library and X Window System interaction" SECTION = "x11/libs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "perl-native glib-2.0 gtk+ gtk+3 intltool-native libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice" +DEPENDS = "intltool-native perl-native gtk+ gtk+3 libice libsm libxfce4util xfce4-dev-tools xfconf virtual/libx11" -inherit xfce autotools gettext gtk-doc gobject-introspection distro_features_check +inherit xfce gtk-doc gobject-introspection distro_features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += " \ file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ " -SRC_URI[md5sum] = "692520f2a2cccaaafb0357c3dcbb015b" -SRC_URI[sha256sum] = "3c38b065796a1cb2c2f2e9a28edaa6b37a3728c1c0b7a4297af9ecd82a8ab66d" +SRC_URI[md5sum] = "9e5a805d2d557df79e571468978a2766" +SRC_URI[sha256sum] = "3c5e505ce56a5993db473efed9962705dd255ffaee17009ed1b3e9f40b543969" EXTRA_OECONF += "--with-vendor-info=${DISTRO}"
Signature · 1 line
2.20.0
PATCH v2 3/15 exo: 0.12.5 -> 0.12.6
In reply to [email protected]From: Kai Kang <[email protected]>
* gtk+3 is required but not added to DEPENDS that libxfce4ui depends on it already
* remove libxfce4util from DEPENDS for clean that it is required by libxfce4ui
---
meta-xfce/recipes-xfce/exo/{exo_0.12.5.bb => exo_0.12.6.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-xfce/recipes-xfce/exo/{exo_0.12.5.bb => exo_0.12.6.bb} (80%)meta-xfce/recipes-xfce/exo/exo_0.12.6.bb renamed from meta-xfce/recipes-xfce/exo/exo_0.12.5.bb +3 -3
@@ -2,7 +2,7 @@ DESCRIPTION="Application library for the Xfce desktop environment" SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "gtk+ libxfce4util libxfce4ui virtual/libx11 liburi-perl-native cairo" +DEPENDS = "gtk+ libxfce4ui virtual/libx11 liburi-perl-native cairo" DEPENDS_class-native = "glib-2.0-native xfce4-dev-tools-native intltool-native" inherit xfce pythonnative perlnative gtk-doc distro_features_check
@@ -20,8 +20,8 @@ SRC_URI_append_class-native = " \ file://reduce-build-to-exo-csource-only.patch \ " -SRC_URI[md5sum] = "1de1d539262847d49474d20cbebc78ea" -SRC_URI[sha256sum] = "e8f434d6436ae647dd1614e8a24aba23c83f70cb14037b5bc98652f558be43e8" +SRC_URI[md5sum] = "e97267e5d5a41bf5b95e9bfdaa62e47a" +SRC_URI[sha256sum] = "1417fffc593225d61ba57b050ae2ce66ef37615c9ec66944db32019761441003" PACKAGES =+ "exo-csource"
Signature · 1 line
2.20.0
PATCH v2 4/15 xfconf: 4.13.7 -> 4.13.8
In reply to [email protected]From: Kai Kang <[email protected]>
* remove dbus-glib from DEPENDS that it has been replaced by gdbus. glib-2.0 provides gdbus and has been imported to DEPENDS by libxfce4util.
* inherit class gobject-introspection which has been supported by xfconf 4.13.8
---
.../xfconf/{xfconf_4.13.7.bb => xfconf_4.13.8.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta-xfce/recipes-xfce/xfconf/{xfconf_4.13.7.bb => xfconf_4.13.8.bb} (69%)meta-xfce/recipes-xfce/xfconf/xfconf_4.13.8.bb renamed from meta-xfce/recipes-xfce/xfconf/xfconf_4.13.7.bb +4 -4
@@ -2,14 +2,14 @@ SUMMARY = "Xfce configuration daemon and utilities" SECTION = "x11/wm" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "dbus-glib libxfce4util perl intltool-native xfce4-dev-tools-native" +DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native" -inherit xfce gtk-doc +inherit xfce gtk-doc gobject-introspection EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" -SRC_URI[md5sum] = "ea4c070c4ed8387e6435b56d0e871559" -SRC_URI[sha256sum] = "5deb13fc48a4116f5ebdee5c21d0fd3deb85bec2f69602beb3c3adb4f85e5bde" +SRC_URI[md5sum] = "5d48e8d50f7bfadd31e804ce602a5cf3" +SRC_URI[sha256sum] = "55e2441c4ff78a7006fabb59647f7bc1f190cbb82327b93ba063ff624a896591" FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ ${libdir}/gio/modules/libxfconfgsettingsbackend.so \
Signature · 1 line
2.20.0
PATCH v2 5/15 thunar: 1.8.6 -> 1.8.7
In reply to [email protected]From: Kai Kang <[email protected]>
* dbus-glib is removed from DEPENDS that it has been replace by gdbus from 1.7.0
* remove glib-2.0 gtk+3 libxfce4util and xfconf from DEPENDS for clean which are required by libxfce4ui
---
.../thunar/{thunar_1.8.6.bb => thunar_1.8.7.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-xfce/recipes-xfce/thunar/{thunar_1.8.6.bb => thunar_1.8.7.bb} (74%)meta-xfce/recipes-xfce/thunar/thunar_1.8.7.bb renamed from meta-xfce/recipes-xfce/thunar/thunar_1.8.6.bb +3 -3
@@ -2,15 +2,15 @@ SUMMARY = "File manager for the Xfce Desktop Environment" SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo glib-2.0 gtk+3 gdk-pixbuf libxfce4util libxfce4ui xfconf libsm dbus-glib startup-notification libnotify xfce4-panel udev" +DEPENDS = "exo gdk-pixbuf libxfce4ui libsm startup-notification libnotify xfce4-panel udev" inherit xfce gobject-introspection distro_features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:3]}/Thunar-${PV}.tar.bz2" -SRC_URI[md5sum] = "3cb40548d7c642176eab8b97a5ba6d29" -SRC_URI[sha256sum] = "c0e5fb828e3d036941dfeb7ed7f9f2b17b729fc044c2bf7c4218c1c91b38ef2a" +SRC_URI[md5sum] = "9abdbc78cbf9957f9727c327476a08c2" +SRC_URI[sha256sum] = "3e033af06751beee23e73cf16cbd97513d3c0adf358d8a42158af38a44b9d329" S = "${WORKDIR}/Thunar-${PV}/"
Signature · 1 line
2.20.0
PATCH v2 6/15 xfce4-session: 4.13.2 -> 4.13.3
In reply to [email protected]From: Kai Kang <[email protected]>
* remove dependency dbus-glib which is replaced by gdbus already
* remove dependency gtk+ that gtk+3 is used right now
* clean items in DEPENDS which are imported indirectly by libxfce4ui
---
...session_4.13.2.bb => xfce4-session_4.13.3.bb} | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
rename meta-xfce/recipes-xfce/xfce4-session/{xfce4-session_4.13.2.bb => xfce4-session_4.13.3.bb} (76%)meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.3.bb renamed from meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.2.bb +3 -13
@@ -3,17 +3,7 @@ SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" -DEPENDS = " \ - dbus \ - dbus-glib \ - gtk+ \ - libwnck3 \ - libsm \ - libxfce4ui \ - libxfce4util \ - virtual/libx11 \ - xfconf \ -" +DEPENDS = "dbus libwnck3 libsm libxfce4ui virtual/libx11" inherit xfce update-alternatives distro_features_check
@@ -25,8 +15,8 @@ PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" SRC_URI += " \ file://0001-configure.in-hard-code-path-to-iceauth.patch \ " -SRC_URI[md5sum] = "1306b6166f47cdf6e0c61259abbb621f" -SRC_URI[sha256sum] = "c0be0c7e602c962d0e8fca63bd86165e60313d07bfb72cf2c3f99ab53e2a22a1" +SRC_URI[md5sum] = "94eca4dd2280910292abf9692304ce2c" +SRC_URI[sha256sum] = "eaed34f29aa044d878d60dcb7293a542f48248919e3dcd8df98215121cb6d362" ALTERNATIVE_${PN} = "x-session-manager" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session"
Signature · 1 line
2.20.0
PATCH v2 7/15 xfwm4: 4.13.2 -> 4.13.3
In reply to [email protected]From: Kai Kang <[email protected]>
* clean DEPENDS
- remove dbus-glib which is replaced by gdbus
- libxfce4util and xfconf are required by libxfce4ui
---
.../recipes-xfce/xfwm4/{xfwm4_4.13.2.bb => xfwm4_4.13.3.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-xfce/recipes-xfce/xfwm4/{xfwm4_4.13.2.bb => xfwm4_4.13.3.bb} (82%)meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.3.bb renamed from meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.2.bb +3 -3
@@ -2,14 +2,14 @@ DESCRIPTION="Xfce4 Window Manager" SECTION = "x11/wm" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "virtual/libx11 libxfce4util libxfce4ui xfconf libwnck3 dbus-glib libxinerama exo-native" +DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama exo-native" inherit xfce update-alternatives distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "aee4a8375beeae09715e77479610ff02" -SRC_URI[sha256sum] = "7be8a63e92077e42e6cc064a1dfdae608ab99fdc730adbd5200802dbdd86d5a9" +SRC_URI[md5sum] = "e53081e5928d401604d158429716e699" +SRC_URI[sha256sum] = "12ad274f6662c8afee35fd9b9310e73bd462c423578d448b2d7353e3c8eda6c1" PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \
Signature · 1 line
2.20.0
PATCH v2 8/15 xfdesktop: 4.13.4 -> 4.13.5
In reply to [email protected]From: Kai Kang <[email protected]>
* clean DEPENDS
- dbus-glib has been replaced by gdbus
- libxfce4util and xfconf are required by libxfce4ui
---
.../xfdesktop/{xfdesktop_4.13.4.bb => xfdesktop_4.13.5.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-xfce/recipes-xfce/xfdesktop/{xfdesktop_4.13.4.bb => xfdesktop_4.13.5.bb} (60%)meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.5.bb renamed from meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.13.4.bb +3 -3
@@ -2,14 +2,14 @@ SUMMARY = "Xfce4 Desktop Manager" SECTION = "x11/base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "libxfce4util libxfce4ui libwnck xfconf dbus-glib dbus-glib-native thunar garcon exo" +DEPENDS = "libxfce4ui libwnck thunar garcon exo" inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "d1174af12148141a07b62cc051c43c84" -SRC_URI[sha256sum] = "f4f7fa5162512971c25066eb04ef78f0d075656da79b6f7425ffb619a5119ca0" +SRC_URI[md5sum] = "6a58fe3119b9fb3eb6bb563e14689739" +SRC_URI[sha256sum] = "b7d273d36f5f39a446c4d0303148bc595ed7b0f36269619c91526edd1d1caeb6" PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify"
Signature · 1 line
2.20.0
PATCH v2 9/15 xfce4-power-manager: 1.6.2 -> 1.6.3
In reply to [email protected]From: Kai Kang <[email protected]>
* clean DEPENDS
- dbus-glib has been replaced by gdbus
- gtk+3 glib-2.0 xfconf and libxfce4util are required by libxfce4ui which is required by xfce4-panel
---
...power-manager_1.6.2.bb => xfce4-power-manager_1.6.3.bb} | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_1.6.2.bb => xfce4-power-manager_1.6.3.bb} (79%)meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.3.bb renamed from meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.2.bb +3 -4
@@ -9,11 +9,10 @@ inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -DEPENDS += "gtk+3 glib-2.0 dbus-glib xfconf libxfce4ui libxfce4util libnotify \ - libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" +DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" -SRC_URI[md5sum] = "2a49be4eca78fb519984db5aae38e4ab" -SRC_URI[sha256sum] = "66ac34b33a2021b5af04c0181dfab6e6ee2bfab0ae07ed4527ca4552a66e1c01" +SRC_URI[md5sum] = "b5ed83dd7f30a54f95d1fae1c84fa33c" +SRC_URI[sha256sum] = "debd8ac2409b5ac230593894b8bb668298f78bd12891623edbfc32ac87c64011" EXTRA_OECONF = " \ --enable-network-manager \
Signature · 1 line
2.20.0
PATCH v2 10/15 xfce4-panel: 4.13.5 -> 4.13.6
In reply to [email protected]From: Kai Kang <[email protected]>
* clean DEPENDS
- libxfce4util xfconf and gtk+3 are required by libxfce4ui which is required by garcon and exo
* bbclass gtk-icon-cache has been inherited in xfce.bbclass
---
.../{xfce4-panel_4.13.5.bb => xfce4-panel_4.13.6.bb} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename meta-xfce/recipes-xfce/xfce4-panel/{xfce4-panel_4.13.5.bb => xfce4-panel_4.13.6.bb} (81%)meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.6.bb renamed from meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.5.bb +4 -4
@@ -2,14 +2,14 @@ SUMMARY = "Xfce4 Panel" SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" -DEPENDS = "libxfce4util garcon libxfce4ui xfconf exo gtk+ gtk+3 dbus cairo virtual/libx11 libxml2 libwnck3 vala-native" +DEPENDS = "garcon exo gtk+ dbus cairo virtual/libx11 libxml2 libwnck3 vala-native" -inherit xfce gtk-doc gobject-introspection distro_features_check gtk-icon-cache remove-libtool +inherit xfce gtk-doc gobject-introspection distro_features_check remove-libtool REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "376e360fb87095edaea7df8ca34fe6a7" -SRC_URI[sha256sum] = "0d05b6dd8c91c154a364a3e31583c5f423c33e26d44d43cc409165f7d578ca15" +SRC_URI[md5sum] = "bb18c10b44df2d9afc30abe6bd2f63df" +SRC_URI[sha256sum] = "42411fee7675bb6fb3055395673dc925d43495df93b5e940a1ae3d0a3d2f63a8" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ file://0001-use-lxdm-to-replace-dm-tool.patch \
Signature · 1 line
2.20.0
PATCH v2 11/15 xfce4-dev-tools: 4.12.0 -> 4.13.0
In reply to [email protected]From: Kai Kang <[email protected]>
---
.../{xfce4-dev-tools_4.12.0.bb => xfce4-dev-tools_4.13.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-xfce/recipes-xfce/xfce4-dev-tools/{xfce4-dev-tools_4.12.0.bb => xfce4-dev-tools_4.13.0.bb} (79%)meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.13.0.bb renamed from meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.12.0.bb +2 -2
@@ -10,8 +10,8 @@ inherit autotools pkgconfig BBCLASSEXTEND = "native" SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "559202c4d9650e23696c44aa94cfc5a9" -SRC_URI[sha256sum] = "e2e3a654fe9110df81f8c2483c9cbfa6d656fed15d5e5e717d6ef10bd0f5b5cb" +SRC_URI[md5sum] = "dc7ce082ed0fb9a8f2c0953a939b8d42" +SRC_URI[sha256sum] = "d24d4db2151a35324c672d4596a6a256f7d92727fe6a9d23648ab53f5207ba3b" do_install_append() { install -d ${D}${datadir}/aclocal
Signature · 1 line
2.20.0
PATCH v2 12/15 thunar-volman: 0.9.2 -> 0.9.3
In reply to [email protected]From: Kai Kang <[email protected]>
* clean DEPENDS that removed items are required by exo:
exo --> libxfce4ui --> libxfce4util --> glib-2.0
--> xfconf
---
.../{thunar-volman_0.9.2.bb => thunar-volman_0.9.3.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-xfce/recipes-xfce/thunar-volman/{thunar-volman_0.9.2.bb => thunar-volman_0.9.3.bb} (63%)meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.3.bb renamed from meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.9.2.bb +3 -3
@@ -2,14 +2,14 @@ SUMMARY = "Automatic management of removable drives and media for thunar" SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo glib-2.0 libxfce4ui libxfce4util xfconf libnotify libgudev" +DEPENDS = "exo libnotify libgudev" inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[md5sum] = "af216d5b60820e7cd39aae1b5ad869a3" -SRC_URI[sha256sum] = "b944b4299b73d2ca79184922dfea49782e4849f5960e209def71ac700a92ff27" +SRC_URI[md5sum] = "699a0534a0899e31366018a9e9e2aeb0" +SRC_URI[sha256sum] = "29309091db8b0f08c5a727625cc470673134977d7966cae0392f131300f9d5e9" PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify"
Signature · 1 line
2.20.0
PATCH v2 13/15 garcon: 0.6.2 -> 0.6.3
In reply to [email protected]From: Kai Kang <[email protected]>
* remove libxfce4util from DEPENDS which is required by libxfce4ui
---
.../garcon/{garcon_0.6.2.bb => garcon_0.6.3.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-xfce/recipes-xfce/garcon/{garcon_0.6.2.bb => garcon_0.6.3.bb} (64%)meta-xfce/recipes-xfce/garcon/garcon_0.6.3.bb renamed from meta-xfce/recipes-xfce/garcon/garcon_0.6.2.bb +3 -3
@@ -2,15 +2,15 @@ DESCRIPTION="Xfce Menu Library" SECTION = "x11/libs" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" -DEPENDS = "xfce4-dev-tools-native libxfce4util libxfce4ui intltool-native" +DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" inherit xfce gtk-doc distro_features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" -SRC_URI[md5sum] = "a4b6332ff6f090575d534d6a9d2761d8" -SRC_URI[sha256sum] = "a87f09648ff10d45c524b3bfe618f18622bdd8b205589d35fed2f12d9c79c47c" +SRC_URI[md5sum] = "3b54d210adec3b6be781a1da26b53da2" +SRC_URI[sha256sum] = "76b1fea531363e9c5e767f1899039b4fe854edf23f6c0f260807e5551f798401" EXTRA_OECONF = "--disable-gtk-doc"
Signature · 1 line
2.20.0
PATCH v2 14/15 xfce4-settings: 4.12.4 -> 4.13.7
In reply to [email protected]From: Kai Kang <[email protected]>
Upgrade xfce4-settings from 4.12.4 to 4.13.7:
* update SRC_URI to re-use official tarball and not inherit xfce-git
* remove unneeded backport patch
* remove dependency gtk+ that gtk+3 is used now
* remove dependency dbus-glib which is replaced by gdbus
* clean DEPENDS that libxfce4util and xfconf are requried by libxfce4ui which is required by exo and garcon
* remove packageconfig datetime-setter
---
...2-Fix-linking-to-dbus-glib-bug-13633.patch | 41 -------------------
...ttings_git.bb => xfce4-settings_4.13.7.bb} | 19 +++------
2 files changed, 5 insertions(+), 55 deletions(-)
delete mode 100644 meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch
rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_git.bb => xfce4-settings_4.13.7.bb} (52%)meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch deleted +0 -41
@@ -1,41 +0,0 @@ -From b6e46e6a84e45f7bd954687be703987825a54c1e Mon Sep 17 00:00:00 2001 -From: Eric Koegel <[email protected]> -Date: Sun, 11 Jun 2017 11:38:26 +0300 -Subject: [PATCH] Fix linking to dbus-glib (bug #13633) - -With xfconf moving to GDBus nothing provides the libs for dbus-glib -that xfce4-settings requires. This patch adds the libs back in until -settings can be ported to GDBus. - -Signed-off-by: Sean Davis <[email protected]> - -Upstream-Status: Backport ---- - xfce4-settings-editor/Makefile.am | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/xfce4-settings-editor/Makefile.am b/xfce4-settings-editor/Makefile.am -index 5964366..c2c7c4b 100644 ---- a/xfce4-settings-editor/Makefile.am -+++ b/xfce4-settings-editor/Makefile.am -@@ -28,6 +28,7 @@ xfce4_settings_editor_CFLAGS = \ - $(LIBXFCE4UTIL_CFLAGS) \ - $(LIBXFCE4UI_CFLAGS) \ - $(XFCONF_CFLAGS) \ -+ $(DBUS_GLIB_CFLAGS) \ - $(PLATFORM_CFLAGS) - - xfce4_settings_editor_LDFLAGS = \ -@@ -39,7 +40,8 @@ xfce4_settings_editor_LDADD = \ - $(DBUS_GLIB_LIBS) \ - $(LIBXFCE4UTIL_LIBS) \ - $(LIBXFCE4UI_LIBS) \ -- $(XFCONF_LIBS) -+ $(XFCONF_LIBS) \ -+ $(DBUS_GLIB_LIBS) - - desktopdir = $(datadir)/applications - desktop_in_files = xfce4-settings-editor.desktop.in --- -2.14.3 -
meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.13.7.bb renamed from meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb +5 -14
@@ -2,32 +2,23 @@ SUMMARY = "Xfce4 settings" SECTION = "x11/wm" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo exo-native garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libxcursor libxklavier upower" +DEPENDS = "exo exo-native garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" -inherit xfce xfce-git distro_features_check +inherit xfce distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -# schnitzeltony git repo is the mainline repo -# + datetime-setter - sent to mainline but strange response -# + minor bugfixes - sent mainline but no response -# + option to hide mousepointer for a specific (touch) input device - sent mainline but no response -SRC_URI = " \ - git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.4 \ +SRC_URI += " \ file://0001-xsettings.xml-Set-default-themes.patch \ - file://0002-Fix-linking-to-dbus-glib-bug-13633.patch \ " -SRCREV = "75d7c9b15e5ccce12b0864d3659ae9b6de96e245" -S = "${WORKDIR}/git" -PV = "4.12.4+git${SRCPV}" +SRC_URI[md5sum] = "ec0a3daa810bce57cf140317243eeb1d" +SRC_URI[sha256sum] = "ac11391eee22cb5fbffe3342916bcf9805f29c722aca825c2f57d98dc167a065" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" PACKAGECONFIG ??= " \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','datetime-setter','',d)} \ ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ " -PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime-settings,, tzdata" PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop"
Signature · 1 line
2.20.0
PATCH v2 15/15 xfce4-pulseaudio-plugin: add dependency dbus-glib
In reply to [email protected]From: Kai Kang <[email protected]>
Xfce core modules have ported to gdbus. But xfce4-pulseaudio-plugin stills needs dbus-glib. Add dbus-glib to DEPENDS.
--- .../pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.1.bb +1 -1
@@ -6,7 +6,7 @@ inherit xfce-panel-plugin distro_features_check REQUIRED_DISTRO_FEATURES = "pulseaudio x11" -DEPENDS += "pulseaudio" +DEPENDS += "dbus-glib pulseaudio" SRC_URI[md5sum] = "7df7280c19c2c8b8c5bc4f4f2136d1dd" SRC_URI[sha256sum] = "6ca88314dbac3e24c0e1bfc593fad6edb66319766be62e8256c81b0314f049f0"
Signature · 1 line
2.20.0