From b9ed89634f16be44f79a18907b8df9aad0612e52 Mon Sep 17 00:00:00 2001 From: Michal Vasilek 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 " 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 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 " +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 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 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 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 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 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 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 " license="GPL-3.0-only" From 910360c18299da9b130545cc03887947ea382d4d Mon Sep 17 00:00:00 2001 From: Michal Vasilek 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 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 " 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 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 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 " 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 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 " @@ -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"