diff mbox series

package/modem-manager: bump version to 1.20.4

Message ID 20230114080403.26526-1-heiko.thiery@gmail.com
State Accepted
Headers show
Series package/modem-manager: bump version to 1.20.4 | expand

Commit Message

Heiko Thiery Jan. 14, 2023, 8:04 a.m. UTC 
Drop patch that is now upstream.

Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
 ...n-hardcode-building-a-shared-library.patch | 54 -------------------
 package/modem-manager/modem-manager.hash      |  2 +-
 package/modem-manager/modem-manager.mk        |  2 +-
 3 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch

Comments

Peter Korsgaard Jan. 14, 2023, 10:48 a.m. UTC | #1 
>>>>> "Heiko" == Heiko Thiery <heiko.thiery@gmail.com> writes:

 > Drop patch that is now upstream.
 > Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>

Committed, thanks.
diff mbox series

Patch

diff --git a/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch b/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch
deleted file mode 100644
index e99396d0d1..0000000000
--- a/package/modem-manager/0001-meson-Un-hardcode-building-a-shared-library.patch
+++ /dev/null
@@ -1,54 +0,0 @@ 
-From a9651f2390d3691dc74bcdb24b69a043fb0aacae Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 31 Dec 2022 10:18:32 +0100
-Subject: [PATCH] meson: Un-hardcode building a shared library
-
-Use library() instead of shared_library() to allow specifying which kind
-of library to build with "meson setup --default-library ..."
-
-This will avoid the following static build failure:
-
-FAILED: src/ModemManager
-/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/bin/m68k-linux-gcc  -o src/ModemManager src/ModemManager.p/meson-generated_.._mm-daemon-enums-types.c.o src/ModemManager.p/main.c.o src/ModemManager.p/mm-auth-provider.c.o src/ModemManager.p/mm-base-bearer.c.o src/ModemManager.p/mm-base-call.c.o src/ModemManager.p/mm-base-manager.c.o src/ModemManager.p/mm-base-modem-at.c.o src/ModemManager.p/mm-base-modem.c.o src/ModemManager.p/mm-base-sim.c.o src/ModemManager.p/mm-base-sms.c.o src/ModemManager.p/mm-bearer-list.c.o src/ModemManager.p/mm-broadband-bearer.c.o src/ModemManager.p/mm-broadband-modem.c.o src/ModemManager.p/mm-call-list.c.o src/ModemManager.p/mm-context.c.o src/ModemManager.p/mm-device.c.o src/ModemManager.p/mm-dispatcher.c.o src/ModemManager.p/mm-dispatcher-connection.c.o src/ModemManager.p/mm-dispatcher-fcc-unlock.c.o src/ModemManager.p/mm-filter.c.o src/ModemManager.p/mm-iface-modem-3gpp.c.o src/ModemManager.p/mm-iface-modem-3gpp-profile-manag
 er.c.o src/ModemManager.p/mm-iface-modem-3gpp-ussd.c.o src/ModemManager.p/mm-iface-modem.c.o src/ModemManager.p/mm-iface-modem-cdma.c.o src/ModemManager.p/mm-iface-modem-firmware.c.o src/ModemManager.p/mm-iface-modem-location.c.o src/ModemManager.p/mm-iface-modem-messaging.c.o src/ModemManager.p/mm-iface-modem-oma.c.o src/ModemManager.p/mm-iface-modem-sar.c.o src/ModemManager.p/mm-iface-modem-signal.c.o src/ModemManager.p/mm-iface-modem-simple.c.o src/ModemManager.p/mm-iface-modem-time.c.o src/ModemManager.p/mm-iface-modem-voice.c.o src/ModemManager.p/mm-plugin.c.o src/ModemManager.p/mm-plugin-manager.c.o src/ModemManager.p/mm-port-probe.c.o src/ModemManager.p/mm-port-probe-at.c.o src/ModemManager.p/mm-private-boxed-types.c.o src/ModemManager.p/mm-sms-list.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static '-Wl,-rpath,$ORIGIN/../libmm-glib' -Wl,-rpath-link,/home/autobuild/autobuild/instance-11/output-1/build/modem-manager-1.20.2/build/libmm-glib -Wl,--start-group src/libport.a s
 rc/libkerneldevice.a src/libhelpers.a libmm-glib/libmm-glib.so.0.9.0 libqcdm/src/libqcdm.a libmm-glib/generated/tests/libmm-test-generated.a -Wl,--export-dynamic /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libglib-2.0.a -pthread -lm /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpcre.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libffi.a /home/auto
 build/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libblkid.a -Wl,--end-group
-/home/autobuild/autobuild/instance-11/output-1/per-package/modem-manager/host/opt/ext-toolchain/bin/../lib/gcc/m68k-buildroot-linux-uclibc/11.2.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: attempted static link of dynamic object `libmm-glib/libmm-glib.so.0.9.0'
-
-Fixes:
- - http://autobuild.buildroot.org/results/9803d593305df36c4a8d67aac2fb4c9a3120a072
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[yann.morin.1998@free.fr: actual backport of upstreeam commit]
-Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
----
- libmm-glib/meson.build | 2 +-
- plugins/meson.build    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libmm-glib/meson.build b/libmm-glib/meson.build
-index 42f8ac61..de668dab 100644
---- a/libmm-glib/meson.build
-+++ b/libmm-glib/meson.build
-@@ -129,7 +129,7 @@ deps = [include_dep]
- 
- libname = 'mm-glib'
- 
--libmm_glib = shared_library(
-+libmm_glib = library(
-   libname,
-   version: mm_glib_version,
-   sources: sources,
-diff --git a/plugins/meson.build b/plugins/meson.build
-index f849bb53..9e081beb 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -18,7 +18,7 @@ if enable_tests
-     libmm_test_generated_dep
-   ]
- 
--  libmm_test_common = shared_library(
-+  libmm_test_common = library(
-     'mm-test-common',
-     sources: sources,
-     include_directories: top_inc,
--- 
-2.25.1
-
diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash
index e6967f8d62..4b8b795af7 100644
--- a/package/modem-manager/modem-manager.hash
+++ b/package/modem-manager/modem-manager.hash
@@ -1,4 +1,4 @@ 
 #Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc
-sha256  ba56aa764edc148f58348a589743cf1c1e27c55dcd7ebd820dcedd52fb8d7179  ModemManager-1.20.2.tar.gz
+sha256  9c16b47547faac9515f2d03d1e8175de9c5e6769b1ee16b608ba6cfe6f04b03e  ModemManager-1.20.4.tar.gz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk
index f1fc17523a..979a80a8e9 100644
--- a/package/modem-manager/modem-manager.mk
+++ b/package/modem-manager/modem-manager.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-MODEM_MANAGER_VERSION = 1.20.2
+MODEM_MANAGER_VERSION = 1.20.4
 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.gz
 MODEM_MANAGER_SITE = https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEM_MANAGER_VERSION)
 MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib)