* Re: grilo: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
@ 2024-02-28 5:55 ` oreo639
2024-02-28 6:00 ` [PR PATCH] [Updated] " chrysos349
` (27 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 5:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#issuecomment-1968286117
Comment:
grilo-plugins should probably also be updated
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR PATCH] [Updated] grilo: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
2024-02-28 5:55 ` oreo639
@ 2024-02-28 6:00 ` chrysos349
2024-02-28 6:01 ` grilo{,-plugins}: " chrysos349
` (26 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: chrysos349 @ 2024-02-28 6:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 765 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages grilo
https://github.com/void-linux/void-packages/pull/48982
grilo: update to 0.3.16
split into a separate pr, according to @oreo639's recommendation (https://github.com/void-linux/void-packages/pull/48752#issuecomment-1968076680).
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/48982.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-grilo-48982.patch --]
[-- Type: text/x-diff, Size: 5197 bytes --]
From 6854cc21b497eceb643709a4d5fa3cf2036691c3 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Feb 2024 08:33:51 +0300
Subject: [PATCH 1/2] grilo: update to 0.3.16
---
.../grilo/patches/fix-pkgconfig-files.patch | 40 +++++++++++++++++++
srcpkgs/grilo/template | 22 ++++++----
2 files changed, 55 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/grilo/patches/fix-pkgconfig-files.patch
diff --git a/srcpkgs/grilo/patches/fix-pkgconfig-files.patch b/srcpkgs/grilo/patches/fix-pkgconfig-files.patch
new file mode 100644
index 00000000000000..8c662407d1fe78
--- /dev/null
+++ b/srcpkgs/grilo/patches/fix-pkgconfig-files.patch
@@ -0,0 +1,40 @@
+--- a/libs/net/meson.build
++++ b/libs/net/meson.build
+@@ -52,6 +52,7 @@
+ description: 'Grilo networking helpers for plug-ins',
+ version: grlnet_version,
+ variables: [
++ 'datadir=' + datadir_for_pc_file,
+ 'girdir=' + girdir_for_pc_file,
+ 'typelibdir=' + typelibdir_for_pc_file,
+ 'soupapiversion=' + soup_api_version,
+--- a/libs/pls/meson.build
++++ b/libs/pls/meson.build
+@@ -42,6 +42,7 @@
+ description: 'Grilo playlist utility',
+ version: grlpls_version,
+ variables: [
++ 'datadir=' + datadir_for_pc_file,
+ 'girdir=' + girdir_for_pc_file,
+ 'typelibdir=' + typelibdir_for_pc_file,
+ ],
+--- a/meson.build
++++ b/meson.build
+@@ -88,6 +88,7 @@
+ localedir = join_paths(prefix, get_option('localedir'))
+ datadir_unprefixed = get_option('datadir')
+ datadir = join_paths(prefix, datadir_unprefixed)
++datadir_for_pc_file = join_paths('${prefix}', datadir_unprefixed)
+
+ girdir = join_paths(datadir, 'gir-1.0')
+ girdir_for_pc_file = join_paths('${datadir}', 'gir-1.0')
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -117,6 +117,7 @@
+ description: 'Grilo Framework for multimedia developers',
+ version: grilo_version,
+ variables: [
++ 'datadir=' + datadir_for_pc_file,
+ 'girdir=' + girdir_for_pc_file,
+ 'typelibdir=' + typelibdir_for_pc_file,
+ 'plugindir=' + plugins_dir_for_pc_file,
diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index e47ec38542a50c..7bcdfe595cf02b 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -1,25 +1,30 @@
# Template file for 'grilo'
pkgname=grilo
-version=0.3.13
+version=0.3.16
revision=1
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala)
- -Denable-gtk-doc=false"
-hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)"
-makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel
+ $(vopt_bool gtk_doc enable-gtk-doc)"
+hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)
+ $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel libxml2-devel libsoup3-devel liboauth-devel
totem-pl-parser-devel"
short_desc="Framework focused on making media discovery and browsing easy"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
-homepage="http://live.gnome.org/Grilo"
+homepage="https://wiki.gnome.org/Projects/Grilo"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d14837f22341943ed8a189d9f0827a17016b802d18d0ed080e1413de0fdc927b
+checksum=884580e8c5ece280df23aa63ff5234b7d48988a404df7d6bfccd1e77b473bd96
# Package build options
-build_options="gir"
+build_options="gir gtk_doc"
build_options_default="gir"
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
grilo-devel_package() {
depends="${makedepends} grilo>=${version}_${revision}"
short_desc+=" - development files"
@@ -31,5 +36,8 @@ grilo-devel_package() {
fi
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
}
}
From 7c4e9a935244471946faeba689005a53a17f9b43 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Feb 2024 09:00:33 +0300
Subject: [PATCH 2/2] grilo-plugins: update to 0.3.16
---
srcpkgs/grilo-plugins/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 2d306f8de7e48f..568af47a957b8a 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,9 +1,9 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
-version=0.3.14
-revision=3
+version=0.3.16
+revision=1
build_style=meson
-configure_args="-Dgoa=disabled"
+configure_args="-Dgoa=enabled"
hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Grilo"
distfiles="${GNOME_SITE}/grilo-plugins/${version%.*}/grilo-plugins-${version}.tar.xz"
-checksum=686844b34ec73b24931ff6cc4f6033f0072947a6db60acdc7fb3eaf157a581c8
+checksum=fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb
make_check=no # feel free to fix
post_patch() {
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
2024-02-28 5:55 ` oreo639
2024-02-28 6:00 ` [PR PATCH] [Updated] " chrysos349
@ 2024-02-28 6:01 ` chrysos349
2024-02-28 7:02 ` oreo639
` (25 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: chrysos349 @ 2024-02-28 6:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 149 bytes --]
New comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#issuecomment-1968291980
Comment:
done
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (2 preceding siblings ...)
2024-02-28 6:01 ` grilo{,-plugins}: " chrysos349
@ 2024-02-28 7:02 ` oreo639
2024-02-28 7:21 ` [PR PATCH] [Updated] " chrysos349
` (24 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 7:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#issuecomment-1968353267
Comment:
Replace the patch and just add `.strip('//')` to the end of `gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', '${datadir}'])`. (it gets messed up because we add `pc_sysrootdir`)
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR PATCH] [Updated] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (3 preceding siblings ...)
2024-02-28 7:02 ` oreo639
@ 2024-02-28 7:21 ` chrysos349
2024-02-28 7:31 ` [PR REVIEW] " oreo639
` (23 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: chrysos349 @ 2024-02-28 7:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 776 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages grilo
https://github.com/void-linux/void-packages/pull/48982
grilo{,-plugins}: update to 0.3.16
split into a separate pr, according to @oreo639's recommendation (https://github.com/void-linux/void-packages/pull/48752#issuecomment-1968076680).
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/48982.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-grilo-48982.patch --]
[-- Type: text/x-diff, Size: 4606 bytes --]
From fa85f176e971b18e8bd8460a8b5a33368b954782 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Feb 2024 08:33:51 +0300
Subject: [PATCH 1/2] grilo: update to 0.3.16
---
srcpkgs/grilo/patches/fix-pc-file.patch | 11 +++++++++++
srcpkgs/grilo/template | 22 +++++++++++++++-------
2 files changed, 26 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/grilo/patches/fix-pc-file.patch
diff --git a/srcpkgs/grilo/patches/fix-pc-file.patch b/srcpkgs/grilo/patches/fix-pc-file.patch
new file mode 100644
index 00000000000000..036ad1688f5d30
--- /dev/null
+++ b/srcpkgs/grilo/patches/fix-pc-file.patch
@@ -0,0 +1,11 @@
+--- a/meson.build
++++ b/meson.build
+@@ -96,7 +96,7 @@ typelibdir_for_pc_file = join_paths('${libdir}', 'girepository-1.0')
+ gobject_introspection = dependency('gobject-introspection-1.0', required: false)
+ if gobject_introspection.found()
+ girdir = gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', datadir])
+- girdir_for_pc_file = gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', '${datadir}'])
++ girdir_for_pc_file = gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', '${datadir}']).strip('//')
+ typelibdir = gobject_introspection.get_variable(pkgconfig: 'typelibdir', pkgconfig_define: ['libdir', libdir])
+ typelibdir_for_pc_file = gobject_introspection.get_variable(pkgconfig: 'typelibdir', pkgconfig_define: ['libdir', '${libdir}'])
+ endif
diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index e47ec38542a50c..7bcdfe595cf02b 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -1,25 +1,30 @@
# Template file for 'grilo'
pkgname=grilo
-version=0.3.13
+version=0.3.16
revision=1
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala)
- -Denable-gtk-doc=false"
-hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)"
-makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel
+ $(vopt_bool gtk_doc enable-gtk-doc)"
+hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)
+ $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel libxml2-devel libsoup3-devel liboauth-devel
totem-pl-parser-devel"
short_desc="Framework focused on making media discovery and browsing easy"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
-homepage="http://live.gnome.org/Grilo"
+homepage="https://wiki.gnome.org/Projects/Grilo"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d14837f22341943ed8a189d9f0827a17016b802d18d0ed080e1413de0fdc927b
+checksum=884580e8c5ece280df23aa63ff5234b7d48988a404df7d6bfccd1e77b473bd96
# Package build options
-build_options="gir"
+build_options="gir gtk_doc"
build_options_default="gir"
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
grilo-devel_package() {
depends="${makedepends} grilo>=${version}_${revision}"
short_desc+=" - development files"
@@ -31,5 +36,8 @@ grilo-devel_package() {
fi
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
}
}
From 5f194bab05d08307f96e5563b7e57be1c596226e Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Feb 2024 09:00:33 +0300
Subject: [PATCH 2/2] grilo-plugins: update to 0.3.16
---
srcpkgs/grilo-plugins/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 2d306f8de7e48f..568af47a957b8a 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,9 +1,9 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
-version=0.3.14
-revision=3
+version=0.3.16
+revision=1
build_style=meson
-configure_args="-Dgoa=disabled"
+configure_args="-Dgoa=enabled"
hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Grilo"
distfiles="${GNOME_SITE}/grilo-plugins/${version%.*}/grilo-plugins-${version}.tar.xz"
-checksum=686844b34ec73b24931ff6cc4f6033f0072947a6db60acdc7fb3eaf157a581c8
+checksum=fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb
make_check=no # feel free to fix
post_patch() {
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (4 preceding siblings ...)
2024-02-28 7:21 ` [PR PATCH] [Updated] " chrysos349
@ 2024-02-28 7:31 ` oreo639
2024-02-28 7:38 ` chrysos349
` (22 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 7:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1505475347
Comment:
Add a description for why this patch is necessary.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (5 preceding siblings ...)
2024-02-28 7:31 ` [PR REVIEW] " oreo639
@ 2024-02-28 7:38 ` chrysos349
2024-02-28 7:39 ` chrysos349
` (21 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: chrysos349 @ 2024-02-28 7:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New review comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1505485403
Comment:
will do. unfortunately, your patch didn't work for cross-compilation targets. at least, mine did.
did i do something wrong?
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (6 preceding siblings ...)
2024-02-28 7:38 ` chrysos349
@ 2024-02-28 7:39 ` chrysos349
2024-02-28 7:44 ` oreo639
` (20 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: chrysos349 @ 2024-02-28 7:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New review comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1505486414
Comment:
```
Variable 'datadir' not defined in '/usr/aarch64-linux-gnu/usr/lib/pkgconfig/grilo-0.3.pc'
```
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (7 preceding siblings ...)
2024-02-28 7:39 ` chrysos349
@ 2024-02-28 7:44 ` oreo639
2024-02-28 7:47 ` oreo639
` (19 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 7:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1505491663
Comment:
Yeah, just replace it with `join_paths('${datadir}', 'gir-1.0')`.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (8 preceding siblings ...)
2024-02-28 7:44 ` oreo639
@ 2024-02-28 7:47 ` oreo639
2024-02-28 7:48 ` oreo639
` (18 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 7:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1505491663
Comment:
Yeah, just replace it with `join_paths('${datadir}', 'gir-1.0')`.
(it gets expanded as `/` when native compiling and `${XBPS_CROSS_BASE}` when cross compiling)
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (9 preceding siblings ...)
2024-02-28 7:47 ` oreo639
@ 2024-02-28 7:48 ` oreo639
2024-02-28 7:49 ` oreo639
` (17 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 7:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1505491663
Comment:
Yeah, just replace it with `join_paths('${datadir}', 'gir-1.0')`.
(`pc_sysrootdir` gets expanded as `/` when native compiling and `${XBPS_CROSS_BASE}` when cross compiling)
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (10 preceding siblings ...)
2024-02-28 7:48 ` oreo639
@ 2024-02-28 7:49 ` oreo639
2024-02-28 7:51 ` oreo639
` (16 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 7:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1505491663
Comment:
Yeah, just replace it with `join_paths('${datadir}', 'gir-1.0')`.
(`pc_sysrootdir` gets expanded as `/` when native compiling and `${XBPS_CROSS_BASE}` when cross compiling, meson doesn't generate a default `datadir` for absolute paths)
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (11 preceding siblings ...)
2024-02-28 7:49 ` oreo639
@ 2024-02-28 7:51 ` oreo639
2024-02-28 7:54 ` oreo639
` (15 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 7:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 524 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1505491663
Comment:
Yeah, just replace it with `join_paths('${datadir}', 'gir-1.0')`.
(`pc_sysrootdir` gets expanded as `/` when native compiling and `${XBPS_CROSS_BASE}` when cross compiling, meson doesn't generate a default `datadir` for absolute paths)
https://github.com/void-linux/void-packages/blob/16565ad63d8582c23d2e2b79afcc5e26d7e2321f/srcpkgs/gobject-introspection/template#L59-L66
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (12 preceding siblings ...)
2024-02-28 7:51 ` oreo639
@ 2024-02-28 7:54 ` oreo639
2024-02-28 7:54 ` oreo639
` (14 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 7:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1505491663
Comment:
Yeah, just replace it with `join_paths('${datadir}', 'gir-1.0')`.
(`pc_sysrootdir` gets expanded as `/` when native compiling and `${XBPS_CROSS_BASE}` when cross compiling, meson doesn't generate a default `datadir` for absolute paths)
https://github.com/void-linux/void-packages/blob/16565ad63d8582c23d2e2b79afcc5e26d7e2321f/srcpkgs/gobject-introspection/template#L59-L66
The pkgconfig file was broken before, just no one noticed.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (13 preceding siblings ...)
2024-02-28 7:54 ` oreo639
@ 2024-02-28 7:54 ` oreo639
2024-02-28 7:55 ` oreo639
` (13 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 7:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 613 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1505491663
Comment:
Yeah, just replace it with `join_paths('${datadir}', 'gir-1.0')`.
(`pc_sysrootdir` gets expanded as `/` when native compiling and `${XBPS_CROSS_BASE}` when cross compiling, meson doesn't generate a default `datadir` for absolute paths)
https://github.com/void-linux/void-packages/blob/16565ad63d8582c23d2e2b79afcc5e26d7e2321f/srcpkgs/gobject-introspection/template#L59-L66
The grilo pkgconfig file was broken before when cross compiling, just no one noticed.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (14 preceding siblings ...)
2024-02-28 7:54 ` oreo639
@ 2024-02-28 7:55 ` oreo639
2024-02-28 8:01 ` oreo639
` (12 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 7:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 613 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1505491663
Comment:
Yeah, just replace it with `join_paths('${datadir}', 'gir-1.0')`.
(`pc_sysrootdir` gets expanded as `/` when native compiling and `${XBPS_CROSS_BASE}` when cross compiling, meson doesn't generate a default `datadir` for absolute paths)
https://github.com/void-linux/void-packages/blob/16565ad63d8582c23d2e2b79afcc5e26d7e2321f/srcpkgs/gobject-introspection/template#L59-L66
The grilo pkgconfig file when cross compiling was broken before, just no one noticed.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (15 preceding siblings ...)
2024-02-28 7:55 ` oreo639
@ 2024-02-28 8:01 ` oreo639
2024-02-28 8:05 ` oreo639
` (11 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 8:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 336 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1505511089
Comment:
The same thing also needs to be done for typelibdir (use `join_paths('${libdir}', 'girepository-1.0')`):
https://gitlab.gnome.org/GNOME/grilo/-/blob/master/meson.build?ref_type=heads#L100
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (16 preceding siblings ...)
2024-02-28 8:01 ` oreo639
@ 2024-02-28 8:05 ` oreo639
2024-02-28 9:01 ` [PR PATCH] [Updated] " chrysos349
` (10 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 8:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 361 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#issuecomment-1968353267
Comment:
~~Replace the patch and just add `.strip('//')` to the end of `gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', '${datadir}'])`. (it gets messed up because we add `pc_sysrootdir`)~~
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR PATCH] [Updated] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (17 preceding siblings ...)
2024-02-28 8:05 ` oreo639
@ 2024-02-28 9:01 ` chrysos349
2024-02-28 11:46 ` [PR REVIEW] " chrysos349
` (9 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: chrysos349 @ 2024-02-28 9:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 776 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages grilo
https://github.com/void-linux/void-packages/pull/48982
grilo{,-plugins}: update to 0.3.16
split into a separate pr, according to @oreo639's recommendation (https://github.com/void-linux/void-packages/pull/48752#issuecomment-1968076680).
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/48982.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-grilo-48982.patch --]
[-- Type: text/x-diff, Size: 4724 bytes --]
From 10169f461ec5d4e44119c5670fa2ebb982a39669 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Feb 2024 08:33:51 +0300
Subject: [PATCH 1/2] grilo: update to 0.3.16
---
srcpkgs/grilo/patches/fix-pc-file.patch | 15 +++++++++++++++
srcpkgs/grilo/template | 22 +++++++++++++++-------
2 files changed, 30 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/grilo/patches/fix-pc-file.patch
diff --git a/srcpkgs/grilo/patches/fix-pc-file.patch b/srcpkgs/grilo/patches/fix-pc-file.patch
new file mode 100644
index 00000000000000..2a37a076c111cd
--- /dev/null
+++ b/srcpkgs/grilo/patches/fix-pc-file.patch
@@ -0,0 +1,15 @@
+help meson generate a proper datadir and typelibdir in pc file
+--- a/meson.build
++++ b/meson.build
+@@ -96,9 +96,9 @@ typelibdir_for_pc_file = join_paths('${libdir}', 'girepository-1.0')
+ gobject_introspection = dependency('gobject-introspection-1.0', required: false)
+ if gobject_introspection.found()
+ girdir = gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', datadir])
+- girdir_for_pc_file = gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', '${datadir}'])
++ girdir_for_pc_file = join_paths('${datadir}', 'gir-1.0')
+ typelibdir = gobject_introspection.get_variable(pkgconfig: 'typelibdir', pkgconfig_define: ['libdir', libdir])
+- typelibdir_for_pc_file = gobject_introspection.get_variable(pkgconfig: 'typelibdir', pkgconfig_define: ['libdir', '${libdir}'])
++ typelibdir_for_pc_file = join_paths('${libdir}', 'girepository-1.0')
+ endif
+
+ vapidir = join_paths(datadir, 'vala', 'vapi')
diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index e47ec38542a50c..7bcdfe595cf02b 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -1,25 +1,30 @@
# Template file for 'grilo'
pkgname=grilo
-version=0.3.13
+version=0.3.16
revision=1
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala)
- -Denable-gtk-doc=false"
-hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)"
-makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel
+ $(vopt_bool gtk_doc enable-gtk-doc)"
+hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)
+ $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel libxml2-devel libsoup3-devel liboauth-devel
totem-pl-parser-devel"
short_desc="Framework focused on making media discovery and browsing easy"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
-homepage="http://live.gnome.org/Grilo"
+homepage="https://wiki.gnome.org/Projects/Grilo"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d14837f22341943ed8a189d9f0827a17016b802d18d0ed080e1413de0fdc927b
+checksum=884580e8c5ece280df23aa63ff5234b7d48988a404df7d6bfccd1e77b473bd96
# Package build options
-build_options="gir"
+build_options="gir gtk_doc"
build_options_default="gir"
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
grilo-devel_package() {
depends="${makedepends} grilo>=${version}_${revision}"
short_desc+=" - development files"
@@ -31,5 +36,8 @@ grilo-devel_package() {
fi
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
}
}
From d0b6196686d409ebfeaa39634568f0fbbfe9b971 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Feb 2024 09:00:33 +0300
Subject: [PATCH 2/2] grilo-plugins: update to 0.3.16
---
srcpkgs/grilo-plugins/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 2d306f8de7e48f..568af47a957b8a 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,9 +1,9 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
-version=0.3.14
-revision=3
+version=0.3.16
+revision=1
build_style=meson
-configure_args="-Dgoa=disabled"
+configure_args="-Dgoa=enabled"
hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Grilo"
distfiles="${GNOME_SITE}/grilo-plugins/${version%.*}/grilo-plugins-${version}.tar.xz"
-checksum=686844b34ec73b24931ff6cc4f6033f0072947a6db60acdc7fb3eaf157a581c8
+checksum=fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb
make_check=no # feel free to fix
post_patch() {
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (18 preceding siblings ...)
2024-02-28 9:01 ` [PR PATCH] [Updated] " chrysos349
@ 2024-02-28 11:46 ` chrysos349
2024-02-28 22:32 ` oreo639
` (8 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: chrysos349 @ 2024-02-28 11:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
New review comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1505821861
Comment:
fixed, thanks.
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (19 preceding siblings ...)
2024-02-28 11:46 ` [PR REVIEW] " chrysos349
@ 2024-02-28 22:32 ` oreo639
2024-02-28 22:32 ` oreo639
` (7 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 22:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1506753796
Comment:
This doesn't explain why the patch is necessary. (e.g. why can the pkg-config variables not be used? What goes wrong if they are?)
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (20 preceding siblings ...)
2024-02-28 22:32 ` oreo639
@ 2024-02-28 22:32 ` oreo639
2024-02-28 22:35 ` oreo639
` (6 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 22:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1506753796
Comment:
This doesn't explain why the patch is necessary. (e.g. why can the pkg-config variables not be used? What goes wrong if they are? Why does this not affect other distros?)
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (21 preceding siblings ...)
2024-02-28 22:32 ` oreo639
@ 2024-02-28 22:35 ` oreo639
2024-02-28 22:36 ` oreo639
` (5 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 22:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 622 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1506753796
Comment:
This doesn't explain why the patch is necessary. (e.g. why can the pkg-config variables not be used? What goes wrong if they are? Why does this not affect other distros?)
A proper description would be smth like this:
```
Avoid using pkg-config variables for girdir_for_pc_file and typelibdir_for_pc_file since they include pc_sysrootdir, which cannot be overridden using `pkgconfig_define`.
meson needs non-absolute paths in order to correctly generate `datadir`.
```
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (22 preceding siblings ...)
2024-02-28 22:35 ` oreo639
@ 2024-02-28 22:36 ` oreo639
2024-02-28 22:37 ` oreo639
` (4 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 22:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 725 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1506753796
Comment:
This doesn't explain why the patch is necessary. (e.g. why can the pkg-config variables not be used? What goes wrong if they are? Why does this not affect other distros?)
A proper description would be smth like this:
```
We patch girdir and typelibdir in gobject-introspection to include pc_sysrootdir for cross compiling.
Avoid using pkg-config variables for girdir_for_pc_file and typelibdir_for_pc_file since they include pc_sysrootdir, which cannot be overridden using `pkgconfig_define`.
meson needs non-absolute paths in order to correctly generate `datadir`.
```
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (23 preceding siblings ...)
2024-02-28 22:36 ` oreo639
@ 2024-02-28 22:37 ` oreo639
2024-02-28 22:37 ` oreo639
` (3 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 22:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 723 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1506753796
Comment:
This doesn't explain why the patch is necessary. (e.g. why can the pkg-config variables not be used? What goes wrong if they are? Why does this not affect other distros?)
A proper description would be smth like this:
```
We patch girdir and typelibdir in gobject-introspection to include pc_sysrootdir for cross compiling.
Avoid using pkg-config variables for girdir_for_pc_file and typelibdir_for_pc_file since they include pc_sysrootdir, which cannot be overridden using pkgconfig_define.
meson needs non-absolute paths in order to correctly generate `datadir`.
```
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (24 preceding siblings ...)
2024-02-28 22:37 ` oreo639
@ 2024-02-28 22:37 ` oreo639
2024-02-29 5:14 ` [PR PATCH] [Updated] " chrysos349
` (2 subsequent siblings)
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-28 22:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 721 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1506753796
Comment:
This doesn't explain why the patch is necessary. (e.g. why can the pkg-config variables not be used? What goes wrong if they are? Why does this not affect other distros?)
A proper description would be smth like this:
```
We patch girdir and typelibdir in gobject-introspection to include pc_sysrootdir for cross compiling.
Avoid using pkg-config variables for girdir_for_pc_file and typelibdir_for_pc_file since they include pc_sysrootdir, which cannot be overridden using pkgconfig_define.
meson needs non-absolute paths in order to correctly generate datadir.
```
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR PATCH] [Updated] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (25 preceding siblings ...)
2024-02-28 22:37 ` oreo639
@ 2024-02-29 5:14 ` chrysos349
2024-02-29 5:15 ` [PR REVIEW] " chrysos349
2024-02-29 6:31 ` [PR PATCH] [Merged]: " oreo639
28 siblings, 0 replies; 30+ messages in thread
From: chrysos349 @ 2024-02-29 5:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 776 bytes --]
There is an updated pull request by chrysos349 against master on the void-packages repository
https://github.com/chrysos349/void-packages grilo
https://github.com/void-linux/void-packages/pull/48982
grilo{,-plugins}: update to 0.3.16
split into a separate pr, according to @oreo639's recommendation (https://github.com/void-linux/void-packages/pull/48752#issuecomment-1968076680).
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
A patch file from https://github.com/void-linux/void-packages/pull/48982.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-grilo-48982.patch --]
[-- Type: text/x-diff, Size: 5010 bytes --]
From 87fca5dc86388673eb9df100c06ff80930e9ae84 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Feb 2024 08:33:51 +0300
Subject: [PATCH 1/2] grilo: update to 0.3.16
---
srcpkgs/grilo/patches/fix-pc-file.patch | 19 +++++++++++++++++++
srcpkgs/grilo/template | 22 +++++++++++++++-------
2 files changed, 34 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/grilo/patches/fix-pc-file.patch
diff --git a/srcpkgs/grilo/patches/fix-pc-file.patch b/srcpkgs/grilo/patches/fix-pc-file.patch
new file mode 100644
index 00000000000000..ccfeb92624d3a6
--- /dev/null
+++ b/srcpkgs/grilo/patches/fix-pc-file.patch
@@ -0,0 +1,19 @@
+We patch girdir and typelibdir in gobject-introspection to include pc_sysrootdir
+for cross compiling.
+Avoid using pkg-config variables for girdir_for_pc_file and typelibdir_for_pc_file
+since they include pc_sysrootdir, which cannot be overridden using pkgconfig_define.
+meson needs non-absolute paths in order to correctly generate datadir.
+--- a/meson.build
++++ b/meson.build
+@@ -96,9 +96,9 @@ typelibdir_for_pc_file = join_paths('${libdir}', 'girepository-1.0')
+ gobject_introspection = dependency('gobject-introspection-1.0', required: false)
+ if gobject_introspection.found()
+ girdir = gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', datadir])
+- girdir_for_pc_file = gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', '${datadir}'])
++ girdir_for_pc_file = join_paths('${datadir}', 'gir-1.0')
+ typelibdir = gobject_introspection.get_variable(pkgconfig: 'typelibdir', pkgconfig_define: ['libdir', libdir])
+- typelibdir_for_pc_file = gobject_introspection.get_variable(pkgconfig: 'typelibdir', pkgconfig_define: ['libdir', '${libdir}'])
++ typelibdir_for_pc_file = join_paths('${libdir}', 'girepository-1.0')
+ endif
+
+ vapidir = join_paths(datadir, 'vala', 'vapi')
diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index e47ec38542a50c..7bcdfe595cf02b 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -1,25 +1,30 @@
# Template file for 'grilo'
pkgname=grilo
-version=0.3.13
+version=0.3.16
revision=1
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala)
- -Denable-gtk-doc=false"
-hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)"
-makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel
+ $(vopt_bool gtk_doc enable-gtk-doc)"
+hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)
+ $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk+3-devel libxml2-devel libsoup3-devel liboauth-devel
totem-pl-parser-devel"
short_desc="Framework focused on making media discovery and browsing easy"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
-homepage="http://live.gnome.org/Grilo"
+homepage="https://wiki.gnome.org/Projects/Grilo"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d14837f22341943ed8a189d9f0827a17016b802d18d0ed080e1413de0fdc927b
+checksum=884580e8c5ece280df23aa63ff5234b7d48988a404df7d6bfccd1e77b473bd96
# Package build options
-build_options="gir"
+build_options="gir gtk_doc"
build_options_default="gir"
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
grilo-devel_package() {
depends="${makedepends} grilo>=${version}_${revision}"
short_desc+=" - development files"
@@ -31,5 +36,8 @@ grilo-devel_package() {
fi
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
}
}
From 0d24a89858d87a8aec011485d78b7ccf7aa76233 Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Wed, 28 Feb 2024 09:00:33 +0300
Subject: [PATCH 2/2] grilo-plugins: update to 0.3.16
---
srcpkgs/grilo-plugins/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 2d306f8de7e48f..568af47a957b8a 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,9 +1,9 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
-version=0.3.14
-revision=3
+version=0.3.16
+revision=1
build_style=meson
-configure_args="-Dgoa=disabled"
+configure_args="-Dgoa=enabled"
hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Grilo"
distfiles="${GNOME_SITE}/grilo-plugins/${version%.*}/grilo-plugins-${version}.tar.xz"
-checksum=686844b34ec73b24931ff6cc4f6033f0072947a6db60acdc7fb3eaf157a581c8
+checksum=fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb
make_check=no # feel free to fix
post_patch() {
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR REVIEW] grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (26 preceding siblings ...)
2024-02-29 5:14 ` [PR PATCH] [Updated] " chrysos349
@ 2024-02-29 5:15 ` chrysos349
2024-02-29 6:31 ` [PR PATCH] [Merged]: " oreo639
28 siblings, 0 replies; 30+ messages in thread
From: chrysos349 @ 2024-02-29 5:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by chrysos349 on void-packages repository
https://github.com/void-linux/void-packages/pull/48982#discussion_r1507004132
Comment:
Used your extended description. Thanks!
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PR PATCH] [Merged]: grilo{,-plugins}: update to 0.3.16
2024-02-28 5:34 [PR PATCH] grilo: update to 0.3.16 chrysos349
` (27 preceding siblings ...)
2024-02-29 5:15 ` [PR REVIEW] " chrysos349
@ 2024-02-29 6:31 ` oreo639
28 siblings, 0 replies; 30+ messages in thread
From: oreo639 @ 2024-02-29 6:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 616 bytes --]
There's a merged pull request on the void-packages repository
grilo{,-plugins}: update to 0.3.16
https://github.com/void-linux/void-packages/pull/48982
Description:
split into a separate pr, according to @oreo639's recommendation (https://github.com/void-linux/void-packages/pull/48752#issuecomment-1968076680).
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl x
- armv7l x
- armv6l-musl x
^ permalink raw reply [flat|nested] 30+ messages in thread