* [gentoo-commits] proj/musl:master commit in: net-libs/libqmi/files/, net-libs/libqmi/
@ 2017-11-02 1:20 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2017-11-02 1:20 UTC (permalink / raw
To: gentoo-commits
commit: 437c6ad2ce311292cc0f0bc99587162d05b97f22
Author: Bjorn Pagen <bjornpagen <AT> gmail <DOT> com>
AuthorDate: Tue Oct 31 22:52:51 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Nov 2 01:19:51 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=437c6ad2
add net-libs/libqmi
net-libs/libqmi/Manifest | 4 +++
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, 94 insertions(+)
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
new file mode 100644
index 0000000..9e4a47a
--- /dev/null
+++ b/net-libs/libqmi/Manifest
@@ -0,0 +1,4 @@
+AUX libqmi-fix-musl.patch 868 SHA256 014fb554596b849838edf4367fca740f84a5e7c9818691fafe68aff193995ef4 SHA512 b3956792faa0fae99de740e66c3a66faec2335ef5f13fc7a93db560dcae2b7e806d180f12d0043117e59cedf939819480030489e26d3cb399795646508eadd28 WHIRLPOOL 022db4be9a5a05f9053590cf46efb300eb12547b0eff9034aefe743138c6ce871775b8cccd0948874dce2c5def82993c9d649fb9dc3b3065b63e1df61efe2598
+DIST libqmi-1.18.0.tar.xz 873176 SHA256 a0a42c55935e75a630208e2f70840bd4407f56fe1c5258f5b0f6c0aaedf88cec SHA512 3890501fa2299ce5ac8fda732363e39738c95ffb153708d8f727e88c082014018463c569a0d9666385f6394d060ec41052dec400f3f6c733e78748ca7ee56b76 WHIRLPOOL 337f68dde312ea3771340ce0b8b5d5d36019ad14d79cff176822e38560afccbf7fd6c1c8ab5630962887d8604b88152057ef2c838bb5819f8e07da039f91ebed
+EBUILD libqmi-1.18.0.ebuild 1172 SHA256 fc3341eb92b5772ed43ae3d770124e12181c6f159f66e5fb3f1d8d35e0620451 SHA512 5c6a303a3ac87b61175a4079ad6ac4bfb485cd7d271897b3c2949eee10b6f7ff8fa2322db2b36a4859c8a6af20af42851190244e129ba4756ca964fc32c1f848 WHIRLPOOL f94c2671e4c3ad003ff8fc5e41f91ab391eddb847453c110a276b59570a1c8fe92cc3476080f26f5b5684dee095a52039e9cdb3bf53151d9766a5ee358ba2955
+MISC metadata.xml 543 SHA256 4e1856ce0b67c34942d29148d08024374d9ff75c29e59e0a564de4e8026d9301 SHA512 b0285ce2d4cb22f9e3724a53f77dbdd0b029f7402aab7fa223169482cfe6e848403d309561e3c1ddd9ee7ea47e5175ce849ba9c212a3d3ee1fe9c05071a0f690 WHIRLPOOL 17037d5da3beb52cf1bb417adbf18ca13db0366135ba0be56758dccf01b74486c13749e2d9f21d015b867d6f3684665b3feab18f09f4aa7461320150dc323ffd
diff --git a/net-libs/libqmi/files/libqmi-fix-musl.patch b/net-libs/libqmi/files/libqmi-fix-musl.patch
new file mode 100644
index 0000000..9178fa8
--- /dev/null
+++ b/net-libs/libqmi/files/libqmi-fix-musl.patch
@@ -0,0 +1,25 @@
+From 7e5e61297eb4bb6f3ff0d3e01a85beb09c0e8d52 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander@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
new file mode 100644
index 0000000..bc53a40
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.18.0.ebuild
@@ -0,0 +1,47 @@
+# 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
new file mode 100644
index 0000000..bca6a9f
--- /dev/null
+++ b/net-libs/libqmi/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>vapier@gentoo.org</email>
+ <description>feel free to update</description>
+ </maintainer>
+ <maintainer type="person">
+ <email>chainsaw@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>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/musl:master commit in: net-libs/libqmi/files/, net-libs/libqmi/
@ 2020-04-27 12:25 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2020-04-27 12:25 UTC (permalink / raw
To: gentoo-commits
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 <aleksander@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>vapier@gentoo.org</email>
- <description>feel free to update</description>
- </maintainer>
- <maintainer type="person">
- <email>chainsaw@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>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-27 12:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-27 12:25 [gentoo-commits] proj/musl:master commit in: net-libs/libqmi/files/, net-libs/libqmi/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2017-11-02 1:20 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox