commit: 59c3cc1531947e21902225666c21a434f6ba1f10 Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz> AuthorDate: Mon Apr 27 04:42:32 2020 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Mon Apr 27 12:25:03 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=59c3cc15
net-libs/libqmi: Fixed upstream in commit 6097ad5, release 1.18.2 Current stable ::gentoo version 1.22.2 builds fine: >>> Completed installing net-libs/libqmi-1.22.2 into >>> /var/tmp/portage/net-libs/libqmi-1.22.2/image >>> net-libs/libqmi-1.22.2 merged. Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz> Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> net-libs/libqmi/Manifest | 1 - net-libs/libqmi/files/libqmi-fix-musl.patch | 25 --------------- net-libs/libqmi/libqmi-1.18.0.ebuild | 47 ----------------------------- net-libs/libqmi/metadata.xml | 18 ----------- 4 files changed, 91 deletions(-) diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest deleted file mode 100644 index b15c594..0000000 --- a/net-libs/libqmi/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libqmi-1.18.0.tar.xz 873176 SHA256 a0a42c55935e75a630208e2f70840bd4407f56fe1c5258f5b0f6c0aaedf88cec SHA512 3890501fa2299ce5ac8fda732363e39738c95ffb153708d8f727e88c082014018463c569a0d9666385f6394d060ec41052dec400f3f6c733e78748ca7ee56b76 WHIRLPOOL 337f68dde312ea3771340ce0b8b5d5d36019ad14d79cff176822e38560afccbf7fd6c1c8ab5630962887d8604b88152057ef2c838bb5819f8e07da039f91ebed diff --git a/net-libs/libqmi/files/libqmi-fix-musl.patch b/net-libs/libqmi/files/libqmi-fix-musl.patch deleted file mode 100644 index 9178fa8..0000000 --- a/net-libs/libqmi/files/libqmi-fix-musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7e5e61297eb4bb6f3ff0d3e01a85beb09c0e8d52 Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado <aleksan...@aleksander.es> -Date: Thu, 23 Feb 2017 10:53:38 +0100 -Subject: [PATCH 2/2] build: musl compatibility - ---- - src/libqmi-glib/qmi-utils.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libqmi-glib/qmi-utils.c b/src/libqmi-glib/qmi-utils.c -index 29e5f22..810640c 100644 ---- a/src/libqmi-glib/qmi-utils.c -+++ b/src/libqmi-glib/qmi-utils.c -@@ -740,7 +740,7 @@ __qmi_utils_get_driver (const gchar *cdc_wdm_path) - * /sys/bus/usb/drivers/qmi_wwan - */ - tmp = g_strdup_printf ("/sys/class/%s/%s/device/driver", subsystems[i], device_basename); -- path = canonicalize_file_name (tmp); -+ path = realpath (tmp, NULL); - g_free (tmp); - - if (g_file_test (path, G_FILE_TEST_EXISTS)) --- -2.11.1 - diff --git a/net-libs/libqmi/libqmi-1.18.0.ebuild b/net-libs/libqmi/libqmi-1.18.0.ebuild deleted file mode 100644 index bc53a40..0000000 --- a/net-libs/libqmi/libqmi-1.18.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit multilib -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git" -else - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" - SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz" -fi - -DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol helper library" -HOMEPAGE="https://cgit.freedesktop.org/libqmi/" - -LICENSE="LGPL-2" -SLOT="0/5.1" # soname of libqmi-glib.so -IUSE="doc +mbim static-libs" - -RDEPEND=">=dev-libs/glib-2.32 - virtual/libgudev - mbim? ( >=net-libs/libmbim-1.14.0 )" -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - virtual/pkgconfig" -[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214 - -src_prepare() { - default - eapply "${FILESDIR}/libqmi-fix-musl.patch" - [[ -e configure ]] || eautoreconf -} - -src_configure() { - econf \ - --disable-more-warnings \ - $(use_enable mbim mbim-qmux) \ - $(use_enable static{-libs,}) \ - $(use_enable {,gtk-}doc) -} - -src_install() { - default - use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la" -} diff --git a/net-libs/libqmi/metadata.xml b/net-libs/libqmi/metadata.xml deleted file mode 100644 index bca6a9f..0000000 --- a/net-libs/libqmi/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>vap...@gentoo.org</email> - <description>feel free to update</description> - </maintainer> - <maintainer type="person"> - <email>chain...@gentoo.org</email> - <name>Tony Vroon</name> - </maintainer> - <slots> - <subslots>libqmi-glib.so soname version</subslots> - </slots> - <use> - <flag name="mbim">Support QMI over Mobile Broadband Interface Model (MBIM)</flag> - </use> -</pkgmetadata>