Skip to contentSkip to conversation

xfce4-screenshooter: upgrade 1.9.4 -> 1.9.5

PATCH New Andreas Müller 1 participant 3 messages Apr 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 xfce4-screenshooter: upgrade 1.9.4 -> 1.9.5

This fixes a bug introduced in 1.9.4 [1]

[1] https://bugzilla.xfce.org/show_bug.cgi?id=15187

---
 ...e4-screenshooter_1.9.4.bb => xfce4-screenshooter_1.9.5.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-apps/xfce4-screenshooter/{xfce4-screenshooter_1.9.4.bb => xfce4-screenshooter_1.9.5.bb} (80%)
meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.5.bb renamed from meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.4.bb +2 -2
similarity index 80%
rename from meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.4.bb
rename to meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.5.bb
index 7c5848b92..9f8f61a4a 100644
@@ -7,8 +7,8 @@ DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-
 
 inherit xfce-app
 
-SRC_URI[md5sum] = "68321e50939fea3c66f0771d59845dab"
-SRC_URI[sha256sum] = "c4f3225b3f73f1feb1869807b8b27aec4c32a3e9c2954915a5fb39d18d3a60f2"
+SRC_URI[md5sum] = "0354811cd2622d3de92e342c7eaa184d"
+SRC_URI[sha256sum] = "bf35b5432cb920987c6d7ff193600e5dd4d73422b6aa02b4ec5288744053b38c"
 
 do_compile_prepend() {
     mkdir -p lib
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/3 networkmanager: Fix upstream regex for 1.16

---
 .../networkmanager/networkmanager_1.16.0.bb                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb +1 -1
index bdf60ee7c..4a432be77 100644
@@ -38,7 +38,7 @@ SRC_URI = " \
 SRC_URI[md5sum] = "10abacaafb162a67d2942adf03e7e9e4"
 SRC_URI[sha256sum] = "8e962833b6ca03edda1bc57ed6614a7b8c2339531b44acef098d05f2324c5d2c"
 
-UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.10/"
+UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.16/"
 UPSTREAM_CHECK_REGEX = "NetworkManager\-(?P<pver>1\.10(\.\d+)+).tar.xz"
 
 S = "${WORKDIR}/NetworkManager-${PV}"
Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/3 networkmanager: fix build with musl

In reply to Andreas Müller

* Cleanup patches
* Apply musl-hacks only for musl

---

And yes I am aware that it is now nm-applet failing on musl :(

 ...-net-ethernet.h-and-linux-if_ether.h.patch |  54 ---
 .../musl/0001-Fix-build-with-musl.patch       | 364 ++++++++++++++++++
 ...-net-ethernet.h-seems-to-be-over-spe.patch |  37 --
 .../networkmanager/musl/0003-musl-basic.patch |  56 ---
 .../musl/0004-musl-dlopen-configure-ac.patch  |  33 --
 .../musl/0005-musl-network-support.patch      |  71 ----
 .../musl/0006-musl-process-util.patch         |  60 ---
 ...er-conflicts-by-including-net-ethern.patch |  75 ----
 ...-Add-a-strndupa-replacement-for-musl.patch |  45 ---
 .../networkmanager/networkmanager_1.16.0.bb   |  10 +-
 10 files changed, 366 insertions(+), 439 deletions(-)
 delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch
 create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl.patch
 delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
 delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch
 delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch
 delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch
 delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch
 delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch
 delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch
meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch deleted +0 -54
deleted file mode 100644
index 555e5ffcb..000000000
@@ -1,54 +0,0 @@
-From b2cdab746ef64bc25ba0b9cff596ebdddd6e8dc6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 7 Nov 2018 11:30:44 -0800
-Subject: [PATCH] Do not include net/ethernet.h and linux/if_ether.h
-
-They conflict when used together especially with musl
-removing them still keeps it working so it seems they are redundant
-
-Signed-off-by: Khem Raj <[email protected]>
-
----
- shared/n-acd/src/n-acd.c              | 1 -
- src/platform/wpan/nm-wpan-utils.h     | 2 --
- src/settings/nm-settings-connection.h | 2 --
- 3 files changed, 5 deletions(-)
-
-diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c
-index def56a2..dd4eb78 100644
---- a/shared/n-acd/src/n-acd.c
-+++ b/shared/n-acd/src/n-acd.c
-@@ -11,7 +11,6 @@
- #include <inttypes.h>
- #include <limits.h>
- #include <linux/if_packet.h>
--#include <netinet/if_ether.h>
- #include <netinet/in.h>
- #include <stdlib.h>
- #include <string.h>
-diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/platform/wpan/nm-wpan-utils.h
-index 1b54ec4..ed39938 100644
---- a/src/platform/wpan/nm-wpan-utils.h
-+++ b/src/platform/wpan/nm-wpan-utils.h
-@@ -20,8 +20,6 @@
- #ifndef __WPAN_UTILS_H__
- #define __WPAN_UTILS_H__
- 
--#include <net/ethernet.h>
--
- #include "nm-dbus-interface.h"
- #include "platform/nm-netlink.h"
- 
-diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h
-index e796b71..c01fef6 100644
---- a/src/settings/nm-settings-connection.h
-+++ b/src/settings/nm-settings-connection.h
-@@ -22,8 +22,6 @@
- #ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__
- #define __NETWORKMANAGER_SETTINGS_CONNECTION_H__
- 
--#include <net/ethernet.h>
--
- #include "nm-dbus-object.h"
- #include "nm-connection.h"
- 
meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl.patch new file +364 -0

364 lines not on this page · raw message

meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch deleted +0 -37
deleted file mode 100644
index 5c59208b4..000000000
@@ -1,37 +0,0 @@
-From 32dc6cab58912add5bc6495558538953d9344c36 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 31 Mar 2017 16:48:00 -0700
-Subject: [PATCH] sd-lldp.h: Remove net/ethernet.h seems to be over specified
-
-Signed-off-by: Khem Raj <[email protected]>
-
----
- src/systemd/src/libsystemd-network/sd-lldp.c | 1 +
- src/systemd/src/systemd/sd-lldp.h            | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/systemd/src/libsystemd-network/sd-lldp.c b/src/systemd/src/libsystemd-network/sd-lldp.c
-index 741128e..62914ae 100644
---- a/src/systemd/src/libsystemd-network/sd-lldp.c
-+++ b/src/systemd/src/libsystemd-network/sd-lldp.c
-@@ -3,6 +3,7 @@
- #include "nm-sd-adapt-core.h"
- 
- #include <arpa/inet.h>
-+#include <net/ethernet.h>
- #include <linux/sockios.h>
- #include <sys/ioctl.h>
- 
-diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/systemd/src/systemd/sd-lldp.h
-index bf3afad..4cace87 100644
---- a/src/systemd/src/systemd/sd-lldp.h
-+++ b/src/systemd/src/systemd/sd-lldp.h
-@@ -18,7 +18,7 @@
- ***/
- 
- #include <inttypes.h>
--#include <net/ethernet.h>
-+//#include <net/ethernet.h>
- #include <sys/types.h>
- 
- #include "sd-event.h"
meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch deleted +0 -56

56 lines not on this page · raw message

meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch deleted +0 -33
deleted file mode 100644
index 419e1be24..000000000
@@ -1,33 +0,0 @@
-From 7743ea63fbe572b1f82db7d399fe9c5c99521432 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
-Date: Thu, 22 Mar 2018 18:18:06 +0100
-Subject: [PATCH] musl: dlopen is included so LD_LIBS="" instead of
- LD_LIBS="none required"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Stolen from [1] and prettyfied slightly
-
-[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
-
-Signed-off-by: Andreas Müller <[email protected]>
-
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index b914219..1b2b0ff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -241,6 +241,7 @@ dnl
- dnl Checks for libdl - on certain platforms its part of libc
- dnl
- AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
-+AS_IF([test "$ac_cv_search_dlopen" = "none required"],[ac_cv_search_dlopen=""])
- AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
- 
- PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch deleted +0 -71

71 lines not on this page · raw message

meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch deleted +0 -60

60 lines not on this page · raw message

meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch deleted +0 -75

75 lines not on this page · raw message

meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch deleted +0 -45

45 lines not on this page · raw message

meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb +2 -8
index 4a432be77..90792ff4e 100644
@@ -26,15 +26,9 @@ SRC_URI = " \
     ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
     file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
     file://0002-Do-not-create-settings-settings-property-documentati.patch \
-    file://musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch \
-    file://musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \
-    file://musl/0003-musl-basic.patch \
-    file://musl/0004-musl-dlopen-configure-ac.patch \
-    file://musl/0005-musl-network-support.patch \
-    file://musl/0006-musl-process-util.patch \
-    file://musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch \
-    file://musl/0008-Add-a-strndupa-replacement-for-musl.patch \
 "
+SRC_URI_append_libc-musl = " file://musl/0001-Fix-build-with-musl.patch"
+
 SRC_URI[md5sum] = "10abacaafb162a67d2942adf03e7e9e4"
 SRC_URI[sha256sum] = "8e962833b6ca03edda1bc57ed6614a7b8c2339531b44acef098d05f2324c5d2c"
 
Signature · 1 line
2.20.1