* [PR PATCH] libqrtr-glib: update to 1.2.2.
@ 2022-08-26 2:01 JamiKettunen
2022-08-26 2:26 ` [PR PATCH] [Updated] " JamiKettunen
` (17 more replies)
0 siblings, 18 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-26 2:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]
There is a new pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages libqrtr-glib
https://github.com/void-linux/void-packages/pull/38915
libqrtr-glib: update to 1.2.2.
Builds fine, but local testing to-be-done still...
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38915.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libqrtr-glib-38915.patch --]
[-- Type: text/x-diff, Size: 3311 bytes --]
From 5ea595a16c1b44a6effe5dfd3adab8a306e17a63 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 11 Aug 2022 16:22:51 +0300
Subject: [PATCH 1/3] libqrtr-glib: update to 1.2.2.
---
srcpkgs/libqrtr-glib/template | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/libqrtr-glib/template b/srcpkgs/libqrtr-glib/template
index b09104c12bb7..4b4ecb97860e 100644
--- a/srcpkgs/libqrtr-glib/template
+++ b/srcpkgs/libqrtr-glib/template
@@ -1,29 +1,32 @@
# Template file for 'libqrtr-glib'
pkgname=libqrtr-glib
-version=1.0.0
+version=1.2.2
revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config"
+build_style=meson
+build_helper="gir qemu"
+configure_args="$(vopt_bool gir introspection)"
+hostmakedepends="pkg-config gtk-doc"
makedepends="glib-devel"
short_desc="Qualcomm IPC Router protocol helper library"
maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"
-distfiles="${FREEDESKTOP_SITE}/libqmi/${pkgname}-${version}.tar.xz"
-checksum=30d879b2ade6f8f461def3a677755db5c0238babf688d5c83c03b3e6abe35cee
+distfiles="${homepage}/-/archive/${version}/libqrtr-glib-${version}.tar.gz"
+checksum=c5cdf5ea91cbd2cf2758b2896064c7b1dfe7156063267df905f957ac69b6b763
+
build_options="gir"
build_options_default="gir"
libqrtr-glib-devel_package() {
- depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} ${makedepends}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ vmove usr/share/gtk-doc
vmove "usr/lib/*.so"
- vmove usr/share
}
}
From 5cd107c5782864375ee88ebad4ba4f8192ce2430 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 26 Aug 2022 04:46:50 +0300
Subject: [PATCH 2/3] libqmi: revbump for libqrtr-glib
---
srcpkgs/libqmi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libqmi/template b/srcpkgs/libqmi/template
index d598938d2c13..fc987c762b90 100644
--- a/srcpkgs/libqmi/template
+++ b/srcpkgs/libqmi/template
@@ -1,7 +1,7 @@
# Template file for 'libqmi'
pkgname=libqmi
version=1.30.4
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
configure_args="--disable-static --enable-mbim-qmux --enable-qrtr
From 5c388f7cd357bab7eed5fcf71a770e2467cfc437 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 26 Aug 2022 04:50:39 +0300
Subject: [PATCH 3/3] ModemManager: revbump for libqrtr-glib
---
srcpkgs/ModemManager/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index 048f7867bb31..c3460178f842 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -1,7 +1,7 @@
# Template file for 'ModemManager'
pkgname=ModemManager
version=1.18.6
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static --with-polkit=permissive
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
@ 2022-08-26 2:26 ` JamiKettunen
2022-08-26 2:29 ` JamiKettunen
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-26 2:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
There is an updated pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages libqrtr-glib
https://github.com/void-linux/void-packages/pull/38915
libqrtr-glib: update to 1.2.2.
Builds fine, but local testing to-be-done still...
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38915.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libqrtr-glib-38915.patch --]
[-- Type: text/x-diff, Size: 3318 bytes --]
From 9404559596515e6eeb15f6d095107e51c613947e Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 11 Aug 2022 16:22:51 +0300
Subject: [PATCH 1/3] libqrtr-glib: update to 1.2.2.
---
srcpkgs/libqrtr-glib/template | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/libqrtr-glib/template b/srcpkgs/libqrtr-glib/template
index b09104c12bb7..98db42e0a565 100644
--- a/srcpkgs/libqrtr-glib/template
+++ b/srcpkgs/libqrtr-glib/template
@@ -1,29 +1,32 @@
# Template file for 'libqrtr-glib'
pkgname=libqrtr-glib
-version=1.0.0
+version=1.2.2
revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config"
+build_style=meson
+build_helper="gir qemu"
+configure_args="$(vopt_bool gir introspection)"
+hostmakedepends="pkg-config gtk-doc python"
makedepends="glib-devel"
short_desc="Qualcomm IPC Router protocol helper library"
maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"
-distfiles="${FREEDESKTOP_SITE}/libqmi/${pkgname}-${version}.tar.xz"
-checksum=30d879b2ade6f8f461def3a677755db5c0238babf688d5c83c03b3e6abe35cee
+distfiles="${homepage}/-/archive/${version}/libqrtr-glib-${version}.tar.gz"
+checksum=c5cdf5ea91cbd2cf2758b2896064c7b1dfe7156063267df905f957ac69b6b763
+
build_options="gir"
build_options_default="gir"
libqrtr-glib-devel_package() {
- depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} ${makedepends}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ vmove usr/share/gtk-doc
vmove "usr/lib/*.so"
- vmove usr/share
}
}
From 2d93ddb96019a4a167bc810b8a5a5d3aafac39e8 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 26 Aug 2022 04:46:50 +0300
Subject: [PATCH 2/3] libqmi: revbump for libqrtr-glib
---
srcpkgs/libqmi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libqmi/template b/srcpkgs/libqmi/template
index d598938d2c13..fc987c762b90 100644
--- a/srcpkgs/libqmi/template
+++ b/srcpkgs/libqmi/template
@@ -1,7 +1,7 @@
# Template file for 'libqmi'
pkgname=libqmi
version=1.30.4
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
configure_args="--disable-static --enable-mbim-qmux --enable-qrtr
From f06d89160e09b083a5f13f3c2f0ebb6b3e5b54bf Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 26 Aug 2022 04:50:39 +0300
Subject: [PATCH 3/3] ModemManager: revbump for libqrtr-glib
---
srcpkgs/ModemManager/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index 048f7867bb31..c3460178f842 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -1,7 +1,7 @@
# Template file for 'ModemManager'
pkgname=ModemManager
version=1.18.6
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static --with-polkit=permissive
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
2022-08-26 2:26 ` [PR PATCH] [Updated] " JamiKettunen
@ 2022-08-26 2:29 ` JamiKettunen
2022-08-26 2:31 ` JamiKettunen
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-26 2:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
There is an updated pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages libqrtr-glib
https://github.com/void-linux/void-packages/pull/38915
libqrtr-glib: update to 1.2.2.
Builds fine, but local testing to-be-done still...
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38915.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libqrtr-glib-38915.patch --]
[-- Type: text/x-diff, Size: 3346 bytes --]
From 87dabc456a3c159827933150bf3216d4af0da640 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 11 Aug 2022 16:22:51 +0300
Subject: [PATCH 1/3] libqrtr-glib: update to 1.2.2.
---
srcpkgs/libqrtr-glib/template | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/libqrtr-glib/template b/srcpkgs/libqrtr-glib/template
index b09104c12bb7..e9cfd0d84540 100644
--- a/srcpkgs/libqrtr-glib/template
+++ b/srcpkgs/libqrtr-glib/template
@@ -1,29 +1,32 @@
# Template file for 'libqrtr-glib'
pkgname=libqrtr-glib
-version=1.0.0
+version=1.2.2
revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config"
-makedepends="glib-devel"
+build_style=meson
+build_helper="gir qemu"
+configure_args="$(vopt_bool gir introspection)"
+hostmakedepends="pkg-config gtk-doc"
+makedepends="glib-devel python"
short_desc="Qualcomm IPC Router protocol helper library"
maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"
-distfiles="${FREEDESKTOP_SITE}/libqmi/${pkgname}-${version}.tar.xz"
-checksum=30d879b2ade6f8f461def3a677755db5c0238babf688d5c83c03b3e6abe35cee
+distfiles="${homepage}/-/archive/${version}/libqrtr-glib-${version}.tar.gz"
+checksum=c5cdf5ea91cbd2cf2758b2896064c7b1dfe7156063267df905f957ac69b6b763
+
build_options="gir"
build_options_default="gir"
libqrtr-glib-devel_package() {
- depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} ${makedepends}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ vmove usr/share/gtk-doc
vmove "usr/lib/*.so"
- vmove usr/share
}
}
From 60424e7101b35aab6982bef0f2903f938fc226f5 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 26 Aug 2022 04:46:50 +0300
Subject: [PATCH 2/3] libqmi: revbump for libqrtr-glib
---
srcpkgs/libqmi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libqmi/template b/srcpkgs/libqmi/template
index d598938d2c13..fc987c762b90 100644
--- a/srcpkgs/libqmi/template
+++ b/srcpkgs/libqmi/template
@@ -1,7 +1,7 @@
# Template file for 'libqmi'
pkgname=libqmi
version=1.30.4
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
configure_args="--disable-static --enable-mbim-qmux --enable-qrtr
From 9a29d09f856d1276b8fad8fcd6efdbbbc88eb930 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 26 Aug 2022 04:50:39 +0300
Subject: [PATCH 3/3] ModemManager: revbump for libqrtr-glib
---
srcpkgs/ModemManager/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index 048f7867bb31..c3460178f842 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -1,7 +1,7 @@
# Template file for 'ModemManager'
pkgname=ModemManager
version=1.18.6
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static --with-polkit=permissive
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
2022-08-26 2:26 ` [PR PATCH] [Updated] " JamiKettunen
2022-08-26 2:29 ` JamiKettunen
@ 2022-08-26 2:31 ` JamiKettunen
2022-08-26 2:34 ` JamiKettunen
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-26 2:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 515 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/38915#issuecomment-1227976362
Comment:
Due to `python` related build errors seen [first seen here](https://github.com/void-linux/void-packages/runs/8028582126) on `aarch64-musl` and `armv6l-musl` I'm considering dropping `gtk-doc` on cross arches. Any ideas if it could be solved instead of dropped? I cannot reproduce this build failure locally for these specific arches while cross-building on `x86_64`...
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (2 preceding siblings ...)
2022-08-26 2:31 ` JamiKettunen
@ 2022-08-26 2:34 ` JamiKettunen
2022-08-26 8:27 ` classabbyamp
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-26 2:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 742 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/38915#issuecomment-1227976362
Comment:
Due to `python` related build errors seen [first seen here](https://github.com/void-linux/void-packages/runs/8028582126) on `aarch64-musl` and `armv6l-musl` I'm considering dropping `gtk-doc` on cross arches. Any ideas if it could be solved instead of dropped? I cannot reproduce this build failure locally for these specific arches while cross-building on `x86_64`...
[Originally](https://github.com/JamiKettunen/void-packages/commit/5ea595a) I didn't have `python` at all in `*makedepends` but it seems adding it to either `hostmakedepends` or `makedepends` individually didn't help either.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (3 preceding siblings ...)
2022-08-26 2:34 ` JamiKettunen
@ 2022-08-26 8:27 ` classabbyamp
2022-08-26 11:54 ` JamiKettunen
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-08-26 8:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38915#issuecomment-1228209456
Comment:
why add python2 and not python3?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (4 preceding siblings ...)
2022-08-26 8:27 ` classabbyamp
@ 2022-08-26 11:54 ` JamiKettunen
2022-08-26 12:18 ` [PR PATCH] [Updated] " JamiKettunen
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-26 11:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/38915#issuecomment-1228399467
Comment:
> why add python2 and not python3?
@classabbyamp Oh whoops... let me try with `python3` two more times (as `hostmakedepend` and then `makedepend`) on CI since I can't reproduce it locally for whatever reason
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (5 preceding siblings ...)
2022-08-26 11:54 ` JamiKettunen
@ 2022-08-26 12:18 ` JamiKettunen
2022-08-26 12:21 ` JamiKettunen
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-26 12:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
There is an updated pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages libqrtr-glib
https://github.com/void-linux/void-packages/pull/38915
libqrtr-glib: update to 1.2.2.
Builds fine, but local testing to-be-done still...
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38915.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libqrtr-glib-38915.patch --]
[-- Type: text/x-diff, Size: 3361 bytes --]
From 9ee7bb6e03c7be1ec2b7d061c725183ad7ba1c0b Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 11 Aug 2022 16:22:51 +0300
Subject: [PATCH 1/3] libqrtr-glib: update to 1.2.2.
---
srcpkgs/libqrtr-glib/template | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/libqrtr-glib/template b/srcpkgs/libqrtr-glib/template
index b09104c12bb7..98368209d88b 100644
--- a/srcpkgs/libqrtr-glib/template
+++ b/srcpkgs/libqrtr-glib/template
@@ -1,29 +1,33 @@
# Template file for 'libqrtr-glib'
pkgname=libqrtr-glib
-version=1.0.0
+version=1.2.2
revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config"
+build_style=meson
+build_helper="gir qemu"
+configure_args="$(vopt_bool gir introspection)"
+hostmakedepends="pkg-config gtk-doc python3"
makedepends="glib-devel"
short_desc="Qualcomm IPC Router protocol helper library"
maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"
-distfiles="${FREEDESKTOP_SITE}/libqmi/${pkgname}-${version}.tar.xz"
-checksum=30d879b2ade6f8f461def3a677755db5c0238babf688d5c83c03b3e6abe35cee
+changelog="${homepage}/-/raw/main/NEWS"
+distfiles="${homepage}/-/archive/${version}/libqrtr-glib-${version}.tar.gz"
+checksum=c5cdf5ea91cbd2cf2758b2896064c7b1dfe7156063267df905f957ac69b6b763
+
build_options="gir"
build_options_default="gir"
libqrtr-glib-devel_package() {
- depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} ${makedepends}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ vmove usr/share/gtk-doc
vmove "usr/lib/*.so"
- vmove usr/share
}
}
From 9a178404c0adf0e4d089ec03b2471b8306d18bcb Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 26 Aug 2022 04:46:50 +0300
Subject: [PATCH 2/3] libqmi: revbump for libqrtr-glib
---
srcpkgs/libqmi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libqmi/template b/srcpkgs/libqmi/template
index d598938d2c13..fc987c762b90 100644
--- a/srcpkgs/libqmi/template
+++ b/srcpkgs/libqmi/template
@@ -1,7 +1,7 @@
# Template file for 'libqmi'
pkgname=libqmi
version=1.30.4
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
configure_args="--disable-static --enable-mbim-qmux --enable-qrtr
From 884ebdc8c26471a9c176dea58e075a04f9d33040 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 26 Aug 2022 04:50:39 +0300
Subject: [PATCH 3/3] ModemManager: revbump for libqrtr-glib
---
srcpkgs/ModemManager/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index 048f7867bb31..c3460178f842 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -1,7 +1,7 @@
# Template file for 'ModemManager'
pkgname=ModemManager
version=1.18.6
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static --with-polkit=permissive
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (6 preceding siblings ...)
2022-08-26 12:18 ` [PR PATCH] [Updated] " JamiKettunen
@ 2022-08-26 12:21 ` JamiKettunen
2022-08-26 12:38 ` JamiKettunen
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-26 12:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
There is an updated pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages libqrtr-glib
https://github.com/void-linux/void-packages/pull/38915
libqrtr-glib: update to 1.2.2.
Builds fine, but local testing to-be-done still...
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38915.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libqrtr-glib-38915.patch --]
[-- Type: text/x-diff, Size: 3389 bytes --]
From f20782f2ead0cb1efb5ab0ccbdc50dd15946bc48 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 11 Aug 2022 16:22:51 +0300
Subject: [PATCH 1/3] libqrtr-glib: update to 1.2.2.
---
srcpkgs/libqrtr-glib/template | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/libqrtr-glib/template b/srcpkgs/libqrtr-glib/template
index b09104c12bb7..7bbc733628e2 100644
--- a/srcpkgs/libqrtr-glib/template
+++ b/srcpkgs/libqrtr-glib/template
@@ -1,29 +1,33 @@
# Template file for 'libqrtr-glib'
pkgname=libqrtr-glib
-version=1.0.0
+version=1.2.2
revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config"
-makedepends="glib-devel"
+build_style=meson
+build_helper="gir qemu"
+configure_args="$(vopt_bool gir introspection)"
+hostmakedepends="pkg-config gtk-doc"
+makedepends="glib-devel python3"
short_desc="Qualcomm IPC Router protocol helper library"
maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"
-distfiles="${FREEDESKTOP_SITE}/libqmi/${pkgname}-${version}.tar.xz"
-checksum=30d879b2ade6f8f461def3a677755db5c0238babf688d5c83c03b3e6abe35cee
+changelog="${homepage}/-/raw/main/NEWS"
+distfiles="${homepage}/-/archive/${version}/libqrtr-glib-${version}.tar.gz"
+checksum=c5cdf5ea91cbd2cf2758b2896064c7b1dfe7156063267df905f957ac69b6b763
+
build_options="gir"
build_options_default="gir"
libqrtr-glib-devel_package() {
- depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} ${makedepends}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ vmove usr/share/gtk-doc
vmove "usr/lib/*.so"
- vmove usr/share
}
}
From 20b583e2c7bf22862d8db68267a2a43c36a26a41 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 26 Aug 2022 04:46:50 +0300
Subject: [PATCH 2/3] libqmi: revbump for libqrtr-glib
---
srcpkgs/libqmi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libqmi/template b/srcpkgs/libqmi/template
index d598938d2c13..fc987c762b90 100644
--- a/srcpkgs/libqmi/template
+++ b/srcpkgs/libqmi/template
@@ -1,7 +1,7 @@
# Template file for 'libqmi'
pkgname=libqmi
version=1.30.4
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
configure_args="--disable-static --enable-mbim-qmux --enable-qrtr
From 607bd75c016894869e293371e76418c47147b4a5 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 26 Aug 2022 04:50:39 +0300
Subject: [PATCH 3/3] ModemManager: revbump for libqrtr-glib
---
srcpkgs/ModemManager/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index 048f7867bb31..c3460178f842 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -1,7 +1,7 @@
# Template file for 'ModemManager'
pkgname=ModemManager
version=1.18.6
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static --with-polkit=permissive
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (7 preceding siblings ...)
2022-08-26 12:21 ` JamiKettunen
@ 2022-08-26 12:38 ` JamiKettunen
2022-08-26 12:39 ` JamiKettunen
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-26 12:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 432 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/38915#issuecomment-1228437031
Comment:
@leahneukirchen No luck still... I have no idea so myself I'm in favor of dropping gtk-doc from cross builds. Also I believe I can just not bump `libqmi` & `ModemManager` as the SONAME is still `libqrtr-glib.so.0`, not sure why I included those, guess I'll see when testing later today
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (8 preceding siblings ...)
2022-08-26 12:38 ` JamiKettunen
@ 2022-08-26 12:39 ` JamiKettunen
2022-08-26 20:11 ` [PR PATCH] [Updated] " JamiKettunen
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-26 12:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 525 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/38915#issuecomment-1228437031
Comment:
@leahneukirchen No luck still... I have no idea so myself I'm in favor of dropping gtk-doc from cross builds (especially considering https://freedesktop.org/software/libqmi/libqrtr-glib/latest/ exists). Also I believe I can just not bump `libqmi` & `ModemManager` as the SONAME is still `libqrtr-glib.so.0`, not sure why I included those, guess I'll see when testing later today
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (9 preceding siblings ...)
2022-08-26 12:39 ` JamiKettunen
@ 2022-08-26 20:11 ` JamiKettunen
2022-08-26 20:11 ` JamiKettunen
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-26 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
There is an updated pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages libqrtr-glib
https://github.com/void-linux/void-packages/pull/38915
libqrtr-glib: update to 1.2.2.
Builds fine, but local testing to-be-done still...
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38915.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libqrtr-glib-38915.patch --]
[-- Type: text/x-diff, Size: 3665 bytes --]
From 72c93a0345a4c4120d2c93a46d7cc5a6f19bff5a Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 11 Aug 2022 16:22:51 +0300
Subject: [PATCH 1/3] libqrtr-glib: update to 1.2.2.
---
srcpkgs/libqrtr-glib/template | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/libqrtr-glib/template b/srcpkgs/libqrtr-glib/template
index b09104c12bb7..cd5b1d430b87 100644
--- a/srcpkgs/libqrtr-glib/template
+++ b/srcpkgs/libqrtr-glib/template
@@ -1,29 +1,40 @@
# Template file for 'libqrtr-glib'
pkgname=libqrtr-glib
-version=1.0.0
+version=1.2.2
revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config"
+build_style=meson
+build_helper="gir qemu"
+configure_args="$(vopt_bool gir introspection)"
+hostmakedepends="pkg-config gtk-doc"
makedepends="glib-devel"
short_desc="Qualcomm IPC Router protocol helper library"
maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"
-distfiles="${FREEDESKTOP_SITE}/libqmi/${pkgname}-${version}.tar.xz"
-checksum=30d879b2ade6f8f461def3a677755db5c0238babf688d5c83c03b3e6abe35cee
+changelog="${homepage}/-/raw/main/NEWS"
+distfiles="${homepage}/-/archive/${version}/libqrtr-glib-${version}.tar.gz"
+checksum=c5cdf5ea91cbd2cf2758b2896064c7b1dfe7156063267df905f957ac69b6b763
+
build_options="gir"
build_options_default="gir"
+# FIXME: drop gtk-doc generation from cross builds to avoid aarch64-musl & armv6l-musl
+# python relocation errors on CI that are not reproducible when building locally
+# https://github.com/void-linux/void-packages/runs/8028582126
+if [ "$CROSS_BUILD" ]; then
+ configure_args+=" -Dgtk_doc=false"
+fi
+
libqrtr-glib-devel_package() {
- depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} ${makedepends}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ vmove usr/share/gtk-doc
vmove "usr/lib/*.so"
- vmove usr/share
}
}
From 70b8ca58caa286405d8b0b71f221d0de6ba520d0 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 26 Aug 2022 04:46:50 +0300
Subject: [PATCH 2/3] libqmi: revbump for libqrtr-glib
---
srcpkgs/libqmi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libqmi/template b/srcpkgs/libqmi/template
index d598938d2c13..fc987c762b90 100644
--- a/srcpkgs/libqmi/template
+++ b/srcpkgs/libqmi/template
@@ -1,7 +1,7 @@
# Template file for 'libqmi'
pkgname=libqmi
version=1.30.4
-revision=1
+revision=2
build_style=gnu-configure
build_helper=gir
configure_args="--disable-static --enable-mbim-qmux --enable-qrtr
From 96f847124789754c96141826373a9016c86b33c5 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 26 Aug 2022 04:50:39 +0300
Subject: [PATCH 3/3] ModemManager: revbump for libqrtr-glib
---
srcpkgs/ModemManager/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index 048f7867bb31..c3460178f842 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -1,7 +1,7 @@
# Template file for 'ModemManager'
pkgname=ModemManager
version=1.18.6
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static --with-polkit=permissive
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (10 preceding siblings ...)
2022-08-26 20:11 ` [PR PATCH] [Updated] " JamiKettunen
@ 2022-08-26 20:11 ` JamiKettunen
2022-08-26 20:15 ` JamiKettunen
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-26 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
There is an updated pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages libqrtr-glib
https://github.com/void-linux/void-packages/pull/38915
libqrtr-glib: update to 1.2.2.
Builds fine, but local testing to-be-done still...
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38915.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libqrtr-glib-38915.patch --]
[-- Type: text/x-diff, Size: 2265 bytes --]
From 72c93a0345a4c4120d2c93a46d7cc5a6f19bff5a Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 11 Aug 2022 16:22:51 +0300
Subject: [PATCH] libqrtr-glib: update to 1.2.2.
---
srcpkgs/libqrtr-glib/template | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/libqrtr-glib/template b/srcpkgs/libqrtr-glib/template
index b09104c12bb7..cd5b1d430b87 100644
--- a/srcpkgs/libqrtr-glib/template
+++ b/srcpkgs/libqrtr-glib/template
@@ -1,29 +1,40 @@
# Template file for 'libqrtr-glib'
pkgname=libqrtr-glib
-version=1.0.0
+version=1.2.2
revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config"
+build_style=meson
+build_helper="gir qemu"
+configure_args="$(vopt_bool gir introspection)"
+hostmakedepends="pkg-config gtk-doc"
makedepends="glib-devel"
short_desc="Qualcomm IPC Router protocol helper library"
maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"
-distfiles="${FREEDESKTOP_SITE}/libqmi/${pkgname}-${version}.tar.xz"
-checksum=30d879b2ade6f8f461def3a677755db5c0238babf688d5c83c03b3e6abe35cee
+changelog="${homepage}/-/raw/main/NEWS"
+distfiles="${homepage}/-/archive/${version}/libqrtr-glib-${version}.tar.gz"
+checksum=c5cdf5ea91cbd2cf2758b2896064c7b1dfe7156063267df905f957ac69b6b763
+
build_options="gir"
build_options_default="gir"
+# FIXME: drop gtk-doc generation from cross builds to avoid aarch64-musl & armv6l-musl
+# python relocation errors on CI that are not reproducible when building locally
+# https://github.com/void-linux/void-packages/runs/8028582126
+if [ "$CROSS_BUILD" ]; then
+ configure_args+=" -Dgtk_doc=false"
+fi
+
libqrtr-glib-devel_package() {
- depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} ${makedepends}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ vmove usr/share/gtk-doc
vmove "usr/lib/*.so"
- vmove usr/share
}
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (11 preceding siblings ...)
2022-08-26 20:11 ` JamiKettunen
@ 2022-08-26 20:15 ` JamiKettunen
2022-08-27 7:07 ` [PR REVIEW] " classabbyamp
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-26 20:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
There is an updated pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages libqrtr-glib
https://github.com/void-linux/void-packages/pull/38915
libqrtr-glib: update to 1.2.2.
Builds fine, but local testing to-be-done still...
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38915.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libqrtr-glib-38915.patch --]
[-- Type: text/x-diff, Size: 2308 bytes --]
From 89820f73c46e78a640da4cd9dd6e8009f49293cd Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 11 Aug 2022 16:22:51 +0300
Subject: [PATCH] libqrtr-glib: update to 1.2.2.
---
srcpkgs/libqrtr-glib/template | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/libqrtr-glib/template b/srcpkgs/libqrtr-glib/template
index b09104c12bb7..3e68e1e2e93a 100644
--- a/srcpkgs/libqrtr-glib/template
+++ b/srcpkgs/libqrtr-glib/template
@@ -1,29 +1,42 @@
# Template file for 'libqrtr-glib'
pkgname=libqrtr-glib
-version=1.0.0
+version=1.2.2
revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config"
+build_style=meson
+build_helper="gir qemu"
+configure_args="$(vopt_bool gir introspection)"
+hostmakedepends="pkg-config gtk-doc"
makedepends="glib-devel"
short_desc="Qualcomm IPC Router protocol helper library"
maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"
-distfiles="${FREEDESKTOP_SITE}/libqmi/${pkgname}-${version}.tar.xz"
-checksum=30d879b2ade6f8f461def3a677755db5c0238babf688d5c83c03b3e6abe35cee
+changelog="${homepage}/-/raw/main/NEWS"
+distfiles="${homepage}/-/archive/${version}/libqrtr-glib-${version}.tar.gz"
+checksum=c5cdf5ea91cbd2cf2758b2896064c7b1dfe7156063267df905f957ac69b6b763
+
build_options="gir"
build_options_default="gir"
+# FIXME: drop gtk-doc generation from cross builds to avoid aarch64-musl & armv6l-musl
+# python relocation errors on CI that are not reproducible when building locally
+# https://github.com/void-linux/void-packages/runs/8028582126
+if [ "$CROSS_BUILD" ]; then
+ configure_args+=" -Dgtk_doc=false"
+fi
+
libqrtr-glib-devel_package() {
- depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} ${makedepends}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ -z "$CROSS_BUILD" ]; then
+ vmove usr/share/gtk-doc
+ fi
vmove "usr/lib/*.so"
- vmove usr/share
}
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (12 preceding siblings ...)
2022-08-26 20:15 ` JamiKettunen
@ 2022-08-27 7:07 ` classabbyamp
2022-08-27 22:37 ` [PR PATCH] [Updated] " JamiKettunen
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-08-27 7:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38915#discussion_r956548830
Comment:
```suggestion
changelog="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/raw/main/NEWS"
distfiles="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/archive/${version}/libqrtr-glib-${version}.tar.gz"
```
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (13 preceding siblings ...)
2022-08-27 7:07 ` [PR REVIEW] " classabbyamp
@ 2022-08-27 22:37 ` JamiKettunen
2022-08-27 22:55 ` JamiKettunen
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-27 22:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
There is an updated pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages libqrtr-glib
https://github.com/void-linux/void-packages/pull/38915
libqrtr-glib: update to 1.2.2.
Builds fine, but local testing to-be-done still...
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38915.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libqrtr-glib-38915.patch --]
[-- Type: text/x-diff, Size: 2406 bytes --]
From 6dc88822701231ced170aff0572cfe2d7c42682d Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 11 Aug 2022 16:22:51 +0300
Subject: [PATCH] libqrtr-glib: update to 1.2.2.
---
srcpkgs/libqrtr-glib/template | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/libqrtr-glib/template b/srcpkgs/libqrtr-glib/template
index b09104c12bb7..a866cc3b3361 100644
--- a/srcpkgs/libqrtr-glib/template
+++ b/srcpkgs/libqrtr-glib/template
@@ -1,29 +1,42 @@
# Template file for 'libqrtr-glib'
pkgname=libqrtr-glib
-version=1.0.0
+version=1.2.2
revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config"
+build_style=meson
+build_helper="gir qemu"
+configure_args="$(vopt_bool gir introspection)"
+hostmakedepends="pkg-config gtk-doc"
makedepends="glib-devel"
short_desc="Qualcomm IPC Router protocol helper library"
maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="LGPL-2.1-or-later"
homepage="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"
-distfiles="${FREEDESKTOP_SITE}/libqmi/${pkgname}-${version}.tar.xz"
-checksum=30d879b2ade6f8f461def3a677755db5c0238babf688d5c83c03b3e6abe35cee
+changelog="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/raw/main/NEWS"
+distfiles="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/archive/${version}/libqrtr-glib-${version}.tar.gz"
+checksum=c5cdf5ea91cbd2cf2758b2896064c7b1dfe7156063267df905f957ac69b6b763
+
build_options="gir"
build_options_default="gir"
+# FIXME: drop gtk-doc generation from cross builds to avoid aarch64-musl & armv6l-musl
+# python relocation errors on CI that are not reproducible when building locally
+# https://github.com/void-linux/void-packages/runs/8028582126
+if [ "$CROSS_BUILD" ]; then
+ configure_args+=" -Dgtk_doc=false"
+fi
+
libqrtr-glib-devel_package() {
- depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} ${makedepends}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ -z "$CROSS_BUILD" ]; then
+ vmove usr/share/gtk-doc
+ fi
vmove "usr/lib/*.so"
- vmove usr/share
}
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (14 preceding siblings ...)
2022-08-27 22:37 ` [PR PATCH] [Updated] " JamiKettunen
@ 2022-08-27 22:55 ` JamiKettunen
2022-08-27 23:03 ` JamiKettunen
2022-08-29 10:15 ` [PR PATCH] [Merged]: " classabbyamp
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-27 22:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4008 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/38915#issuecomment-1229284640
Comment:
Tested as working on a OnePlus 5T :)
```
$ mmcli -L
/org/freedesktop/ModemManager1/Modem/0 [QUALCOMM INCORPORATED] 0
$ mmcli -m 0
-----------------------------------
General | path: /org/freedesktop/ModemManager1/Modem/0
| device id: 8809050a15a82cd439b9090afef51641481e8b9f
-----------------------------------
Hardware | manufacturer: QUALCOMM INCORPORATED
| model: 0
| firmware revision: MPSS.AT.2.0.c4.7-00070-8998_GEN_PACK-2.179387.1.214666.1
| carrier config: Oversea-Commercial_DS
| carrier config revision: 0801F11E
| h/w revision: 20001
| supported: gsm-umts, lte
| cdma-evdo, lte
| lte
| cdma-evdo, gsm-umts, lte
| current: cdma-evdo
| equipment id: <REDACTED>
-----------------------------------
System | device: qcom-soc
| drivers: ipa, qrtr
| plugin: qcom-soc
| primary port: qrtr0
| ports: qrtr0 (qmi), rmnet_ipa0 (net)
-----------------------------------
Status | state: enabled
| power state: on
| access tech: umts
| signal quality: 80% (cached)
-----------------------------------
Modes | supported: allowed: 2g; preferred: none
| allowed: 3g; preferred: none
| allowed: 2g, 3g; preferred: 3g
| allowed: 2g, 3g; preferred: 2g
| allowed: 2g, 4g; preferred: 4g
| allowed: 2g, 4g; preferred: 2g
| allowed: 3g, 4g; preferred: 4g
| allowed: 3g, 4g; preferred: 3g
| allowed: 2g, 3g, 4g; preferred: 4g
| allowed: 2g, 3g, 4g; preferred: 3g
| allowed: 2g, 3g, 4g; preferred: 2g
| current: allowed: 2g, 3g, 4g; preferred: 4g
-----------------------------------
Bands | supported: egsm, dcs, pcs, g850, utran-1, utran-4, utran-6, utran-5,
| utran-8, utran-2, eutran-1, eutran-2, eutran-3, eutran-4, eutran-5,
| eutran-7, eutran-8, eutran-12, eutran-17, eutran-18, eutran-19,
| eutran-20, eutran-25, eutran-26, eutran-28, eutran-29, eutran-30,
| eutran-34, eutran-38, eutran-39, eutran-40, eutran-41, eutran-66,
| cdma-bc0
| current: egsm, dcs, pcs, g850, utran-1, utran-4, utran-5, utran-8,
| utran-2, eutran-1, eutran-2, eutran-3, eutran-4, eutran-5, eutran-7,
| eutran-8, eutran-12, eutran-17, eutran-18, eutran-19, eutran-20,
| eutran-25, eutran-26, eutran-28, eutran-29, eutran-30, eutran-34,
| eutran-38, eutran-39, eutran-40, eutran-41, eutran-66, cdma-bc0
-----------------------------------
IP | supported: ipv4
-----------------------------------
CDMA | meid: <REDACTED>
| esn: <REDACTED>
| activation: not-activated
```
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (15 preceding siblings ...)
2022-08-27 22:55 ` JamiKettunen
@ 2022-08-27 23:03 ` JamiKettunen
2022-08-29 10:15 ` [PR PATCH] [Merged]: " classabbyamp
17 siblings, 0 replies; 19+ messages in thread
From: JamiKettunen @ 2022-08-27 23:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4126 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/38915#issuecomment-1229284640
Comment:
Tested as working on a OnePlus 5T :)
```
$ xpkg -v | grep -E 'ModemManager|libqmi|libqrtr-glib'
ModemManager-1.18.6_1
libqmi-1.30.4_1
libqrtr-glib-1.2.2_1
$ mmcli -L
/org/freedesktop/ModemManager1/Modem/0 [QUALCOMM INCORPORATED] 0
$ mmcli -m 0
-----------------------------------
General | path: /org/freedesktop/ModemManager1/Modem/0
| device id: 8809050a15a82cd439b9090afef51641481e8b9f
-----------------------------------
Hardware | manufacturer: QUALCOMM INCORPORATED
| model: 0
| firmware revision: MPSS.AT.2.0.c4.7-00070-8998_GEN_PACK-2.179387.1.214666.1
| carrier config: Oversea-Commercial_DS
| carrier config revision: 0801F11E
| h/w revision: 20001
| supported: gsm-umts, lte
| cdma-evdo, lte
| lte
| cdma-evdo, gsm-umts, lte
| current: cdma-evdo
| equipment id: <REDACTED>
-----------------------------------
System | device: qcom-soc
| drivers: ipa, qrtr
| plugin: qcom-soc
| primary port: qrtr0
| ports: qrtr0 (qmi), rmnet_ipa0 (net)
-----------------------------------
Status | state: enabled
| power state: on
| access tech: umts
| signal quality: 80% (cached)
-----------------------------------
Modes | supported: allowed: 2g; preferred: none
| allowed: 3g; preferred: none
| allowed: 2g, 3g; preferred: 3g
| allowed: 2g, 3g; preferred: 2g
| allowed: 2g, 4g; preferred: 4g
| allowed: 2g, 4g; preferred: 2g
| allowed: 3g, 4g; preferred: 4g
| allowed: 3g, 4g; preferred: 3g
| allowed: 2g, 3g, 4g; preferred: 4g
| allowed: 2g, 3g, 4g; preferred: 3g
| allowed: 2g, 3g, 4g; preferred: 2g
| current: allowed: 2g, 3g, 4g; preferred: 4g
-----------------------------------
Bands | supported: egsm, dcs, pcs, g850, utran-1, utran-4, utran-6, utran-5,
| utran-8, utran-2, eutran-1, eutran-2, eutran-3, eutran-4, eutran-5,
| eutran-7, eutran-8, eutran-12, eutran-17, eutran-18, eutran-19,
| eutran-20, eutran-25, eutran-26, eutran-28, eutran-29, eutran-30,
| eutran-34, eutran-38, eutran-39, eutran-40, eutran-41, eutran-66,
| cdma-bc0
| current: egsm, dcs, pcs, g850, utran-1, utran-4, utran-5, utran-8,
| utran-2, eutran-1, eutran-2, eutran-3, eutran-4, eutran-5, eutran-7,
| eutran-8, eutran-12, eutran-17, eutran-18, eutran-19, eutran-20,
| eutran-25, eutran-26, eutran-28, eutran-29, eutran-30, eutran-34,
| eutran-38, eutran-39, eutran-40, eutran-41, eutran-66, cdma-bc0
-----------------------------------
IP | supported: ipv4
-----------------------------------
CDMA | meid: <REDACTED>
| esn: <REDACTED>
| activation: not-activated
```
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Merged]: libqrtr-glib: update to 1.2.2.
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
` (16 preceding siblings ...)
2022-08-27 23:03 ` JamiKettunen
@ 2022-08-29 10:15 ` classabbyamp
17 siblings, 0 replies; 19+ messages in thread
From: classabbyamp @ 2022-08-29 10:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1007 bytes --]
There's a merged pull request on the void-packages repository
libqrtr-glib: update to 1.2.2.
https://github.com/void-linux/void-packages/pull/38915
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2022-08-29 10:15 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-26 2:01 [PR PATCH] libqrtr-glib: update to 1.2.2 JamiKettunen
2022-08-26 2:26 ` [PR PATCH] [Updated] " JamiKettunen
2022-08-26 2:29 ` JamiKettunen
2022-08-26 2:31 ` JamiKettunen
2022-08-26 2:34 ` JamiKettunen
2022-08-26 8:27 ` classabbyamp
2022-08-26 11:54 ` JamiKettunen
2022-08-26 12:18 ` [PR PATCH] [Updated] " JamiKettunen
2022-08-26 12:21 ` JamiKettunen
2022-08-26 12:38 ` JamiKettunen
2022-08-26 12:39 ` JamiKettunen
2022-08-26 20:11 ` [PR PATCH] [Updated] " JamiKettunen
2022-08-26 20:11 ` JamiKettunen
2022-08-26 20:15 ` JamiKettunen
2022-08-27 7:07 ` [PR REVIEW] " classabbyamp
2022-08-27 22:37 ` [PR PATCH] [Updated] " JamiKettunen
2022-08-27 22:55 ` JamiKettunen
2022-08-27 23:03 ` JamiKettunen
2022-08-29 10:15 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).