* [PR PATCH] geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0
@ 2022-10-01 15:58 paper42
2022-10-22 14:03 ` [PR PATCH] [Updated] " paper42
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: paper42 @ 2022-10-01 15:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1317 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome-photos43
https://github.com/void-linux/void-packages/pull/39594
geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/39594.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-photos43-39594.patch --]
[-- Type: text/x-diff, Size: 18183 bytes --]
From e4801314e267e13a94381e860615e82c49f475d3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:39:35 +0200
Subject: [PATCH 01/13] geocode-glib: use libsoup3, split -common
---
common/shlibs | 2 +-
srcpkgs/geocode-glib-common | 1 +
srcpkgs/geocode-glib/template | 17 +++++++++++++----
3 files changed, 15 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/geocode-glib-common
diff --git a/common/shlibs b/common/shlibs
index 33311eb0fed8..126d9cbef2b5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1420,7 +1420,7 @@ libthreadutil.so.6 libupnp-1.6.18_1
libupnp.so.17 libupnp-1.14.0_1
libixml.so.11 libupnp-1.14.0_1
libupnpp.so.12 libupnpp-0.22.2_1
-libgeocode-glib.so.0 geocode-glib-3.10.0_1
+libgeocode-glib-2.so.0 geocode-glib-3.26.4_2
libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
libpotrace.so.0 libpotrace-1.11_1
libSDL2-2.0.so.0 SDL2-2.0.0_1
diff --git a/srcpkgs/geocode-glib-common b/srcpkgs/geocode-glib-common
new file mode 120000
index 000000000000..45ec1fe82f87
--- /dev/null
+++ b/srcpkgs/geocode-glib-common
@@ -0,0 +1 @@
+geocode-glib
\ No newline at end of file
diff --git a/srcpkgs/geocode-glib/template b/srcpkgs/geocode-glib/template
index 29571876a43c..251e72ad20ea 100644
--- a/srcpkgs/geocode-glib/template
+++ b/srcpkgs/geocode-glib/template
@@ -1,24 +1,33 @@
# Template file for 'geocode-glib'
+# keep in sync with geocode-glib-libsoup2
pkgname=geocode-glib
version=3.26.4
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Denable-gtk-doc=false $(vopt_bool gir enable-introspection)
- -Denable-installed-tests=false"
+ -Denable-installed-tests=false -Dsoup2=false"
hostmakedepends="pkg-config glib-devel"
-makedepends="json-glib-devel libsoup-gnome-devel"
+makedepends="json-glib-devel libsoup3-devel"
+depends="geocode-glib-common"
short_desc="GLib library for geocoding and reverse geocoding"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://developer.gnome.org/geocode-glib"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/geocode-glib/${version%.*}/geocode-glib-${version}.tar.xz"
checksum=2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa
# Package build options
build_options="gir"
build_options_default="gir"
+geocode-glib-common_package() {
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/icons
+ }
+}
+
geocode-glib-devel_package() {
depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From a8e3f9fe28892e6b9e15f3efefac2744e688ebc7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:40:14 +0200
Subject: [PATCH 02/13] New package: geocode-glib-libsoup2-2.26.4
---
common/shlibs | 1 +
srcpkgs/geocode-glib-libsoup2-devel | 1 +
srcpkgs/geocode-glib-libsoup2/template | 40 ++++++++++++++++++++++++++
3 files changed, 42 insertions(+)
create mode 120000 srcpkgs/geocode-glib-libsoup2-devel
create mode 100644 srcpkgs/geocode-glib-libsoup2/template
diff --git a/common/shlibs b/common/shlibs
index 126d9cbef2b5..b7afc3b89173 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1421,6 +1421,7 @@ libupnp.so.17 libupnp-1.14.0_1
libixml.so.11 libupnp-1.14.0_1
libupnpp.so.12 libupnpp-0.22.2_1
libgeocode-glib-2.so.0 geocode-glib-3.26.4_2
+libgeocode-glib.so.0 geocode-glib-libsoup2-3.26.4_1
libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
libpotrace.so.0 libpotrace-1.11_1
libSDL2-2.0.so.0 SDL2-2.0.0_1
diff --git a/srcpkgs/geocode-glib-libsoup2-devel b/srcpkgs/geocode-glib-libsoup2-devel
new file mode 120000
index 000000000000..a7938e2bdce8
--- /dev/null
+++ b/srcpkgs/geocode-glib-libsoup2-devel
@@ -0,0 +1 @@
+geocode-glib-libsoup2
\ No newline at end of file
diff --git a/srcpkgs/geocode-glib-libsoup2/template b/srcpkgs/geocode-glib-libsoup2/template
new file mode 100644
index 000000000000..08b2c2dd618b
--- /dev/null
+++ b/srcpkgs/geocode-glib-libsoup2/template
@@ -0,0 +1,40 @@
+# Template file for 'geocode-glib-libsoup2'
+# keep in sync with geocode-glib
+pkgname=geocode-glib-libsoup2
+version=3.26.4
+revision=1
+wrksrc="geocode-glib-$version"
+build_style=meson
+build_helper="gir"
+configure_args="-Denable-gtk-doc=false $(vopt_bool gir enable-introspection)
+ -Denable-installed-tests=false -Dsoup2=true"
+hostmakedepends="pkg-config glib-devel"
+makedepends="json-glib-devel libsoup-gnome-devel"
+depends="geocode-glib-common"
+short_desc="GLib library for geocoding and reverse geocoding"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://developer.gnome.org/geocode-glib"
+distfiles="${GNOME_SITE}/geocode-glib/${version%.*}/geocode-glib-${version}.tar.xz"
+checksum=2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+post_install() {
+ rm -r ${DESTDIR}/usr/share/icons
+}
+
+geocode-glib-libsoup2-devel_package() {
+ depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
From 9f641120c0c1b4d8feafda98ea891db42b47b961 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 03/13] empathy: depend on geocode-glib-libsoup2
---
srcpkgs/empathy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template
index 34319aa881c6..6b946242d332 100644
--- a/srcpkgs/empathy/template
+++ b/srcpkgs/empathy/template
@@ -1,7 +1,7 @@
# Template file for 'empathy'
pkgname=empathy
version=3.12.14
-revision=4
+revision=5
build_style=gnu-configure
configure_args="
--enable-gst-1.0=yes --enable-gudev=yes --enable-spell=yes
@@ -14,7 +14,7 @@ makedepends="
libcanberra-devel clutter-gst-devel clutter-gtk-devel
telepathy-glib-devel telepathy-logger-devel libnotify-devel
telepathy-farstream-devel telepathy-mission-control-devel
- evolution-data-server-devel geocode-glib-devel folks-devel
+ evolution-data-server-devel geocode-glib-libsoup2-devel folks-devel
webkit2gtk-devel libgudev-devel pulseaudio-devel cheese-devel
enchant2-devel NetworkManager-devel libchamplain-devel
gnutls-devel gsettings-desktop-schemas-devel geoclue2-devel iso-codes"
From deba6392c20b14a65c54aa603aa28a70f53ad0da Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 04/13] gnome-calendar: depend on geocode-glib-libsoup2
---
srcpkgs/gnome-calendar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index cd1d201d2dfb..086915b3988f 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
version=42.2
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
$(vopt_if gir 'gobject-introspection')"
-makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-libsoup2-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
libgweather-devel libical-devel libpeas-devel libsoup-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
From 6f9fdcd04b80bfdaf223033347936a608d7eb487 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 05/13] gnome-clocks: depend on geocode-glib-libsoup2
---
srcpkgs/gnome-clocks/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index c2f76af5604a..9197dbbcbd46 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
version=42.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
gtk4-devel libadwaita-devel libnotify-devel gsound-devel
- libgweather-devel geocode-glib-devel geoclue2-devel
+ libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel
hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
From a76774d151e02959838380ddb7003f51a7b91b7d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 06/13] gnome-core: depend on geocode-glib-libsoup2
---
srcpkgs/gnome-core/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 1cee451d1e65..0d236adc7966 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
version=42.0
-revision=1
+revision=2
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ depends="
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib>=3.26.2
+ geocode-glib-libsoup2>=3.26.2
gfbgraph>=0.2.4
gjs>=1.72.0
glib>=2.72.0
From c14630b706f899c8a21be72d8fe725d46e66f399 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 07/13] gnome-maps: depend on geocode-glib-libsoup2
---
srcpkgs/gnome-maps/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index dd5a5024aaf7..a7fb6656f26c 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
version=42.3
-revision=2
+revision=3
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gettext pkg-config AppStream gjs"
-makedepends="folks-devel geoclue2-devel geocode-glib-devel gjs-devel
+makedepends="folks-devel geoclue2-devel geocode-glib-libsoup2-devel gjs-devel
gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel
libgweather-devel"
depends="geoclue2 gjs libhandy1 libgweather"
From 6732cc3fd594fdf234ac79b336a7a1aead4949ec Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:39:34 +0200
Subject: [PATCH 08/13] gnome-settings-daemon: depend on geocode-glib-libsoup2
---
srcpkgs/gnome-settings-daemon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 24af1a5094b7..ea3ac6838044 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
version=42.2
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
From 937a9a47781bb985eedb84471fb958d977e5884a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 09/13] io.elementary.calendar: depend on geocode-glib-libsoup2
---
srcpkgs/io.elementary.calendar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index bf87c7599001..e0eec6e5c940 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
# Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar
version=6.1.0
-revision=1
+revision=2
wrksrc="calendar-${version}"
build_style=meson
build_helper="gir"
@@ -9,7 +9,7 @@ hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
glib-devel evolution-data-server-devel"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
- folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
+ folks-devel geocode-glib-libsoup2-devel geoclue2-devel libical-devel libnotify-devel"
short_desc="Desktop calendar app designed for elementary OS"
maintainer="Cameron Nemo <cnemo@tutanota.com>"
license="GPL-3.0-only"
From a1e72bfeaf83b3fe7e8b1326e160972679d99f58 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 10/13] io.elementary.photos: depend on geocode-glib-libsoup2
---
srcpkgs/io.elementary.photos/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template
index 370f6f5a0ce9..131619be60e8 100644
--- a/srcpkgs/io.elementary.photos/template
+++ b/srcpkgs/io.elementary.photos/template
@@ -1,13 +1,13 @@
# Template file for 'io.elementary.photos'
pkgname=io.elementary.photos
version=2.7.5
-revision=1
+revision=2
wrksrc="photos-${version}"
build_style=meson
hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream
glib-devel python3-scour"
makedepends="libaccounts-glib-devel libexif-devel libgee08-devel
- geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel
+ geocode-glib-libsoup2-devel libgexiv2-devel libglib-devel libgphoto2-devel
gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel
json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel
webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel
From a1b974c803908a61c56534ea46e34cf10193523b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 11/13] libgweather: depend on geocode-glib-libsoup2
---
srcpkgs/libgweather/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index cd14de2d4b7b..b4fcfcb12563 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -2,20 +2,20 @@
pkgname=libgweather
reverts="40.0_1"
version=4.0.0
-revision=2
+revision=3
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
$(vopt_bool gtk_doc gtk_doc) -Dzoneinfo_dir=/usr/share/zoneinfo"
hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala)
$(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
build_options="gir gtk_doc"
From 5f5218e3b424d471e60425db4cec46e1ef385769 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:39:33 +0200
Subject: [PATCH 12/13] evolution: depend on geocode-glib-libsoup2
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index a2d7f527c1d8..fd9d12a73e74 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From db06c8313f2de03cfb99283c932f10614c86ae41 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:41:53 +0200
Subject: [PATCH 13/13] gnome-photos: update to 43.0.
---
srcpkgs/gnome-photos/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index dbdbf6850a6f..48de445bdfad 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,15 +1,16 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- gfbgraph-devel tracker-devel libexif-devel librsvg-devel grilo-devel
+ tracker-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
- geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel"
+ geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
+ libportal-gtk3-devel"
depends="desktop-file-utils tracker tracker-miners"
short_desc="Access, organize, and share your photos on GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Photos"
changelog="https://gitlab.gnome.org/GNOME/gnome-photos/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz"
-checksum=25cb281425199dec7b045f13f32f8f96034cb0cb8b94d96f9dffaf4f5be68551
+checksum=c7ac7458d533f29d955011c74b76224d79ea31bcc12e9d6d0ce7b6c3704d08e1
build_options="gir"
build_options_default="gir"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0
2022-10-01 15:58 [PR PATCH] geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0 paper42
@ 2022-10-22 14:03 ` paper42
2022-10-22 14:46 ` paper42
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-10-22 14:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1322 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome-photos43
https://github.com/void-linux/void-packages/pull/39594
geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/39594.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-photos43-39594.patch --]
[-- Type: text/x-diff, Size: 18409 bytes --]
From b9ed89634f16be44f79a18907b8df9aad0612e52 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:39:35 +0200
Subject: [PATCH 01/13] geocode-glib: use libsoup3, split -common
---
common/shlibs | 2 +-
srcpkgs/geocode-glib-common | 1 +
srcpkgs/geocode-glib/template | 17 +++++++++++++----
3 files changed, 15 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/geocode-glib-common
diff --git a/common/shlibs b/common/shlibs
index 9712cbc1262f..6083e349df85 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1426,7 +1426,7 @@ libthreadutil.so.6 libupnp-1.6.18_1
libupnp.so.17 libupnp-1.14.0_1
libixml.so.11 libupnp-1.14.0_1
libupnpp.so.12 libupnpp-0.22.2_1
-libgeocode-glib.so.0 geocode-glib-3.10.0_1
+libgeocode-glib-2.so.0 geocode-glib-3.26.4_2
libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
libpotrace.so.0 libpotrace-1.11_1
libSDL2-2.0.so.0 SDL2-2.0.0_1
diff --git a/srcpkgs/geocode-glib-common b/srcpkgs/geocode-glib-common
new file mode 120000
index 000000000000..45ec1fe82f87
--- /dev/null
+++ b/srcpkgs/geocode-glib-common
@@ -0,0 +1 @@
+geocode-glib
\ No newline at end of file
diff --git a/srcpkgs/geocode-glib/template b/srcpkgs/geocode-glib/template
index 29571876a43c..251e72ad20ea 100644
--- a/srcpkgs/geocode-glib/template
+++ b/srcpkgs/geocode-glib/template
@@ -1,24 +1,33 @@
# Template file for 'geocode-glib'
+# keep in sync with geocode-glib-libsoup2
pkgname=geocode-glib
version=3.26.4
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Denable-gtk-doc=false $(vopt_bool gir enable-introspection)
- -Denable-installed-tests=false"
+ -Denable-installed-tests=false -Dsoup2=false"
hostmakedepends="pkg-config glib-devel"
-makedepends="json-glib-devel libsoup-gnome-devel"
+makedepends="json-glib-devel libsoup3-devel"
+depends="geocode-glib-common"
short_desc="GLib library for geocoding and reverse geocoding"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://developer.gnome.org/geocode-glib"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/geocode-glib/${version%.*}/geocode-glib-${version}.tar.xz"
checksum=2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa
# Package build options
build_options="gir"
build_options_default="gir"
+geocode-glib-common_package() {
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/icons
+ }
+}
+
geocode-glib-devel_package() {
depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 34bbdd6cfb5dd341ee21ff6974dcd20a8b215b5c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:40:14 +0200
Subject: [PATCH 02/13] New package: geocode-glib-libsoup2-2.26.4
---
common/shlibs | 1 +
srcpkgs/geocode-glib-libsoup2-devel | 1 +
srcpkgs/geocode-glib-libsoup2/template | 40 ++++++++++++++++++++++++++
3 files changed, 42 insertions(+)
create mode 120000 srcpkgs/geocode-glib-libsoup2-devel
create mode 100644 srcpkgs/geocode-glib-libsoup2/template
diff --git a/common/shlibs b/common/shlibs
index 6083e349df85..716f7886e0ba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1427,6 +1427,7 @@ libupnp.so.17 libupnp-1.14.0_1
libixml.so.11 libupnp-1.14.0_1
libupnpp.so.12 libupnpp-0.22.2_1
libgeocode-glib-2.so.0 geocode-glib-3.26.4_2
+libgeocode-glib.so.0 geocode-glib-libsoup2-3.26.4_1
libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
libpotrace.so.0 libpotrace-1.11_1
libSDL2-2.0.so.0 SDL2-2.0.0_1
diff --git a/srcpkgs/geocode-glib-libsoup2-devel b/srcpkgs/geocode-glib-libsoup2-devel
new file mode 120000
index 000000000000..a7938e2bdce8
--- /dev/null
+++ b/srcpkgs/geocode-glib-libsoup2-devel
@@ -0,0 +1 @@
+geocode-glib-libsoup2
\ No newline at end of file
diff --git a/srcpkgs/geocode-glib-libsoup2/template b/srcpkgs/geocode-glib-libsoup2/template
new file mode 100644
index 000000000000..08b2c2dd618b
--- /dev/null
+++ b/srcpkgs/geocode-glib-libsoup2/template
@@ -0,0 +1,40 @@
+# Template file for 'geocode-glib-libsoup2'
+# keep in sync with geocode-glib
+pkgname=geocode-glib-libsoup2
+version=3.26.4
+revision=1
+wrksrc="geocode-glib-$version"
+build_style=meson
+build_helper="gir"
+configure_args="-Denable-gtk-doc=false $(vopt_bool gir enable-introspection)
+ -Denable-installed-tests=false -Dsoup2=true"
+hostmakedepends="pkg-config glib-devel"
+makedepends="json-glib-devel libsoup-gnome-devel"
+depends="geocode-glib-common"
+short_desc="GLib library for geocoding and reverse geocoding"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://developer.gnome.org/geocode-glib"
+distfiles="${GNOME_SITE}/geocode-glib/${version%.*}/geocode-glib-${version}.tar.xz"
+checksum=2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+post_install() {
+ rm -r ${DESTDIR}/usr/share/icons
+}
+
+geocode-glib-libsoup2-devel_package() {
+ depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
From 2af6f783eae68c86ceecaef1017691f3d7b2fd83 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 03/13] gnome-calendar: depend on geocode-glib-libsoup2
---
srcpkgs/gnome-calendar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index cd1d201d2dfb..086915b3988f 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
version=42.2
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
$(vopt_if gir 'gobject-introspection')"
-makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-libsoup2-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
libgweather-devel libical-devel libpeas-devel libsoup-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
From fbf5b83d9770340b876da439c32ea5e3eace8386 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 04/13] gnome-clocks: depend on geocode-glib-libsoup2
---
srcpkgs/gnome-clocks/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index c2f76af5604a..9197dbbcbd46 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
version=42.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
gtk4-devel libadwaita-devel libnotify-devel gsound-devel
- libgweather-devel geocode-glib-devel geoclue2-devel
+ libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel
hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
From ee1b359f2ca2b7b944411f22e35aa0cecd7a420a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 05/13] gnome-core: depend on geocode-glib-libsoup2
---
srcpkgs/gnome-core/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index d4a852d1ea88..cc7bab7ddfd5 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -19,7 +19,7 @@ depends="
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib>=3.26.2
+ geocode-glib-libsoup2>=3.26.2
gfbgraph>=0.2.4
gjs>=1.72.0
glib>=2.72.0
From f053ca0bb252b2c3a05143d9464e828748819391 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 06/13] gnome-maps: depend on geocode-glib-libsoup2
---
srcpkgs/gnome-maps/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index dd5a5024aaf7..a7fb6656f26c 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
version=42.3
-revision=2
+revision=3
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gettext pkg-config AppStream gjs"
-makedepends="folks-devel geoclue2-devel geocode-glib-devel gjs-devel
+makedepends="folks-devel geoclue2-devel geocode-glib-libsoup2-devel gjs-devel
gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel
libgweather-devel"
depends="geoclue2 gjs libhandy1 libgweather"
From 047c59dfe515bf5b2ea178e01081583f0deb15b7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:39:34 +0200
Subject: [PATCH 07/13] gnome-settings-daemon: depend on geocode-glib-libsoup2
---
srcpkgs/gnome-settings-daemon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 24af1a5094b7..ea3ac6838044 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
version=42.2
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
From c1e6117b9772e9392937d44e239914d53a620ef9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 08/13] io.elementary.calendar: depend on geocode-glib-libsoup2
---
srcpkgs/io.elementary.calendar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index b58812b3c854..68b9adf972af 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
# Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar
version=6.1.0
-revision=1
+revision=2
wrksrc="calendar-${version}"
build_style=meson
build_helper="gir"
@@ -9,7 +9,7 @@ hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
glib-devel evolution-data-server-devel"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
- folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
+ folks-devel geocode-glib-libsoup2-devel geoclue2-devel libical-devel libnotify-devel"
short_desc="Desktop calendar app designed for elementary OS"
maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-only"
From 910360c18299da9b130545cc03887947ea382d4d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 09/13] io.elementary.photos: depend on geocode-glib-libsoup2
---
srcpkgs/io.elementary.photos/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template
index 405c02b690c5..c001f4de19f0 100644
--- a/srcpkgs/io.elementary.photos/template
+++ b/srcpkgs/io.elementary.photos/template
@@ -1,13 +1,13 @@
# Template file for 'io.elementary.photos'
pkgname=io.elementary.photos
version=2.7.5
-revision=1
+revision=2
wrksrc="photos-${version}"
build_style=meson
hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream
glib-devel python3-scour"
makedepends="libaccounts-glib-devel libexif-devel libgee08-devel
- geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel
+ geocode-glib-libsoup2-devel libgexiv2-devel libglib-devel libgphoto2-devel
gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel
json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel
webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel
From e410cc458bcbb4955540af727831cb2df3ab818a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 10/13] libgweather: depend on geocode-glib-libsoup2
---
srcpkgs/libgweather/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index cd14de2d4b7b..b4fcfcb12563 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -2,20 +2,20 @@
pkgname=libgweather
reverts="40.0_1"
version=4.0.0
-revision=2
+revision=3
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
$(vopt_bool gtk_doc gtk_doc) -Dzoneinfo_dir=/usr/share/zoneinfo"
hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala)
$(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
build_options="gir gtk_doc"
From 1d0ed32677b95869b257f09119b82322f0675297 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:39:33 +0200
Subject: [PATCH 11/13] evolution: depend on geocode-glib-libsoup2
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index a2d7f527c1d8..fd9d12a73e74 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 8eb17585c612c3f8ae7d88c1a59338721f7ed6fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 15:58:18 +0200
Subject: [PATCH 12/13] gnome-initial-setup: depend on geocode-glib-libsoup2
---
srcpkgs/gnome-initial-setup/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 9e8a2c3824f9..c70a7d2c06ba 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
version=42.2
-revision=1
+revision=2
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
@@ -10,12 +10,12 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel"
+ pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
From 84eaee80e04c117c8ceabfb35fc24638288da934 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:41:53 +0200
Subject: [PATCH 13/13] gnome-photos: update to 43.0.
---
srcpkgs/gnome-photos/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index dbdbf6850a6f..48de445bdfad 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,15 +1,16 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- gfbgraph-devel tracker-devel libexif-devel librsvg-devel grilo-devel
+ tracker-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
- geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel"
+ geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
+ libportal-gtk3-devel"
depends="desktop-file-utils tracker tracker-miners"
short_desc="Access, organize, and share your photos on GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Photos"
changelog="https://gitlab.gnome.org/GNOME/gnome-photos/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz"
-checksum=25cb281425199dec7b045f13f32f8f96034cb0cb8b94d96f9dffaf4f5be68551
+checksum=c7ac7458d533f29d955011c74b76224d79ea31bcc12e9d6d0ce7b6c3704d08e1
build_options="gir"
build_options_default="gir"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0
2022-10-01 15:58 [PR PATCH] geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0 paper42
2022-10-22 14:03 ` [PR PATCH] [Updated] " paper42
@ 2022-10-22 14:46 ` paper42
2022-10-22 19:09 ` paper42
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-10-22 14:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1322 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome-photos43
https://github.com/void-linux/void-packages/pull/39594
geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/39594.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-photos43-39594.patch --]
[-- Type: text/x-diff, Size: 57555 bytes --]
From 9bec15dc9511990f4a196fc61214e412d5595959 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:13:21 +0200
Subject: [PATCH 01/24] New package: rest0-0.8.1
---
common/shlibs | 4 ++--
srcpkgs/rest0-devel | 1 +
srcpkgs/rest0/template | 41 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/rest0-devel
create mode 100644 srcpkgs/rest0/template
diff --git a/common/shlibs b/common/shlibs
index 9712cbc1262f..82ede873858f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -875,8 +875,8 @@ libcogl-gst.so.20 cogl-1.18.0_1
libcogl-gles2.so.20 cogl-1.18.0_1
libcogl-path.so.20 cogl-1.18.0_1
libp11-kit.so.0 p11-kit-0.7_1
-librest-0.7.so.0 rest-0.7_1
-librest-extras-0.7.so.0 rest-0.7_1
+librest-0.7.so.0 rest0-0.8.1_1
+librest-extras-0.7.so.0 rest0-0.8.1_1
libgoa-1.0.so.0 gnome-online-accounts-3.2.0_1
libgoa-backend-1.0.so.1 gnome-online-accounts-3.10.0_1
liboauth.so.0 liboauth-0.9.4_1
diff --git a/srcpkgs/rest0-devel b/srcpkgs/rest0-devel
new file mode 120000
index 000000000000..57e62aa92398
--- /dev/null
+++ b/srcpkgs/rest0-devel
@@ -0,0 +1 @@
+rest0
\ No newline at end of file
diff --git a/srcpkgs/rest0/template b/srcpkgs/rest0/template
new file mode 100644
index 000000000000..88e2e972149b
--- /dev/null
+++ b/srcpkgs/rest0/template
@@ -0,0 +1,41 @@
+# Template file for 'rest0'
+pkgname=rest0
+version=0.8.1
+revision=1
+wrksrc="rest-${version}"
+build_style=gnu-configure
+build_helper="gir"
+configure_args="$(vopt_enable gir introspection) --disable-static
+ --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
+hostmakedepends="automake perl m4 libtool pkg-config glib-devel gtk-doc"
+makedepends="libglib-devel libsoup-gnome-devel libxml2-devel"
+depends="ca-certificates"
+short_desc="RESTful library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/librest"
+changelog="https://gitlab.gnome.org/GNOME/librest/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/rest/${version%.*}/rest-${version}.tar.xz"
+checksum=0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+ autoreconf -fi
+}
+
+rest0-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libglib-devel libsoup-devel
+ libxml2-devel"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
From 55451bd44363ad79b080c8daa56e6bd3db796fff Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:41:55 +0200
Subject: [PATCH 02/24] rest: update to 0.9.1.
---
common/shlibs | 2 ++
srcpkgs/rest/template | 27 ++++++++++++---------------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 82ede873858f..71adfca7d660 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -876,7 +876,9 @@ libcogl-gles2.so.20 cogl-1.18.0_1
libcogl-path.so.20 cogl-1.18.0_1
libp11-kit.so.0 p11-kit-0.7_1
librest-0.7.so.0 rest0-0.8.1_1
+librest-1.0.so.0 rest-0.9.1_1
librest-extras-0.7.so.0 rest0-0.8.1_1
+librest-extras-1.0.so.0 rest-0.9.1_1
libgoa-1.0.so.0 gnome-online-accounts-3.2.0_1
libgoa-backend-1.0.so.1 gnome-online-accounts-3.10.0_1
liboauth.so.0 liboauth-0.9.4_1
diff --git a/srcpkgs/rest/template b/srcpkgs/rest/template
index aa4299c8ffd3..a1ad0c54c585 100644
--- a/srcpkgs/rest/template
+++ b/srcpkgs/rest/template
@@ -1,31 +1,28 @@
# Template file for 'rest'
pkgname=rest
-version=0.8.1
-revision=3
-build_style=gnu-configure
+version=0.9.1
+revision=1
+build_style=meson
build_helper="gir"
-configure_args="$(vopt_enable gir introspection) --disable-static
- --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
-hostmakedepends="automake perl m4 libtool pkg-config glib-devel gtk-doc"
-makedepends="libglib-devel libsoup-gnome-devel libxml2-devel"
+configure_args="$(vopt_bool gir introspection) -Dexamples=false -Dsoup2=false
+ -Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt"
+hostmakedepends="pkg-config glib-devel gi-docgen"
+makedepends="libsoup3-devel json-glib-devel libxml2-devel"
depends="ca-certificates"
short_desc="RESTful library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9
+homepage="https://gitlab.gnome.org/GNOME/librest"
+changelog="https://gitlab.gnome.org/GNOME/librest/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/rest/${version%.*}/rest-${version}.tar.xz"
+checksum=9266a5c10ece383e193dfb7ffb07b509cc1f51521ab8dad76af96ed14212c2e3
# Package build options
build_options="gir"
build_options_default="gir"
-pre_configure() {
- autoreconf -fi
-}
-
rest-devel_package() {
- depends="rest-${version}_${revision} libglib-devel libsoup-devel
+ depends="${sourcepkg}>=${version}_${revision} libglib-devel libsoup3-devel
libxml2-devel"
short_desc+=" - development files"
pkg_install() {
From 3414ad82339c6fa58d967c909f59f9f075e6c19c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:40:14 +0200
Subject: [PATCH 03/24] New package: geocode-glib-libsoup2-2.26.4
---
common/shlibs | 2 +-
srcpkgs/geocode-glib-libsoup2-devel | 1 +
srcpkgs/geocode-glib-libsoup2/template | 40 ++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/geocode-glib-libsoup2-devel
create mode 100644 srcpkgs/geocode-glib-libsoup2/template
diff --git a/common/shlibs b/common/shlibs
index 71adfca7d660..2e8b002cde26 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1428,7 +1428,7 @@ libthreadutil.so.6 libupnp-1.6.18_1
libupnp.so.17 libupnp-1.14.0_1
libixml.so.11 libupnp-1.14.0_1
libupnpp.so.12 libupnpp-0.22.2_1
-libgeocode-glib.so.0 geocode-glib-3.10.0_1
+libgeocode-glib.so.0 geocode-glib-libsoup2-3.26.4_1
libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
libpotrace.so.0 libpotrace-1.11_1
libSDL2-2.0.so.0 SDL2-2.0.0_1
diff --git a/srcpkgs/geocode-glib-libsoup2-devel b/srcpkgs/geocode-glib-libsoup2-devel
new file mode 120000
index 000000000000..a7938e2bdce8
--- /dev/null
+++ b/srcpkgs/geocode-glib-libsoup2-devel
@@ -0,0 +1 @@
+geocode-glib-libsoup2
\ No newline at end of file
diff --git a/srcpkgs/geocode-glib-libsoup2/template b/srcpkgs/geocode-glib-libsoup2/template
new file mode 100644
index 000000000000..08b2c2dd618b
--- /dev/null
+++ b/srcpkgs/geocode-glib-libsoup2/template
@@ -0,0 +1,40 @@
+# Template file for 'geocode-glib-libsoup2'
+# keep in sync with geocode-glib
+pkgname=geocode-glib-libsoup2
+version=3.26.4
+revision=1
+wrksrc="geocode-glib-$version"
+build_style=meson
+build_helper="gir"
+configure_args="-Denable-gtk-doc=false $(vopt_bool gir enable-introspection)
+ -Denable-installed-tests=false -Dsoup2=true"
+hostmakedepends="pkg-config glib-devel"
+makedepends="json-glib-devel libsoup-gnome-devel"
+depends="geocode-glib-common"
+short_desc="GLib library for geocoding and reverse geocoding"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://developer.gnome.org/geocode-glib"
+distfiles="${GNOME_SITE}/geocode-glib/${version%.*}/geocode-glib-${version}.tar.xz"
+checksum=2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+post_install() {
+ rm -r ${DESTDIR}/usr/share/icons
+}
+
+geocode-glib-libsoup2-devel_package() {
+ depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
From 98937ca6aaec33504ec95c58fefcbef61447eac4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:39:35 +0200
Subject: [PATCH 04/24] geocode-glib: use libsoup3, split -common
---
common/shlibs | 1 +
srcpkgs/geocode-glib-common | 1 +
srcpkgs/geocode-glib/template | 17 +++++++++++++----
3 files changed, 15 insertions(+), 4 deletions(-)
create mode 120000 srcpkgs/geocode-glib-common
diff --git a/common/shlibs b/common/shlibs
index 2e8b002cde26..882b67d7f36f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1429,6 +1429,7 @@ libupnp.so.17 libupnp-1.14.0_1
libixml.so.11 libupnp-1.14.0_1
libupnpp.so.12 libupnpp-0.22.2_1
libgeocode-glib.so.0 geocode-glib-libsoup2-3.26.4_1
+libgeocode-glib-2.so.0 geocode-glib-3.26.4_2
libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
libpotrace.so.0 libpotrace-1.11_1
libSDL2-2.0.so.0 SDL2-2.0.0_1
diff --git a/srcpkgs/geocode-glib-common b/srcpkgs/geocode-glib-common
new file mode 120000
index 000000000000..45ec1fe82f87
--- /dev/null
+++ b/srcpkgs/geocode-glib-common
@@ -0,0 +1 @@
+geocode-glib
\ No newline at end of file
diff --git a/srcpkgs/geocode-glib/template b/srcpkgs/geocode-glib/template
index 29571876a43c..251e72ad20ea 100644
--- a/srcpkgs/geocode-glib/template
+++ b/srcpkgs/geocode-glib/template
@@ -1,24 +1,33 @@
# Template file for 'geocode-glib'
+# keep in sync with geocode-glib-libsoup2
pkgname=geocode-glib
version=3.26.4
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Denable-gtk-doc=false $(vopt_bool gir enable-introspection)
- -Denable-installed-tests=false"
+ -Denable-installed-tests=false -Dsoup2=false"
hostmakedepends="pkg-config glib-devel"
-makedepends="json-glib-devel libsoup-gnome-devel"
+makedepends="json-glib-devel libsoup3-devel"
+depends="geocode-glib-common"
short_desc="GLib library for geocoding and reverse geocoding"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://developer.gnome.org/geocode-glib"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/geocode-glib/${version%.*}/geocode-glib-${version}.tar.xz"
checksum=2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa
# Package build options
build_options="gir"
build_options_default="gir"
+geocode-glib-common_package() {
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/icons
+ }
+}
+
geocode-glib-devel_package() {
depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From c449fc562050e0ac711cf9b1bbf5a3cb33035a1f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 05/24] gnome-calendar: use geocode-glib-libsoup2
---
srcpkgs/gnome-calendar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index cd1d201d2dfb..086915b3988f 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
version=42.2
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
$(vopt_if gir 'gobject-introspection')"
-makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-libsoup2-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
libgweather-devel libical-devel libpeas-devel libsoup-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
From 8fe63343d2b4496cfdd6f07059a4017aee97d30b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 06/24] gnome-clocks: use geocode-glib-libsoup2
---
srcpkgs/gnome-clocks/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index c2f76af5604a..9197dbbcbd46 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
version=42.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
gtk4-devel libadwaita-devel libnotify-devel gsound-devel
- libgweather-devel geocode-glib-devel geoclue2-devel
+ libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel
hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
From 69c24151e5740bea35b884a8135d17a7c2a2bbfc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 07/24] gnome-core: use geocode-glib-libsoup2
---
srcpkgs/gnome-core/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index d4a852d1ea88..1601288f857e 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
version=42.0
-revision=2
+revision=3
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ depends="
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib>=3.26.2
+ geocode-glib-libsoup2>=3.26.2
gfbgraph>=0.2.4
gjs>=1.72.0
glib>=2.72.0
From 62962bfbc27dc56c8fb598223ae0bb0cce2b229a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 08/24] gnome-maps: use geocode-glib-libsoup2, rest0
---
srcpkgs/gnome-maps/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index dd5a5024aaf7..bf82966579bb 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,12 +1,12 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
version=42.3
-revision=2
+revision=3
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gettext pkg-config AppStream gjs"
-makedepends="folks-devel geoclue2-devel geocode-glib-devel gjs-devel
- gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel
+makedepends="folks-devel geoclue2-devel geocode-glib-libsoup2-devel gjs-devel
+ gnome-desktop-devel libchamplain-devel rest0-devel libhandy1-devel
libgweather-devel"
depends="geoclue2 gjs libhandy1 libgweather"
short_desc="GNOME maps application"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Maps"
changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gnome-maps/${version%.*}/gnome-maps-${version}.tar.xz"
checksum=e456467facf3c8fd10c9386b5e74c43d9595ad9fb75257f7da014af983d69cd1
From 0be3bddff9a7f74fbda29a08802226a938b551ee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:39:34 +0200
Subject: [PATCH 09/24] gnome-settings-daemon: use geocode-glib-libsoup2
---
srcpkgs/gnome-settings-daemon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 24af1a5094b7..ea3ac6838044 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
version=42.2
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
From 196f5ddf54e33f94f2a61da67bbf8c623b520e5f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 10/24] io.elementary.calendar: use geocode-glib-libsoup2
---
srcpkgs/io.elementary.calendar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index b58812b3c854..68b9adf972af 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
# Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar
version=6.1.0
-revision=1
+revision=2
wrksrc="calendar-${version}"
build_style=meson
build_helper="gir"
@@ -9,7 +9,7 @@ hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
glib-devel evolution-data-server-devel"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
- folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
+ folks-devel geocode-glib-libsoup2-devel geoclue2-devel libical-devel libnotify-devel"
short_desc="Desktop calendar app designed for elementary OS"
maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-only"
From 3a85e9f606f8c96c74550b22a60045cf91c74a0b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 11/24] io.elementary.photos: use geocode-glib-libsoup2, rest0
---
srcpkgs/io.elementary.photos/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template
index 405c02b690c5..661e8044c159 100644
--- a/srcpkgs/io.elementary.photos/template
+++ b/srcpkgs/io.elementary.photos/template
@@ -1,15 +1,15 @@
# Template file for 'io.elementary.photos'
pkgname=io.elementary.photos
version=2.7.5
-revision=1
+revision=2
wrksrc="photos-${version}"
build_style=meson
hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream
glib-devel python3-scour"
makedepends="libaccounts-glib-devel libexif-devel libgee08-devel
- geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel
+ geocode-glib-libsoup2-devel libgexiv2-devel libglib-devel libgphoto2-devel
gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel
- json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel
+ json-glib-devel libraw-devel rest0-devel libsoup-devel sqlite-devel
webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel
vte3-devel libhandy1-devel libgomp-devel"
depends="desktop-file-utils gsettings-desktop-schemas"
From 5f2aad9423a9a0d222ae3672737c62a76d3c42ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 12/24] libgweather: use geocode-glib-libsoup2
---
srcpkgs/libgweather/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index cd14de2d4b7b..b4fcfcb12563 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -2,20 +2,20 @@
pkgname=libgweather
reverts="40.0_1"
version=4.0.0
-revision=2
+revision=3
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
$(vopt_bool gtk_doc gtk_doc) -Dzoneinfo_dir=/usr/share/zoneinfo"
hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala)
$(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
build_options="gir gtk_doc"
From 5903afaa56c0749d1fc5139cd4011e5cad52525b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:39:33 +0200
Subject: [PATCH 13/24] evolution: use geocode-glib-libsoup2
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index a2d7f527c1d8..fd9d12a73e74 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 0de006a233c964a950104383f82b843645953a3e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 15:58:18 +0200
Subject: [PATCH 14/24] gnome-initial-setup: use geocode-glib-libsoup2, rest0
---
srcpkgs/gnome-initial-setup/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 9e8a2c3824f9..d8d472d4bfd9 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
version=42.2
-revision=1
+revision=2
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
@@ -9,13 +9,13 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-devel
gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel"
+ rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
From 5f98cabb296c6dce5b6bc9e109e004ec7e769a7c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:11 +0200
Subject: [PATCH 15/24] cawbird: use rest0
---
srcpkgs/cawbird/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cawbird/template b/srcpkgs/cawbird/template
index 85c5d621bcc0..941a02a44a66 100644
--- a/srcpkgs/cawbird/template
+++ b/srcpkgs/cawbird/template
@@ -1,11 +1,11 @@
# Template file for 'cawbird'
pkgname=cawbird
version=1.3.2
-revision=2
+revision=3
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
makedepends="gspell-devel gst-plugins-base1-devel gtk+3-devel
- json-glib-devel libglib-devel liboauth-devel libsoup-devel rest-devel
+ json-glib-devel libglib-devel liboauth-devel libsoup-devel rest0-devel
sqlite-devel"
checkdepends="xvfb-run"
short_desc="Native Gtk+ Twitter client for the Linux desktop"
From 3e1eafbb2d4c9b149a96f9bf0df506641712a5a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:13 +0200
Subject: [PATCH 16/24] gfbgraph: use rest0
---
srcpkgs/gfbgraph/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
index 63c6376122a2..c4a5a5ec7196 100644
--- a/srcpkgs/gfbgraph/template
+++ b/srcpkgs/gfbgraph/template
@@ -1,12 +1,12 @@
# Template file for 'gfbgraph'
pkgname=gfbgraph
version=0.2.5
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static $(vopt_enable gtk_doc gtk-doc)"
hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
-makedepends="rest-devel json-glib-devel gnome-online-accounts-devel"
+makedepends="rest0-devel json-glib-devel gnome-online-accounts-devel"
short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
From 3537d27af58fc65cfb70b17c3a5ff6559ff1175f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:28 +0200
Subject: [PATCH 17/24] gnome-online-accounts: use rest0
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 47085810e534..fa21b95b7434 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
version=3.44.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="$(vopt_enable gir introspection)
@@ -13,14 +13,14 @@ configure_args="$(vopt_enable gir introspection)
hostmakedepends="docbook-xsl gettext glib-devel
libxslt pkg-config $(vopt_if gir vala)"
makedepends="gcr-devel gtk+3-devel json-glib-devel libnotify-devel libsecret-devel
- libsoup-devel mit-krb5-devel rest-devel telepathy-glib-devel webkit2gtk-devel"
+ libsoup-devel mit-krb5-devel rest0-devel telepathy-glib-devel webkit2gtk-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-44/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
checksum=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
build_options="gir"
From 1dd86ea1351a07a7f1883aab31a913df1d8e9152 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:34 +0200
Subject: [PATCH 18/24] gnome-recipes: use rest0
---
srcpkgs/gnome-recipes/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template
index 5b87bb4ff935..37c44c1e486d 100644
--- a/srcpkgs/gnome-recipes/template
+++ b/srcpkgs/gnome-recipes/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-recipes'
pkgname=gnome-recipes
version=2.0.4
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config git"
makedepends="gtk+3-devel gnome-autoar-devel gspell-devel libcanberra-devel
- libsoup-devel gnome-online-accounts-devel rest-devel json-glib-devel"
+ libsoup-devel gnome-online-accounts-devel rest0-devel json-glib-devel"
short_desc="GNOME app for sharing and finding recipes"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Recipes"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gnome-recipes/${version%.*}/gnome-recipes-${version}.tar.xz"
checksum=b30e96985f66fe138a17189c77af44d34d0b4c859b304ebdb52033bc2cd3ffed
From c29bce6ef7cdf4f0d20841a460e8ebb37d726846 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:38 +0200
Subject: [PATCH 19/24] grilo-plugins: use rest0
---
srcpkgs/grilo-plugins/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 65d0eb1640df..d49a8ec8b200 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,12 +1,12 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.14
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker3"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
- libquvi-devel rest-devel sqlite-devel libgcrypt-devel
+ libquvi-devel rest0-devel sqlite-devel libgcrypt-devel
tracker3-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel gnome-online-accounts-devel
avahi-glib-libs-devel"
@@ -15,7 +15,7 @@ short_desc="Plugins for Grilo"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Grilo"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/grilo-plugins/${version%.*}/grilo-plugins-${version}.tar.xz"
checksum=686844b34ec73b24931ff6cc4f6033f0072947a6db60acdc7fb3eaf157a581c8
make_check=no # feel free to fix
From 628aee8b9955e2e760352cb058ea11aead8d4ef7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:55 +0200
Subject: [PATCH 20/24] libzapojit: use rest0
---
srcpkgs/libzapojit/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libzapojit/template b/srcpkgs/libzapojit/template
index c1c1c6091529..ae7554d4d7fe 100644
--- a/srcpkgs/libzapojit/template
+++ b/srcpkgs/libzapojit/template
@@ -1,24 +1,24 @@
# Template file for 'libzapojit'
pkgname=libzapojit
version=0.0.3
-revision=9
+revision=10
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
-makedepends="json-glib-devel rest-devel gnome-online-accounts-devel"
+makedepends="json-glib-devel rest0-devel gnome-online-accounts-devel"
short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Zapojit"
-distfiles="${GNOME_SITE}/${pkgname}/0.0/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/libzapojit/0.0/libzapojit-${version}.tar.xz"
checksum=3d25f99329105abb99d1e9651b0aa1842065456ea54c22970a7330e9f3d1c37e
build_options="gir"
build_options_default="gir"
libzapojit-devel_package() {
- depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 6fc60bf1d8aab1da93e8878e0116e8a862a4600a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:23:29 +0200
Subject: [PATCH 21/24] gnome-core: remove gfbgraph
unused and removed package
---
srcpkgs/gnome-core/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 1601288f857e..3c749515351e 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
version=42.0
-revision=3
+revision=4
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -20,7 +20,6 @@ depends="
gcr>=3.41.0
gdm>=${version}
geocode-glib-libsoup2>=3.26.2
- gfbgraph>=0.2.4
gjs>=1.72.0
glib>=2.72.0
glib-networking>=2.72.0
From 8e264935010c8a5fd3de1ed67846594d0e69283c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:20:55 +0200
Subject: [PATCH 22/24] gfbgraph: remove package
* uses libsoup2, not regularly maintained, unused
---
common/shlibs | 1 -
srcpkgs/gfbgraph-devel | 1 -
srcpkgs/gfbgraph/template | 43 -------------------------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 45 deletions(-)
delete mode 120000 srcpkgs/gfbgraph-devel
delete mode 100644 srcpkgs/gfbgraph/template
diff --git a/common/shlibs b/common/shlibs
index 882b67d7f36f..17263fadc71a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1575,7 +1575,6 @@ libslim.so.1.3.6 slim-1.3.6_1
libmediaart-2.0.so.0 libmediaart-1.9.1_1
libinput.so.10 libinput-1.2.0_1
libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1
-libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1
libgtkhex-4.so.0 libgtkhex-42.1_1
libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
libdmraid.so.1 dmraid-1.0.0.rc16.3_5
diff --git a/srcpkgs/gfbgraph-devel b/srcpkgs/gfbgraph-devel
deleted file mode 120000
index d66938286a0c..000000000000
--- a/srcpkgs/gfbgraph-devel
+++ /dev/null
@@ -1 +0,0 @@
-gfbgraph
\ No newline at end of file
diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
deleted file mode 100644
index c4a5a5ec7196..000000000000
--- a/srcpkgs/gfbgraph/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'gfbgraph'
-pkgname=gfbgraph
-version=0.2.5
-revision=2
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static $(vopt_enable gtk_doc gtk-doc)"
-hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
-makedepends="rest0-devel json-glib-devel gnome-online-accounts-devel"
-short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://wiki.gnome.org/Projects/GFBGraph"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
-make_check=no # needs facebook credentials
-
-build_options="gir gtk_doc"
-build_options_default="gir"
-
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default+=" gtk_doc"
-fi
-
-post_install() {
- rm -rf ${DESTDIR}/usr/doc
-}
-
-gfbgraph-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
- fi
- vmove "usr/lib/*.so"
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fba091c8294b..6d06ff1eb22f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -109,6 +109,7 @@ replaces="
geoip-data<=20171002_2
gespeaker<=0.8.6_3
getmail<=5.14_2
+ gfbgraph<=0.2.5_1
giti<=1.0.0_1
gksu<=2.0.2_4
glibmm-doc<=2.64.2_2
From 5388ef78a614cbb9ba0113a4b0bf9ce501218c17 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:41:53 +0200
Subject: [PATCH 23/24] gnome-photos: update to 43.0.
---
srcpkgs/gnome-photos/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index dbdbf6850a6f..48de445bdfad 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,15 +1,16 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- gfbgraph-devel tracker-devel libexif-devel librsvg-devel grilo-devel
+ tracker-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
- geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel"
+ geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
+ libportal-gtk3-devel"
depends="desktop-file-utils tracker tracker-miners"
short_desc="Access, organize, and share your photos on GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Photos"
changelog="https://gitlab.gnome.org/GNOME/gnome-photos/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz"
-checksum=25cb281425199dec7b045f13f32f8f96034cb0cb8b94d96f9dffaf4f5be68551
+checksum=c7ac7458d533f29d955011c74b76224d79ea31bcc12e9d6d0ce7b6c3704d08e1
build_options="gir"
build_options_default="gir"
From 21094915d5db3eef6412374c589a99c8fd95e0a8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 12:59:30 +0200
Subject: [PATCH 24/24] shotwell: update to 0.31.5, use libsoup3
---
srcpkgs/shotwell/patches/meson-0.61.patch | 27 --
.../patches/shotwell-0.31.3-vapi_fixes.patch | 368 ------------------
.../patches/shotwell-0.54.1-vapi_fixes.patch | 67 ----
srcpkgs/shotwell/template | 8 +-
4 files changed, 4 insertions(+), 466 deletions(-)
delete mode 100644 srcpkgs/shotwell/patches/meson-0.61.patch
delete mode 100644 srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch
delete mode 100644 srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
diff --git a/srcpkgs/shotwell/patches/meson-0.61.patch b/srcpkgs/shotwell/patches/meson-0.61.patch
deleted file mode 100644
index f33fa2af1637..000000000000
--- a/srcpkgs/shotwell/patches/meson-0.61.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cc328b43ebb9a54a256ec73a86fb18381b2038e6 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Tue, 11 Jan 2022 21:57:26 -0500
-Subject: [PATCH] fix duplicate languages causing meson 0.61 to error out
-
-It tried to create multiple targets with the same name and generating
-the same file. On older versions of meson, this was a run_target and
-just ran twice, but was still wrong.
----
- help/LINGUAS | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/help/LINGUAS b/help/LINGUAS
-index 68f089c4..5352eecd 100644
---- a/help/LINGUAS
-+++ b/help/LINGUAS
-@@ -6,7 +6,6 @@ es
- fr
- hu
- id
--id
- lv
- pt_BR
- sv
---
-GitLab
-
diff --git a/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch
deleted file mode 100644
index 908e615f0849..000000000000
--- a/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch
+++ /dev/null
@@ -1,368 +0,0 @@
-From 9a9876e27076f5939525023eb8c7f24d48c8ff25 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sun, 14 Mar 2021 11:21:10 +0100
-Subject: [PATCH 1/6] vapis: Plug memory leak in GPhoto2
-
-Caller was supposed to free the StorageInfo, which with the old binding
-we never did
----
- src/camera/GPhoto.vala | 5 +++--
- src/camera/ImportPage.vala | 14 ++++++--------
- vapi/libgphoto2.vapi | 2 +-
- 3 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
-index aa2fcf2b..64ff7ca0 100644
---- a/src/camera/GPhoto.vala
-+++ b/src/camera/GPhoto.vala
-@@ -135,9 +135,10 @@ namespace GPhoto {
- // filesystem. In these cases shotwell can access the file directly. See:
- // https://bugzilla.gnome.org/show_bug.cgi?id=716915
- public PhotoMetadata? get_fallback_metadata(Camera camera, Context context, string folder, string filename) {
-- GPhoto.CameraStorageInformation *sifs = null;
-+ // Fixme: Why do we need to query get_storageinfo here first?
-+ GPhoto.CameraStorageInformation[] sifs = null;
- int count = 0;
-- camera.get_storageinfo(&sifs, out count, context);
-+ camera.get_storageinfo(out sifs, context);
-
- GPhoto.PortInfo port_info;
- camera.get_port_info(out port_info);
-diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
-index ab24df61..c424de88 100644
---- a/src/camera/ImportPage.vala
-+++ b/src/camera/ImportPage.vala
-@@ -1179,9 +1179,9 @@ public class ImportPage : CheckerboardPage {
-
- Gee.ArrayList<ImportSource> import_list = new Gee.ArrayList<ImportSource>();
-
-- GPhoto.CameraStorageInformation *sifs = null;
-+ GPhoto.CameraStorageInformation[] sifs = null;
- int count = 0;
-- refresh_result = dcamera.gcamera.get_storageinfo(&sifs, out count, spin_idle_context.context);
-+ refresh_result = dcamera.gcamera.get_storageinfo(out sifs, spin_idle_context.context);
- if (refresh_result == GPhoto.Result.OK) {
- for (int fsid = 0; fsid < count; fsid++) {
- // Check well-known video and image paths first to prevent accidental
-@@ -1324,18 +1324,16 @@ public class ImportPage : CheckerboardPage {
- // Need to do this because some phones (iPhone, in particular) changes the name of their filesystem
- // between each mount
- public static string? get_fs_basedir(GPhoto.Camera camera, int fsid) {
-- GPhoto.CameraStorageInformation *sifs = null;
-+ GPhoto.CameraStorageInformation[] sifs = null;
- int count = 0;
-- GPhoto.Result res = camera.get_storageinfo(&sifs, out count, null_context.context);
-+ GPhoto.Result res = camera.get_storageinfo(out sifs, null_context.context);
- if (res != GPhoto.Result.OK)
- return null;
-
-- if (fsid >= count)
-+ if (fsid >= sifs.length)
- return null;
-
-- GPhoto.CameraStorageInformation *ifs = sifs + fsid;
--
-- return (ifs->fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? ifs->basedir : "/";
-+ return (sifs[fsid].fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? sifs[fsid].basedir : "/";
- }
-
- public static string? get_fulldir(GPhoto.Camera camera, string camera_name, int fsid, string folder) {
-diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
-index 22f70eed..7e569823 100644
---- a/vapi/libgphoto2.vapi
-+++ b/vapi/libgphoto2.vapi
-@@ -64,7 +64,7 @@ namespace GPhoto {
- public Result set_port_info(PortInfo info);
- public Result get_abilities(out CameraAbilities abilities);
- public Result set_abilities(CameraAbilities abilities);
-- public Result get_storageinfo(CameraStorageInformation **sifs, out int count, Context context);
-+ public Result get_storageinfo([CCode (array_length_pos=1)]out CameraStorageInformation[] sifs, Context context);
-
- // Folders
- [CCode (cname="gp_camera_folder_list_folders")]
---
-2.31.1
-
-From e1f53784dd7475388470a30683df34b5ca7784eb Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 13 Mar 2021 23:22:50 +0100
-Subject: [PATCH 2/6] More GPhoto2 vapi fixes
-
----
- vapi/libgphoto2.vapi | 25 ++++++++++++-------------
- 1 file changed, 12 insertions(+), 13 deletions(-)
-
-diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
-index 7e569823..607a644f 100644
---- a/vapi/libgphoto2.vapi
-+++ b/vapi/libgphoto2.vapi
-@@ -53,7 +53,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_CAMERA",
- unref_function="gp_camera_unref",
- free_function="gp_camera_free",
-- cheader_filename="gphoto2/gphoto2-camera.h,gphoto.h"
-+ cheader_filename="gphoto2/gphoto2-camera.h,gphoto2.h"
- )]
- public class Camera {
- [CCode (cname="gp_camera_new")]
-@@ -74,7 +74,7 @@ namespace GPhoto {
- [CCode (cname="gp_camera_folder_delete_all")]
- public Result delete_all_files(string folder, Context context);
- [CCode (cname="gp_camera_folder_put_file")]
-- public Result put_file(string folder, CameraFile file, Context context);
-+ public Result put_file(string folder, string filename, CameraFileType type, CameraFile file, Context context);
- [CCode (cname="gp_camera_folder_make_dir")]
- public Result make_dir(string folder, string name, Context context);
- [CCode (cname="gp_camera_folder_remove_dir")]
-@@ -99,7 +99,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_FILE",
- unref_function="gp_file_unref",
- free_function="gp_file_free",
-- cheader_filename="gphoto2/gphoto2-file.h,gphoto.h"
-+ cheader_filename="gphoto2/gphoto2-file.h,gphoto2.h"
- )]
- public class CameraFile {
- [CCode (cname="gp_file_new")]
-@@ -140,7 +140,6 @@ namespace GPhoto {
- public enum CameraFileInfoFields {
- NONE,
- TYPE,
-- NAME,
- SIZE,
- WIDTH,
- HEIGHT,
-@@ -159,7 +158,7 @@ namespace GPhoto {
- public CameraFileInfoFields fields;
- public CameraFileStatus status;
- public ulong size;
-- public string type;
-+ public char type[64];
- public uint width;
- public uint height;
- public string name;
-@@ -176,7 +175,7 @@ namespace GPhoto {
- public CameraFileInfoFields fields;
- public CameraFileStatus status;
- public ulong size;
-- public string type;
-+ public char type[64];
- public uint width;
- public uint height;
- public string name;
-@@ -257,7 +256,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_LIST",
- unref_function="gp_list_unref",
- free_function="gp_list_free",
-- cheader_filename="gphoto2/gphoto2-list.h,gphoto.h"
-+ cheader_filename="gphoto2/gphoto2-list.h,gphoto2.h"
- )]
- public class CameraList {
- [CCode (cname="gp_list_new")]
-@@ -266,7 +265,7 @@ namespace GPhoto {
- public Result append(string name, string value);
- public Result reset();
- public Result sort();
-- public Result find_by_name(out int? index, string name);
-+ public Result find_by_name(out int index, string name);
- public Result get_name(int index, out unowned string name);
- public Result get_value(int index, out unowned string value);
- public Result set_name(int index, string name);
-@@ -314,9 +313,9 @@ namespace GPhoto {
- )]
- public struct CameraStorageInformation {
- public CameraStorageInfoFields fields;
-- public string basedir;
-- public string label;
-- public string description;
-+ public char basedir[256];
-+ public char label[256];
-+ public char description[256];
- public int type;
- public int fstype;
- public int access;
-@@ -329,7 +328,7 @@ namespace GPhoto {
- [CCode (
- ref_function="GPHOTO_REF_CONTEXT",
- unref_function="gp_context_unref",
-- cheader_filename="gphoto2/gphoto2-context.h,gphoto.h"
-+ cheader_filename="gphoto2/gphoto2-context.h,gphoto2.h"
- )]
- public class Context {
- [CCode (cname="gp_context_new")]
-@@ -485,7 +484,7 @@ namespace GPhoto {
-
- [CCode (
- cheader_filename="gphoto2/gphoto2-version.h",
-- cprefix="GP_VERSION"
-+ cprefix="GP_VERSION_"
- )]
- public enum VersionVerbosity {
- SHORT,
---
-2.31.1
-
-From 754520638beafa997d81fdbff58a9d07a48f7cfd Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 13 Mar 2021 22:31:32 +0100
-Subject: [PATCH 3/6] vapis: Fix gphoto2 vapi
-
-There was some copy-paste going on there that didn't actually match the
-C structs
----
- vapi/libgphoto2.vapi | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
-index 607a644f..adcef5c5 100644
---- a/vapi/libgphoto2.vapi
-+++ b/vapi/libgphoto2.vapi
-@@ -161,7 +161,6 @@ namespace GPhoto {
- public char type[64];
- public uint width;
- public uint height;
-- public string name;
- public CameraFilePermissions permissions;
- public time_t mtime;
- }
-@@ -178,9 +177,6 @@ namespace GPhoto {
- public char type[64];
- public uint width;
- public uint height;
-- public string name;
-- public CameraFilePermissions permissions;
-- public time_t mtime;
- }
-
- [CCode (
---
-2.31.1
-
-From f7d044e7a72b80a550fd1907a2d56053caab1ae3 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 13 Mar 2021 22:32:17 +0100
-Subject: [PATCH 4/6] Fix strings in [SimpleType] structs
-
----
- src/camera/ImportPage.vala | 5 +++--
- vapi/libraw.vapi | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
-index c424de88..f5e98955 100644
---- a/src/camera/ImportPage.vala
-+++ b/src/camera/ImportPage.vala
-@@ -1408,12 +1408,13 @@ public class ImportPage : CheckerboardPage {
- import_list.add(video_source);
- } else {
- // determine file format from type, and then from file extension
-- PhotoFileFormat file_format = PhotoFileFormat.from_gphoto_type(info.file.type);
-+ string file_type = (string)info.file.type;
-+ PhotoFileFormat file_format = PhotoFileFormat.from_gphoto_type(file_type);
- if (file_format == PhotoFileFormat.UNKNOWN) {
- file_format = PhotoFileFormat.get_by_basename_extension(filename);
- if (file_format == PhotoFileFormat.UNKNOWN) {
- message("Skipping %s/%s: Not a supported file extension (%s)", fulldir,
-- filename, info.file.type);
-+ filename, file_type);
-
- continue;
- }
-diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi
-index b1b5875b..146f447e 100644
---- a/vapi/libraw.vapi
-+++ b/vapi/libraw.vapi
-@@ -248,7 +248,7 @@ public struct Thumbnail {
- public uint tlength;
- public int tcolors;
- [CCode (array_length_cname="tlength")]
-- public uint8[] thumb;
-+ public unowned uint8[] thumb;
- }
-
- [CCode (cname="enum LibRaw_thumbnail_formats", cprefix="LIBRAW_THUMBNAIL_")]
---
-2.31.1
-
-From a035ff6ee39dc47c6051f7b29c7da83d3ecde52e Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sun, 14 Mar 2021 11:21:10 +0100
-Subject: [PATCH 5/6] Fix compile error after GPhoto vapi change
-
----
- src/camera/ImportPage.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
-index f5e98955..7dbe9d42 100644
---- a/src/camera/ImportPage.vala
-+++ b/src/camera/ImportPage.vala
-@@ -1333,7 +1333,7 @@ public class ImportPage : CheckerboardPage {
- if (fsid >= sifs.length)
- return null;
-
-- return (sifs[fsid].fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? sifs[fsid].basedir : "/";
-+ return (GPhoto.CameraStorageInfoFields.BASE in sifs[fsid].fields) ? (string) sifs[fsid].basedir : "/";
- }
-
- public static string? get_fulldir(GPhoto.Camera camera, string camera_name, int fsid, string folder) {
---
-2.31.1
-
-From 44dae743da462742f1acdeb599f0a10afa43e629 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sun, 14 Mar 2021 12:22:55 +0100
-Subject: [PATCH 6/6] Fix and clarify the helper header for GPhoto
-
----
- vapi/libgphoto2.vapi | 8 ++++----
- vapi/{gphoto.h => shotwell-gphoto-helper.h} | 0
- 2 files changed, 4 insertions(+), 4 deletions(-)
- rename vapi/{gphoto.h => shotwell-gphoto-helper.h} (100%)
-
-diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
-index adcef5c5..aeab7255 100644
---- a/vapi/libgphoto2.vapi
-+++ b/vapi/libgphoto2.vapi
-@@ -53,7 +53,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_CAMERA",
- unref_function="gp_camera_unref",
- free_function="gp_camera_free",
-- cheader_filename="gphoto2/gphoto2-camera.h,gphoto2.h"
-+ cheader_filename="gphoto2/gphoto2-camera.h,shotwell-gphoto-helper.h"
- )]
- public class Camera {
- [CCode (cname="gp_camera_new")]
-@@ -99,7 +99,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_FILE",
- unref_function="gp_file_unref",
- free_function="gp_file_free",
-- cheader_filename="gphoto2/gphoto2-file.h,gphoto2.h"
-+ cheader_filename="gphoto2/gphoto2-file.h,shotwell-gphoto-helper.h"
- )]
- public class CameraFile {
- [CCode (cname="gp_file_new")]
-@@ -252,7 +252,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_LIST",
- unref_function="gp_list_unref",
- free_function="gp_list_free",
-- cheader_filename="gphoto2/gphoto2-list.h,gphoto2.h"
-+ cheader_filename="gphoto2/gphoto2-list.h,shotwell-gphoto-helper.h"
- )]
- public class CameraList {
- [CCode (cname="gp_list_new")]
-@@ -324,7 +324,7 @@ namespace GPhoto {
- [CCode (
- ref_function="GPHOTO_REF_CONTEXT",
- unref_function="gp_context_unref",
-- cheader_filename="gphoto2/gphoto2-context.h,gphoto2.h"
-+ cheader_filename="gphoto2/gphoto2-context.h,shotwell-gphoto-helper.h"
- )]
- public class Context {
- [CCode (cname="gp_context_new")]
-diff --git a/vapi/gphoto.h b/vapi/shotwell-gphoto-helper.h
-similarity index 100%
-rename from vapi/gphoto.h
-rename to vapi/shotwell-gphoto-helper.h
---
-2.31.1
-
diff --git a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
deleted file mode 100644
index f39f988f9645..000000000000
--- a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 59ae0ce648982669f24a33db501f3f229508cb6e Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Tue, 30 Nov 2021 15:09:17 +0100
-Subject: [PATCH] Fix accessibility issues with initializer of constants
-
----
- src/International.vala | 2 --
- src/Resources.vala | 7 -------
- vapi/version.vapi | 17 ++++++++++++++---
- 3 files changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/src/International.vala b/src/International.vala
-index 555a91f8..73f07639 100644
---- a/src/International.vala
-+++ b/src/International.vala
-@@ -4,8 +4,6 @@
- * See the COPYING file in this distribution.
- */
-
--extern const string _LANG_SUPPORT_DIR;
--
- public const string TRANSLATABLE = "translatable";
-
- namespace InternationalSupport {
-diff --git a/src/Resources.vala b/src/Resources.vala
-index 6d2b8851..86f0eb65 100644
---- a/src/Resources.vala
-+++ b/src/Resources.vala
-@@ -4,13 +4,6 @@
- * See the COPYING file in this distribution.
- */
-
--// defined by ./configure or Makefile and included by gcc -D
--extern const string _PREFIX;
--extern const string _VERSION;
--extern const string GETTEXT_PACKAGE;
--extern const string _LIB;
--extern const string _LIBEXECDIR;
--
- namespace Resources {
- public const string APP_TITLE = "Shotwell";
- public const string APP_LIBRARY_ROLE = _("Photo Manager");
-diff --git a/vapi/version.vapi b/vapi/version.vapi
-index 06974c84..e191f2f7 100644
---- a/vapi/version.vapi
-+++ b/vapi/version.vapi
-@@ -1,3 +1,14 @@
--[CCode (cheader_filename="version.h")]
--extern const string? _GIT_VERSION;
--
-+[CCode (cheader_filename = "version.h")]
-+public const string? _GIT_VERSION;
-+[CCode (cheader_filename = "config.h")]
-+public const string _PREFIX;
-+[CCode (cheader_filename = "config.h")]
-+public const string _VERSION;
-+[CCode (cheader_filename = "config.h")]
-+public const string GETTEXT_PACKAGE;
-+[CCode (cheader_filename = "config.h")]
-+public const string _LIB;
-+[CCode (cheader_filename = "config.h")]
-+public const string _LIBEXECDIR;
-+[CCode (cheader_filename = "config.h")]
-+public const string _LANG_SUPPORT_DIR;
---
-GitLab
-
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index fa533f27b167..0a5f0718780c 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -1,14 +1,14 @@
# Template file for 'shotwell'
pkgname=shotwell
-version=0.31.3
-revision=2
+version=0.31.5
+revision=1
build_style=meson
hostmakedepends="gcr-devel gettext glib-devel itstool
libgee08-devel libgexiv2-devel pkg-config vala-devel"
makedepends="gst-plugins-base1-devel libgdata-devel
libgee08-devel libgexiv2-devel libgphoto2-devel libgudev-devel
libraw-devel libsecret-devel libchamplain-devel libwebp-devel
- rest-devel vala-devel webkit2gtk-devel"
+ rest-devel vala-devel libwebkit2gtk41-devel libsoup3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Open source photo manager for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later, CC-BY-SA-3.0"
homepage="https://wiki.gnome.org/Apps/Shotwell"
changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
-checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2
+checksum=3b048fc6ce99b232d1e0ea9b8db074083c86c88d3b6d63136a2cf8217aa45c19
lib32disabled=yes
post_extract() {
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0
2022-10-01 15:58 [PR PATCH] geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0 paper42
2022-10-22 14:03 ` [PR PATCH] [Updated] " paper42
2022-10-22 14:46 ` paper42
@ 2022-10-22 19:09 ` paper42
2022-10-22 19:52 ` paper42
2022-10-22 20:13 ` [PR PATCH] [Merged]: " paper42
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-10-22 19:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1322 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome-photos43
https://github.com/void-linux/void-packages/pull/39594
geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/39594.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-photos43-39594.patch --]
[-- Type: text/x-diff, Size: 57529 bytes --]
From 51871d140ffd68e5440d77e72e991e46e80c1a08 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:13:21 +0200
Subject: [PATCH 01/23] New package: rest0-0.8.1
---
common/shlibs | 4 ++--
srcpkgs/rest0-devel | 1 +
srcpkgs/rest0/template | 42 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 45 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/rest0-devel
create mode 100644 srcpkgs/rest0/template
diff --git a/common/shlibs b/common/shlibs
index 9712cbc1262f..82ede873858f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -875,8 +875,8 @@ libcogl-gst.so.20 cogl-1.18.0_1
libcogl-gles2.so.20 cogl-1.18.0_1
libcogl-path.so.20 cogl-1.18.0_1
libp11-kit.so.0 p11-kit-0.7_1
-librest-0.7.so.0 rest-0.7_1
-librest-extras-0.7.so.0 rest-0.7_1
+librest-0.7.so.0 rest0-0.8.1_1
+librest-extras-0.7.so.0 rest0-0.8.1_1
libgoa-1.0.so.0 gnome-online-accounts-3.2.0_1
libgoa-backend-1.0.so.1 gnome-online-accounts-3.10.0_1
liboauth.so.0 liboauth-0.9.4_1
diff --git a/srcpkgs/rest0-devel b/srcpkgs/rest0-devel
new file mode 120000
index 000000000000..57e62aa92398
--- /dev/null
+++ b/srcpkgs/rest0-devel
@@ -0,0 +1 @@
+rest0
\ No newline at end of file
diff --git a/srcpkgs/rest0/template b/srcpkgs/rest0/template
new file mode 100644
index 000000000000..ee090d9e6d2d
--- /dev/null
+++ b/srcpkgs/rest0/template
@@ -0,0 +1,42 @@
+# Template file for 'rest0'
+pkgname=rest0
+version=0.8.1
+revision=1
+wrksrc="rest-${version}"
+build_style=gnu-configure
+build_helper="gir"
+configure_args="$(vopt_enable gir introspection) --disable-static
+ --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
+hostmakedepends="automake perl m4 libtool pkg-config glib-devel gtk-doc"
+makedepends="libglib-devel libsoup-gnome-devel libxml2-devel"
+depends="ca-certificates"
+short_desc="RESTful library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/librest"
+changelog="https://gitlab.gnome.org/GNOME/librest/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/rest/${version%.*}/rest-${version}.tar.xz"
+checksum=0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+ autoreconf -fi
+}
+
+rest0-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libglib-devel libsoup-devel
+ libxml2-devel"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gtk-doc
+ vmove "usr/lib/*.so"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
From 2582ee8025667d481e7047bb5e039aae573c41df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:41:55 +0200
Subject: [PATCH 02/23] rest: update to 0.9.1.
---
common/shlibs | 2 ++
srcpkgs/rest/patches/cross.patch | 10 ++++++++++
srcpkgs/rest/template | 31 ++++++++++++++++++-------------
3 files changed, 30 insertions(+), 13 deletions(-)
create mode 100644 srcpkgs/rest/patches/cross.patch
diff --git a/common/shlibs b/common/shlibs
index 82ede873858f..71adfca7d660 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -876,7 +876,9 @@ libcogl-gles2.so.20 cogl-1.18.0_1
libcogl-path.so.20 cogl-1.18.0_1
libp11-kit.so.0 p11-kit-0.7_1
librest-0.7.so.0 rest0-0.8.1_1
+librest-1.0.so.0 rest-0.9.1_1
librest-extras-0.7.so.0 rest0-0.8.1_1
+librest-extras-1.0.so.0 rest-0.9.1_1
libgoa-1.0.so.0 gnome-online-accounts-3.2.0_1
libgoa-backend-1.0.so.1 gnome-online-accounts-3.10.0_1
liboauth.so.0 liboauth-0.9.4_1
diff --git a/srcpkgs/rest/patches/cross.patch b/srcpkgs/rest/patches/cross.patch
new file mode 100644
index 000000000000..ae113dc8e81a
--- /dev/null
+++ b/srcpkgs/rest/patches/cross.patch
@@ -0,0 +1,10 @@
+--- a/docs/meson.build
++++ b/docs/meson.build
+@@ -1,6 +1,7 @@
+ if get_option('gtk_doc') and get_option('introspection')
+ dependency('gi-docgen', version: '>= 2021.6',
+ fallback: ['gi-docgen', 'dummy_dep'],
++ native: true,
+ )
+
+ gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
diff --git a/srcpkgs/rest/template b/srcpkgs/rest/template
index aa4299c8ffd3..155cd7533575 100644
--- a/srcpkgs/rest/template
+++ b/srcpkgs/rest/template
@@ -1,36 +1,41 @@
# Template file for 'rest'
pkgname=rest
-version=0.8.1
-revision=3
-build_style=gnu-configure
+version=0.9.1
+revision=1
+build_style=meson
build_helper="gir"
-configure_args="$(vopt_enable gir introspection) --disable-static
- --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
-hostmakedepends="automake perl m4 libtool pkg-config glib-devel gtk-doc"
-makedepends="libglib-devel libsoup-gnome-devel libxml2-devel"
+configure_args="$(vopt_bool gir introspection) -Dexamples=false -Dsoup2=false
+ -Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt"
+hostmakedepends="pkg-config glib-devel gi-docgen"
+makedepends="libsoup3-devel json-glib-devel libxml2-devel"
depends="ca-certificates"
short_desc="RESTful library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9
+homepage="https://gitlab.gnome.org/GNOME/librest"
+changelog="https://gitlab.gnome.org/GNOME/librest/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/rest/${version%.*}/rest-${version}.tar.xz"
+checksum=9266a5c10ece383e193dfb7ffb07b509cc1f51521ab8dad76af96ed14212c2e3
# Package build options
build_options="gir"
build_options_default="gir"
-pre_configure() {
- autoreconf -fi
+pre_build() {
+ # help gi-docgen find gi files on cross
+ if [ -n "$CROSS_BUILD" ]; then
+ export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+ fi
}
rest-devel_package() {
- depends="rest-${version}_${revision} libglib-devel libsoup-devel
+ depends="${sourcepkg}>=${version}_${revision} libglib-devel libsoup3-devel
libxml2-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ vmove usr/share/doc
vmove "usr/lib/*.so"
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
From ffdafa2a6085e241e1b37b23438374618aab40e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:40:14 +0200
Subject: [PATCH 03/23] New package: geocode-glib-libsoup2-2.26.4
---
common/shlibs | 2 +-
srcpkgs/geocode-glib-libsoup2-devel | 1 +
srcpkgs/geocode-glib-libsoup2/template | 40 ++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/geocode-glib-libsoup2-devel
create mode 100644 srcpkgs/geocode-glib-libsoup2/template
diff --git a/common/shlibs b/common/shlibs
index 71adfca7d660..2e8b002cde26 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1428,7 +1428,7 @@ libthreadutil.so.6 libupnp-1.6.18_1
libupnp.so.17 libupnp-1.14.0_1
libixml.so.11 libupnp-1.14.0_1
libupnpp.so.12 libupnpp-0.22.2_1
-libgeocode-glib.so.0 geocode-glib-3.10.0_1
+libgeocode-glib.so.0 geocode-glib-libsoup2-3.26.4_1
libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
libpotrace.so.0 libpotrace-1.11_1
libSDL2-2.0.so.0 SDL2-2.0.0_1
diff --git a/srcpkgs/geocode-glib-libsoup2-devel b/srcpkgs/geocode-glib-libsoup2-devel
new file mode 120000
index 000000000000..a7938e2bdce8
--- /dev/null
+++ b/srcpkgs/geocode-glib-libsoup2-devel
@@ -0,0 +1 @@
+geocode-glib-libsoup2
\ No newline at end of file
diff --git a/srcpkgs/geocode-glib-libsoup2/template b/srcpkgs/geocode-glib-libsoup2/template
new file mode 100644
index 000000000000..08b2c2dd618b
--- /dev/null
+++ b/srcpkgs/geocode-glib-libsoup2/template
@@ -0,0 +1,40 @@
+# Template file for 'geocode-glib-libsoup2'
+# keep in sync with geocode-glib
+pkgname=geocode-glib-libsoup2
+version=3.26.4
+revision=1
+wrksrc="geocode-glib-$version"
+build_style=meson
+build_helper="gir"
+configure_args="-Denable-gtk-doc=false $(vopt_bool gir enable-introspection)
+ -Denable-installed-tests=false -Dsoup2=true"
+hostmakedepends="pkg-config glib-devel"
+makedepends="json-glib-devel libsoup-gnome-devel"
+depends="geocode-glib-common"
+short_desc="GLib library for geocoding and reverse geocoding"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://developer.gnome.org/geocode-glib"
+distfiles="${GNOME_SITE}/geocode-glib/${version%.*}/geocode-glib-${version}.tar.xz"
+checksum=2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+post_install() {
+ rm -r ${DESTDIR}/usr/share/icons
+}
+
+geocode-glib-libsoup2-devel_package() {
+ depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
From 2f3ddd8695b961f842d72ab388757f80f13dd3cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:39:35 +0200
Subject: [PATCH 04/23] geocode-glib: use libsoup3, split -common
---
common/shlibs | 1 +
srcpkgs/geocode-glib-common | 1 +
srcpkgs/geocode-glib/template | 17 +++++++++++++----
3 files changed, 15 insertions(+), 4 deletions(-)
create mode 120000 srcpkgs/geocode-glib-common
diff --git a/common/shlibs b/common/shlibs
index 2e8b002cde26..882b67d7f36f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1429,6 +1429,7 @@ libupnp.so.17 libupnp-1.14.0_1
libixml.so.11 libupnp-1.14.0_1
libupnpp.so.12 libupnpp-0.22.2_1
libgeocode-glib.so.0 geocode-glib-libsoup2-3.26.4_1
+libgeocode-glib-2.so.0 geocode-glib-3.26.4_2
libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
libpotrace.so.0 libpotrace-1.11_1
libSDL2-2.0.so.0 SDL2-2.0.0_1
diff --git a/srcpkgs/geocode-glib-common b/srcpkgs/geocode-glib-common
new file mode 120000
index 000000000000..45ec1fe82f87
--- /dev/null
+++ b/srcpkgs/geocode-glib-common
@@ -0,0 +1 @@
+geocode-glib
\ No newline at end of file
diff --git a/srcpkgs/geocode-glib/template b/srcpkgs/geocode-glib/template
index 29571876a43c..251e72ad20ea 100644
--- a/srcpkgs/geocode-glib/template
+++ b/srcpkgs/geocode-glib/template
@@ -1,24 +1,33 @@
# Template file for 'geocode-glib'
+# keep in sync with geocode-glib-libsoup2
pkgname=geocode-glib
version=3.26.4
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Denable-gtk-doc=false $(vopt_bool gir enable-introspection)
- -Denable-installed-tests=false"
+ -Denable-installed-tests=false -Dsoup2=false"
hostmakedepends="pkg-config glib-devel"
-makedepends="json-glib-devel libsoup-gnome-devel"
+makedepends="json-glib-devel libsoup3-devel"
+depends="geocode-glib-common"
short_desc="GLib library for geocoding and reverse geocoding"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://developer.gnome.org/geocode-glib"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/geocode-glib/${version%.*}/geocode-glib-${version}.tar.xz"
checksum=2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa
# Package build options
build_options="gir"
build_options_default="gir"
+geocode-glib-common_package() {
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/icons
+ }
+}
+
geocode-glib-devel_package() {
depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From c4fa5ad273a8e524da51cff7b832234c10a6dfe6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 05/23] gnome-calendar: use geocode-glib-libsoup2
---
srcpkgs/gnome-calendar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index cd1d201d2dfb..086915b3988f 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
version=42.2
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
$(vopt_if gir 'gobject-introspection')"
-makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-libsoup2-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
libgweather-devel libical-devel libpeas-devel libsoup-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
From ced1fac9357cc78fb415b14a85ed7ed22ff9bf90 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 06/23] gnome-clocks: use geocode-glib-libsoup2
---
srcpkgs/gnome-clocks/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index c2f76af5604a..9197dbbcbd46 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
version=42.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
gtk4-devel libadwaita-devel libnotify-devel gsound-devel
- libgweather-devel geocode-glib-devel geoclue2-devel
+ libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel
hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
From e65b1dcd4bf460739867a9ef7da5985f1e084714 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 07/23] gnome-core: use geocode-glib-libsoup2
---
srcpkgs/gnome-core/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index d4a852d1ea88..1601288f857e 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
version=42.0
-revision=2
+revision=3
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ depends="
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib>=3.26.2
+ geocode-glib-libsoup2>=3.26.2
gfbgraph>=0.2.4
gjs>=1.72.0
glib>=2.72.0
From c6df253d2c1b2c0169de9702220eb60ef0c01e42 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 08/23] gnome-maps: use geocode-glib-libsoup2, rest0
---
srcpkgs/gnome-maps/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index dd5a5024aaf7..bf82966579bb 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,12 +1,12 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
version=42.3
-revision=2
+revision=3
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gettext pkg-config AppStream gjs"
-makedepends="folks-devel geoclue2-devel geocode-glib-devel gjs-devel
- gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel
+makedepends="folks-devel geoclue2-devel geocode-glib-libsoup2-devel gjs-devel
+ gnome-desktop-devel libchamplain-devel rest0-devel libhandy1-devel
libgweather-devel"
depends="geoclue2 gjs libhandy1 libgweather"
short_desc="GNOME maps application"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Maps"
changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gnome-maps/${version%.*}/gnome-maps-${version}.tar.xz"
checksum=e456467facf3c8fd10c9386b5e74c43d9595ad9fb75257f7da014af983d69cd1
From bd0fef22b4e5512ad2bfcbc540232a0581d82562 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:39:34 +0200
Subject: [PATCH 09/23] gnome-settings-daemon: use geocode-glib-libsoup2
---
srcpkgs/gnome-settings-daemon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 24af1a5094b7..ea3ac6838044 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
version=42.2
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
From fbc3982f32c675ecb1fc4398af635b3f486ac7e6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 10/23] io.elementary.calendar: use geocode-glib-libsoup2
---
srcpkgs/io.elementary.calendar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index b58812b3c854..68b9adf972af 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
# Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar
version=6.1.0
-revision=1
+revision=2
wrksrc="calendar-${version}"
build_style=meson
build_helper="gir"
@@ -9,7 +9,7 @@ hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
glib-devel evolution-data-server-devel"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
- folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
+ folks-devel geocode-glib-libsoup2-devel geoclue2-devel libical-devel libnotify-devel"
short_desc="Desktop calendar app designed for elementary OS"
maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-only"
From ba0b96d8c52751a3e2b954ef652dcaa1d398f5d5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 11/23] io.elementary.photos: use geocode-glib-libsoup2, rest0
---
srcpkgs/io.elementary.photos/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template
index 405c02b690c5..661e8044c159 100644
--- a/srcpkgs/io.elementary.photos/template
+++ b/srcpkgs/io.elementary.photos/template
@@ -1,15 +1,15 @@
# Template file for 'io.elementary.photos'
pkgname=io.elementary.photos
version=2.7.5
-revision=1
+revision=2
wrksrc="photos-${version}"
build_style=meson
hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream
glib-devel python3-scour"
makedepends="libaccounts-glib-devel libexif-devel libgee08-devel
- geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel
+ geocode-glib-libsoup2-devel libgexiv2-devel libglib-devel libgphoto2-devel
gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel
- json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel
+ json-glib-devel libraw-devel rest0-devel libsoup-devel sqlite-devel
webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel
vte3-devel libhandy1-devel libgomp-devel"
depends="desktop-file-utils gsettings-desktop-schemas"
From ebaee7b9315cc074efa092422d2dd386ff152291 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 12/23] libgweather: use geocode-glib-libsoup2
---
srcpkgs/libgweather/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index cd14de2d4b7b..b4fcfcb12563 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -2,20 +2,20 @@
pkgname=libgweather
reverts="40.0_1"
version=4.0.0
-revision=2
+revision=3
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
$(vopt_bool gtk_doc gtk_doc) -Dzoneinfo_dir=/usr/share/zoneinfo"
hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala)
$(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
build_options="gir gtk_doc"
From 2496d3e7d97d16d4d7285c10d5a6c89aa29596b7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:39:33 +0200
Subject: [PATCH 13/23] evolution: use geocode-glib-libsoup2
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index a2d7f527c1d8..fd9d12a73e74 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 251f4d4c6ec339caf774ec0d4c9ce7b6fec92c15 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 15:58:18 +0200
Subject: [PATCH 14/23] gnome-initial-setup: use geocode-glib-libsoup2, rest0
---
srcpkgs/gnome-initial-setup/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 9e8a2c3824f9..d8d472d4bfd9 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
version=42.2
-revision=1
+revision=2
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
@@ -9,13 +9,13 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-devel
gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel"
+ rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
From f98854e49b8e6a5a4355215aeca0cb942e92622a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:11 +0200
Subject: [PATCH 15/23] cawbird: use rest0
---
srcpkgs/cawbird/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cawbird/template b/srcpkgs/cawbird/template
index 85c5d621bcc0..941a02a44a66 100644
--- a/srcpkgs/cawbird/template
+++ b/srcpkgs/cawbird/template
@@ -1,11 +1,11 @@
# Template file for 'cawbird'
pkgname=cawbird
version=1.3.2
-revision=2
+revision=3
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
makedepends="gspell-devel gst-plugins-base1-devel gtk+3-devel
- json-glib-devel libglib-devel liboauth-devel libsoup-devel rest-devel
+ json-glib-devel libglib-devel liboauth-devel libsoup-devel rest0-devel
sqlite-devel"
checkdepends="xvfb-run"
short_desc="Native Gtk+ Twitter client for the Linux desktop"
From 6b392ab4d56fe8ceaca7f7f675d33144a00c563a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:28 +0200
Subject: [PATCH 16/23] gnome-online-accounts: use rest0
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 47085810e534..fa21b95b7434 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
version=3.44.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="$(vopt_enable gir introspection)
@@ -13,14 +13,14 @@ configure_args="$(vopt_enable gir introspection)
hostmakedepends="docbook-xsl gettext glib-devel
libxslt pkg-config $(vopt_if gir vala)"
makedepends="gcr-devel gtk+3-devel json-glib-devel libnotify-devel libsecret-devel
- libsoup-devel mit-krb5-devel rest-devel telepathy-glib-devel webkit2gtk-devel"
+ libsoup-devel mit-krb5-devel rest0-devel telepathy-glib-devel webkit2gtk-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-44/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
checksum=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
build_options="gir"
From fe35e49477196f26bfda3dcb3731a7fab7668745 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:34 +0200
Subject: [PATCH 17/23] gnome-recipes: use rest0
---
srcpkgs/gnome-recipes/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template
index 5b87bb4ff935..37c44c1e486d 100644
--- a/srcpkgs/gnome-recipes/template
+++ b/srcpkgs/gnome-recipes/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-recipes'
pkgname=gnome-recipes
version=2.0.4
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config git"
makedepends="gtk+3-devel gnome-autoar-devel gspell-devel libcanberra-devel
- libsoup-devel gnome-online-accounts-devel rest-devel json-glib-devel"
+ libsoup-devel gnome-online-accounts-devel rest0-devel json-glib-devel"
short_desc="GNOME app for sharing and finding recipes"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Recipes"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gnome-recipes/${version%.*}/gnome-recipes-${version}.tar.xz"
checksum=b30e96985f66fe138a17189c77af44d34d0b4c859b304ebdb52033bc2cd3ffed
From d8402d0d94b550dd2102e901ea3a0f020bb94bab Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:38 +0200
Subject: [PATCH 18/23] grilo-plugins: use rest0
---
srcpkgs/grilo-plugins/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 65d0eb1640df..d49a8ec8b200 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,12 +1,12 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.14
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker3"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
- libquvi-devel rest-devel sqlite-devel libgcrypt-devel
+ libquvi-devel rest0-devel sqlite-devel libgcrypt-devel
tracker3-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel gnome-online-accounts-devel
avahi-glib-libs-devel"
@@ -15,7 +15,7 @@ short_desc="Plugins for Grilo"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Grilo"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/grilo-plugins/${version%.*}/grilo-plugins-${version}.tar.xz"
checksum=686844b34ec73b24931ff6cc4f6033f0072947a6db60acdc7fb3eaf157a581c8
make_check=no # feel free to fix
From 2e3339c07e292135a354b5732c604b5a94463c27 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:55 +0200
Subject: [PATCH 19/23] libzapojit: use rest0
---
srcpkgs/libzapojit/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libzapojit/template b/srcpkgs/libzapojit/template
index c1c1c6091529..ae7554d4d7fe 100644
--- a/srcpkgs/libzapojit/template
+++ b/srcpkgs/libzapojit/template
@@ -1,24 +1,24 @@
# Template file for 'libzapojit'
pkgname=libzapojit
version=0.0.3
-revision=9
+revision=10
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
-makedepends="json-glib-devel rest-devel gnome-online-accounts-devel"
+makedepends="json-glib-devel rest0-devel gnome-online-accounts-devel"
short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Zapojit"
-distfiles="${GNOME_SITE}/${pkgname}/0.0/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/libzapojit/0.0/libzapojit-${version}.tar.xz"
checksum=3d25f99329105abb99d1e9651b0aa1842065456ea54c22970a7330e9f3d1c37e
build_options="gir"
build_options_default="gir"
libzapojit-devel_package() {
- depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 5a16dcc7b32942239397ed5e60b80a3e88fd4c4d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:23:29 +0200
Subject: [PATCH 20/23] gnome-core: remove gfbgraph
unused and removed package
---
srcpkgs/gnome-core/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 1601288f857e..3c749515351e 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
version=42.0
-revision=3
+revision=4
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -20,7 +20,6 @@ depends="
gcr>=3.41.0
gdm>=${version}
geocode-glib-libsoup2>=3.26.2
- gfbgraph>=0.2.4
gjs>=1.72.0
glib>=2.72.0
glib-networking>=2.72.0
From 99ca6179e6ba75fde1502ae1a81a0f76fb075318 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:13 +0200
Subject: [PATCH 21/23] gfbgraph: remove package
* uses libsoup2, not regularly maintained, unused
---
common/shlibs | 1 -
srcpkgs/gfbgraph-devel | 1 -
srcpkgs/gfbgraph/template | 43 -------------------------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 45 deletions(-)
delete mode 120000 srcpkgs/gfbgraph-devel
delete mode 100644 srcpkgs/gfbgraph/template
diff --git a/common/shlibs b/common/shlibs
index 882b67d7f36f..17263fadc71a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1575,7 +1575,6 @@ libslim.so.1.3.6 slim-1.3.6_1
libmediaart-2.0.so.0 libmediaart-1.9.1_1
libinput.so.10 libinput-1.2.0_1
libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1
-libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1
libgtkhex-4.so.0 libgtkhex-42.1_1
libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
libdmraid.so.1 dmraid-1.0.0.rc16.3_5
diff --git a/srcpkgs/gfbgraph-devel b/srcpkgs/gfbgraph-devel
deleted file mode 120000
index d66938286a0c..000000000000
--- a/srcpkgs/gfbgraph-devel
+++ /dev/null
@@ -1 +0,0 @@
-gfbgraph
\ No newline at end of file
diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
deleted file mode 100644
index 63c6376122a2..000000000000
--- a/srcpkgs/gfbgraph/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'gfbgraph'
-pkgname=gfbgraph
-version=0.2.5
-revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static $(vopt_enable gtk_doc gtk-doc)"
-hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
-makedepends="rest-devel json-glib-devel gnome-online-accounts-devel"
-short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://wiki.gnome.org/Projects/GFBGraph"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
-make_check=no # needs facebook credentials
-
-build_options="gir gtk_doc"
-build_options_default="gir"
-
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default+=" gtk_doc"
-fi
-
-post_install() {
- rm -rf ${DESTDIR}/usr/doc
-}
-
-gfbgraph-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
- fi
- vmove "usr/lib/*.so"
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fba091c8294b..6d06ff1eb22f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -109,6 +109,7 @@ replaces="
geoip-data<=20171002_2
gespeaker<=0.8.6_3
getmail<=5.14_2
+ gfbgraph<=0.2.5_1
giti<=1.0.0_1
gksu<=2.0.2_4
glibmm-doc<=2.64.2_2
From 7d2e460e561dc80c12824275d6441e44d226ec72 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:41:53 +0200
Subject: [PATCH 22/23] gnome-photos: update to 43.0.
---
srcpkgs/gnome-photos/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index dbdbf6850a6f..48de445bdfad 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,15 +1,16 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- gfbgraph-devel tracker-devel libexif-devel librsvg-devel grilo-devel
+ tracker-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
- geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel"
+ geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
+ libportal-gtk3-devel"
depends="desktop-file-utils tracker tracker-miners"
short_desc="Access, organize, and share your photos on GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Photos"
changelog="https://gitlab.gnome.org/GNOME/gnome-photos/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz"
-checksum=25cb281425199dec7b045f13f32f8f96034cb0cb8b94d96f9dffaf4f5be68551
+checksum=c7ac7458d533f29d955011c74b76224d79ea31bcc12e9d6d0ce7b6c3704d08e1
build_options="gir"
build_options_default="gir"
From 028e26435329315398934b038861975312fcb6eb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 12:59:30 +0200
Subject: [PATCH 23/23] shotwell: update to 0.31.5, use libsoup3
---
srcpkgs/shotwell/patches/meson-0.61.patch | 27 --
.../patches/shotwell-0.31.3-vapi_fixes.patch | 368 ------------------
.../patches/shotwell-0.54.1-vapi_fixes.patch | 67 ----
srcpkgs/shotwell/template | 8 +-
4 files changed, 4 insertions(+), 466 deletions(-)
delete mode 100644 srcpkgs/shotwell/patches/meson-0.61.patch
delete mode 100644 srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch
delete mode 100644 srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
diff --git a/srcpkgs/shotwell/patches/meson-0.61.patch b/srcpkgs/shotwell/patches/meson-0.61.patch
deleted file mode 100644
index f33fa2af1637..000000000000
--- a/srcpkgs/shotwell/patches/meson-0.61.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cc328b43ebb9a54a256ec73a86fb18381b2038e6 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Tue, 11 Jan 2022 21:57:26 -0500
-Subject: [PATCH] fix duplicate languages causing meson 0.61 to error out
-
-It tried to create multiple targets with the same name and generating
-the same file. On older versions of meson, this was a run_target and
-just ran twice, but was still wrong.
----
- help/LINGUAS | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/help/LINGUAS b/help/LINGUAS
-index 68f089c4..5352eecd 100644
---- a/help/LINGUAS
-+++ b/help/LINGUAS
-@@ -6,7 +6,6 @@ es
- fr
- hu
- id
--id
- lv
- pt_BR
- sv
---
-GitLab
-
diff --git a/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch
deleted file mode 100644
index 908e615f0849..000000000000
--- a/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch
+++ /dev/null
@@ -1,368 +0,0 @@
-From 9a9876e27076f5939525023eb8c7f24d48c8ff25 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sun, 14 Mar 2021 11:21:10 +0100
-Subject: [PATCH 1/6] vapis: Plug memory leak in GPhoto2
-
-Caller was supposed to free the StorageInfo, which with the old binding
-we never did
----
- src/camera/GPhoto.vala | 5 +++--
- src/camera/ImportPage.vala | 14 ++++++--------
- vapi/libgphoto2.vapi | 2 +-
- 3 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
-index aa2fcf2b..64ff7ca0 100644
---- a/src/camera/GPhoto.vala
-+++ b/src/camera/GPhoto.vala
-@@ -135,9 +135,10 @@ namespace GPhoto {
- // filesystem. In these cases shotwell can access the file directly. See:
- // https://bugzilla.gnome.org/show_bug.cgi?id=716915
- public PhotoMetadata? get_fallback_metadata(Camera camera, Context context, string folder, string filename) {
-- GPhoto.CameraStorageInformation *sifs = null;
-+ // Fixme: Why do we need to query get_storageinfo here first?
-+ GPhoto.CameraStorageInformation[] sifs = null;
- int count = 0;
-- camera.get_storageinfo(&sifs, out count, context);
-+ camera.get_storageinfo(out sifs, context);
-
- GPhoto.PortInfo port_info;
- camera.get_port_info(out port_info);
-diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
-index ab24df61..c424de88 100644
---- a/src/camera/ImportPage.vala
-+++ b/src/camera/ImportPage.vala
-@@ -1179,9 +1179,9 @@ public class ImportPage : CheckerboardPage {
-
- Gee.ArrayList<ImportSource> import_list = new Gee.ArrayList<ImportSource>();
-
-- GPhoto.CameraStorageInformation *sifs = null;
-+ GPhoto.CameraStorageInformation[] sifs = null;
- int count = 0;
-- refresh_result = dcamera.gcamera.get_storageinfo(&sifs, out count, spin_idle_context.context);
-+ refresh_result = dcamera.gcamera.get_storageinfo(out sifs, spin_idle_context.context);
- if (refresh_result == GPhoto.Result.OK) {
- for (int fsid = 0; fsid < count; fsid++) {
- // Check well-known video and image paths first to prevent accidental
-@@ -1324,18 +1324,16 @@ public class ImportPage : CheckerboardPage {
- // Need to do this because some phones (iPhone, in particular) changes the name of their filesystem
- // between each mount
- public static string? get_fs_basedir(GPhoto.Camera camera, int fsid) {
-- GPhoto.CameraStorageInformation *sifs = null;
-+ GPhoto.CameraStorageInformation[] sifs = null;
- int count = 0;
-- GPhoto.Result res = camera.get_storageinfo(&sifs, out count, null_context.context);
-+ GPhoto.Result res = camera.get_storageinfo(out sifs, null_context.context);
- if (res != GPhoto.Result.OK)
- return null;
-
-- if (fsid >= count)
-+ if (fsid >= sifs.length)
- return null;
-
-- GPhoto.CameraStorageInformation *ifs = sifs + fsid;
--
-- return (ifs->fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? ifs->basedir : "/";
-+ return (sifs[fsid].fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? sifs[fsid].basedir : "/";
- }
-
- public static string? get_fulldir(GPhoto.Camera camera, string camera_name, int fsid, string folder) {
-diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
-index 22f70eed..7e569823 100644
---- a/vapi/libgphoto2.vapi
-+++ b/vapi/libgphoto2.vapi
-@@ -64,7 +64,7 @@ namespace GPhoto {
- public Result set_port_info(PortInfo info);
- public Result get_abilities(out CameraAbilities abilities);
- public Result set_abilities(CameraAbilities abilities);
-- public Result get_storageinfo(CameraStorageInformation **sifs, out int count, Context context);
-+ public Result get_storageinfo([CCode (array_length_pos=1)]out CameraStorageInformation[] sifs, Context context);
-
- // Folders
- [CCode (cname="gp_camera_folder_list_folders")]
---
-2.31.1
-
-From e1f53784dd7475388470a30683df34b5ca7784eb Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 13 Mar 2021 23:22:50 +0100
-Subject: [PATCH 2/6] More GPhoto2 vapi fixes
-
----
- vapi/libgphoto2.vapi | 25 ++++++++++++-------------
- 1 file changed, 12 insertions(+), 13 deletions(-)
-
-diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
-index 7e569823..607a644f 100644
---- a/vapi/libgphoto2.vapi
-+++ b/vapi/libgphoto2.vapi
-@@ -53,7 +53,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_CAMERA",
- unref_function="gp_camera_unref",
- free_function="gp_camera_free",
-- cheader_filename="gphoto2/gphoto2-camera.h,gphoto.h"
-+ cheader_filename="gphoto2/gphoto2-camera.h,gphoto2.h"
- )]
- public class Camera {
- [CCode (cname="gp_camera_new")]
-@@ -74,7 +74,7 @@ namespace GPhoto {
- [CCode (cname="gp_camera_folder_delete_all")]
- public Result delete_all_files(string folder, Context context);
- [CCode (cname="gp_camera_folder_put_file")]
-- public Result put_file(string folder, CameraFile file, Context context);
-+ public Result put_file(string folder, string filename, CameraFileType type, CameraFile file, Context context);
- [CCode (cname="gp_camera_folder_make_dir")]
- public Result make_dir(string folder, string name, Context context);
- [CCode (cname="gp_camera_folder_remove_dir")]
-@@ -99,7 +99,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_FILE",
- unref_function="gp_file_unref",
- free_function="gp_file_free",
-- cheader_filename="gphoto2/gphoto2-file.h,gphoto.h"
-+ cheader_filename="gphoto2/gphoto2-file.h,gphoto2.h"
- )]
- public class CameraFile {
- [CCode (cname="gp_file_new")]
-@@ -140,7 +140,6 @@ namespace GPhoto {
- public enum CameraFileInfoFields {
- NONE,
- TYPE,
-- NAME,
- SIZE,
- WIDTH,
- HEIGHT,
-@@ -159,7 +158,7 @@ namespace GPhoto {
- public CameraFileInfoFields fields;
- public CameraFileStatus status;
- public ulong size;
-- public string type;
-+ public char type[64];
- public uint width;
- public uint height;
- public string name;
-@@ -176,7 +175,7 @@ namespace GPhoto {
- public CameraFileInfoFields fields;
- public CameraFileStatus status;
- public ulong size;
-- public string type;
-+ public char type[64];
- public uint width;
- public uint height;
- public string name;
-@@ -257,7 +256,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_LIST",
- unref_function="gp_list_unref",
- free_function="gp_list_free",
-- cheader_filename="gphoto2/gphoto2-list.h,gphoto.h"
-+ cheader_filename="gphoto2/gphoto2-list.h,gphoto2.h"
- )]
- public class CameraList {
- [CCode (cname="gp_list_new")]
-@@ -266,7 +265,7 @@ namespace GPhoto {
- public Result append(string name, string value);
- public Result reset();
- public Result sort();
-- public Result find_by_name(out int? index, string name);
-+ public Result find_by_name(out int index, string name);
- public Result get_name(int index, out unowned string name);
- public Result get_value(int index, out unowned string value);
- public Result set_name(int index, string name);
-@@ -314,9 +313,9 @@ namespace GPhoto {
- )]
- public struct CameraStorageInformation {
- public CameraStorageInfoFields fields;
-- public string basedir;
-- public string label;
-- public string description;
-+ public char basedir[256];
-+ public char label[256];
-+ public char description[256];
- public int type;
- public int fstype;
- public int access;
-@@ -329,7 +328,7 @@ namespace GPhoto {
- [CCode (
- ref_function="GPHOTO_REF_CONTEXT",
- unref_function="gp_context_unref",
-- cheader_filename="gphoto2/gphoto2-context.h,gphoto.h"
-+ cheader_filename="gphoto2/gphoto2-context.h,gphoto2.h"
- )]
- public class Context {
- [CCode (cname="gp_context_new")]
-@@ -485,7 +484,7 @@ namespace GPhoto {
-
- [CCode (
- cheader_filename="gphoto2/gphoto2-version.h",
-- cprefix="GP_VERSION"
-+ cprefix="GP_VERSION_"
- )]
- public enum VersionVerbosity {
- SHORT,
---
-2.31.1
-
-From 754520638beafa997d81fdbff58a9d07a48f7cfd Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 13 Mar 2021 22:31:32 +0100
-Subject: [PATCH 3/6] vapis: Fix gphoto2 vapi
-
-There was some copy-paste going on there that didn't actually match the
-C structs
----
- vapi/libgphoto2.vapi | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
-index 607a644f..adcef5c5 100644
---- a/vapi/libgphoto2.vapi
-+++ b/vapi/libgphoto2.vapi
-@@ -161,7 +161,6 @@ namespace GPhoto {
- public char type[64];
- public uint width;
- public uint height;
-- public string name;
- public CameraFilePermissions permissions;
- public time_t mtime;
- }
-@@ -178,9 +177,6 @@ namespace GPhoto {
- public char type[64];
- public uint width;
- public uint height;
-- public string name;
-- public CameraFilePermissions permissions;
-- public time_t mtime;
- }
-
- [CCode (
---
-2.31.1
-
-From f7d044e7a72b80a550fd1907a2d56053caab1ae3 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 13 Mar 2021 22:32:17 +0100
-Subject: [PATCH 4/6] Fix strings in [SimpleType] structs
-
----
- src/camera/ImportPage.vala | 5 +++--
- vapi/libraw.vapi | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
-index c424de88..f5e98955 100644
---- a/src/camera/ImportPage.vala
-+++ b/src/camera/ImportPage.vala
-@@ -1408,12 +1408,13 @@ public class ImportPage : CheckerboardPage {
- import_list.add(video_source);
- } else {
- // determine file format from type, and then from file extension
-- PhotoFileFormat file_format = PhotoFileFormat.from_gphoto_type(info.file.type);
-+ string file_type = (string)info.file.type;
-+ PhotoFileFormat file_format = PhotoFileFormat.from_gphoto_type(file_type);
- if (file_format == PhotoFileFormat.UNKNOWN) {
- file_format = PhotoFileFormat.get_by_basename_extension(filename);
- if (file_format == PhotoFileFormat.UNKNOWN) {
- message("Skipping %s/%s: Not a supported file extension (%s)", fulldir,
-- filename, info.file.type);
-+ filename, file_type);
-
- continue;
- }
-diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi
-index b1b5875b..146f447e 100644
---- a/vapi/libraw.vapi
-+++ b/vapi/libraw.vapi
-@@ -248,7 +248,7 @@ public struct Thumbnail {
- public uint tlength;
- public int tcolors;
- [CCode (array_length_cname="tlength")]
-- public uint8[] thumb;
-+ public unowned uint8[] thumb;
- }
-
- [CCode (cname="enum LibRaw_thumbnail_formats", cprefix="LIBRAW_THUMBNAIL_")]
---
-2.31.1
-
-From a035ff6ee39dc47c6051f7b29c7da83d3ecde52e Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sun, 14 Mar 2021 11:21:10 +0100
-Subject: [PATCH 5/6] Fix compile error after GPhoto vapi change
-
----
- src/camera/ImportPage.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
-index f5e98955..7dbe9d42 100644
---- a/src/camera/ImportPage.vala
-+++ b/src/camera/ImportPage.vala
-@@ -1333,7 +1333,7 @@ public class ImportPage : CheckerboardPage {
- if (fsid >= sifs.length)
- return null;
-
-- return (sifs[fsid].fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? sifs[fsid].basedir : "/";
-+ return (GPhoto.CameraStorageInfoFields.BASE in sifs[fsid].fields) ? (string) sifs[fsid].basedir : "/";
- }
-
- public static string? get_fulldir(GPhoto.Camera camera, string camera_name, int fsid, string folder) {
---
-2.31.1
-
-From 44dae743da462742f1acdeb599f0a10afa43e629 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sun, 14 Mar 2021 12:22:55 +0100
-Subject: [PATCH 6/6] Fix and clarify the helper header for GPhoto
-
----
- vapi/libgphoto2.vapi | 8 ++++----
- vapi/{gphoto.h => shotwell-gphoto-helper.h} | 0
- 2 files changed, 4 insertions(+), 4 deletions(-)
- rename vapi/{gphoto.h => shotwell-gphoto-helper.h} (100%)
-
-diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
-index adcef5c5..aeab7255 100644
---- a/vapi/libgphoto2.vapi
-+++ b/vapi/libgphoto2.vapi
-@@ -53,7 +53,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_CAMERA",
- unref_function="gp_camera_unref",
- free_function="gp_camera_free",
-- cheader_filename="gphoto2/gphoto2-camera.h,gphoto2.h"
-+ cheader_filename="gphoto2/gphoto2-camera.h,shotwell-gphoto-helper.h"
- )]
- public class Camera {
- [CCode (cname="gp_camera_new")]
-@@ -99,7 +99,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_FILE",
- unref_function="gp_file_unref",
- free_function="gp_file_free",
-- cheader_filename="gphoto2/gphoto2-file.h,gphoto2.h"
-+ cheader_filename="gphoto2/gphoto2-file.h,shotwell-gphoto-helper.h"
- )]
- public class CameraFile {
- [CCode (cname="gp_file_new")]
-@@ -252,7 +252,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_LIST",
- unref_function="gp_list_unref",
- free_function="gp_list_free",
-- cheader_filename="gphoto2/gphoto2-list.h,gphoto2.h"
-+ cheader_filename="gphoto2/gphoto2-list.h,shotwell-gphoto-helper.h"
- )]
- public class CameraList {
- [CCode (cname="gp_list_new")]
-@@ -324,7 +324,7 @@ namespace GPhoto {
- [CCode (
- ref_function="GPHOTO_REF_CONTEXT",
- unref_function="gp_context_unref",
-- cheader_filename="gphoto2/gphoto2-context.h,gphoto2.h"
-+ cheader_filename="gphoto2/gphoto2-context.h,shotwell-gphoto-helper.h"
- )]
- public class Context {
- [CCode (cname="gp_context_new")]
-diff --git a/vapi/gphoto.h b/vapi/shotwell-gphoto-helper.h
-similarity index 100%
-rename from vapi/gphoto.h
-rename to vapi/shotwell-gphoto-helper.h
---
-2.31.1
-
diff --git a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
deleted file mode 100644
index f39f988f9645..000000000000
--- a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 59ae0ce648982669f24a33db501f3f229508cb6e Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Tue, 30 Nov 2021 15:09:17 +0100
-Subject: [PATCH] Fix accessibility issues with initializer of constants
-
----
- src/International.vala | 2 --
- src/Resources.vala | 7 -------
- vapi/version.vapi | 17 ++++++++++++++---
- 3 files changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/src/International.vala b/src/International.vala
-index 555a91f8..73f07639 100644
---- a/src/International.vala
-+++ b/src/International.vala
-@@ -4,8 +4,6 @@
- * See the COPYING file in this distribution.
- */
-
--extern const string _LANG_SUPPORT_DIR;
--
- public const string TRANSLATABLE = "translatable";
-
- namespace InternationalSupport {
-diff --git a/src/Resources.vala b/src/Resources.vala
-index 6d2b8851..86f0eb65 100644
---- a/src/Resources.vala
-+++ b/src/Resources.vala
-@@ -4,13 +4,6 @@
- * See the COPYING file in this distribution.
- */
-
--// defined by ./configure or Makefile and included by gcc -D
--extern const string _PREFIX;
--extern const string _VERSION;
--extern const string GETTEXT_PACKAGE;
--extern const string _LIB;
--extern const string _LIBEXECDIR;
--
- namespace Resources {
- public const string APP_TITLE = "Shotwell";
- public const string APP_LIBRARY_ROLE = _("Photo Manager");
-diff --git a/vapi/version.vapi b/vapi/version.vapi
-index 06974c84..e191f2f7 100644
---- a/vapi/version.vapi
-+++ b/vapi/version.vapi
-@@ -1,3 +1,14 @@
--[CCode (cheader_filename="version.h")]
--extern const string? _GIT_VERSION;
--
-+[CCode (cheader_filename = "version.h")]
-+public const string? _GIT_VERSION;
-+[CCode (cheader_filename = "config.h")]
-+public const string _PREFIX;
-+[CCode (cheader_filename = "config.h")]
-+public const string _VERSION;
-+[CCode (cheader_filename = "config.h")]
-+public const string GETTEXT_PACKAGE;
-+[CCode (cheader_filename = "config.h")]
-+public const string _LIB;
-+[CCode (cheader_filename = "config.h")]
-+public const string _LIBEXECDIR;
-+[CCode (cheader_filename = "config.h")]
-+public const string _LANG_SUPPORT_DIR;
---
-GitLab
-
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index fa533f27b167..0a5f0718780c 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -1,14 +1,14 @@
# Template file for 'shotwell'
pkgname=shotwell
-version=0.31.3
-revision=2
+version=0.31.5
+revision=1
build_style=meson
hostmakedepends="gcr-devel gettext glib-devel itstool
libgee08-devel libgexiv2-devel pkg-config vala-devel"
makedepends="gst-plugins-base1-devel libgdata-devel
libgee08-devel libgexiv2-devel libgphoto2-devel libgudev-devel
libraw-devel libsecret-devel libchamplain-devel libwebp-devel
- rest-devel vala-devel webkit2gtk-devel"
+ rest-devel vala-devel libwebkit2gtk41-devel libsoup3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Open source photo manager for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later, CC-BY-SA-3.0"
homepage="https://wiki.gnome.org/Apps/Shotwell"
changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
-checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2
+checksum=3b048fc6ce99b232d1e0ea9b8db074083c86c88d3b6d63136a2cf8217aa45c19
lib32disabled=yes
post_extract() {
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0
2022-10-01 15:58 [PR PATCH] geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0 paper42
` (2 preceding siblings ...)
2022-10-22 19:09 ` paper42
@ 2022-10-22 19:52 ` paper42
2022-10-22 20:13 ` [PR PATCH] [Merged]: " paper42
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-10-22 19:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1322 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gnome-photos43
https://github.com/void-linux/void-packages/pull/39594
geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/39594.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnome-photos43-39594.patch --]
[-- Type: text/x-diff, Size: 57616 bytes --]
From 51871d140ffd68e5440d77e72e991e46e80c1a08 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:13:21 +0200
Subject: [PATCH 01/23] New package: rest0-0.8.1
---
common/shlibs | 4 ++--
srcpkgs/rest0-devel | 1 +
srcpkgs/rest0/template | 42 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 45 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/rest0-devel
create mode 100644 srcpkgs/rest0/template
diff --git a/common/shlibs b/common/shlibs
index 9712cbc1262f..82ede873858f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -875,8 +875,8 @@ libcogl-gst.so.20 cogl-1.18.0_1
libcogl-gles2.so.20 cogl-1.18.0_1
libcogl-path.so.20 cogl-1.18.0_1
libp11-kit.so.0 p11-kit-0.7_1
-librest-0.7.so.0 rest-0.7_1
-librest-extras-0.7.so.0 rest-0.7_1
+librest-0.7.so.0 rest0-0.8.1_1
+librest-extras-0.7.so.0 rest0-0.8.1_1
libgoa-1.0.so.0 gnome-online-accounts-3.2.0_1
libgoa-backend-1.0.so.1 gnome-online-accounts-3.10.0_1
liboauth.so.0 liboauth-0.9.4_1
diff --git a/srcpkgs/rest0-devel b/srcpkgs/rest0-devel
new file mode 120000
index 000000000000..57e62aa92398
--- /dev/null
+++ b/srcpkgs/rest0-devel
@@ -0,0 +1 @@
+rest0
\ No newline at end of file
diff --git a/srcpkgs/rest0/template b/srcpkgs/rest0/template
new file mode 100644
index 000000000000..ee090d9e6d2d
--- /dev/null
+++ b/srcpkgs/rest0/template
@@ -0,0 +1,42 @@
+# Template file for 'rest0'
+pkgname=rest0
+version=0.8.1
+revision=1
+wrksrc="rest-${version}"
+build_style=gnu-configure
+build_helper="gir"
+configure_args="$(vopt_enable gir introspection) --disable-static
+ --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
+hostmakedepends="automake perl m4 libtool pkg-config glib-devel gtk-doc"
+makedepends="libglib-devel libsoup-gnome-devel libxml2-devel"
+depends="ca-certificates"
+short_desc="RESTful library"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/librest"
+changelog="https://gitlab.gnome.org/GNOME/librest/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/rest/${version%.*}/rest-${version}.tar.xz"
+checksum=0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+ autoreconf -fi
+}
+
+rest0-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libglib-devel libsoup-devel
+ libxml2-devel"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gtk-doc
+ vmove "usr/lib/*.so"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
From 2582ee8025667d481e7047bb5e039aae573c41df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 29 Sep 2022 00:41:55 +0200
Subject: [PATCH 02/23] rest: update to 0.9.1.
---
common/shlibs | 2 ++
srcpkgs/rest/patches/cross.patch | 10 ++++++++++
srcpkgs/rest/template | 31 ++++++++++++++++++-------------
3 files changed, 30 insertions(+), 13 deletions(-)
create mode 100644 srcpkgs/rest/patches/cross.patch
diff --git a/common/shlibs b/common/shlibs
index 82ede873858f..71adfca7d660 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -876,7 +876,9 @@ libcogl-gles2.so.20 cogl-1.18.0_1
libcogl-path.so.20 cogl-1.18.0_1
libp11-kit.so.0 p11-kit-0.7_1
librest-0.7.so.0 rest0-0.8.1_1
+librest-1.0.so.0 rest-0.9.1_1
librest-extras-0.7.so.0 rest0-0.8.1_1
+librest-extras-1.0.so.0 rest-0.9.1_1
libgoa-1.0.so.0 gnome-online-accounts-3.2.0_1
libgoa-backend-1.0.so.1 gnome-online-accounts-3.10.0_1
liboauth.so.0 liboauth-0.9.4_1
diff --git a/srcpkgs/rest/patches/cross.patch b/srcpkgs/rest/patches/cross.patch
new file mode 100644
index 000000000000..ae113dc8e81a
--- /dev/null
+++ b/srcpkgs/rest/patches/cross.patch
@@ -0,0 +1,10 @@
+--- a/docs/meson.build
++++ b/docs/meson.build
+@@ -1,6 +1,7 @@
+ if get_option('gtk_doc') and get_option('introspection')
+ dependency('gi-docgen', version: '>= 2021.6',
+ fallback: ['gi-docgen', 'dummy_dep'],
++ native: true,
+ )
+
+ gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
diff --git a/srcpkgs/rest/template b/srcpkgs/rest/template
index aa4299c8ffd3..155cd7533575 100644
--- a/srcpkgs/rest/template
+++ b/srcpkgs/rest/template
@@ -1,36 +1,41 @@
# Template file for 'rest'
pkgname=rest
-version=0.8.1
-revision=3
-build_style=gnu-configure
+version=0.9.1
+revision=1
+build_style=meson
build_helper="gir"
-configure_args="$(vopt_enable gir introspection) --disable-static
- --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
-hostmakedepends="automake perl m4 libtool pkg-config glib-devel gtk-doc"
-makedepends="libglib-devel libsoup-gnome-devel libxml2-devel"
+configure_args="$(vopt_bool gir introspection) -Dexamples=false -Dsoup2=false
+ -Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt"
+hostmakedepends="pkg-config glib-devel gi-docgen"
+makedepends="libsoup3-devel json-glib-devel libxml2-devel"
depends="ca-certificates"
short_desc="RESTful library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9
+homepage="https://gitlab.gnome.org/GNOME/librest"
+changelog="https://gitlab.gnome.org/GNOME/librest/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/rest/${version%.*}/rest-${version}.tar.xz"
+checksum=9266a5c10ece383e193dfb7ffb07b509cc1f51521ab8dad76af96ed14212c2e3
# Package build options
build_options="gir"
build_options_default="gir"
-pre_configure() {
- autoreconf -fi
+pre_build() {
+ # help gi-docgen find gi files on cross
+ if [ -n "$CROSS_BUILD" ]; then
+ export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+ fi
}
rest-devel_package() {
- depends="rest-${version}_${revision} libglib-devel libsoup-devel
+ depends="${sourcepkg}>=${version}_${revision} libglib-devel libsoup3-devel
libxml2-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
+ vmove usr/share/doc
vmove "usr/lib/*.so"
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
From 220ac9b8dee798aa1825ef49b2aa1a1697e49c93 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:40:14 +0200
Subject: [PATCH 03/23] New package: geocode-glib-libsoup2-2.26.4
---
common/shlibs | 2 +-
srcpkgs/geocode-glib-libsoup2-devel | 1 +
srcpkgs/geocode-glib-libsoup2/template | 41 ++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/geocode-glib-libsoup2-devel
create mode 100644 srcpkgs/geocode-glib-libsoup2/template
diff --git a/common/shlibs b/common/shlibs
index 71adfca7d660..2e8b002cde26 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1428,7 +1428,7 @@ libthreadutil.so.6 libupnp-1.6.18_1
libupnp.so.17 libupnp-1.14.0_1
libixml.so.11 libupnp-1.14.0_1
libupnpp.so.12 libupnpp-0.22.2_1
-libgeocode-glib.so.0 geocode-glib-3.10.0_1
+libgeocode-glib.so.0 geocode-glib-libsoup2-3.26.4_1
libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
libpotrace.so.0 libpotrace-1.11_1
libSDL2-2.0.so.0 SDL2-2.0.0_1
diff --git a/srcpkgs/geocode-glib-libsoup2-devel b/srcpkgs/geocode-glib-libsoup2-devel
new file mode 120000
index 000000000000..a7938e2bdce8
--- /dev/null
+++ b/srcpkgs/geocode-glib-libsoup2-devel
@@ -0,0 +1 @@
+geocode-glib-libsoup2
\ No newline at end of file
diff --git a/srcpkgs/geocode-glib-libsoup2/template b/srcpkgs/geocode-glib-libsoup2/template
new file mode 100644
index 000000000000..fd18e141c16b
--- /dev/null
+++ b/srcpkgs/geocode-glib-libsoup2/template
@@ -0,0 +1,41 @@
+# Template file for 'geocode-glib-libsoup2'
+# keep in sync with geocode-glib
+pkgname=geocode-glib-libsoup2
+version=3.26.4
+revision=1
+wrksrc="geocode-glib-$version"
+build_style=meson
+build_helper="gir"
+configure_args="-Denable-gtk-doc=false $(vopt_bool gir enable-introspection)
+ -Denable-installed-tests=false -Dsoup2=true"
+hostmakedepends="pkg-config glib-devel"
+makedepends="json-glib-devel libsoup-gnome-devel"
+depends="geocode-glib-common"
+short_desc="GLib library for geocoding and reverse geocoding"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://developer.gnome.org/geocode-glib"
+distfiles="${GNOME_SITE}/geocode-glib/${version%.*}/geocode-glib-${version}.tar.xz"
+checksum=2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa
+make_check=no # expects installed locales
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+post_install() {
+ rm -r ${DESTDIR}/usr/share/icons
+}
+
+geocode-glib-libsoup2-devel_package() {
+ depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
From e06370892dbdaade289f671ae131614e2a68513e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:39:35 +0200
Subject: [PATCH 04/23] geocode-glib: use libsoup3, split -common
---
common/shlibs | 1 +
srcpkgs/geocode-glib-common | 1 +
srcpkgs/geocode-glib/template | 18 ++++++++++++++----
3 files changed, 16 insertions(+), 4 deletions(-)
create mode 120000 srcpkgs/geocode-glib-common
diff --git a/common/shlibs b/common/shlibs
index 2e8b002cde26..882b67d7f36f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1429,6 +1429,7 @@ libupnp.so.17 libupnp-1.14.0_1
libixml.so.11 libupnp-1.14.0_1
libupnpp.so.12 libupnpp-0.22.2_1
libgeocode-glib.so.0 geocode-glib-libsoup2-3.26.4_1
+libgeocode-glib-2.so.0 geocode-glib-3.26.4_2
libzeitgeist-2.0.so.0 libzeitgeist2-0.9.14_1
libpotrace.so.0 libpotrace-1.11_1
libSDL2-2.0.so.0 SDL2-2.0.0_1
diff --git a/srcpkgs/geocode-glib-common b/srcpkgs/geocode-glib-common
new file mode 120000
index 000000000000..45ec1fe82f87
--- /dev/null
+++ b/srcpkgs/geocode-glib-common
@@ -0,0 +1 @@
+geocode-glib
\ No newline at end of file
diff --git a/srcpkgs/geocode-glib/template b/srcpkgs/geocode-glib/template
index 29571876a43c..32dafda1d17c 100644
--- a/srcpkgs/geocode-glib/template
+++ b/srcpkgs/geocode-glib/template
@@ -1,24 +1,34 @@
# Template file for 'geocode-glib'
+# keep in sync with geocode-glib-libsoup2
pkgname=geocode-glib
version=3.26.4
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Denable-gtk-doc=false $(vopt_bool gir enable-introspection)
- -Denable-installed-tests=false"
+ -Denable-installed-tests=false -Dsoup2=false"
hostmakedepends="pkg-config glib-devel"
-makedepends="json-glib-devel libsoup-gnome-devel"
+makedepends="json-glib-devel libsoup3-devel"
+depends="geocode-glib-common"
short_desc="GLib library for geocoding and reverse geocoding"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://developer.gnome.org/geocode-glib"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/geocode-glib/${version%.*}/geocode-glib-${version}.tar.xz"
checksum=2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa
+make_check=no # expects installed locales
# Package build options
build_options="gir"
build_options_default="gir"
+geocode-glib-common_package() {
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/icons
+ }
+}
+
geocode-glib-devel_package() {
depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 88867d2837ae17c65d88a21c9abc811cb8e59aa6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 05/23] gnome-calendar: use geocode-glib-libsoup2
---
srcpkgs/gnome-calendar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-calendar/template b/srcpkgs/gnome-calendar/template
index cd1d201d2dfb..086915b3988f 100644
--- a/srcpkgs/gnome-calendar/template
+++ b/srcpkgs/gnome-calendar/template
@@ -1,11 +1,11 @@
# Template file for 'gnome-calendar'
pkgname=gnome-calendar
version=42.2
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel pkg-config gtk-update-icon-cache
$(vopt_if gir 'gobject-introspection')"
-makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-devel
+makedepends="evolution-data-server-devel geoclue2-devel geocode-glib-libsoup2-devel
gsettings-desktop-schemas-devel gtk4-devel libadwaita-devel libdazzle-devel
libgweather-devel libical-devel libpeas-devel libsoup-devel"
short_desc="Calendar application designed to perfectly fit the GNOME desktop"
From 0dc6c97b15f215abbf5d3839ce17bdc88d2b831c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 06/23] gnome-clocks: use geocode-glib-libsoup2
---
srcpkgs/gnome-clocks/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index c2f76af5604a..9197dbbcbd46 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-clocks'
pkgname=gnome-clocks
version=42.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel vala
gtk-update-icon-cache desktop-file-utils"
makedepends="glib-devel vala-devel gnome-desktop-devel
gtk4-devel libadwaita-devel libnotify-devel gsound-devel
- libgweather-devel geocode-glib-devel geoclue2-devel
+ libgweather-devel geocode-glib-libsoup2-devel geoclue2-devel
hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Clock application for the GNOME Desktop"
From 8c1a0ccfdcf755391711e52374ee10481a167597 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:43 +0200
Subject: [PATCH 07/23] gnome-core: use geocode-glib-libsoup2
---
srcpkgs/gnome-core/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index d4a852d1ea88..1601288f857e 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
version=42.0
-revision=2
+revision=3
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,7 +19,7 @@ depends="
font-adobe-source-code-pro>=2.030R
gcr>=3.41.0
gdm>=${version}
- geocode-glib>=3.26.2
+ geocode-glib-libsoup2>=3.26.2
gfbgraph>=0.2.4
gjs>=1.72.0
glib>=2.72.0
From ae808231c628381e11a6fb62ebfcd73e68ae4037 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 08/23] gnome-maps: use geocode-glib-libsoup2, rest0
---
srcpkgs/gnome-maps/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template
index dd5a5024aaf7..bf82966579bb 100644
--- a/srcpkgs/gnome-maps/template
+++ b/srcpkgs/gnome-maps/template
@@ -1,12 +1,12 @@
# Template file for 'gnome-maps'
pkgname=gnome-maps
version=42.3
-revision=2
+revision=3
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gettext pkg-config AppStream gjs"
-makedepends="folks-devel geoclue2-devel geocode-glib-devel gjs-devel
- gnome-desktop-devel libchamplain-devel rest-devel libhandy1-devel
+makedepends="folks-devel geoclue2-devel geocode-glib-libsoup2-devel gjs-devel
+ gnome-desktop-devel libchamplain-devel rest0-devel libhandy1-devel
libgweather-devel"
depends="geoclue2 gjs libhandy1 libgweather"
short_desc="GNOME maps application"
@@ -14,5 +14,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Maps"
changelog="https://gitlab.gnome.org/GNOME/gnome-maps/-/raw/gnome-42/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gnome-maps/${version%.*}/gnome-maps-${version}.tar.xz"
checksum=e456467facf3c8fd10c9386b5e74c43d9595ad9fb75257f7da014af983d69cd1
From dc4aad67cf498b71a0eaf7549fce28c7e4ac834f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:39:34 +0200
Subject: [PATCH 09/23] gnome-settings-daemon: use geocode-glib-libsoup2
---
srcpkgs/gnome-settings-daemon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 24af1a5094b7..ea3ac6838044 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
version=42.2
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
From c55c3c7d302023acba71451e1a460447ae105a32 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 10/23] io.elementary.calendar: use geocode-glib-libsoup2
---
srcpkgs/io.elementary.calendar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index b58812b3c854..68b9adf972af 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,7 +1,7 @@
# Template file for 'io.elementary.calendar'
pkgname=io.elementary.calendar
version=6.1.0
-revision=1
+revision=2
wrksrc="calendar-${version}"
build_style=meson
build_helper="gir"
@@ -9,7 +9,7 @@ hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
glib-devel evolution-data-server-devel"
makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
- folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
+ folks-devel geocode-glib-libsoup2-devel geoclue2-devel libical-devel libnotify-devel"
short_desc="Desktop calendar app designed for elementary OS"
maintainer="Cameron Nemo <cam@nohom.org>"
license="GPL-3.0-only"
From e0fcea4b4b2803f95e1b226066d6f4e309f2f91b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 11/23] io.elementary.photos: use geocode-glib-libsoup2, rest0
---
srcpkgs/io.elementary.photos/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template
index 405c02b690c5..661e8044c159 100644
--- a/srcpkgs/io.elementary.photos/template
+++ b/srcpkgs/io.elementary.photos/template
@@ -1,15 +1,15 @@
# Template file for 'io.elementary.photos'
pkgname=io.elementary.photos
version=2.7.5
-revision=1
+revision=2
wrksrc="photos-${version}"
build_style=meson
hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream
glib-devel python3-scour"
makedepends="libaccounts-glib-devel libexif-devel libgee08-devel
- geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel
+ geocode-glib-libsoup2-devel libgexiv2-devel libglib-devel libgphoto2-devel
gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel
- json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel
+ json-glib-devel libraw-devel rest0-devel libsoup-devel sqlite-devel
webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel
vte3-devel libhandy1-devel libgomp-devel"
depends="desktop-file-utils gsettings-desktop-schemas"
From c91ed81e36e01026db0173693b201cbd832c69b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:31:44 +0200
Subject: [PATCH 12/23] libgweather: use geocode-glib-libsoup2
---
srcpkgs/libgweather/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index cd14de2d4b7b..b4fcfcb12563 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -2,20 +2,20 @@
pkgname=libgweather
reverts="40.0_1"
version=4.0.0
-revision=2
+revision=3
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
$(vopt_bool gtk_doc gtk_doc) -Dzoneinfo_dir=/usr/share/zoneinfo"
hostmakedepends="glib-devel gettext pkg-config python3-gobject-devel $(vopt_if gir vala)
$(vopt_if gtk_doc gi-docgen)"
-makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
+makedepends="geocode-glib-libsoup2-devel gtk+3-devel libsoup-gnome-devel"
depends="tzdata"
short_desc="GNOME Weather information access library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/LibGWeather"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/libgweather/${version%.*}/libgweather-${version}.tar.xz"
checksum=440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c
build_options="gir gtk_doc"
From 340ce126b2eaa3143ea2412513a1ccab58d4d014 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:39:33 +0200
Subject: [PATCH 13/23] evolution: use geocode-glib-libsoup2
---
srcpkgs/evolution/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index a2d7f527c1d8..fd9d12a73e74 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
# Template file for 'evolution'
pkgname=evolution
version=3.44.4
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DSYSCONF_INSTALL_DIR=/etc
From 414ade99e9ac4d6e39b066d49588bb3a62bb086f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 15:58:18 +0200
Subject: [PATCH 14/23] gnome-initial-setup: use geocode-glib-libsoup2, rest0
---
srcpkgs/gnome-initial-setup/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index 9e8a2c3824f9..d8d472d4bfd9 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
version=42.2
-revision=1
+revision=2
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
@@ -9,13 +9,13 @@ makedepends="NetworkManager-devel accountsservice-devel libglib-devel
gnome-desktop-devel cheese-devel libgweather-devel webkit2gtk-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
- rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
- pango-devel libhandy1-devel"
+ rest0-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
+ pango-devel libhandy1-devel geocode-glib-libsoup2-devel"
depends="iso-codes"
short_desc="GNOME initial setup"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
checksum=4d83d98b249abe15bb2b3e7e7aead9c47f848bca7b6a091abc908b76541abe7b
From fb8f929c776710bee1b89dccf100bc4d1896eecd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:11 +0200
Subject: [PATCH 15/23] cawbird: use rest0
---
srcpkgs/cawbird/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cawbird/template b/srcpkgs/cawbird/template
index 85c5d621bcc0..941a02a44a66 100644
--- a/srcpkgs/cawbird/template
+++ b/srcpkgs/cawbird/template
@@ -1,11 +1,11 @@
# Template file for 'cawbird'
pkgname=cawbird
version=1.3.2
-revision=2
+revision=3
build_style=meson
hostmakedepends="glib-devel pkg-config vala gettext"
makedepends="gspell-devel gst-plugins-base1-devel gtk+3-devel
- json-glib-devel libglib-devel liboauth-devel libsoup-devel rest-devel
+ json-glib-devel libglib-devel liboauth-devel libsoup-devel rest0-devel
sqlite-devel"
checkdepends="xvfb-run"
short_desc="Native Gtk+ Twitter client for the Linux desktop"
From f69cf6312605940f31e9e751a5c59415c4ef8b4f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:28 +0200
Subject: [PATCH 16/23] gnome-online-accounts: use rest0
---
srcpkgs/gnome-online-accounts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template
index 47085810e534..fa21b95b7434 100644
--- a/srcpkgs/gnome-online-accounts/template
+++ b/srcpkgs/gnome-online-accounts/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-online-accounts'
pkgname=gnome-online-accounts
version=3.44.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="$(vopt_enable gir introspection)
@@ -13,14 +13,14 @@ configure_args="$(vopt_enable gir introspection)
hostmakedepends="docbook-xsl gettext glib-devel
libxslt pkg-config $(vopt_if gir vala)"
makedepends="gcr-devel gtk+3-devel json-glib-devel libnotify-devel libsecret-devel
- libsoup-devel mit-krb5-devel rest-devel telepathy-glib-devel webkit2gtk-devel"
+ libsoup-devel mit-krb5-devel rest0-devel telepathy-glib-devel webkit2gtk-devel"
depends="hicolor-icon-theme"
short_desc="GNOME service to access online accounts"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
changelog="https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/raw/gnome-3-44/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gnome-online-accounts/${version%.*}/gnome-online-accounts-${version}.tar.xz"
checksum=381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
build_options="gir"
From f08036bb768f2e52ecb0426b6637b6b27c7ecb69 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:34 +0200
Subject: [PATCH 17/23] gnome-recipes: use rest0
---
srcpkgs/gnome-recipes/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template
index 5b87bb4ff935..37c44c1e486d 100644
--- a/srcpkgs/gnome-recipes/template
+++ b/srcpkgs/gnome-recipes/template
@@ -1,14 +1,14 @@
# Template file for 'gnome-recipes'
pkgname=gnome-recipes
version=2.0.4
-revision=1
+revision=2
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config git"
makedepends="gtk+3-devel gnome-autoar-devel gspell-devel libcanberra-devel
- libsoup-devel gnome-online-accounts-devel rest-devel json-glib-devel"
+ libsoup-devel gnome-online-accounts-devel rest0-devel json-glib-devel"
short_desc="GNOME app for sharing and finding recipes"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Recipes"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/gnome-recipes/${version%.*}/gnome-recipes-${version}.tar.xz"
checksum=b30e96985f66fe138a17189c77af44d34d0b4c859b304ebdb52033bc2cd3ffed
From d2c1a16852cadb6ff2e0bb06d9a246d4a96eaf41 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:38 +0200
Subject: [PATCH 18/23] grilo-plugins: use rest0
---
srcpkgs/grilo-plugins/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 65d0eb1640df..d49a8ec8b200 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -1,12 +1,12 @@
# Template file for 'grilo-plugins'
pkgname=grilo-plugins
version=0.3.14
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker3"
# XXX missing plugins: fakemetadata.
makedepends="grilo-devel gom-devel json-glib-devel
- libquvi-devel rest-devel sqlite-devel libgcrypt-devel
+ libquvi-devel rest0-devel sqlite-devel libgcrypt-devel
tracker3-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
gstreamer1-devel libdmapsharing-devel lua53-devel gnome-online-accounts-devel
avahi-glib-libs-devel"
@@ -15,7 +15,7 @@ short_desc="Plugins for Grilo"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Grilo"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/grilo-plugins/${version%.*}/grilo-plugins-${version}.tar.xz"
checksum=686844b34ec73b24931ff6cc4f6033f0072947a6db60acdc7fb3eaf157a581c8
make_check=no # feel free to fix
From 82b4ffa2da458bad78822262422b3fe6c5787c8b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:55 +0200
Subject: [PATCH 19/23] libzapojit: use rest0
---
srcpkgs/libzapojit/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libzapojit/template b/srcpkgs/libzapojit/template
index c1c1c6091529..ae7554d4d7fe 100644
--- a/srcpkgs/libzapojit/template
+++ b/srcpkgs/libzapojit/template
@@ -1,24 +1,24 @@
# Template file for 'libzapojit'
pkgname=libzapojit
version=0.0.3
-revision=9
+revision=10
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
-makedepends="json-glib-devel rest-devel gnome-online-accounts-devel"
+makedepends="json-glib-devel rest0-devel gnome-online-accounts-devel"
short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Zapojit"
-distfiles="${GNOME_SITE}/${pkgname}/0.0/${pkgname}-${version}.tar.xz"
+distfiles="${GNOME_SITE}/libzapojit/0.0/libzapojit-${version}.tar.xz"
checksum=3d25f99329105abb99d1e9651b0aa1842065456ea54c22970a7330e9f3d1c37e
build_options="gir"
build_options_default="gir"
libzapojit-devel_package() {
- depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From bf2a3fbc66c4bede9bec5fcf74b91a2687e577eb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 16:23:29 +0200
Subject: [PATCH 20/23] gnome-core: remove gfbgraph
unused and removed package
---
srcpkgs/gnome-core/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-core/template b/srcpkgs/gnome-core/template
index 1601288f857e..3c749515351e 100644
--- a/srcpkgs/gnome-core/template
+++ b/srcpkgs/gnome-core/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-core'
pkgname=gnome-core
version=42.0
-revision=3
+revision=4
build_style=meta
short_desc="GNOME meta-package for Void Linux - core components"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -20,7 +20,6 @@ depends="
gcr>=3.41.0
gdm>=${version}
geocode-glib-libsoup2>=3.26.2
- gfbgraph>=0.2.4
gjs>=1.72.0
glib>=2.72.0
glib-networking>=2.72.0
From 3f300ef432f1fd40d8fcb26953ee7c5ef333d477 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 22 Oct 2022 16:30:13 +0200
Subject: [PATCH 21/23] gfbgraph: remove package
* uses libsoup2, not regularly maintained, unused
---
common/shlibs | 1 -
srcpkgs/gfbgraph-devel | 1 -
srcpkgs/gfbgraph/template | 43 -------------------------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 45 deletions(-)
delete mode 120000 srcpkgs/gfbgraph-devel
delete mode 100644 srcpkgs/gfbgraph/template
diff --git a/common/shlibs b/common/shlibs
index 882b67d7f36f..17263fadc71a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1575,7 +1575,6 @@ libslim.so.1.3.6 slim-1.3.6_1
libmediaart-2.0.so.0 libmediaart-1.9.1_1
libinput.so.10 libinput-1.2.0_1
libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1
-libgfbgraph-0.2.so.0 gfbgraph-0.2.2_1
libgtkhex-4.so.0 libgtkhex-42.1_1
libgdlmm-3.0.so.2 libgdlmm-3.7.3_1
libdmraid.so.1 dmraid-1.0.0.rc16.3_5
diff --git a/srcpkgs/gfbgraph-devel b/srcpkgs/gfbgraph-devel
deleted file mode 120000
index d66938286a0c..000000000000
--- a/srcpkgs/gfbgraph-devel
+++ /dev/null
@@ -1 +0,0 @@
-gfbgraph
\ No newline at end of file
diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
deleted file mode 100644
index 63c6376122a2..000000000000
--- a/srcpkgs/gfbgraph/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'gfbgraph'
-pkgname=gfbgraph
-version=0.2.5
-revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static $(vopt_enable gtk_doc gtk-doc)"
-hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
-makedepends="rest-devel json-glib-devel gnome-online-accounts-devel"
-short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://wiki.gnome.org/Projects/GFBGraph"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
-make_check=no # needs facebook credentials
-
-build_options="gir gtk_doc"
-build_options_default="gir"
-
-if [ -z "$CROSS_BUILD" ]; then
- build_options_default+=" gtk_doc"
-fi
-
-post_install() {
- rm -rf ${DESTDIR}/usr/doc
-}
-
-gfbgraph-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- if [ "$build_option_gtk_doc" ]; then
- vmove usr/share/gtk-doc
- fi
- vmove "usr/lib/*.so"
- if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fba091c8294b..6d06ff1eb22f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -109,6 +109,7 @@ replaces="
geoip-data<=20171002_2
gespeaker<=0.8.6_3
getmail<=5.14_2
+ gfbgraph<=0.2.5_1
giti<=1.0.0_1
gksu<=2.0.2_4
glibmm-doc<=2.64.2_2
From e59b7491727a4bc9b4b905307e9c15acb0827771 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 17:41:53 +0200
Subject: [PATCH 22/23] gnome-photos: update to 43.0.
---
srcpkgs/gnome-photos/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index dbdbf6850a6f..48de445bdfad 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,15 +1,16 @@
# Template file for 'gnome-photos'
pkgname=gnome-photos
-version=42.0
+version=43.0
revision=1
build_helper="gir"
build_style=meson
configure_args="-Ddogtail=false -Dmanuals=true"
hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg docbook-xsl libxslt"
makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
- gfbgraph-devel tracker-devel libexif-devel librsvg-devel grilo-devel
+ tracker-devel libexif-devel librsvg-devel grilo-devel
libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
- geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel"
+ geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel
+ libportal-gtk3-devel"
depends="desktop-file-utils tracker tracker-miners"
short_desc="Access, organize, and share your photos on GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Photos"
changelog="https://gitlab.gnome.org/GNOME/gnome-photos/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz"
-checksum=25cb281425199dec7b045f13f32f8f96034cb0cb8b94d96f9dffaf4f5be68551
+checksum=c7ac7458d533f29d955011c74b76224d79ea31bcc12e9d6d0ce7b6c3704d08e1
build_options="gir"
build_options_default="gir"
From e81176c123b8a11228832aa515beae91f4e8a133 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Oct 2022 12:59:30 +0200
Subject: [PATCH 23/23] shotwell: update to 0.31.5, use libsoup3
---
srcpkgs/shotwell/patches/meson-0.61.patch | 27 --
.../patches/shotwell-0.31.3-vapi_fixes.patch | 368 ------------------
.../patches/shotwell-0.54.1-vapi_fixes.patch | 67 ----
srcpkgs/shotwell/template | 8 +-
4 files changed, 4 insertions(+), 466 deletions(-)
delete mode 100644 srcpkgs/shotwell/patches/meson-0.61.patch
delete mode 100644 srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch
delete mode 100644 srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
diff --git a/srcpkgs/shotwell/patches/meson-0.61.patch b/srcpkgs/shotwell/patches/meson-0.61.patch
deleted file mode 100644
index f33fa2af1637..000000000000
--- a/srcpkgs/shotwell/patches/meson-0.61.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cc328b43ebb9a54a256ec73a86fb18381b2038e6 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Tue, 11 Jan 2022 21:57:26 -0500
-Subject: [PATCH] fix duplicate languages causing meson 0.61 to error out
-
-It tried to create multiple targets with the same name and generating
-the same file. On older versions of meson, this was a run_target and
-just ran twice, but was still wrong.
----
- help/LINGUAS | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/help/LINGUAS b/help/LINGUAS
-index 68f089c4..5352eecd 100644
---- a/help/LINGUAS
-+++ b/help/LINGUAS
-@@ -6,7 +6,6 @@ es
- fr
- hu
- id
--id
- lv
- pt_BR
- sv
---
-GitLab
-
diff --git a/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch
deleted file mode 100644
index 908e615f0849..000000000000
--- a/srcpkgs/shotwell/patches/shotwell-0.31.3-vapi_fixes.patch
+++ /dev/null
@@ -1,368 +0,0 @@
-From 9a9876e27076f5939525023eb8c7f24d48c8ff25 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sun, 14 Mar 2021 11:21:10 +0100
-Subject: [PATCH 1/6] vapis: Plug memory leak in GPhoto2
-
-Caller was supposed to free the StorageInfo, which with the old binding
-we never did
----
- src/camera/GPhoto.vala | 5 +++--
- src/camera/ImportPage.vala | 14 ++++++--------
- vapi/libgphoto2.vapi | 2 +-
- 3 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
-index aa2fcf2b..64ff7ca0 100644
---- a/src/camera/GPhoto.vala
-+++ b/src/camera/GPhoto.vala
-@@ -135,9 +135,10 @@ namespace GPhoto {
- // filesystem. In these cases shotwell can access the file directly. See:
- // https://bugzilla.gnome.org/show_bug.cgi?id=716915
- public PhotoMetadata? get_fallback_metadata(Camera camera, Context context, string folder, string filename) {
-- GPhoto.CameraStorageInformation *sifs = null;
-+ // Fixme: Why do we need to query get_storageinfo here first?
-+ GPhoto.CameraStorageInformation[] sifs = null;
- int count = 0;
-- camera.get_storageinfo(&sifs, out count, context);
-+ camera.get_storageinfo(out sifs, context);
-
- GPhoto.PortInfo port_info;
- camera.get_port_info(out port_info);
-diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
-index ab24df61..c424de88 100644
---- a/src/camera/ImportPage.vala
-+++ b/src/camera/ImportPage.vala
-@@ -1179,9 +1179,9 @@ public class ImportPage : CheckerboardPage {
-
- Gee.ArrayList<ImportSource> import_list = new Gee.ArrayList<ImportSource>();
-
-- GPhoto.CameraStorageInformation *sifs = null;
-+ GPhoto.CameraStorageInformation[] sifs = null;
- int count = 0;
-- refresh_result = dcamera.gcamera.get_storageinfo(&sifs, out count, spin_idle_context.context);
-+ refresh_result = dcamera.gcamera.get_storageinfo(out sifs, spin_idle_context.context);
- if (refresh_result == GPhoto.Result.OK) {
- for (int fsid = 0; fsid < count; fsid++) {
- // Check well-known video and image paths first to prevent accidental
-@@ -1324,18 +1324,16 @@ public class ImportPage : CheckerboardPage {
- // Need to do this because some phones (iPhone, in particular) changes the name of their filesystem
- // between each mount
- public static string? get_fs_basedir(GPhoto.Camera camera, int fsid) {
-- GPhoto.CameraStorageInformation *sifs = null;
-+ GPhoto.CameraStorageInformation[] sifs = null;
- int count = 0;
-- GPhoto.Result res = camera.get_storageinfo(&sifs, out count, null_context.context);
-+ GPhoto.Result res = camera.get_storageinfo(out sifs, null_context.context);
- if (res != GPhoto.Result.OK)
- return null;
-
-- if (fsid >= count)
-+ if (fsid >= sifs.length)
- return null;
-
-- GPhoto.CameraStorageInformation *ifs = sifs + fsid;
--
-- return (ifs->fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? ifs->basedir : "/";
-+ return (sifs[fsid].fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? sifs[fsid].basedir : "/";
- }
-
- public static string? get_fulldir(GPhoto.Camera camera, string camera_name, int fsid, string folder) {
-diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
-index 22f70eed..7e569823 100644
---- a/vapi/libgphoto2.vapi
-+++ b/vapi/libgphoto2.vapi
-@@ -64,7 +64,7 @@ namespace GPhoto {
- public Result set_port_info(PortInfo info);
- public Result get_abilities(out CameraAbilities abilities);
- public Result set_abilities(CameraAbilities abilities);
-- public Result get_storageinfo(CameraStorageInformation **sifs, out int count, Context context);
-+ public Result get_storageinfo([CCode (array_length_pos=1)]out CameraStorageInformation[] sifs, Context context);
-
- // Folders
- [CCode (cname="gp_camera_folder_list_folders")]
---
-2.31.1
-
-From e1f53784dd7475388470a30683df34b5ca7784eb Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 13 Mar 2021 23:22:50 +0100
-Subject: [PATCH 2/6] More GPhoto2 vapi fixes
-
----
- vapi/libgphoto2.vapi | 25 ++++++++++++-------------
- 1 file changed, 12 insertions(+), 13 deletions(-)
-
-diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
-index 7e569823..607a644f 100644
---- a/vapi/libgphoto2.vapi
-+++ b/vapi/libgphoto2.vapi
-@@ -53,7 +53,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_CAMERA",
- unref_function="gp_camera_unref",
- free_function="gp_camera_free",
-- cheader_filename="gphoto2/gphoto2-camera.h,gphoto.h"
-+ cheader_filename="gphoto2/gphoto2-camera.h,gphoto2.h"
- )]
- public class Camera {
- [CCode (cname="gp_camera_new")]
-@@ -74,7 +74,7 @@ namespace GPhoto {
- [CCode (cname="gp_camera_folder_delete_all")]
- public Result delete_all_files(string folder, Context context);
- [CCode (cname="gp_camera_folder_put_file")]
-- public Result put_file(string folder, CameraFile file, Context context);
-+ public Result put_file(string folder, string filename, CameraFileType type, CameraFile file, Context context);
- [CCode (cname="gp_camera_folder_make_dir")]
- public Result make_dir(string folder, string name, Context context);
- [CCode (cname="gp_camera_folder_remove_dir")]
-@@ -99,7 +99,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_FILE",
- unref_function="gp_file_unref",
- free_function="gp_file_free",
-- cheader_filename="gphoto2/gphoto2-file.h,gphoto.h"
-+ cheader_filename="gphoto2/gphoto2-file.h,gphoto2.h"
- )]
- public class CameraFile {
- [CCode (cname="gp_file_new")]
-@@ -140,7 +140,6 @@ namespace GPhoto {
- public enum CameraFileInfoFields {
- NONE,
- TYPE,
-- NAME,
- SIZE,
- WIDTH,
- HEIGHT,
-@@ -159,7 +158,7 @@ namespace GPhoto {
- public CameraFileInfoFields fields;
- public CameraFileStatus status;
- public ulong size;
-- public string type;
-+ public char type[64];
- public uint width;
- public uint height;
- public string name;
-@@ -176,7 +175,7 @@ namespace GPhoto {
- public CameraFileInfoFields fields;
- public CameraFileStatus status;
- public ulong size;
-- public string type;
-+ public char type[64];
- public uint width;
- public uint height;
- public string name;
-@@ -257,7 +256,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_LIST",
- unref_function="gp_list_unref",
- free_function="gp_list_free",
-- cheader_filename="gphoto2/gphoto2-list.h,gphoto.h"
-+ cheader_filename="gphoto2/gphoto2-list.h,gphoto2.h"
- )]
- public class CameraList {
- [CCode (cname="gp_list_new")]
-@@ -266,7 +265,7 @@ namespace GPhoto {
- public Result append(string name, string value);
- public Result reset();
- public Result sort();
-- public Result find_by_name(out int? index, string name);
-+ public Result find_by_name(out int index, string name);
- public Result get_name(int index, out unowned string name);
- public Result get_value(int index, out unowned string value);
- public Result set_name(int index, string name);
-@@ -314,9 +313,9 @@ namespace GPhoto {
- )]
- public struct CameraStorageInformation {
- public CameraStorageInfoFields fields;
-- public string basedir;
-- public string label;
-- public string description;
-+ public char basedir[256];
-+ public char label[256];
-+ public char description[256];
- public int type;
- public int fstype;
- public int access;
-@@ -329,7 +328,7 @@ namespace GPhoto {
- [CCode (
- ref_function="GPHOTO_REF_CONTEXT",
- unref_function="gp_context_unref",
-- cheader_filename="gphoto2/gphoto2-context.h,gphoto.h"
-+ cheader_filename="gphoto2/gphoto2-context.h,gphoto2.h"
- )]
- public class Context {
- [CCode (cname="gp_context_new")]
-@@ -485,7 +484,7 @@ namespace GPhoto {
-
- [CCode (
- cheader_filename="gphoto2/gphoto2-version.h",
-- cprefix="GP_VERSION"
-+ cprefix="GP_VERSION_"
- )]
- public enum VersionVerbosity {
- SHORT,
---
-2.31.1
-
-From 754520638beafa997d81fdbff58a9d07a48f7cfd Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 13 Mar 2021 22:31:32 +0100
-Subject: [PATCH 3/6] vapis: Fix gphoto2 vapi
-
-There was some copy-paste going on there that didn't actually match the
-C structs
----
- vapi/libgphoto2.vapi | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
-index 607a644f..adcef5c5 100644
---- a/vapi/libgphoto2.vapi
-+++ b/vapi/libgphoto2.vapi
-@@ -161,7 +161,6 @@ namespace GPhoto {
- public char type[64];
- public uint width;
- public uint height;
-- public string name;
- public CameraFilePermissions permissions;
- public time_t mtime;
- }
-@@ -178,9 +177,6 @@ namespace GPhoto {
- public char type[64];
- public uint width;
- public uint height;
-- public string name;
-- public CameraFilePermissions permissions;
-- public time_t mtime;
- }
-
- [CCode (
---
-2.31.1
-
-From f7d044e7a72b80a550fd1907a2d56053caab1ae3 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sat, 13 Mar 2021 22:32:17 +0100
-Subject: [PATCH 4/6] Fix strings in [SimpleType] structs
-
----
- src/camera/ImportPage.vala | 5 +++--
- vapi/libraw.vapi | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
-index c424de88..f5e98955 100644
---- a/src/camera/ImportPage.vala
-+++ b/src/camera/ImportPage.vala
-@@ -1408,12 +1408,13 @@ public class ImportPage : CheckerboardPage {
- import_list.add(video_source);
- } else {
- // determine file format from type, and then from file extension
-- PhotoFileFormat file_format = PhotoFileFormat.from_gphoto_type(info.file.type);
-+ string file_type = (string)info.file.type;
-+ PhotoFileFormat file_format = PhotoFileFormat.from_gphoto_type(file_type);
- if (file_format == PhotoFileFormat.UNKNOWN) {
- file_format = PhotoFileFormat.get_by_basename_extension(filename);
- if (file_format == PhotoFileFormat.UNKNOWN) {
- message("Skipping %s/%s: Not a supported file extension (%s)", fulldir,
-- filename, info.file.type);
-+ filename, file_type);
-
- continue;
- }
-diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi
-index b1b5875b..146f447e 100644
---- a/vapi/libraw.vapi
-+++ b/vapi/libraw.vapi
-@@ -248,7 +248,7 @@ public struct Thumbnail {
- public uint tlength;
- public int tcolors;
- [CCode (array_length_cname="tlength")]
-- public uint8[] thumb;
-+ public unowned uint8[] thumb;
- }
-
- [CCode (cname="enum LibRaw_thumbnail_formats", cprefix="LIBRAW_THUMBNAIL_")]
---
-2.31.1
-
-From a035ff6ee39dc47c6051f7b29c7da83d3ecde52e Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sun, 14 Mar 2021 11:21:10 +0100
-Subject: [PATCH 5/6] Fix compile error after GPhoto vapi change
-
----
- src/camera/ImportPage.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
-index f5e98955..7dbe9d42 100644
---- a/src/camera/ImportPage.vala
-+++ b/src/camera/ImportPage.vala
-@@ -1333,7 +1333,7 @@ public class ImportPage : CheckerboardPage {
- if (fsid >= sifs.length)
- return null;
-
-- return (sifs[fsid].fields & GPhoto.CameraStorageInfoFields.BASE) != 0 ? sifs[fsid].basedir : "/";
-+ return (GPhoto.CameraStorageInfoFields.BASE in sifs[fsid].fields) ? (string) sifs[fsid].basedir : "/";
- }
-
- public static string? get_fulldir(GPhoto.Camera camera, string camera_name, int fsid, string folder) {
---
-2.31.1
-
-From 44dae743da462742f1acdeb599f0a10afa43e629 Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Sun, 14 Mar 2021 12:22:55 +0100
-Subject: [PATCH 6/6] Fix and clarify the helper header for GPhoto
-
----
- vapi/libgphoto2.vapi | 8 ++++----
- vapi/{gphoto.h => shotwell-gphoto-helper.h} | 0
- 2 files changed, 4 insertions(+), 4 deletions(-)
- rename vapi/{gphoto.h => shotwell-gphoto-helper.h} (100%)
-
-diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
-index adcef5c5..aeab7255 100644
---- a/vapi/libgphoto2.vapi
-+++ b/vapi/libgphoto2.vapi
-@@ -53,7 +53,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_CAMERA",
- unref_function="gp_camera_unref",
- free_function="gp_camera_free",
-- cheader_filename="gphoto2/gphoto2-camera.h,gphoto2.h"
-+ cheader_filename="gphoto2/gphoto2-camera.h,shotwell-gphoto-helper.h"
- )]
- public class Camera {
- [CCode (cname="gp_camera_new")]
-@@ -99,7 +99,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_FILE",
- unref_function="gp_file_unref",
- free_function="gp_file_free",
-- cheader_filename="gphoto2/gphoto2-file.h,gphoto2.h"
-+ cheader_filename="gphoto2/gphoto2-file.h,shotwell-gphoto-helper.h"
- )]
- public class CameraFile {
- [CCode (cname="gp_file_new")]
-@@ -252,7 +252,7 @@ namespace GPhoto {
- ref_function="GPHOTO_REF_LIST",
- unref_function="gp_list_unref",
- free_function="gp_list_free",
-- cheader_filename="gphoto2/gphoto2-list.h,gphoto2.h"
-+ cheader_filename="gphoto2/gphoto2-list.h,shotwell-gphoto-helper.h"
- )]
- public class CameraList {
- [CCode (cname="gp_list_new")]
-@@ -324,7 +324,7 @@ namespace GPhoto {
- [CCode (
- ref_function="GPHOTO_REF_CONTEXT",
- unref_function="gp_context_unref",
-- cheader_filename="gphoto2/gphoto2-context.h,gphoto2.h"
-+ cheader_filename="gphoto2/gphoto2-context.h,shotwell-gphoto-helper.h"
- )]
- public class Context {
- [CCode (cname="gp_context_new")]
-diff --git a/vapi/gphoto.h b/vapi/shotwell-gphoto-helper.h
-similarity index 100%
-rename from vapi/gphoto.h
-rename to vapi/shotwell-gphoto-helper.h
---
-2.31.1
-
diff --git a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
deleted file mode 100644
index f39f988f9645..000000000000
--- a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 59ae0ce648982669f24a33db501f3f229508cb6e Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Tue, 30 Nov 2021 15:09:17 +0100
-Subject: [PATCH] Fix accessibility issues with initializer of constants
-
----
- src/International.vala | 2 --
- src/Resources.vala | 7 -------
- vapi/version.vapi | 17 ++++++++++++++---
- 3 files changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/src/International.vala b/src/International.vala
-index 555a91f8..73f07639 100644
---- a/src/International.vala
-+++ b/src/International.vala
-@@ -4,8 +4,6 @@
- * See the COPYING file in this distribution.
- */
-
--extern const string _LANG_SUPPORT_DIR;
--
- public const string TRANSLATABLE = "translatable";
-
- namespace InternationalSupport {
-diff --git a/src/Resources.vala b/src/Resources.vala
-index 6d2b8851..86f0eb65 100644
---- a/src/Resources.vala
-+++ b/src/Resources.vala
-@@ -4,13 +4,6 @@
- * See the COPYING file in this distribution.
- */
-
--// defined by ./configure or Makefile and included by gcc -D
--extern const string _PREFIX;
--extern const string _VERSION;
--extern const string GETTEXT_PACKAGE;
--extern const string _LIB;
--extern const string _LIBEXECDIR;
--
- namespace Resources {
- public const string APP_TITLE = "Shotwell";
- public const string APP_LIBRARY_ROLE = _("Photo Manager");
-diff --git a/vapi/version.vapi b/vapi/version.vapi
-index 06974c84..e191f2f7 100644
---- a/vapi/version.vapi
-+++ b/vapi/version.vapi
-@@ -1,3 +1,14 @@
--[CCode (cheader_filename="version.h")]
--extern const string? _GIT_VERSION;
--
-+[CCode (cheader_filename = "version.h")]
-+public const string? _GIT_VERSION;
-+[CCode (cheader_filename = "config.h")]
-+public const string _PREFIX;
-+[CCode (cheader_filename = "config.h")]
-+public const string _VERSION;
-+[CCode (cheader_filename = "config.h")]
-+public const string GETTEXT_PACKAGE;
-+[CCode (cheader_filename = "config.h")]
-+public const string _LIB;
-+[CCode (cheader_filename = "config.h")]
-+public const string _LIBEXECDIR;
-+[CCode (cheader_filename = "config.h")]
-+public const string _LANG_SUPPORT_DIR;
---
-GitLab
-
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index fa533f27b167..0a5f0718780c 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -1,14 +1,14 @@
# Template file for 'shotwell'
pkgname=shotwell
-version=0.31.3
-revision=2
+version=0.31.5
+revision=1
build_style=meson
hostmakedepends="gcr-devel gettext glib-devel itstool
libgee08-devel libgexiv2-devel pkg-config vala-devel"
makedepends="gst-plugins-base1-devel libgdata-devel
libgee08-devel libgexiv2-devel libgphoto2-devel libgudev-devel
libraw-devel libsecret-devel libchamplain-devel libwebp-devel
- rest-devel vala-devel webkit2gtk-devel"
+ rest-devel vala-devel libwebkit2gtk41-devel libsoup3-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="Open source photo manager for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later, CC-BY-SA-3.0"
homepage="https://wiki.gnome.org/Apps/Shotwell"
changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
-checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2
+checksum=3b048fc6ce99b232d1e0ea9b8db074083c86c88d3b6d63136a2cf8217aa45c19
lib32disabled=yes
post_extract() {
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0
2022-10-01 15:58 [PR PATCH] geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0 paper42
` (3 preceding siblings ...)
2022-10-22 19:52 ` paper42
@ 2022-10-22 20:13 ` paper42
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-10-22 20:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]
There's a merged pull request on the void-packages repository
geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0
https://github.com/void-linux/void-packages/pull/39594
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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] 6+ messages in thread
end of thread, other threads:[~2022-10-22 20:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-01 15:58 [PR PATCH] geocode-glib: use libsoup3, split -common, geocode-glib-libsoup2, gnome-photos: update to 43.0 paper42
2022-10-22 14:03 ` [PR PATCH] [Updated] " paper42
2022-10-22 14:46 ` paper42
2022-10-22 19:09 ` paper42
2022-10-22 19:52 ` paper42
2022-10-22 20:13 ` [PR PATCH] [Merged]: " paper42
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).