* [PATCH 1/7] libndp: initial add 1.5
2015-06-25 12:35 [PATCH 0/7] here and there / some resend Andreas Müller
@ 2015-06-25 12:35 ` Andreas Müller
2015-06-25 12:35 ` [PATCH 2/7] networkmanager: update to 1.0.2 Andreas Müller
` (6 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2015-06-25 12:35 UTC (permalink / raw)
To: openembedded-devel
it is required for later networkmanager
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta-oe/recipes-connectivity/libndp/libndp_1.5.bb | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 meta-oe/recipes-connectivity/libndp/libndp_1.5.bb
diff --git a/meta-oe/recipes-connectivity/libndp/libndp_1.5.bb b/meta-oe/recipes-connectivity/libndp/libndp_1.5.bb
new file mode 100644
index 0000000..8f1d1ff
--- /dev/null
+++ b/meta-oe/recipes-connectivity/libndp/libndp_1.5.bb
@@ -0,0 +1,10 @@
+SUMMARY = "Library for IPv6 Neighbor Discovery Protocol"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI = "http://libndp.org/files/${BPN}-${PV}.tar.gz"
+SRC_URI[md5sum] = "beb82e8d75d8382d1b7c0bb0f68be429"
+SRC_URI[sha256sum] = "faf116ab70ce9514ec4e8573556025debea08f606e7f38b616de1f26e120c795"
+
+inherit autotools
--
1.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/7] networkmanager: update to 1.0.2
2015-06-25 12:35 [PATCH 0/7] here and there / some resend Andreas Müller
2015-06-25 12:35 ` [PATCH 1/7] libndp: initial add 1.5 Andreas Müller
@ 2015-06-25 12:35 ` Andreas Müller
2015-06-29 12:50 ` Martin Jansa
2015-06-25 12:35 ` [PATCH 3/7] network-manager-applet: " Andreas Müller
` (5 subsequent siblings)
7 siblings, 1 reply; 12+ messages in thread
From: Andreas Müller @ 2015-06-25 12:35 UTC (permalink / raw)
To: openembedded-devel
* at_console support is gone
* add PACKAGECONFIG for bluez5/modemmanager/ppp and disable them by default
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
...c-Check-only-for-libsystemd-not-libsystem.patch | 30 ----------------
...manager_0.9.8.10.bb => networkmanager_1.0.2.bb} | 41 +++++-----------------
2 files changed, 8 insertions(+), 63 deletions(-)
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch
rename meta-oe/recipes-connectivity/networkmanager/{networkmanager_0.9.8.10.bb => networkmanager_1.0.2.bb} (59%)
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch
deleted file mode 100644
index e356e9b..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 10427a19302e871daeeb245581e930dc58195492 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Thu, 27 Feb 2014 12:59:03 +0100
-Subject: [PATCH] configure.ac: Check only for libsystemd not libsystemd-login
-
-* they were merged into libsystemd in systemd-209
-
-Upstream-Status: Pending (it would need to be conditional on systemd version for upstream to accept this)
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index cc66e9b..3fe958e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -283,7 +283,7 @@ AS_IF([! (echo "$with_session_tracking" | grep -q -E "^(systemd|consolekit|no)$"
- AM_CONDITIONAL(SESSION_TRACKING_CK, test "$with_session_tracking" = "consolekit")
- AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "xwith_session_tracking" = "systemd")
- if test "$with_session_tracking" = "systemd"; then
-- PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login])
-+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd])
- AC_SUBST(SYSTEMD_LOGIN_CFLAGS)
- AC_SUBST(SYSTEMD_LOGIN_LIBS)
- fi
---
-1.9.0
-
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.2.bb
similarity index 59%
rename from meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb
rename to meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.2.bb
index 8d37c98..324d165 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.2.bb
@@ -4,18 +4,16 @@ SECTION = "net/misc"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b"
-DEPENDS = "libnl dbus dbus-glib udev wireless-tools nss util-linux ppp"
+DEPENDS = "libnl dbus dbus-glib udev wireless-tools nss util-linux libndp"
inherit gnome gettext systemd
SRC_URI = " \
${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
- file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \
"
-SRC_URI[md5sum] = "aad2558887e25417c52eb2deaade2f85"
-SRC_URI[sha256sum] = "064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972"
-
+SRC_URI[md5sum] = "5a4899f89edcbdd1ac46d2d947e8d6eb"
+SRC_URI[sha256sum] = "359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff"
S = "${WORKDIR}/NetworkManager-${PV}"
@@ -40,30 +38,11 @@ PACKAGECONFIG[systemd] = " \
polkit \
"
# consolekit is not picked by shlibs, so add it to RDEPENDS too
+PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
-PACKAGECONFIG[concheck] = "--enable-concheck,--disable-concheck,libsoup-2.4"
-
-# Work around dbus permission problems since we lack a proper at_console
-do_install_prepend() {
- sed -i 's:deny send_destination:allow send_destination:g' ${S}/src/org.freedesktop.NetworkManager.conf
- sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-dispatcher.conf
- sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-dhcp-client.conf
- sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-avahi-autoipd.conf
-}
-
-do_install_append () {
- install -d ${D}${sysconfdir}/dbus-1/event.d
- # Additional test binaries
- install -d ${D}${bindir}
- install -m 0755 ${B}/test/.libs/libnm* ${D}${bindir}
-
- # Install an empty VPN folder as nm-connection-editor will happily segfault without it :o.
- # With or without VPN support built in ;).
- install -d ${D}${sysconfdir}/NetworkManager/VPN
-
- rm -rf "${D}${localstatedir}/run"
- rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
-}
+PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4"
+PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
+PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion"
@@ -78,7 +57,7 @@ FILES_${PN} += " \
${datadir}/polkit-1 \
${datadir}/dbus-1 \
${base_libdir}/udev/* \
- ${systemd_unitdir}/system/NetworkManager-wait-online.service \
+ ${systemd_unitdir}/system \
"
RRECOMMENDS_${PN} += "iptables dnsmasq"
@@ -86,7 +65,6 @@ RCONFLICTS_${PN} = "connman"
RDEPENDS_${PN} = " \
wpa-supplicant \
dhcp-client \
- ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \
"
FILES_${PN}-dbg += " \
@@ -95,14 +73,11 @@ FILES_${PN}-dbg += " \
"
FILES_${PN}-dev += " \
- ${datadir}/NetworkManager/gdb-cmd \
${libdir}/pppd/*/*.la \
${libdir}/NetworkManager/*.la \
"
FILES_${PN}-tests = " \
- ${bindir}/nm-tool \
- ${bindir}/libnm-glib-test \
${bindir}/nm-online \
"
--
1.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 2/7] networkmanager: update to 1.0.2
2015-06-25 12:35 ` [PATCH 2/7] networkmanager: update to 1.0.2 Andreas Müller
@ 2015-06-29 12:50 ` Martin Jansa
2015-07-02 16:23 ` Andreas Müller
2015-07-15 20:40 ` Andreas Müller
0 siblings, 2 replies; 12+ messages in thread
From: Martin Jansa @ 2015-06-29 12:50 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 7306 bytes --]
On Thu, Jun 25, 2015 at 02:35:49PM +0200, Andreas Müller wrote:
> * at_console support is gone
> * add PACKAGECONFIG for bluez5/modemmanager/ppp and disable them by default
world build shows:
networkmanager-1.0.2: networkmanager: Files/directories were installed
but not shipped in any package:
/run
/run/NetworkManager
Please set FILES such that these items are packaged. Alternatively if
they are unneeded, avoid installing them or delete them within
do_install. [installed-vs-shipped]
can you please check it?
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
> ...c-Check-only-for-libsystemd-not-libsystem.patch | 30 ----------------
> ...manager_0.9.8.10.bb => networkmanager_1.0.2.bb} | 41 +++++-----------------
> 2 files changed, 8 insertions(+), 63 deletions(-)
> delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch
> rename meta-oe/recipes-connectivity/networkmanager/{networkmanager_0.9.8.10.bb => networkmanager_1.0.2.bb} (59%)
>
> diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch
> deleted file mode 100644
> index e356e9b..0000000
> --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From 10427a19302e871daeeb245581e930dc58195492 Mon Sep 17 00:00:00 2001
> -From: Martin Jansa <Martin.Jansa@gmail.com>
> -Date: Thu, 27 Feb 2014 12:59:03 +0100
> -Subject: [PATCH] configure.ac: Check only for libsystemd not libsystemd-login
> -
> -* they were merged into libsystemd in systemd-209
> -
> -Upstream-Status: Pending (it would need to be conditional on systemd version for upstream to accept this)
> -
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ----
> - configure.ac | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index cc66e9b..3fe958e 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -283,7 +283,7 @@ AS_IF([! (echo "$with_session_tracking" | grep -q -E "^(systemd|consolekit|no)$"
> - AM_CONDITIONAL(SESSION_TRACKING_CK, test "$with_session_tracking" = "consolekit")
> - AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "xwith_session_tracking" = "systemd")
> - if test "$with_session_tracking" = "systemd"; then
> -- PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login])
> -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd])
> - AC_SUBST(SYSTEMD_LOGIN_CFLAGS)
> - AC_SUBST(SYSTEMD_LOGIN_LIBS)
> - fi
> ---
> -1.9.0
> -
> diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.2.bb
> similarity index 59%
> rename from meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb
> rename to meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.2.bb
> index 8d37c98..324d165 100644
> --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb
> +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.2.bb
> @@ -4,18 +4,16 @@ SECTION = "net/misc"
> LICENSE = "GPLv2+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b"
>
> -DEPENDS = "libnl dbus dbus-glib udev wireless-tools nss util-linux ppp"
> +DEPENDS = "libnl dbus dbus-glib udev wireless-tools nss util-linux libndp"
>
> inherit gnome gettext systemd
>
> SRC_URI = " \
> ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
> file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
> - file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \
> "
> -SRC_URI[md5sum] = "aad2558887e25417c52eb2deaade2f85"
> -SRC_URI[sha256sum] = "064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972"
> -
> +SRC_URI[md5sum] = "5a4899f89edcbdd1ac46d2d947e8d6eb"
> +SRC_URI[sha256sum] = "359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff"
>
> S = "${WORKDIR}/NetworkManager-${PV}"
>
> @@ -40,30 +38,11 @@ PACKAGECONFIG[systemd] = " \
> polkit \
> "
> # consolekit is not picked by shlibs, so add it to RDEPENDS too
> +PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
> PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
> -PACKAGECONFIG[concheck] = "--enable-concheck,--disable-concheck,libsoup-2.4"
> -
> -# Work around dbus permission problems since we lack a proper at_console
> -do_install_prepend() {
> - sed -i 's:deny send_destination:allow send_destination:g' ${S}/src/org.freedesktop.NetworkManager.conf
> - sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-dispatcher.conf
> - sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-dhcp-client.conf
> - sed -i 's:deny send_destination:allow send_destination:g' ${S}/callouts/nm-avahi-autoipd.conf
> -}
> -
> -do_install_append () {
> - install -d ${D}${sysconfdir}/dbus-1/event.d
> - # Additional test binaries
> - install -d ${D}${bindir}
> - install -m 0755 ${B}/test/.libs/libnm* ${D}${bindir}
> -
> - # Install an empty VPN folder as nm-connection-editor will happily segfault without it :o.
> - # With or without VPN support built in ;).
> - install -d ${D}${sysconfdir}/NetworkManager/VPN
> -
> - rm -rf "${D}${localstatedir}/run"
> - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
> -}
> +PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4"
> +PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
> +PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
>
> PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion"
>
> @@ -78,7 +57,7 @@ FILES_${PN} += " \
> ${datadir}/polkit-1 \
> ${datadir}/dbus-1 \
> ${base_libdir}/udev/* \
> - ${systemd_unitdir}/system/NetworkManager-wait-online.service \
> + ${systemd_unitdir}/system \
> "
>
> RRECOMMENDS_${PN} += "iptables dnsmasq"
> @@ -86,7 +65,6 @@ RCONFLICTS_${PN} = "connman"
> RDEPENDS_${PN} = " \
> wpa-supplicant \
> dhcp-client \
> - ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \
> "
>
> FILES_${PN}-dbg += " \
> @@ -95,14 +73,11 @@ FILES_${PN}-dbg += " \
> "
>
> FILES_${PN}-dev += " \
> - ${datadir}/NetworkManager/gdb-cmd \
> ${libdir}/pppd/*/*.la \
> ${libdir}/NetworkManager/*.la \
> "
>
> FILES_${PN}-tests = " \
> - ${bindir}/nm-tool \
> - ${bindir}/libnm-glib-test \
> ${bindir}/nm-online \
> "
>
> --
> 1.9.3
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 2/7] networkmanager: update to 1.0.2
2015-06-29 12:50 ` Martin Jansa
@ 2015-07-02 16:23 ` Andreas Müller
2015-07-15 20:40 ` Andreas Müller
1 sibling, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2015-07-02 16:23 UTC (permalink / raw)
To: openembedded-devel@lists.openembedded.org
On Mon, Jun 29, 2015 at 2:50 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Thu, Jun 25, 2015 at 02:35:49PM +0200, Andreas Müller wrote:
>> * at_console support is gone
>> * add PACKAGECONFIG for bluez5/modemmanager/ppp and disable them by default
>
> world build shows:
> networkmanager-1.0.2: networkmanager: Files/directories were installed
> but not shipped in any package:
> /run
> /run/NetworkManager
> Please set FILES such that these items are packaged. Alternatively if
> they are unneeded, avoid installing them or delete them within
> do_install. [installed-vs-shipped]
>
> can you please check it?
>
Am out till 16th - will check then
Andreas
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/7] networkmanager: update to 1.0.2
2015-06-29 12:50 ` Martin Jansa
2015-07-02 16:23 ` Andreas Müller
@ 2015-07-15 20:40 ` Andreas Müller
1 sibling, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2015-07-15 20:40 UTC (permalink / raw)
To: openembedded-devel@lists.openembedded.org
On Mon, Jun 29, 2015 at 2:50 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Thu, Jun 25, 2015 at 02:35:49PM +0200, Andreas Müller wrote:
>> * at_console support is gone
>> * add PACKAGECONFIG for bluez5/modemmanager/ppp and disable them by default
>
> world build shows:
> networkmanager-1.0.2: networkmanager: Files/directories were installed
> but not shipped in any package:
> /run
> /run/NetworkManager
> Please set FILES such that these items are packaged. Alternatively if
> they are unneeded, avoid installing them or delete them within
> do_install. [installed-vs-shipped]
>
> can you please check it?
>
I cannot reproduce this here. Is there some place I can find logs
causing this message? I would be interested in log.do_configure /
log.do_compile / log.do_install to see what's different to my build.
Andreas
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/7] network-manager-applet: update to 1.0.2
2015-06-25 12:35 [PATCH 0/7] here and there / some resend Andreas Müller
2015-06-25 12:35 ` [PATCH 1/7] libndp: initial add 1.5 Andreas Müller
2015-06-25 12:35 ` [PATCH 2/7] networkmanager: update to 1.0.2 Andreas Müller
@ 2015-06-25 12:35 ` Andreas Müller
2015-06-25 12:35 ` [PATCH 4/7] libxfce4ui: build gtk3 libs and pack gtk2/gtk3 libs in separate packages Andreas Müller
` (4 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2015-06-25 12:35 UTC (permalink / raw)
To: openembedded-devel
note that 1.x only supports gtk3
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
...ort-for-AP-mode-setting-for-wifi-sharing.patch} | 0
...ses-and-properties-which-are-not-supporte.patch | 41 ----------------------
...or-network-sharing-if-device-supports-it.patch} | 2 +-
...0.9.8.10.bb => network-manager-applet_1.0.2.bb} | 16 +++------
4 files changed, 6 insertions(+), 53 deletions(-)
rename meta-gnome/recipes-connectivity/network-manager-applet/files/{0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch => 0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch} (100%)
delete mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch
rename meta-gnome/recipes-connectivity/network-manager-applet/files/{0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch => 0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch} (97%)
rename meta-gnome/recipes-connectivity/network-manager-applet/{network-manager-applet_0.9.8.10.bb => network-manager-applet_1.0.2.bb} (67%)
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch
similarity index 100%
rename from meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch
rename to meta-gnome/recipes-connectivity/network-manager-applet/files/0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch
deleted file mode 100644
index 4bd0e4f..0000000
--- a/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c7d75ce38fa392c04c39a75e7b7e068666a7b1e7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Tue, 8 Apr 2014 15:22:54 +0200
-Subject: [PATCH] remove classes and properties which are not supported by gtk+
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-unsupported classes caused nm-connection editor to crash
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- src/connection-editor/ce-page-general.ui | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui
-index b05f0df..049432b 100644
---- a/src/connection-editor/ce-page-general.ui
-+++ b/src/connection-editor/ce-page-general.ui
-@@ -37,8 +37,6 @@
- <object class="GtkComboBox" id="dependent_vpn_combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
-- <property name="margin_left">26</property>
-- <property name="margin_bottom">12</property>
- <property name="model">dependent_vpn_model</property>
- <child>
- <object class="GtkCellRendererText" id="renderer1"/>
-@@ -59,7 +57,6 @@
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
-- <property name="margin_bottom">12</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
---
-1.8.3.1
-
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch b/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch
similarity index 97%
rename from meta-gnome/recipes-connectivity/network-manager-applet/files/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch
rename to meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch
index e215646..4e3d7e2 100644
--- a/meta-gnome/recipes-connectivity/network-manager-applet/files/0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch
@@ -28,7 +28,7 @@ index 3532caa..ca72c96 100644
+ g_object_unref (*device);
+ }
+
- if (priv->adhoc_create) {
+ if (priv->operation == OP_CREATE_ADHOC) {
NMSettingIP4Config *s_ip4;
- g_object_set (s_wireless, NM_SETTING_WIRELESS_MODE, "adhoc", NULL);
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.2.bb
similarity index 67%
rename from meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb
rename to meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.2.bb
index 72c9ae6..210b5b2 100644
--- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.2.bb
@@ -2,24 +2,18 @@ SUMMARY = "GTK+ applet for NetworkManager"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-DEPENDS = "libnotify libsecret networkmanager dbus-glib gconf gnome-keyring libgnome-keyring iso-codes"
+DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib gconf gnome-keyring libgnome-keyring iso-codes"
inherit gnomebase gsettings gtk-icon-cache
GNOME_COMPRESS_TYPE = "xz"
SRC_URI += " \
- file://0001-remove-classes-and-properties-which-are-not-supporte.patch \
- file://0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch \
- file://0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch \
-"
-SRC_URI[archive.md5sum] = "5148348c139229c6a753f815f3f11e1c"
-SRC_URI[archive.sha256sum] = "46fee9a1e667d1826e6a94bb6bd2e6bdbde535fc995e534542f5f7e8b8dae0cb"
-
-# GTK2.x mode
-EXTRA_OECONF += " \
- --with-gtkver=2 \
+ file://0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch \
+ file://0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch \
"
+SRC_URI[archive.md5sum] = "5b2a8baa6b038b3e55e5444ff321e80d"
+SRC_URI[archive.sha256sum] = "760af85b43fa5bcf74b96f899a6d4c1d5e9445e5eb63088c49e5164bbf88d9a9"
PACKAGECONFIG[bluetooth] = "--with-bluetooth,--without-bluetooth,gnome-bluetooth,gnome-bluetooth"
PACKAGECONFIG[modemmanager] = "--with-modem-manager-1,--without-modem-manager-1,modemmanager"
--
1.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/7] libxfce4ui: build gtk3 libs and pack gtk2/gtk3 libs in separate packages
2015-06-25 12:35 [PATCH 0/7] here and there / some resend Andreas Müller
` (2 preceding siblings ...)
2015-06-25 12:35 ` [PATCH 3/7] network-manager-applet: " Andreas Müller
@ 2015-06-25 12:35 ` Andreas Müller
2015-06-25 12:35 ` [PATCH 5/7] xfce4-session: ensure ip for machine is found by adding to hosts Andreas Müller
` (3 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2015-06-25 12:35 UTC (permalink / raw)
To: openembedded-devel
the solution provided still allows gtk3 free images (tested on image including
packagegroup-xfce-extended) but there will be updates/new recipes for xfce4
requiring gtk3 part of libxfce4ui e.g xfce4-pulseaudio-plugin (replacement for
deprecated xfce4-mixer due to missing mixer API in gstreamer-1.0) / parole /
xfce4-power-manager.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
...configure.ac-remove-optional-gtk3-support.patch | 37 ----------------------
.../recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb | 7 ++--
2 files changed, 5 insertions(+), 39 deletions(-)
delete mode 100644 meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac-remove-optional-gtk3-support.patch
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac-remove-optional-gtk3-support.patch b/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac-remove-optional-gtk3-support.patch
deleted file mode 100644
index e154711..0000000
--- a/meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac-remove-optional-gtk3-support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d61dc6718a2abaf70d19f17d34128cb7e161e057 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Wed, 18 Sep 2013 20:50:11 +0200
-Subject: [PATCH] configure.ac: remove optional gtk3 support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-it drags in gtk3 if that was build before. This is not yet wanted
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.ac | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e47df04..b6edab1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -129,12 +129,6 @@ XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.28.0])
- XDT_CHECK_PACKAGE([GTK2], [gtk+-2.0], [2.24.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
-
--dnl ***********************************************************
--dnl *** Optional support for a GTK+3 version of the library ***
--dnl ***********************************************************
--XDT_CHECK_OPTIONAL_PACKAGE([GTK3],
-- [gtk+-3.0], [3.2.0], [gtk3],
-- [GTK+ 3 support])
- AM_CONDITIONAL([ENABLE_GTK3_LIBRARY], [test "x$GTK3_FOUND" = "xyes"])
-
- dnl *************************************************
---
-1.8.3.1
-
diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb
index 36f42d3..26d21c1 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb
@@ -2,13 +2,12 @@ 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+ intltool libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice"
+DEPENDS = "perl-native glib-2.0 gtk+ gtk+3 intltool libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice"
inherit xfce autotools gettext gtk-doc
SRC_URI += " \
file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \
- file://0002-configure.ac-remove-optional-gtk3-support.patch \
"
SRC_URI[md5sum] = "ea9fad7d059fe8f531fe8db42dabb5a9"
SRC_URI[sha256sum] = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43"
@@ -19,6 +18,10 @@ PACKAGECONFIG ??= ""
PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3"
PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
+PACKAGES =+ "${PN}-gtk2 ${PN}-gtk3"
+FILES_${PN}-gtk2 += "${libdir}/libxfce4ui-1.so.* ${libdir}/libxfce4kbd-private-2.so.*"
+FILES_${PN}-gtk3 += "${libdir}/libxfce4ui-2.so.* ${libdir}/libxfce4kbd-private-3.so.*"
+
FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
FILES_${PN}-dev += "${libdir}/glade3/modules/*.la \
${datadir}/glade3/catalogs/*.in"
--
1.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 5/7] xfce4-session: ensure ip for machine is found by adding to hosts
2015-06-25 12:35 [PATCH 0/7] here and there / some resend Andreas Müller
` (3 preceding siblings ...)
2015-06-25 12:35 ` [PATCH 4/7] libxfce4ui: build gtk3 libs and pack gtk2/gtk3 libs in separate packages Andreas Müller
@ 2015-06-25 12:35 ` Andreas Müller
2015-06-25 12:35 ` [PATCH 6/7] xfdesktop: fix settings for monitors containing white spaces Andreas Müller
` (2 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2015-06-25 12:35 UTC (permalink / raw)
To: openembedded-devel
This fixes very ugly behaviour: Starting applications e.g xfce4-terminal
can delay for minutes in case network is connected.
There was a similar approach implemented for xfce4-session but this was removed
in
commit f54d3a506fef603d8d0c538d1d69a6597152c169
Author: Ash Charles <ashcharles@gmail.com>
Date: Mon Feb 23 08:40:53 2015 -0800
xfce4-session: Remove unneeded pkg_postinst
The pkg_postinst inherited from previous versions of this recipe no
longer seems necessary; no error message seen at runtime in a quick
test. As it made the generated packages unnecessarily
machine-specific, remove this post-install step. Based on the ensuring
discussion, this supersedes the original patch [1].
[1] http://lists.openembedded.org/pipermail/openembedded-devel/2015-February/100454.html
Signed-off-by: Ash Charles <ashcharles@gmail.com>
Tested-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Unfortuantely my tests for that patch only checked for the messagebox:
| Could not look up internet address for <hostname>
| This will prevent Xfce from operating correctly.
| It may be possible to correct the problem by adding
| <hostname> to the file /etc/hosts on your system.
For unknown reasons this messagebox is not created but the hint is still
extremely valid.
To avoid making 'xfce4-session' machine specific an extra meta-recipe
'machine-host' was created on which 'xfce4-session' rdepends.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta-xfce/recipes-xfce/xfce4-session/machine-host.bb | 17 +++++++++++++++++
.../recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb | 2 ++
2 files changed, 19 insertions(+)
create mode 100644 meta-xfce/recipes-xfce/xfce4-session/machine-host.bb
diff --git a/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb b/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb
new file mode 100644
index 0000000..03bd205
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Meta package adding machine name to known hosts"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+
+ALLOW_EMPTY_${PN} = "1"
+
+LOCALHOSTMACHINE = "127.0.0.1 ${MACHINE}"
+
+# on some machines starting applications as xfce4-terminal take ages without
+# machine name in hosts
+pkg_postinst_${PN} () {
+if ! grep -q '${LOCALHOSTMACHINE}' $D/etc/hosts ; then
+ echo '${LOCALHOSTMACHINE}' >> $D/etc/hosts
+fi
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb
index 81c56cc..215aec3 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb
@@ -26,3 +26,5 @@ FILES_${PN} += " \
"
FILES_${PN}-dbg += "${libdir}/xfce4/*/*/.debug"
+
+RDEPENDS_${PN} += "machine-host"
--
1.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 6/7] xfdesktop: fix settings for monitors containing white spaces
2015-06-25 12:35 [PATCH 0/7] here and there / some resend Andreas Müller
` (4 preceding siblings ...)
2015-06-25 12:35 ` [PATCH 5/7] xfce4-session: ensure ip for machine is found by adding to hosts Andreas Müller
@ 2015-06-25 12:35 ` Andreas Müller
2015-06-25 12:35 ` [PATCH 7/7] gnome-settings-daemon: fix PACKAGECONFIG Andreas Müller
2015-06-25 14:40 ` [PATCH 0/7] here and there / some resend Martin Jansa
7 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2015-06-25 12:35 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
...espaces-from-monitor-name-when-accessing-.patch | 138 +++++++++++++++++++++
.../recipes-xfce/xfdesktop/xfdesktop_4.12.2.bb | 1 +
2 files changed, 139 insertions(+)
create mode 100644 meta-xfce/recipes-xfce/xfdesktop/files/0001-Remove-whitespaces-from-monitor-name-when-accessing-.patch
diff --git a/meta-xfce/recipes-xfce/xfdesktop/files/0001-Remove-whitespaces-from-monitor-name-when-accessing-.patch b/meta-xfce/recipes-xfce/xfdesktop/files/0001-Remove-whitespaces-from-monitor-name-when-accessing-.patch
new file mode 100644
index 0000000..3390f28
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfdesktop/files/0001-Remove-whitespaces-from-monitor-name-when-accessing-.patch
@@ -0,0 +1,138 @@
+From f384bfc86322096c62f0b843bacf5e9633e18035 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 25 Jun 2015 13:08:29 +0200
+Subject: [PATCH] Remove whitespaces from monitor name when accessing settings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Desktop wallpaper could not be set here. Running
+'xfdesktop-settings --enable-debug' lead to:
+
+| Saving to /backdrop/screen0/monitorDISP3 BG - DI1/workspace0/last-image//usr/share/backgrounds/xfce/xfce-blue.jpg
+
+and no change was found tracking with Settings Editor.
+
+Upstream-Status: Submitted [1]
+
+[1] https://bugzilla.xfce.org/show_bug.cgi?id=12015
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ common/xfdesktop-common.c | 26 ++++++++++++++++++++++++++
+ common/xfdesktop-common.h | 1 +
+ settings/main.c | 4 ++--
+ src/xfce-workspace.c | 11 +++++------
+ 4 files changed, 34 insertions(+), 8 deletions(-)
+
+diff --git a/common/xfdesktop-common.c b/common/xfdesktop-common.c
+index 5d2c255..1f180df 100644
+--- a/common/xfdesktop-common.c
++++ b/common/xfdesktop-common.c
+@@ -194,6 +194,32 @@ xfdesktop_popup_keyboard_grab_available(GdkWindow *win)
+ }
+
+
++/*
++ * xfdesktop_remove_whitspaces:
++ * remove all whitespaces from string (not only trailing or leading)
++ */
++gchar*
++xfdesktop_remove_whitspaces(gchar* str)
++{
++ gchar* dest;
++ gint offs, curr;
++
++ g_return_val_if_fail(str, NULL);
++
++ offs = 0;
++ dest = str;
++ for(curr=0; curr<=strlen(str); curr++) {
++ if(*dest == ' ' || *dest == '\t')
++ offs++;
++ else if(0 != offs)
++ *(dest-offs) = *dest;
++ dest++;
++ }
++
++ return str;
++}
++
++
+ #ifdef G_ENABLE_DEBUG
+ /* With --enable-debug=full turn on debugging messages from the start */
+ static gboolean enable_debug = TRUE;
+diff --git a/common/xfdesktop-common.h b/common/xfdesktop-common.h
+index d1a2745..9e76e78 100644
+--- a/common/xfdesktop-common.h
++++ b/common/xfdesktop-common.h
+@@ -100,6 +100,7 @@ gint xfce_translate_image_styles(gint input);
+
+ guint32 xfdesktop_popup_keyboard_grab_available(GdkWindow *win);
+
++gchar* xfdesktop_remove_whitspaces(gchar* str);
+
+ #if defined(G_HAVE_ISO_VARARGS)
+
+diff --git a/settings/main.c b/settings/main.c
+index bc68099..b37abad 100644
+--- a/settings/main.c
++++ b/settings/main.c
+@@ -795,9 +795,9 @@ xfdesktop_settings_generate_per_workspace_binding_string(AppearancePanel *panel,
+ panel->screen, panel->monitor, panel->workspace,
+ property);
+ } else {
+- buf = g_strdup_printf("/backdrop/screen%d/monitor%s/workspace%d/%s",
++ buf = xfdesktop_remove_whitspaces(g_strdup_printf("/backdrop/screen%d/monitor%s/workspace%d/%s",
+ panel->screen, panel->monitor_name, panel->workspace,
+- property);
++ property));
+ }
+
+ XF_DEBUG("name %s", buf);
+diff --git a/src/xfce-workspace.c b/src/xfce-workspace.c
+index 6d3b3e6..13e1187 100644
+--- a/src/xfce-workspace.c
++++ b/src/xfce-workspace.c
+@@ -157,7 +157,7 @@ xfce_workspace_set_xfconf_property_string(XfceWorkspace *workspace,
+ workspace->priv->property_prefix, monitor_num, workspace->priv->workspace_num, property);
+ } else {
+ g_snprintf(buf, sizeof(buf), "%smonitor%s/workspace%d/%s",
+- workspace->priv->property_prefix, monitor_name, workspace->priv->workspace_num, property);
++ workspace->priv->property_prefix, xfdesktop_remove_whitspaces(monitor_name), workspace->priv->workspace_num, property);
+
+ g_free(monitor_name);
+ }
+@@ -191,7 +191,7 @@ xfce_workspace_set_xfconf_property_value(XfceWorkspace *workspace,
+ workspace->priv->property_prefix, monitor_num, workspace->priv->workspace_num, property);
+ } else {
+ g_snprintf(buf, sizeof(buf), "%smonitor%s/workspace%d/%s",
+- workspace->priv->property_prefix, monitor_name, workspace->priv->workspace_num, property);
++ workspace->priv->property_prefix, xfdesktop_remove_whitspaces(monitor_name), workspace->priv->workspace_num, property);
+
+ g_free(monitor_name);
+ }
+@@ -609,8 +609,9 @@ xfce_workspace_connect_backdrop_settings(XfceWorkspace *workspace,
+ workspace->priv->property_prefix, monitor, workspace->priv->workspace_num);
+ } else {
+ g_snprintf(buf, sizeof(buf), "%smonitor%s/workspace%d/",
+- workspace->priv->property_prefix, monitor_name, workspace->priv->workspace_num);
+- }
++ workspace->priv->property_prefix, xfdesktop_remove_whitspaces(monitor_name), workspace->priv->workspace_num);
++ g_free(monitor_name);
++ }
+ pp_len = strlen(buf);
+
+ XF_DEBUG("prefix string: %s", buf);
+@@ -674,8 +675,6 @@ xfce_workspace_connect_backdrop_settings(XfceWorkspace *workspace,
+ xfconf_g_property_bind(channel, buf, G_TYPE_STRING,
+ G_OBJECT(backdrop), "image-filename");
+
+-
+- g_free(monitor_name);
+ }
+
+ static void
+--
+1.9.3
+
diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.2.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.2.bb
index 9c72028..95b5f40 100644
--- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.2.bb
+++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.2.bb
@@ -8,6 +8,7 @@ inherit xfce
SRC_URI[md5sum] = "9a29c8e6b8a931fecd29f1ea736a6a70"
SRC_URI[sha256sum] = "c9788883163b57bac39d12e5f8310c869d176454879defb78b67f8e9f1ad5225"
+SRC_URI += "file://0001-Remove-whitespaces-from-monitor-name-when-accessing-.patch"
PACKAGECONFIG ??= ""
PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify"
--
1.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 7/7] gnome-settings-daemon: fix PACKAGECONFIG
2015-06-25 12:35 [PATCH 0/7] here and there / some resend Andreas Müller
` (5 preceding siblings ...)
2015-06-25 12:35 ` [PATCH 6/7] xfdesktop: fix settings for monitors containing white spaces Andreas Müller
@ 2015-06-25 12:35 ` Andreas Müller
2015-06-25 14:40 ` [PATCH 0/7] here and there / some resend Martin Jansa
7 siblings, 0 replies; 12+ messages in thread
From: Andreas Müller @ 2015-06-25 12:35 UTC (permalink / raw)
To: openembedded-devel
detected by new oe-core feature
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
index f45acab..e06c5f9 100644
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
@@ -13,7 +13,7 @@ SRCREV = "0160f6725cfb872e017f3958f108792c3b882872"
S = "${WORKDIR}/git"
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio glib-2.0 libcanberra"
PACKAGECONFIG[smartcard] = "--enable-smartcard-support,--disable-smartcard-support,nss"
--
1.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 0/7] here and there / some resend
2015-06-25 12:35 [PATCH 0/7] here and there / some resend Andreas Müller
` (6 preceding siblings ...)
2015-06-25 12:35 ` [PATCH 7/7] gnome-settings-daemon: fix PACKAGECONFIG Andreas Müller
@ 2015-06-25 14:40 ` Martin Jansa
7 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2015-06-25 14:40 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 4914 bytes --]
On Thu, Jun 25, 2015 at 02:35:47PM +0200, Andreas Müller wrote:
> I saw that my last patches [1-3][5] did not make it into patchwork
> (german umlaut?) so I resend them as pull request:
All these were marked as spam by my gmail account, so I believe this was
another example of
https://bugzilla.yoctoproject.org/show_bug.cgi?id=7657
I'll apply these manually, thanks.
> The following changes since commit 34dcefb1bfbbac33a771b4b68748e0d9d877365e:
>
> lvm2: add systemd support (2015-06-23 12:43:12 +0200)
>
> are available in the git repository at:
>
> https://github.com/schnitzeltony/meta-openembedded.git patches
>
> for you to fetch changes up to 4f22e684e6950301816602fe17b4d06bc0a08078:
>
> gnome-settings-daemon: fix PACKAGECONFIG (2015-06-25 14:20:59 +0200)
>
> ----------------------------------------------------------------
> Andreas Müller (7):
> libndp: initial add 1.5
> networkmanager: update to 1.0.2
> network-manager-applet: update to 1.0.2
> libxfce4ui: build gtk3 libs and pack gtk2/gtk3 libs in separate packages
> xfce4-session: ensure ip for machine is found by adding to hosts
> xfdesktop: fix settings for monitors containing white spaces
> gnome-settings-daemon: fix PACKAGECONFIG
>
> ...ort-for-AP-mode-setting-for-wifi-sharing.patch => 0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch} | 0
> .../network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch | 41 -----------------
> ...twork-sharing-if-device-supports-it.patch => 0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch} | 2 +-
> .../network-manager-applet/{network-manager-applet_0.9.8.10.bb => network-manager-applet_1.0.2.bb} | 16 +++----
> meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb | 2 +-
> meta-oe/recipes-connectivity/libndp/libndp_1.5.bb | 10 +++++
> .../networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch | 30 -------------
> meta-oe/recipes-connectivity/networkmanager/{networkmanager_0.9.8.10.bb => networkmanager_1.0.2.bb} | 41 ++++-------------
> meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac-remove-optional-gtk3-support.patch | 37 ----------------
> meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb | 7 ++-
> meta-xfce/recipes-xfce/xfce4-session/machine-host.bb | 17 ++++++++
> meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb | 2 +
> meta-xfce/recipes-xfce/xfdesktop/files/0001-Remove-whitespaces-from-monitor-name-when-accessing-.patch | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.2.bb | 1 +
> 14 files changed, 188 insertions(+), 156 deletions(-)
> rename meta-gnome/recipes-connectivity/network-manager-applet/files/{0002-Add-support-for-AP-mode-setting-for-wifi-sharing.patch => 0001-Add-support-for-AP-mode-setting-for-wifi-sharing.patch} (100%)
> delete mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch
> rename meta-gnome/recipes-connectivity/network-manager-applet/files/{0003-Use-AP-mode-for-network-sharing-if-device-supports-it.patch => 0002-Use-AP-mode-for-network-sharing-if-device-supports-it.patch} (97%)
> rename meta-gnome/recipes-connectivity/network-manager-applet/{network-manager-applet_0.9.8.10.bb => network-manager-applet_1.0.2.bb} (67%)
> create mode 100644 meta-oe/recipes-connectivity/libndp/libndp_1.5.bb
> delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch
> rename meta-oe/recipes-connectivity/networkmanager/{networkmanager_0.9.8.10.bb => networkmanager_1.0.2.bb} (59%)
> delete mode 100644 meta-xfce/recipes-xfce/libxfce4ui/files/0002-configure.ac-remove-optional-gtk3-support.patch
> create mode 100644 meta-xfce/recipes-xfce/xfce4-session/machine-host.bb
> create mode 100644 meta-xfce/recipes-xfce/xfdesktop/files/0001-Remove-whitespaces-from-monitor-name-when-accessing-.patch
>
> --
> 1.9.3
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread