From f071cfec17310fa95b0b405fe0ccf0c7fa888af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Thu, 24 Mar 2022 12:47:21 +0100 Subject: [PATCH 01/58] community/gnome-bluetooth: upgrade to 42.0 --- community/gnome-bluetooth/APKBUILD | 37 +++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/community/gnome-bluetooth/APKBUILD b/community/gnome-bluetooth/APKBUILD index 7f6e7da84b8..ee85cc42df6 100644 --- a/community/gnome-bluetooth/APKBUILD +++ b/community/gnome-bluetooth/APKBUILD @@ -1,16 +1,26 @@ # Contributor: Natanael Copa # Maintainer: Rasmus Thomsen pkgname=gnome-bluetooth -pkgver=3.34.5 -pkgrel=1 +pkgver=42.0 +pkgrel=0 pkgdesc="The GNOME Bluetooth Subsystem" url="https://wiki.gnome.org/Projects/GnomeBluetooth" -arch="all" +# riscv64, s390x: blocked by gtk4.0-dev, libadwaita-dev, upower-dev +arch="all !riscv64 !s390x" license="GPL-2.0-or-later AND LGPL-2.1-or-later" -depends="hicolor-icon-theme bluez>=5 bluez-obexd" -makedepends="dconf-dev gobject-introspection-dev libnotify-dev libxi-dev - dbus-glib-dev gtk+3.0-dev eudev-dev libcanberra-dev meson" -checkdepends="py3-dbus py3-gobject3" +depends="bluez>=5 bluez-obexd" +makedepends=" + eudev-dev + glib-dev + gobject-introspection-dev + gsound-dev + gtk4.0-dev + libadwaita-dev + libnotify-dev + meson + upower-dev + " +checkdepends="py3-dbus py3-gobject3 py3-dbusmock" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" source="https://download.gnome.org/sources/gnome-bluetooth/${pkgver%.*}/gnome-bluetooth-$pkgver.tar.xz 61-gnome-bluetooth-rfkill.rules" @@ -30,12 +40,7 @@ package() { "$pkgdir/lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules" } -libs() { - default_libs - replaces="gnome-bluetooth" - mkdir -p "$subpkgdir"/usr/share - mv "$pkgdir"/usr/share/icons "$subpkgdir"/usr/share/ -} - -sha512sums="48431b3d19083705a6623442c5cd2d6c14962cdf30fc599ba47dceb6612b80142af77e1b6df142b530cb1015638081a06de38a3034177e0d05a354c40f19d9e5 gnome-bluetooth-3.34.5.tar.xz -80b7fd0bc3e0f82c8d2d609ffed634200e63f61d9a134445df8e8511756b7fb423d338a1d12e42b91c57243097beaa3d4662856ec0507fb19a29b6de7ee9e4de 61-gnome-bluetooth-rfkill.rules" +sha512sums=" +769bd9300fa1d830240e84257230425fe7f2e871cbd6c8fa6416514487a26326601a21c16075a66cf886850bab17f5c8e2235463f3695ea194c9230d6e50337c gnome-bluetooth-42.0.tar.xz +80b7fd0bc3e0f82c8d2d609ffed634200e63f61d9a134445df8e8511756b7fb423d338a1d12e42b91c57243097beaa3d4662856ec0507fb19a29b6de7ee9e4de 61-gnome-bluetooth-rfkill.rules +" -- GitLab From db7d919b3e15bd1510f7dbffd47b22a867d608bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Thu, 24 Mar 2022 12:48:02 +0100 Subject: [PATCH 02/58] community/gnome-bluetooth: update rule This was added upstream: https://github.com/systemd/systemd/pull/21605/files but seems like the rule is not pulled by eudev. Not sure what to do with this. --- community/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules | 2 ++ community/gnome-bluetooth/APKBUILD | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/community/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/community/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules index a76c1e73cf7..cd29294cada 100644 --- a/community/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules +++ b/community/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules @@ -7,5 +7,7 @@ ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end" ACTION!="add|change", GOTO="gnome_bluetooth_end" +# https://github.com/systemd/systemd/pull/21605 +KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess" KERNEL=="rfkill", TAG+="udev-acl" LABEL="gnome_bluetooth_end" diff --git a/community/gnome-bluetooth/APKBUILD b/community/gnome-bluetooth/APKBUILD index ee85cc42df6..0c85aa49f21 100644 --- a/community/gnome-bluetooth/APKBUILD +++ b/community/gnome-bluetooth/APKBUILD @@ -42,5 +42,5 @@ package() { sha512sums=" 769bd9300fa1d830240e84257230425fe7f2e871cbd6c8fa6416514487a26326601a21c16075a66cf886850bab17f5c8e2235463f3695ea194c9230d6e50337c gnome-bluetooth-42.0.tar.xz -80b7fd0bc3e0f82c8d2d609ffed634200e63f61d9a134445df8e8511756b7fb423d338a1d12e42b91c57243097beaa3d4662856ec0507fb19a29b6de7ee9e4de 61-gnome-bluetooth-rfkill.rules +68ea6502a469d800e92d8984984cfddfa66e7bf8a0252d52a2338843d183680c84aa7ec6c4c7d14a250515b34b71d89364480c809743ba9e7ef30473b8ebb5a8 61-gnome-bluetooth-rfkill.rules " -- GitLab From 5d3a3a8f4f819d92b46895d6a4c884af2aff5a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Wed, 23 Mar 2022 15:36:22 +0100 Subject: [PATCH 03/58] community/gnome-desktop: upgrade to 42.0 --- community/gnome-desktop/APKBUILD | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/community/gnome-desktop/APKBUILD b/community/gnome-desktop/APKBUILD index 67c62baf0a4..d7aa648dfa4 100644 --- a/community/gnome-desktop/APKBUILD +++ b/community/gnome-desktop/APKBUILD @@ -1,16 +1,28 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-desktop -pkgver=41.1 +pkgver=42.0 pkgrel=0 pkgdesc="GNOME desktop core libraries" url="https://gitlab.gnome.org/GNOME/gnome-desktop" arch="all !s390x" # s390x: build fails license="GPL-2.0-or-later AND LGPL-2.1-or-later" -depends_dev="gobject-introspection-dev gsettings-desktop-schemas-dev - gtk+3.0-dev" -makedepends="$depends_dev eudev-dev iso-codes-dev libseccomp-dev libx11-dev - itstool libxml2-utils gtk-doc meson glib-dev xkeyboard-config" +depends_dev="gobject-introspection-dev gsettings-desktop-schemas-dev" +makedepends="$depends_dev + eudev-dev + fontconfig-dev + gdk-pixbuf-dev + glib-dev + gtk-doc + gtk+3.0-dev + gtk4.0-dev + iso-codes-dev + itstool + libseccomp-dev + libxml2-utils + meson + xkeyboard-config + " depends="bubblewrap musl-locales" options="!check" # Can't find its own GSettings schemas subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-dbg" @@ -21,6 +33,8 @@ build() { abuild-meson \ -Dgnome_distributor="Alpine Linux" \ -Dudev=enabled \ + -Dbuild_gtk4=true \ + -Dlegacy_library=true \ . output meson compile ${JOBS:+-j ${JOBS}} -C output } @@ -33,5 +47,5 @@ package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output } sha512sums=" -dd90ebfe54f4af614c0f21544c50fa0853db520749a6dd710d493e8f86a498369a66413d3442e985cb5cca4dad05c90a3e24d8d0c634bd7994e4d83c6d1ec762 gnome-desktop-41.1.tar.xz +b9d37765d3cc43bb709e1e9b97deb6ef16d2a8e6ef7cc3c577ba465d4856bbfe8774fb7fc6eaae4d88064081aeeea0c0c77fe2b4ef79b4d9af1232c918526b44 gnome-desktop-42.0.tar.xz " -- GitLab From 37995d966ba7dc8c8ba0681a5dcfe2edfcfaed10 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Thu, 24 Mar 2022 16:34:26 +0100 Subject: [PATCH 04/58] community/gnome-bluetooth: disable on s390x and armhf tests --- community/gnome-bluetooth/APKBUILD | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/community/gnome-bluetooth/APKBUILD b/community/gnome-bluetooth/APKBUILD index 0c85aa49f21..8bc3ac308ee 100644 --- a/community/gnome-bluetooth/APKBUILD +++ b/community/gnome-bluetooth/APKBUILD @@ -25,6 +25,10 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" source="https://download.gnome.org/sources/gnome-bluetooth/${pkgver%.*}/gnome-bluetooth-$pkgver.tar.xz 61-gnome-bluetooth-rfkill.rules" +if [ "$CARCH" = "armhf" ]; then + options="!check"; # tests fail on armhf +fi + build() { abuild-meson output . meson compile ${JOBS:+-j ${JOBS}} -C output -- GitLab From 898e62ec88376aa6e41b4b4b574d7ce7b4da2bbe Mon Sep 17 00:00:00 2001 From: Newbyte Date: Thu, 24 Mar 2022 17:38:19 +0100 Subject: [PATCH 05/58] community/libhandy1: upgrade to 1.6.1 --- community/libhandy1/792.diff | 22 ---------------------- community/libhandy1/APKBUILD | 10 ++++------ 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 community/libhandy1/792.diff diff --git a/community/libhandy1/792.diff b/community/libhandy1/792.diff deleted file mode 100644 index f7d25a9e649..00000000000 --- a/community/libhandy1/792.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/hdy-swipe-tracker.c b/src/hdy-swipe-tracker.c -index 03b417811764b1d1d608f4919fa94816d08a5cec..ba01bd057b49496fb3d4a8565cedcddacd600487 100644 ---- a/src/hdy-swipe-tracker.c -+++ b/src/hdy-swipe-tracker.c -@@ -944,14 +944,14 @@ hdy_swipe_tracker_dispose (GObject *object) - { - HdySwipeTracker *self = HDY_SWIPE_TRACKER (object); - -- if (self->swipeable) -+ if (self->swipeable) { - gtk_grab_remove (GTK_WIDGET (self->swipeable)); -+ g_object_set_data (G_OBJECT (self->swipeable), "captured-event-handler", NULL); -+ } - - if (self->touch_gesture) - g_signal_handlers_disconnect_by_data (self->touch_gesture, self); - -- g_object_set_data (G_OBJECT (self->swipeable), "captured-event-handler", NULL); -- - g_clear_pointer (&self->event_history, g_array_unref); - g_clear_object (&self->touch_gesture); - set_swipeable (self, NULL); diff --git a/community/libhandy1/APKBUILD b/community/libhandy1/APKBUILD index 82a16440857..3a5a7fd69e7 100644 --- a/community/libhandy1/APKBUILD +++ b/community/libhandy1/APKBUILD @@ -1,18 +1,17 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=libhandy1 -pkgver=1.5.0 -pkgrel=1 +pkgver=1.6.1 +pkgrel=0 pkgdesc="Library full of GTK+ widgets for mobile phones" url="https://gitlab.gnome.org/GNOME/libhandy" arch="all !s390x !riscv64" # blocked by rust -> adwaita-icon-theme license="LGPL-2.0-or-later" makedepends="meson glib-dev gtk+3.0-dev vala py3-setuptools gobject-introspection-dev glade-dev" -checkdepends="xvfb-run ibus adwaita-icon-theme" +checkdepends="xvfb-run ibus adwaita-icon-theme ttf-cantarell" subpackages="$pkgname-dbg $pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/libhandy/${pkgver%.*}/libhandy-$pkgver.tar.xz - 792.diff " builddir="$srcdir/libhandy-$pkgver" @@ -43,6 +42,5 @@ dev() { } sha512sums=" -cd7706e97bc9d5a7d595c450145bc157b95afaccc1ee26b5490149327fd644eb522b7bbfee92ea2780083c36d69bbd666c52e38a752e78068a5ba0f79b3c56a0 libhandy-1.5.0.tar.xz -9782af230a636c27bf1a2b0ec1c7dc1de362612a49ddc156623af1a1feae09c75fa462782278487735b10444798e668cb36f52a619839ddc7afc652cda575426 792.diff +1fddf72d7e6d97f12c879a512baeef80e32be4108640b2ff64c5b7dec68d8e2da8f9a2da3c1cb6cde8c2e672f4225e7db698f794641264e64ee9af3c68dbfbb3 libhandy-1.6.1.tar.xz " -- GitLab From 53238f76c709ef4922bec9fbb1e32d954a462b69 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Thu, 24 Mar 2022 17:54:11 +0100 Subject: [PATCH 06/58] community/baobab: upgrade to 42.0 --- community/baobab/APKBUILD | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/community/baobab/APKBUILD b/community/baobab/APKBUILD index cd0fe53bffe..04946833e8c 100644 --- a/community/baobab/APKBUILD +++ b/community/baobab/APKBUILD @@ -1,14 +1,22 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=baobab -pkgver=41.0 +pkgver=42.0 pkgrel=0 pkgdesc="A graphical application to analyse disk usage in any Gnome environment" url="https://wiki.gnome.org/action/show/Apps/DiskUsageAnalyzer" # s390x and riscv64 blocked by rust -> libhandy1 arch="all !s390x !riscv64" license="GPL-2.0-or-later" -makedepends="meson glib-dev gtk+3.0-dev gettext-dev vala itstool libhandy1-dev" +makedepends=" + gettext-dev + glib-dev + gtk4.0-dev + itstool + libadwaita-dev + meson + vala + " options="!check" # no tests subpackages="$pkgname-lang $pkgname-doc" source="https://download.gnome.org/sources/baobab/${pkgver%.*}/baobab-$pkgver.tar.xz" @@ -23,5 +31,5 @@ package() { } sha512sums=" -4f41cac42491afb98855771a621573689f2b35c0a2602799af9f88adf901a5c62c9f8e4b70be43ed27024deba860b128bc22b8a7782ac207a5746b4df6b65aa0 baobab-41.0.tar.xz +21837bfe901034ed3450f6937d3ede1e567d16a5ae308db91029dc2ff4bb523b36f9408f7489c6798140de039e928f49969a1ed741027da0ae8377be6352ba08 baobab-42.0.tar.xz " -- GitLab From 963f174c0d0be11e93986c2a811763f7c09419a4 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Thu, 24 Mar 2022 18:03:35 +0100 Subject: [PATCH 07/58] community/nautilus: upgrade to 42.0 --- community/nautilus/APKBUILD | 36 ++++++++---- .../fix-build-with-libportal-0.5.patch | 57 ------------------- .../nautilus/remove-incorrect-argument.patch | 44 -------------- 3 files changed, 25 insertions(+), 112 deletions(-) delete mode 100644 community/nautilus/fix-build-with-libportal-0.5.patch delete mode 100644 community/nautilus/remove-incorrect-argument.patch diff --git a/community/nautilus/APKBUILD b/community/nautilus/APKBUILD index 3f297cb2fc8..2bc9836b132 100644 --- a/community/nautilus/APKBUILD +++ b/community/nautilus/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=nautilus -pkgver=41.0 -pkgrel=1 +pkgver=42.0 +pkgrel=0 pkgdesc="GNOME file manager" url="https://wiki.gnome.org/Apps/Nautilus" # s390x and riscv64 blocked by librsvg @@ -10,16 +10,32 @@ arch="all !s390x !riscv64" license="GPL-2.0-or-later" depends="tracker-miners gsettings-desktop-schemas" depends_dev="gnome-desktop-dev gnome-autoar-dev" -makedepends="$depends_dev itstool libxml2-dev libxml2-utils docbook-xsl - docbook-xml libxslt intltool libexif-dev jpeg-dev tiff-dev librsvg-dev - libseccomp-dev tracker-dev gst-plugins-base-dev meson gexiv2-dev - tracker-testutils libhandy1-dev libportal-dev" +makedepends=" + $depends_dev + docbook-xml + docbook-xsl + gexiv2-dev + gst-plugins-base-dev + intltool + itstool + jpeg-dev + libexif-dev + libhandy1-dev + libportal-dev + librsvg-dev + libseccomp-dev + libxml2-dev + libxml2-utils + libxslt + meson + tiff-dev + tracker-dev + tracker-testutils + " checkdepends="desktop-file-utils appstream-glib" subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/nautilus/${pkgver%.*}/nautilus-$pkgver.tar.xz meson-fix-mixed-list.patch - remove-incorrect-argument.patch - fix-build-with-libportal-0.5.patch " if [ "$CARCH" = "armhf" ]; then @@ -46,8 +62,6 @@ package() { } sha512sums=" -9c2edf2d7e8461175b80f462cbea01c918dd49c50fdcbeee4713ac83f3506c7e21fe80d5d9990d299ffded2a4d08425500b0850a77ee7e0aba3802caa00db691 nautilus-41.0.tar.xz +c3b182f75f89a31ecb7b4f6b42dfb2f9792e195fdaf0e5f2b1a4dbe0f0d01071cf4ecb8408d6da476aa111ec891462e33c0d139d3423109bd5b4138ae822bd1e nautilus-42.0.tar.xz d08c6833343b8ed89515d12063938e7236cb37d15b7115de50a43bd9a049a09a5a2fc907f52675ba85abecef9bae82c7848249872908eeb39c5c49a744cbf9d1 meson-fix-mixed-list.patch -113efd6d4a6e43328da91a01ea6a02f91ead75e2f8c8f2e0625eb0dd7152690076e6590ed267f22b4e6b8620ae6e87af68490a492e3484f0f9f6b37efc952fa5 remove-incorrect-argument.patch -01fd3c7ae497918c82ac89eee7a136d4a21207b95bb4d3fd7fff9ac6709029a7c3e9a9f315f51fb8601a41e84eeb5286d1851098925c95b26f8226441fa3e06b fix-build-with-libportal-0.5.patch " diff --git a/community/nautilus/fix-build-with-libportal-0.5.patch b/community/nautilus/fix-build-with-libportal-0.5.patch deleted file mode 100644 index 8db7d71f86c..00000000000 --- a/community/nautilus/fix-build-with-libportal-0.5.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 4da207cf1bebe3e84020c1f8d6b7738ccbffb0a8 Mon Sep 17 00:00:00 2001 -From: knuxify -Date: Fri, 21 Jan 2022 09:15:35 +0100 -Subject: [PATCH] fix build with libportal 0.5 - -Based on https://gitlab.gnome.org/GNOME/nautilus/-/commit/ae752ea07895b918683f664fe78950255f7faab0 - ---- - meson.build | 4 +++- - src/meson.build | 1 + - src/nautilus-files-view.c | 2 +- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index eef20f3..f90618a 100644 ---- a/meson.build -+++ b/meson.build -@@ -122,8 +122,10 @@ gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0') - gtk = dependency('gtk+-3.0', version: '>= 3.22.27') - libhandy = dependency('libhandy-1', version: '>= 1.1.90') - libportal = [] -+libportal_gtk3 = [] - if get_option('libportal') -- libportal = dependency('libportal', version: '>= 0.3') -+ libportal = dependency('libportal', version: '>= 0.5') -+ libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5') - endif - selinux = [] - if get_option('selinux') -diff --git a/src/meson.build b/src/meson.build -index 39e0b03..c13f0b7 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -283,6 +283,7 @@ nautilus_deps = [ - libgd_dep, - libhandy, - libportal, -+ libportal_gtk3, - nautilus_extension, - selinux, - tracker_sparql, -diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c -index 4e57ae6..df8059d 100644 ---- a/src/nautilus-files-view.c -+++ b/src/nautilus-files-view.c -@@ -92,7 +92,7 @@ - - #ifdef HAVE_LIBPORTAL - #include --#include -+#include - #endif - - /* Minimum starting update inverval */ --- -2.34.1 - diff --git a/community/nautilus/remove-incorrect-argument.patch b/community/nautilus/remove-incorrect-argument.patch deleted file mode 100644 index 4c1c7787734..00000000000 --- a/community/nautilus/remove-incorrect-argument.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 42b0362e9844f4c5114b21464185620eaadcfcaa Mon Sep 17 00:00:00 2001 -From: Albert Vaca Cintora -Date: Mon, 25 Oct 2021 00:07:52 +0200 -Subject: [PATCH] build: Remove incorrect i18n.merge_file argument - -The positional argument was being silently ignored until meson 0.60.0 where -it fails with "ERROR: Function does not take positional arguments". - -See: https://github.com/mesonbuild/meson/issues/9441 ---- - data/meson.build | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index f27426a5c..913ffd7b8 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -20,7 +20,6 @@ desktop_conf = configuration_data() - desktop_conf.set('icon', application_id) - - desktop = i18n.merge_file( -- 'desktop', - input: configure_file( - input: files('org.gnome.Nautilus.desktop.in.in'), - output: 'org.gnome.Nautilus.desktop.in', -@@ -34,7 +33,6 @@ desktop = i18n.merge_file( - ) - - desktop_autorun_software = i18n.merge_file( -- 'desktop-autorun-software', - input: 'nautilus-autorun-software.desktop.in', - output: 'nautilus-autorun-software.desktop', - install: true, -@@ -48,7 +46,6 @@ appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) - - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: files('org.gnome.Nautilus.appdata.xml.in.in'), - output: 'org.gnome.Nautilus.appdata.xml.in', --- -GitLab - -- GitLab From b3a11fddf2b477a6b64c0518050bddc4ff414bb6 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Mon, 28 Mar 2022 14:30:43 +0200 Subject: [PATCH 08/58] community/phosh: upgrade to 0.17.0 --- community/phosh/APKBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/community/phosh/APKBUILD b/community/phosh/APKBUILD index 3a06ec3e604..d8d062f980f 100644 --- a/community/phosh/APKBUILD +++ b/community/phosh/APKBUILD @@ -3,10 +3,10 @@ # Contributor: Newbyte # Maintainer: Rasmus Thomsen pkgname=phosh -pkgver=0.16.0 +pkgver=0.17.0 pkgrel=0 _commit_gvc="ae1a34aafce7026b8c0f65a43c9192d756fe1057" -_tag_libcall_ui="v0.0.2" +_commit_libcall_ui="acfbb136bbf74514e0b9801ce6c1e8acf36350b6" pkgdesc="Shell PoC for the Librem5" # Blocked on s390x by gnome-session, gnome-settings-daemon, squeekboard and libhandy # Blocked on ppc64le by gnome-session @@ -22,7 +22,7 @@ makedepends="gtk+3.0-dev meson ninja gnome-desktop-dev callaudiod-dev libgudev-d subpackages="$pkgname-dbg $pkgname-lang" source="$pkgname-$pkgver.tar.gz::$url/-/archive/v$pkgver/phosh-v$pkgver.tar.gz https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/$_commit_gvc/gvc-$_commit_gvc.tar.gz - https://gitlab.gnome.org/World/Phosh/libcall-ui/-/archive/$_tag_libcall_ui/libcall-ui-$_tag_libcall_ui.tar.gz + https://gitlab.gnome.org/World/Phosh/libcall-ui/-/archive/$_commit_libcall_ui/libcall-ui-$_commit_libcall_ui.tar.gz phosh.desktop sm.puri.OSK0.desktop " @@ -36,7 +36,7 @@ prepare() { cui_path="$subproject_path"/libcall-ui mkdir -p $gvc_path $cui_path mv "$srcdir"/libgnome-volume-control-"$_commit_gvc"/* $gvc_path - mv "$srcdir"/libcall-ui-"$_tag_libcall_ui"/* $cui_path + mv "$srcdir"/libcall-ui-"$_commit_libcall_ui"/* $cui_path } build() { @@ -59,9 +59,9 @@ package() { } sha512sums=" -d26016c4fadce77c5926eb66a46c6aed0985b88a0f9b93859e8e20caee35bf1687f4f9959872cf89a047712299cdee7aab0cc82f923e90e8d55c6bd2278caf9e phosh-0.16.0.tar.gz +020a0cc5659d5c1a5f4291baed231f3f7b698dc41f027173cc59f3429a1a43bbf6f2213f2fb79d7d2c175518cb6a892c419a3b0ad902e51cca2c313f5bbc84bf phosh-0.17.0.tar.gz 723334bff55927363dab47ef22c71dcaf94263fe76e49c40f1cbfbd5f86383e68fd4bf2182eb5777dda8e2ede4ee4710e1a7ab1379d3ca40d68f68ff30c62e21 gvc-ae1a34aafce7026b8c0f65a43c9192d756fe1057.tar.gz -e40e3d57c1057dc3d2e812b1bb94d001d553f7a8b6b475f9a3a889f2e082b0ee4d07726584aef6997b0f6053946693fd8d1db684e9da34fec82a7b68d9a43979 libcall-ui-v0.0.2.tar.gz +b79e3d8ac9889109e0fe20f149ffb14bde198f7a364152a60c7175228c283f18a7abe2049b01935d11fd005e14ef4da9c23ada6c651801364c79bc2dca1e71f2 libcall-ui-acfbb136bbf74514e0b9801ce6c1e8acf36350b6.tar.gz aef856033ae17bc8e18963ea56aad34e6e0d262d0060f9b5aa9f072c7598d531ee9a55b189d6fadf7e6f3c5dd113b77de51a64bcf17ad5764ff57a4be8472dc7 phosh.desktop 52a670893bd5027d6a45d7ff18258d634dc5d98371a7cdc094261ccc12a15d0b46e96d572ae8882ae27eb90418f2dc4f0fb1a45ce95f8d70eadc51d284780916 sm.puri.OSK0.desktop " -- GitLab From a73a568a6307f9537172c31376f3920045f0206b Mon Sep 17 00:00:00 2001 From: Newbyte Date: Mon, 28 Mar 2022 15:04:38 +0200 Subject: [PATCH 09/58] community/gnome-contacts: upgrade to 42.0 --- community/gnome-contacts/APKBUILD | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/community/gnome-contacts/APKBUILD b/community/gnome-contacts/APKBUILD index b4c779b1bcb..a1ac72cf392 100644 --- a/community/gnome-contacts/APKBUILD +++ b/community/gnome-contacts/APKBUILD @@ -1,22 +1,36 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-contacts -pkgver=41.0 -pkgrel=1 +pkgver=42.0 +pkgrel=0 pkgdesc="A contacts manager for GNOME" url="https://wiki.gnome.org/Apps/Contacts" -# s390x and riscv64 blocked by libhandy1 +# s390x and riscv64 blocked by libadwaita-dev arch="all !s390x !riscv64" license="GPL-2.0-or-later" -makedepends="meson vala folks-dev libgee-dev glib-dev gnome-desktop-dev - gnome-online-accounts-dev cheese-dev evolution-data-server-dev telepathy-glib-dev - libhandy1-dev gtk+3.0-dev" +makedepends=" + cheese-dev + evolution-data-server-dev + folks-dev + glib-dev + gnome-desktop-dev + gnome-online-accounts-dev + gtk4.0-dev + libadwaita-dev + libgee-dev + libportal-dev + meson + telepathy-glib-dev + vala + " checkdepends="appstream-glib desktop-file-utils" subpackages="$pkgname-lang $pkgname-doc" source="https://download.gnome.org/sources/gnome-contacts/${pkgver%.*}/gnome-contacts-$pkgver.tar.xz" build() { - abuild-meson . output + abuild-meson \ + -Dtelepathy=true \ + . output meson compile ${JOBS:+-j ${JOBS}} -C output } @@ -29,5 +43,5 @@ package() { } sha512sums=" -310f333c0863d8e58c2280b994071b2655eee7224ab80a468ffc7acc61834d3f6dbb794bbdc5b8d4428226bab96f3ea65b8bed39df79d88704e38b51a8f4b05f gnome-contacts-41.0.tar.xz +09a0d70a1550136717c4f837f2e4526928559de4bccedb71b34a216d99c36886bfd5786fcc3487198c488b4778046453d0069da55ab283ef87513c2d668a11cd gnome-contacts-42.0.tar.xz " -- GitLab From 9d3cdf4111ff7f5d4d6db03be269f0f05e9b6efe Mon Sep 17 00:00:00 2001 From: Newbyte Date: Mon, 28 Mar 2022 15:23:06 +0200 Subject: [PATCH 10/58] community/gtksourceview5: upgrade to 5.4.0 --- community/gtksourceview5/APKBUILD | 6 +++--- community/gtksourceview5/skip-test.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/community/gtksourceview5/APKBUILD b/community/gtksourceview5/APKBUILD index 01bb97e473d..e9bd764c19d 100644 --- a/community/gtksourceview5/APKBUILD +++ b/community/gtksourceview5/APKBUILD @@ -1,7 +1,7 @@ # Contributor:Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gtksourceview5 -pkgver=5.2.0 +pkgver=5.4.0 pkgrel=0 pkgdesc="A text widget adding syntax highlighting and more to GNOME" url="https://wiki.gnome.org/Projects/GtkSourceView" @@ -32,6 +32,6 @@ package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output } sha512sums=" -0d71b0340b11b3aadfff662abbaa8606cda696c256855201e559b144b124d6e7c87aee5ea1407928f549b0a5e8480c669403fe73ad76520c2214635a1a31bf52 gtksourceview-5.2.0.tar.xz -c765c7c77a94007e95c050c05ef0283b2cdcd5751274924ea08a02ea2507061677d7f286c3e98d6b91f3603a06364d1ea43491e77e2e086e05c841218923e771 skip-test.patch +0a84e2012639aa29613896e36bb8e73656661dbd9c045507cae3c0d9863dc1ed0390432091d2d2e62fd4a9a0f1853820a2edb406ef2deecd0996b202c7b741c3 gtksourceview-5.4.0.tar.xz +e0b1d13dac82715f086ca5d53ef03cfdde4520738a0d011e583752b42b4c5ddbfe320626cb35f1f395a06e9d5bd4122f1f122f043941d42f4efb5c29c331abc4 skip-test.patch " diff --git a/community/gtksourceview5/skip-test.patch b/community/gtksourceview5/skip-test.patch index 9622cab208a..b26f074054a 100644 --- a/community/gtksourceview5/skip-test.patch +++ b/community/gtksourceview5/skip-test.patch @@ -9,6 +9,6 @@ index f842a07..bd31ec8 100644 ['test-undo-manager'], ['test-utils'], - ['test-view'], - ] - - foreach test: testsuite_sources + ['test-vim-input'], + ['test-vim-state'], + ['test-vim-text-object'], -- GitLab From 8db4101769ce48f5fdadd00bba45b999ba9c4b9e Mon Sep 17 00:00:00 2001 From: Newbyte Date: Mon, 28 Mar 2022 15:23:27 +0200 Subject: [PATCH 11/58] community/gnome-calculator: upgrade to 42.0 --- community/gnome-calculator/APKBUILD | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/community/gnome-calculator/APKBUILD b/community/gnome-calculator/APKBUILD index 1b68926ffbe..001e4a1404c 100644 --- a/community/gnome-calculator/APKBUILD +++ b/community/gnome-calculator/APKBUILD @@ -1,15 +1,29 @@ # Contributors: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-calculator -pkgver=41.1 +pkgver=42.0 pkgrel=0 pkgdesc="Calculator for solving mathematical equations" url="https://wiki.gnome.org/Apps/Calculator" -# s390x and riscv64 blocked by rust -> libhandy1 +# s390x and riscv64 blocked by gtk4 arch="all !s390x !riscv64" license="GPL-3.0-or-later" -makedepends="vala gtksourceview4-dev glib-dev gtk+3.0-dev libsoup-dev - libxml2-dev meson mpc1-dev mpfr-dev itstool libgee-dev libhandy1-dev" +# font needed for pango in tests and valadoc +makedepends=" + glib-dev + gtksourceview5-dev + gtk4.0-dev + itstool + libadwaita-dev + libgee-dev + libsoup-dev + libxml2-dev + meson + mpc1-dev + mpfr-dev + ttf-cantarell + vala + " subpackages="$pkgname-doc $pkgname-lang $pkgname-dev" source="https://download.gnome.org/sources/gnome-calculator/${pkgver%.*}/gnome-calculator-$pkgver.tar.xz" @@ -31,5 +45,5 @@ package() { } sha512sums=" -fc0d5c0744c52cd68f076afa29e3028f4998fe04e2e253d267b0350514ebae72172e90a345db69bc13d4ead2c7679416529d7192a34cfd970c7b2773870b9604 gnome-calculator-41.1.tar.xz +9c28126321fdbd9c60f4d992a37f3081b46de24eaf1a057373b8b905c4ad218145cfeb629b001094b4b137cafee5dcdeaae3920ca95f2ec2d4fbe8ea1ef1b72e gnome-calculator-42.0.tar.xz " -- GitLab From afd00ed1c7ed001209d954ff143c245c6522b724 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Mon, 28 Mar 2022 15:49:37 +0200 Subject: [PATCH 12/58] community/vte3: upgrade to 0.68.0 gtk4=false is the default anyway, so drop it. We can't enable it yet as it requries building vte3 from the master git branch. --- community/vte3/APKBUILD | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/community/vte3/APKBUILD b/community/vte3/APKBUILD index 5b3d53dec9b..59bc36c9491 100644 --- a/community/vte3/APKBUILD +++ b/community/vte3/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa # Maintainer: Rasmus Thomsen pkgname=vte3 -pkgver=0.66.1 -pkgrel=2 +pkgver=0.68.0 +pkgrel=0 pkgdesc="Virtual Terminal Emulator library" url="https://gitlab.gnome.org/GNOME/vte" arch="all" @@ -35,7 +35,6 @@ builddir="$srcdir/vte-$pkgver" build() { abuild-meson . output \ -Ddocs=false \ - -Dgtk4=false \ -D_systemd=false meson compile ${JOBS:+-j ${JOBS}} -C output } @@ -49,7 +48,7 @@ package() { } sha512sums=" -61df7cc3225fdc320f1fbd78715d4cc28751befaf88b5414885d32122c00b8b2630f9338a1dcf5e5a119cf2972708efdd0bc4b7ae9301f047bb5d62771b2e120 vte-0.66.1.tar.gz +fb2260ae1363203cdccd0e0c6cafe29e5fb25947d2830a7ce1051f672fdc11c067791a8b74cb3017548e366976763fec2022e0c196ed501f46abb08876ad24d6 vte-0.68.0.tar.gz b6c1856bf075c2e3e91a0d4aff700c59e738bd6abe4122a11d680f104a2dab9d99f7d836a3ef3020b25ceff0a37231a6561eb917f0e4b9f90837eb634d8f7f20 fix-W_EXITCODE.patch d702505daf9b3bcb0ad508ee78b732edd4e7d424f5d05c4a7873dd56837ef01ec3c99109473f6a70fde5a25c6aca1610f2938f627b208895587158e6b31bf937 syscall.patch " -- GitLab From 41384a82624386152c0326ed9b025e81d9e31f8f Mon Sep 17 00:00:00 2001 From: Newbyte Date: Mon, 28 Mar 2022 15:50:30 +0200 Subject: [PATCH 13/58] community/gnome-console: upgrade to 42_beta and rename from kgx --- community/{kgx => gnome-console}/APKBUILD | 24 ++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) rename community/{kgx => gnome-console}/APKBUILD (55%) diff --git a/community/kgx/APKBUILD b/community/gnome-console/APKBUILD similarity index 55% rename from community/kgx/APKBUILD rename to community/gnome-console/APKBUILD index 5f6053f2b59..fa9f17c4160 100644 --- a/community/kgx/APKBUILD +++ b/community/gnome-console/APKBUILD @@ -1,10 +1,13 @@ # Maintainer: David Heidelberg # Contributor: David Heidelberg -pkgname=kgx -pkgver=0.4.0 -pkgrel=1 -pkgdesc="A minimal terminal for GNOME" -url="https://gitlab.gnome.org/ZanderBrown/kgx" +pkgname=gnome-console +pkgver=42_beta +_pkgver=42.beta +# for some reason this is part of the directory name in the archive +_commit=c15483838555fe2ee0426e94448cb776f0140598 +pkgrel=0 +pkgdesc="User-friendly terminal for GNOME" +url="https://gitlab.gnome.org/GNOME/console" # s390x and riscv64 blocked by rust -> libhandy arch="all !s390x !riscv64" license="GPL-3.0-only" @@ -26,12 +29,13 @@ makedepends=" vte3-dev " subpackages="$pkgname-nautilus $pkgname-lang" -source="https://gitlab.gnome.org/ZanderBrown/kgx/-/archive/$pkgver/kgx-$pkgver.tar.gz" +source="https://gitlab.gnome.org/GNOME/console/-/archive/$_pkgver/gnome-console-$_pkgver.tar.gz" +builddir="$srcdir"/console-$_pkgver-$_commit +replaces="kgx" +provides="kgx=$pkgver-r$pkgrel" build() { abuild-meson \ - -Dgtk_doc=false \ - -Dgeneric=true \ -Dtests=true \ . output meson compile ${JOBS:+-j ${JOBS}} -C output @@ -48,10 +52,12 @@ package() { nautilus() { pkgdesc="$pkgdesc (Nautilus extension)" install_if="$pkgname=$pkgver-r$pkgrel nautilus" + replaces="kgx-nautilus" + provides="kgx-nautilus=$pkgver-r$pkgrel" amove usr/lib/nautilus/extensions-3.0/libkgx-nautilus.so } sha512sums=" -25bf0b98f8f8f4a2b7265044183300fc9c53ef5ac1fa3f93ab8302c01441f815c2a8da8738d61b39d87f8ca5768627de9cb3539250d0d8b07fbac605933d2db5 kgx-0.4.0.tar.gz +3db40a135043072adf0fb90c0a17333251623df639d93d7b140664e253e2e6bc7d426fc7aeb6b306c117c2e540620292f8286ed73f616b8596402c2e0bfc9361 gnome-console-42.beta.tar.gz " -- GitLab From 85028248bc52c574aa731fd138180d81401791dd Mon Sep 17 00:00:00 2001 From: Newbyte Date: Mon, 28 Mar 2022 16:10:15 +0200 Subject: [PATCH 14/58] community/adwaita-icon-theme: upgrade to 42.0 --- community/adwaita-icon-theme/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/adwaita-icon-theme/APKBUILD b/community/adwaita-icon-theme/APKBUILD index 059a39b9748..034ee92c620 100644 --- a/community/adwaita-icon-theme/APKBUILD +++ b/community/adwaita-icon-theme/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa # Maintainer: Rasmus Thomsen pkgname=adwaita-icon-theme -pkgver=41.0 +pkgver=42.0 pkgrel=0 pkgdesc="Adwaita icon theme" url="https://gitlab.gnome.org/GNOME/adwaita-icon-theme" @@ -33,5 +33,5 @@ package() { } sha512sums=" -2a540f2b53cb64433780029ea70c2cfe8417ae7e619d8eefa59825e3ebcb8585acd4ccae25344c8e146a0ee0705ccbb39a2cb729a162534fd86a4ff24e505c86 adwaita-icon-theme-41.0.tar.xz +521bfd44fdc253f5fd01fcdfaa485669849ad73c35354ccfe9b358ba433cfa40ee6d68b70ec2268a4ce0631a48670b03b30811ca68e2e19f9430082454e02015 adwaita-icon-theme-42.0.tar.xz " -- GitLab From 0dda796a3065ee45e35aa803bc1fe0509fc98fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Tue, 29 Mar 2022 16:45:54 +0200 Subject: [PATCH 15/58] community/gdm: upgrade to 42.0 --- community/gdm/APKBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/community/gdm/APKBUILD b/community/gdm/APKBUILD index 902be41c567..5f0a7836b9b 100644 --- a/community/gdm/APKBUILD +++ b/community/gdm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gdm -pkgver=41.3 +pkgver=42.0 pkgrel=0 pkgdesc="GNOME display manager" url="https://wiki.gnome.org/Projects/GDM" @@ -27,6 +27,7 @@ makedepends="accountsservice-dev gtk+3.0-dev itstool libcanberra-dev + libgudev-dev libsm-dev libx11-dev libxau-dev @@ -67,7 +68,7 @@ package() { install -m755 -D "$srcdir/$pkgname.initd" "$pkgdir"/etc/init.d/gdm } sha512sums=" -71a93eef02fccee22ca4f90e3217431923da2b1ac4f5995ff7b64c9b4cac839f4695f4122d255407b570635d34e86e233fa7e4d5d22a8d8185ccfa8ad20f83aa gdm-41.3.tar.xz +e07a4e9233573069dd5628e7b7e6dbe462e90bd8f30267d3faf1cbe3dcb8b990afe3ad6af1edf5f0ec689c6eb245aaacd4e8565a7e4feea34cc754d43904daaa gdm-42.0.tar.xz 695d3c0c56d10baabb24b9e43bc14ab44542cb44a5aed15d471d06eecdfe1313678c854a640a151de239b4a30071dc781cc616296a2785ca43512a31403cdb3c remove-systemd-dep.patch cd4c8f80e37dc362727bd535cbe1d3917f2bc47d52af717595e19709051ab5f27c0f650195152ccd1a7e5e2f886e4e8bc60287f05dcd81e84237c7f78c89223f gdm.initd f836cf0acdf148f2ae09ac28251b5126ce597f08254c43b1ec77596f75e1a3229926116c13f98554625be763e8d28415b27bd679b0a5de9f86bdca7857054c82 Xsession -- GitLab From 3e075b8ada74a48608ff1e9cbd441d35f9a1337d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Tue, 29 Mar 2022 16:46:05 +0200 Subject: [PATCH 16/58] community/gnome-session: upgrade to 42.0 --- community/gnome-session/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/gnome-session/APKBUILD b/community/gnome-session/APKBUILD index 4ed79a6c2c3..05951e9208f 100644 --- a/community/gnome-session/APKBUILD +++ b/community/gnome-session/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-session -pkgver=41.3 +pkgver=42.0 pkgrel=0 pkgdesc="GNOME session manager" url="https://gitlab.gnome.org/GNOME/gnome-session" @@ -42,7 +42,7 @@ package() { rm -rf "$pkgdir"/DELETEME } sha512sums=" -a75c038639301ccd1f0abf83f944890f74986e94dc32f45c97c1872ddc09bcebbb94116f7f865b1d9fa40a81133ec14fbfb75d585061750d9809af4abba3aa9a gnome-session-41.3.tar.xz +3d340700958b5800039e3009618709add2cdbaecb58344d9d2f93e4e761a737ef003091c380c68f95386dbb078b3d12f70732f0022611ab4a10e1c1eb988b4fa gnome-session-42.0.tar.xz 3d61a847da175b780fce8b2646264836656e6cdc6294e0af6c667a64f30e6d837ef22ce54b3ac51c4f569a7e09844bdcd058417292ea014826256157fa7dbdc3 0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch fc8d42503bffb7e35ea83cef41e6dc4b1c1e9fccbcd660e4cecf923486e24c3725566e644ba14a6e1dd02dd0620e959aa9b117ce52d9c708d2c83700daf68f83 dont-require-systemd.patch " -- GitLab From 6eb23885857e00d97c53dfbd3a81d00fc3469ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Wed, 30 Mar 2022 01:19:48 +0200 Subject: [PATCH 17/58] community/evince: upgrade to 42.0 --- community/evince/APKBUILD | 42 +++++++++++++++++------- community/evince/meson-0.6.1.patch | 52 ------------------------------ 2 files changed, 31 insertions(+), 63 deletions(-) delete mode 100644 community/evince/meson-0.6.1.patch diff --git a/community/evince/APKBUILD b/community/evince/APKBUILD index 7c43e8e9f46..96b31c64732 100644 --- a/community/evince/APKBUILD +++ b/community/evince/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Sören Tempel # Maintainer: Rasmus Thomsen pkgname=evince -pkgver=41.4 +pkgver=42.0 pkgrel=0 pkgdesc="simple document viewer for GTK+" url="https://wiki.gnome.org/Apps/Evince" @@ -10,16 +10,37 @@ url="https://wiki.gnome.org/Apps/Evince" arch="all !s390x !riscv64" license="GPL-2.0-or-later" depends="adwaita-icon-theme gsettings-desktop-schemas" -depends_dev="gtk+3.0-dev poppler-dev libsm-dev libevent-dev libxrandr-dev - libx11-dev libxcursor-dev libxcomposite-dev libxi-dev util-linux-dev - tiff-dev gobject-introspection-dev libxml2-dev libspectre-dev" -makedepends="$depends_dev itstool meson libexecinfo-dev nautilus-dev - adwaita-icon-theme-dev gtk-doc yelp-tools appstream-glib-dev - libgxps-dev gspell-dev gstreamer-dev libsecret-dev gst-plugins-base-dev - djvulibre-dev libhandy1-dev" +depends_dev=" + gobject-introspection-dev + gtk+3.0-dev + libspectre-dev + libxml2-dev + poppler-dev + tiff-dev + " +makedepends=" + $depends_dev + adwaita-icon-theme-dev + cairo-dev + dbus-dev + djvulibre-dev + gdk-pixbuf-dev + glib-dev + gnome-desktop-dev + gspell-dev + gst-plugins-base-dev + gstreamer-dev + itstool + libarchive-dev + libgxps-dev + libhandy1-dev + libsecret-dev + meson + nautilus-dev + " subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-nautilus $pkgname-libs" source="https://download.gnome.org/sources/evince/${pkgver%.*}/evince-$pkgver.tar.xz - meson-0.6.1.patch" + " # secfixes: # 3.32.0-r1: @@ -64,6 +85,5 @@ doc() { } sha512sums=" -adeb97673c1140614866ca6d4b532bd4aa043cf9942709a1006636b21371da619712515655c18e4d503a0b34a48d00b50c947363500ce251186e584f0eac85a3 evince-41.4.tar.xz -d66898c917eb34a042cdbad58e9122678372479228340180269e0f479f8743ddc83f59c7ea2a813fc2662dd2ff1b9da9dd194e1a879885d054dec5c5fd1b2877 meson-0.6.1.patch +581c00db18769191eff097e4be480283043aa3b6a355f82a16f66caef938d3019e4c51e4ff7b8c098e8b6dd54e8cf7b886765b27b75273c6f13c1a3add426729 evince-42.0.tar.xz " diff --git a/community/evince/meson-0.6.1.patch b/community/evince/meson-0.6.1.patch deleted file mode 100644 index baed9dc1af8..00000000000 --- a/community/evince/meson-0.6.1.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001 -From: r-value -Date: Wed, 17 Nov 2021 18:22:45 +0800 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -`i18n.merge_file` has been ignoring positional arguments for -a time and explicitly rejects with error since meson 0.60.0 ---- - backend/meson.build | 1 - - data/meson.build | 1 - - meson.build | 1 - - 3 files changed, 3 deletions(-) - -diff --git a/backend/meson.build b/backend/meson.build -index e44c1d6d7..ab3df9acf 100644 ---- a/backend/meson.build -+++ b/backend/meson.build -@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends - ) - - i18n.merge_file( -- appstream, - input: appstream_in, - output: appstream, - po_dir: po_dir, -diff --git a/data/meson.build b/data/meson.build -index 8a308b853..afc302098 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -15,7 +15,6 @@ foreach desktop: desktops - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/meson.build b/meson.build -index 34c86661f..f74efb3c4 100644 ---- a/meson.build -+++ b/meson.build -@@ -492,7 +492,6 @@ install_headers( - appdata = ev_namespace + '.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, --- -GitLab - -- GitLab From 85ddac5237e7353c60e29d10756b1a6a8ae5d9c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Mon, 4 Apr 2022 22:50:12 +0200 Subject: [PATCH 18/58] community/gsettings-desktop-schemas: upgrade to 42.0 --- community/gsettings-desktop-schemas/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/gsettings-desktop-schemas/APKBUILD b/community/gsettings-desktop-schemas/APKBUILD index 9f34c0a932c..49cd2655f1f 100644 --- a/community/gsettings-desktop-schemas/APKBUILD +++ b/community/gsettings-desktop-schemas/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gsettings-desktop-schemas -pkgver=41.0 +pkgver=42.0 pkgrel=0 pkgdesc="A collection of GSettings schemas" url="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" @@ -26,5 +26,5 @@ package() { } sha512sums=" -58f9f60d818f0ddce20ad70e6ca64d3e1fb5a5dfd45b737cc055901f7dd5f1625902451e765a26969bdd72e3b37300dacbd3555a4bc3f33c6667dbf9b1869739 gsettings-desktop-schemas-41.0.tar.xz +db73988a6b38857d1aa6588ccac42099c57dcc187ef01776567cc7c28aff67dc06d6a8a067e0c69167d03cd865f0c1d58e75469a40f969084bb2537b088f8664 gsettings-desktop-schemas-42.0.tar.xz " -- GitLab From fbcef12ad7e884e27b49d1e4aab9e2283ea664fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Mon, 4 Apr 2022 23:48:55 +0200 Subject: [PATCH 19/58] community/gnome-settings-daemon: upgrade to 42.1 Those dependencies which depend on GTK have been moved to the makedepends to avoid pulling both GTK3 and GTK4 on packages that depend on gnome-settings-daemon-dev --- community/gnome-settings-daemon/283.patch | 38 ------------------- community/gnome-settings-daemon/APKBUILD | 46 ++++++++++++++++------- 2 files changed, 32 insertions(+), 52 deletions(-) delete mode 100644 community/gnome-settings-daemon/283.patch diff --git a/community/gnome-settings-daemon/283.patch b/community/gnome-settings-daemon/283.patch deleted file mode 100644 index 676f6d2d015..00000000000 --- a/community/gnome-settings-daemon/283.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bc21912efe8521f53d703e28b36c6f1246ac2054 Mon Sep 17 00:00:00 2001 -From: Marvin Schmidt -Date: Wed, 26 Jan 2022 23:08:58 +0100 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. ---- - plugins/power/meson.build | 1 - - plugins/wacom/meson.build | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/plugins/power/meson.build b/plugins/power/meson.build -index 69e619f2..014bb6da 100644 ---- a/plugins/power/meson.build -+++ b/plugins/power/meson.build -@@ -76,7 +76,6 @@ if host_is_linux - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: policy, - po_dir: po_dir, -diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build -index d8dd0ec7..c00323d4 100644 ---- a/plugins/wacom/meson.build -+++ b/plugins/wacom/meson.build -@@ -7,7 +7,6 @@ policy_in = configure_file( - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: policy, - po_dir: po_dir, --- -GitLab - diff --git a/community/gnome-settings-daemon/APKBUILD b/community/gnome-settings-daemon/APKBUILD index fa37f8873e1..ee8e9dfe708 100644 --- a/community/gnome-settings-daemon/APKBUILD +++ b/community/gnome-settings-daemon/APKBUILD @@ -1,27 +1,47 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-settings-daemon -pkgver=41.0 -pkgrel=1 +pkgver=42.1 +pkgrel=0 pkgdesc="GNOME settings daemon" url="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" # s390x and riscv64 blocked by polkit -> upower arch="all !s390x !riscv64" options="!check" # needs unpackaged py-dbusmock license="GPL-2.0-only AND LGPL-2.1-only" -depends_dev="gnome-desktop-dev libnotify-dev - libcanberra-dev colord-dev geoclue-dev - libgweather-dev geocode-glib-dev - pulseaudio-dev upower-dev libwacom-dev - cups-dev networkmanager-dev polkit-dev - lcms2-dev nss-dev alsa-lib-dev gcr-dev - modemmanager-dev" -makedepends="$depends_dev libxml2-utils meson" +depends_dev=" + alsa-lib-dev + colord-dev + cups-dev + geoclue-dev + geocode-glib-dev + lcms2-dev + libcanberra-dev + libgweather4-dev + libnotify-dev + libwacom-dev + modemmanager-dev + networkmanager-dev + nss-dev + pango-dev + polkit-dev + pulseaudio-dev + upower-dev + " +makedepends=" + $depends_dev + gcr-dev + glib-dev + gnome-desktop-dev + gsettings-desktop-schemas-dev + gtk+3.0-dev + libxml2-utils + meson + " checkdepends="py3-gobject3" depends="pulseaudio" subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/gnome-settings-daemon/${pkgver%.*}/gnome-settings-daemon-$pkgver.tar.xz - 283.patch dont-use-logind-for-brightness-changing.patch" build() { @@ -34,9 +54,7 @@ build() { package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output } - sha512sums=" -2c6848a749f84fd0c3a9ade6f4a83ae3ff7464da429b2d73030c9dcbd278b070c40475c678c819e31464941f2bd38d81f11b96f24d0d1fb05271267c3a1ecc2a gnome-settings-daemon-41.0.tar.xz -cdbc21166f8ee82246683f272ed994b9fd21c4afd19d25de8777ff284df75f27009da2748e788dd26fb55dda5612c1939d87d68f19db5a95149a0b8165a6e8e9 283.patch +20e87fc2318d77af016ec071cc6070f43ac42eaaf60a1f9bdb4278f59e038268e0a37759f0ab31068d8701b9dc64d142c0a875f0eeaa700ad47e0dbca3b9d141 gnome-settings-daemon-42.1.tar.xz fd80b939a14bbc5dd502afda0bc6511f2d9c045018680e5ae7fbec32efadb564c5060ec91d374330f246d70571aad5979ce8c175175a29b5ccec3443c8286dc6 dont-use-logind-for-brightness-changing.patch " -- GitLab From f206eab7fb9470a164ae4519af1eb06805a932f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Mon, 4 Apr 2022 23:49:54 +0200 Subject: [PATCH 20/58] community/evolution-data-server: rebuild against libgweather4 --- community/evolution-data-server/APKBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/community/evolution-data-server/APKBUILD b/community/evolution-data-server/APKBUILD index ffa56f7018a..95734b34548 100644 --- a/community/evolution-data-server/APKBUILD +++ b/community/evolution-data-server/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Francesco Colista pkgname=evolution-data-server pkgver=3.44.0 -pkgrel=0 +pkgrel=1 pkgdesc="data server for evolution" options="!check" # Tests fail on the builders, passes CI url="https://projects.gnome.org/evolution" @@ -12,7 +12,7 @@ license="GPL-2.0-or-later" depends_dev="libgdata-dev gcr-dev icu-dev" makedepends="$depends_dev gperf flex bison glib-dev gtk+3.0-dev libsecret-dev libsoup-dev libxml2-dev nss-dev sqlite-dev krb5-dev gnu-libiconv-dev - openldap-dev json-glib-dev webkit2gtk-dev libgweather-dev + openldap-dev json-glib-dev webkit2gtk-dev libgweather4-dev cmake libical-dev libcanberra-dev vala gobject-introspection-dev gnome-online-accounts-dev libphonenumber-dev samurai" subpackages="$pkgname-dev $pkgname-lang" @@ -28,7 +28,8 @@ build() { -DENABLE_INTROSPECTION=ON \ -DENABLE_VALA_BINDINGS=ON \ -DWITH_PHONENUMBER=ON \ - -DWITH_LIBDB=OFF + -DWITH_LIBDB=OFF \ + -DWITH_GWEATHER4=ON cmake --build build } -- GitLab From 798a1e9b2b8881058cd8743073f720c5c05f1add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Mon, 4 Apr 2022 23:51:19 +0200 Subject: [PATCH 21/58] community/evolution: rebuild against libgweather4 --- community/evolution/APKBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/community/evolution/APKBUILD b/community/evolution/APKBUILD index 30724694235..c2b81766c0a 100644 --- a/community/evolution/APKBUILD +++ b/community/evolution/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Rasmus Thomsen pkgname=evolution pkgver=3.44.0 -pkgrel=0 +pkgrel=1 pkgdesc="evolution mail client" url="https://projects.gnome.org/evolution" # s390x blocked by gnome-desktop @@ -11,7 +11,7 @@ arch="all !s390x" license="GPL-2.0-or-later" depends="highlight gsettings-desktop-schemas" depends_dev="evolution=$pkgver-r$pkgrel itstool libxml2-dev gcr-dev - enchant2-dev libcanberra-dev libgweather-dev openldap-dev libnotify-dev" + enchant2-dev libcanberra-dev libgweather4-dev openldap-dev libnotify-dev" makedepends="$depends_dev gperf flex bison libxml2-utils glib-dev webkit2gtk-dev gtkspell3-dev evolution-data-server-dev gnome-autoar-dev gtk+3.0-dev nss-dev cmake gsettings-desktop-schemas-dev @@ -31,7 +31,8 @@ build() { -DENABLE_PST_IMPORT=OFF \ -DENABLE_SMIME=ON \ -DENABLE_SCHEMAS_COMPILE=OFF \ - -DWITH_GLADE_CATALOG=ON + -DWITH_GLADE_CATALOG=ON \ + -DWITH_GWEATHER4=ON cmake --build build } -- GitLab From 8c96e309ce9bd57e3722099da3e8e1bab3253fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Mon, 4 Apr 2022 23:55:06 +0200 Subject: [PATCH 22/58] community/gnome-clocks: upgrade to 42.0 --- ...-invoke-waked-when-an-alarm-changes.patch} | 34 +++++++++---------- ...tart-initial-instance-in-the-backgr.patch} | 26 +++++++------- community/gnome-clocks/APKBUILD | 30 +++++++++++----- 3 files changed, 51 insertions(+), 39 deletions(-) rename community/gnome-clocks/{0001-waked-implementation.patch => 0001-invoke-waked-when-an-alarm-changes.patch} (88%) rename community/gnome-clocks/{0002-background-mode.patch => 0002-Add-argument-to-start-initial-instance-in-the-backgr.patch} (73%) diff --git a/community/gnome-clocks/0001-waked-implementation.patch b/community/gnome-clocks/0001-invoke-waked-when-an-alarm-changes.patch similarity index 88% rename from community/gnome-clocks/0001-waked-implementation.patch rename to community/gnome-clocks/0001-invoke-waked-when-an-alarm-changes.patch index e86254910c5..cb88c27ece6 100644 --- a/community/gnome-clocks/0001-waked-implementation.patch +++ b/community/gnome-clocks/0001-invoke-waked-when-an-alarm-changes.patch @@ -1,4 +1,4 @@ -From e60dad2722616995022d3567eabbcc17c9c77a6f Mon Sep 17 00:00:00 2001 +From 65007fd13530afe604a05ff7ab85fb71eb041936 Mon Sep 17 00:00:00 2001 From: Robin Westermann Date: Sat, 27 Feb 2021 14:41:22 +0100 Subject: [PATCH] invoke waked when an alarm changes @@ -13,30 +13,30 @@ Co-Authored-By: pcworld <0188801@gmail.com> --- build-aux/flatpak/org.gnome.clocks.json | 1 + src/alarm-face.vala | 2 + - src/alarm-item.vala | 13 +++++- + src/alarm-item.vala | 14 ++++++- src/alarm-setup-dialog.vala | 1 + src/meson.build | 1 + src/waked-utils.vala | 53 +++++++++++++++++++++++++ - 6 files changed, 69 insertions(+), 2 deletions(-) + 6 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 src/waked-utils.vala diff --git a/build-aux/flatpak/org.gnome.clocks.json b/build-aux/flatpak/org.gnome.clocks.json -index 1bf5e84..7cb24de 100644 +index b3d768f..daedbf8 100644 --- a/build-aux/flatpak/org.gnome.clocks.json +++ b/build-aux/flatpak/org.gnome.clocks.json -@@ -10,6 +10,7 @@ +@@ -11,6 +11,7 @@ "--socket=fallback-x11", "--socket=wayland", "--socket=pulseaudio", + "--system-talk-name=de.seath.Waked", "--share=network", - "--system-talk-name=org.freedesktop.GeoClue2", - "--filesystem=xdg-run/dconf", + "--env=G_MESSAGES_DEBUG=org.gnome.ClocksDevel" + ], diff --git a/src/alarm-face.vala b/src/alarm-face.vala -index 0fe77cb..420aa14 100644 +index 04728ab..1a593a7 100644 --- a/src/alarm-face.vala +++ b/src/alarm-face.vala -@@ -119,6 +119,7 @@ public class Face : Gtk.Stack, Clocks.Clock { +@@ -121,6 +121,7 @@ public class Face : Adw.Bin, Clocks.Clock { ((SetupDialog) dialog).apply_to_alarm (alarm); save (); } else if (response == DELETE_ALARM) { @@ -44,7 +44,7 @@ index 0fe77cb..420aa14 100644 alarms.delete_item (alarm); save (); } -@@ -128,6 +129,7 @@ public class Face : Gtk.Stack, Clocks.Clock { +@@ -130,6 +131,7 @@ public class Face : Adw.Bin, Clocks.Clock { } internal void delete (Item alarm) { @@ -53,7 +53,7 @@ index 0fe77cb..420aa14 100644 save (); } diff --git a/src/alarm-item.vala b/src/alarm-item.vala -index 6103342..f8fa937 100644 +index 6103342..e350d1d 100644 --- a/src/alarm-item.vala +++ b/src/alarm-item.vala @@ -20,6 +20,7 @@ @@ -89,7 +89,7 @@ index 6103342..f8fa937 100644 } private void update_snooze_time (GLib.DateTime start_time) { -@@ -172,6 +181,7 @@ private class Item : Object, ContentItem { +@@ -172,6 +180,7 @@ private class Item : Object, ContentItem { public void snooze () { bell.stop (); state = State.SNOOZING; @@ -97,7 +97,7 @@ index 6103342..f8fa937 100644 } public void stop () { -@@ -221,6 +229,7 @@ private class Item : Object, ContentItem { +@@ -221,6 +230,7 @@ private class Item : Object, ContentItem { update_alarm_time (); // reschedule for the next repeat } @@ -106,10 +106,10 @@ index 6103342..f8fa937 100644 } diff --git a/src/alarm-setup-dialog.vala b/src/alarm-setup-dialog.vala -index 97cde1f..6d1d93f 100644 +index 30163f3..a838993 100644 --- a/src/alarm-setup-dialog.vala +++ b/src/alarm-setup-dialog.vala -@@ -255,6 +255,7 @@ private class SetupDialog : Gtk.Dialog { +@@ -264,6 +264,7 @@ private class SetupDialog : Gtk.Dialog { private void avoid_duplicate_alarm () { var alarm = new Item (); @@ -118,7 +118,7 @@ index 97cde1f..6d1d93f 100644 var duplicate = alarm.check_duplicate_alarm (other_alarms); diff --git a/src/meson.build b/src/meson.build -index 4c51188..4044e65 100644 +index 61bf1ab..129e9a3 100644 --- a/src/meson.build +++ b/src/meson.build @@ -24,6 +24,7 @@ clocks_vala_sources = files( @@ -189,5 +189,5 @@ index 0000000..9b8fa4a +} +} -- -GitLab +2.35.1 diff --git a/community/gnome-clocks/0002-background-mode.patch b/community/gnome-clocks/0002-Add-argument-to-start-initial-instance-in-the-backgr.patch similarity index 73% rename from community/gnome-clocks/0002-background-mode.patch rename to community/gnome-clocks/0002-Add-argument-to-start-initial-instance-in-the-backgr.patch index 6ceeaeb997e..f5479ce83fc 100644 --- a/community/gnome-clocks/0002-background-mode.patch +++ b/community/gnome-clocks/0002-Add-argument-to-start-initial-instance-in-the-backgr.patch @@ -1,4 +1,4 @@ -From c4505e46d51ccacde30acf0395d40c0c9973aba8 Mon Sep 17 00:00:00 2001 +From 94e223701269f5c9e60bd69575b62aca91c0f85a Mon Sep 17 00:00:00 2001 From: Adam Plumb Date: Fri, 10 Sep 2021 20:14:19 -0400 Subject: [PATCH] Add argument to start initial instance in the background @@ -8,18 +8,18 @@ Subject: [PATCH] Add argument to start initial instance in the background 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/application.vala b/src/application.vala -index 2e67046..625cc16 100644 +index 6c1e39a..864b277 100644 --- a/src/application.vala +++ b/src/application.vala @@ -21,6 +21,7 @@ namespace Clocks { - public class Application : Gtk.Application { + public class Application : Adw.Application { const OptionEntry[] OPTION_ENTRIES = { { "version", 'v', 0, OptionArg.NONE, null, N_("Print version information and exit"), null }, + { "background", 'b', 0, OptionArg.NONE, null, N_("Start in the background"), null }, { (string) null } }; -@@ -37,6 +38,7 @@ public class Application : Gtk.Application { +@@ -37,6 +38,7 @@ public class Application : Adw.Application { private uint world_clocks_id = 0; private Window? window; private List system_notifications; @@ -27,37 +27,37 @@ index 2e67046..625cc16 100644 private Window ensure_window () ensures (window != null) { if (window == null) { -@@ -96,7 +98,15 @@ public class Application : Gtk.Application { +@@ -97,7 +99,15 @@ public class Application : Adw.Application { base.activate (); var win = ensure_window (); - win.present (); + + // The first activation will toggle the background flag to false -+ // That way the next activation (of other instances) ++ // That way the next activation (of other instances) + // will cause the window to display + if (background) { + background = false; + } else { + win.present (); + } + } - win.focus_in_event.connect (() => { - withdraw_notifications (); -@@ -142,6 +152,13 @@ public class Application : Gtk.Application { - print ("%s %s\n", (string) Environment.get_application_name (), Config.VERSION); + protected override void startup () { +@@ -117,6 +127,13 @@ public class Application : Adw.Application { return 0; } -+ + + // This allows the primary instance to start in the background + // Any subsequent instances will cause the window to display + // Even if they pass in the background argument + if (options.contains ("background")) { + background = true; + } - ++ return -1; } + -- -2.33.0 +2.35.1 diff --git a/community/gnome-clocks/APKBUILD b/community/gnome-clocks/APKBUILD index f7df0b2f631..6d7202135d8 100644 --- a/community/gnome-clocks/APKBUILD +++ b/community/gnome-clocks/APKBUILD @@ -1,21 +1,33 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-clocks -pkgver=41.0 +pkgver=42.0 pkgrel=0 pkgdesc="Clock application designed for GNOME 3" url="https://wiki.gnome.org/Apps/Clocks" -# s390x and riscv64 blocked by rust -> libhandy +# s390x and riscv64 blocked by rust -> libadwaita-dev arch="all !s390x !riscv64" license="GPL-2.0-or-later" depends="gsettings-desktop-schemas waked" -makedepends="meson glib-dev gtk+3.0-dev libgweather-dev gsound-dev gnome-desktop-dev - geoclue-dev geocode-glib-dev gettext-dev vala itstool libhandy1-dev" +makedepends=" + geoclue-dev + geocode-glib-dev + gettext-dev + glib-dev + gnome-desktop-dev + gsound-dev + gtk4.0-dev + itstool + libgweather4-dev + libadwaita-dev + meson + vala + " checkdepends="appstream-glib desktop-file-utils" subpackages="$pkgname-lang $pkgname-doc" source="https://download.gnome.org/sources/gnome-clocks/${pkgver%.*}/gnome-clocks-$pkgver.tar.xz - 0001-waked-implementation.patch - 0002-background-mode.patch + 0001-invoke-waked-when-an-alarm-changes.patch + 0002-Add-argument-to-start-initial-instance-in-the-backgr.patch gnome-clocks.desktop " @@ -36,8 +48,8 @@ package() { } sha512sums=" -da0d0b487310d63f14c99dd7e4018dfb0779482e9936594641bb26b1d12479d373da5a2652392d6927a16ec072ee7c08515548c347fb7dcc82e32be5c0e626ba gnome-clocks-41.0.tar.xz -50857339594ad2ab234eaaa090b1a7bfa809798cb7916149751466a7d3d583e9080e61ed1ffd4987b52f7ff4e280f2b9439eff9ad028e1bef31684d255d3ca9d 0001-waked-implementation.patch -2a0ae6fe53a74d1634ce57abe06cbba9cfac7a46947659a4a133c3af962de7017280eaf30a52d377ba382d74133f080449d1711702f57853852ba8ca1e19ee50 0002-background-mode.patch +f642cb4a626de2a97ad78c25922bb933bdac917d363097fcf5149310111abd11834410b48bfb4fc9cbae06f0ab30b0a5200d45304ce292b5a9558a90b922edb4 gnome-clocks-42.0.tar.xz +c90471803b810eedbfe1a721e6a1182a711d73f5ded8b82d4246b02fa3c660234d7dfcf3aa84e8b7a3e8dece268ab4c725890cb763f8b226fa80dab7b7c02314 0001-invoke-waked-when-an-alarm-changes.patch +ffb93c5e5ff4f888c3e1308142af332f15293b84018b262398f7a41216bc1b91eb1c02bd551db079b4e35cca184c70462d8fa900a94f3afeadb033ff41046b55 0002-Add-argument-to-start-initial-instance-in-the-backgr.patch 49126e7428054e87d861468aa714637f2034b620f34aba6b898c7c187524ee5057596bbcebec9bdec471336e8df1edbf48c2ef594898d0e6c559b1f19af39510 gnome-clocks.desktop " -- GitLab From cfae3aaf877697b2e0db6a8f80df79b960187033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Tue, 5 Apr 2022 00:00:06 +0200 Subject: [PATCH 23/58] community/gnome-applets: upgrade to 3.44.0 --- community/gnome-applets/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/community/gnome-applets/APKBUILD b/community/gnome-applets/APKBUILD index cc60d65ebba..118ebf5d305 100644 --- a/community/gnome-applets/APKBUILD +++ b/community/gnome-applets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-applets -pkgver=3.40.0 +pkgver=3.44.0 pkgrel=0 pkgdesc="Small programs for the panel" url="https://wiki.gnome.org/Projects/GnomeApplets" @@ -10,7 +10,7 @@ arch="all !s390x !riscv64" license="GPL-2.0-or-later" depends="adwaita-icon-theme" makedepends="gtk+3.0-dev glib-dev libgtop-dev libwnck3-dev libnotify-dev upower-dev - dbus-glib-dev adwaita-icon-theme-dev libxml2-dev libgweather-dev polkit-dev + dbus-glib-dev adwaita-icon-theme-dev libxml2-dev libgweather4-dev polkit-dev gucharmap-dev intltool gnome-panel-dev itstool" subpackages="$pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/gnome-applets/${pkgver%.*}/gnome-applets-$pkgver.tar.xz" @@ -36,5 +36,5 @@ package() { } sha512sums=" -909a1e9ecbe6904537b7408239a17aad265890cf179c4b8929968fa4d8ba6f1ac1f6e98612eb9c54266d3abacaaa7ed0e218f41b081b7539532527a3234fc037 gnome-applets-3.40.0.tar.xz +8a9a75590e96d0ef6af4775d261337b41b23779b86d38080014f49666fdaee68bc9ef58eeae94e87c43bd07b0b0720b867f03f2c2d0f2d8b7daea3c66251fc7e gnome-applets-3.44.0.tar.xz " -- GitLab From 2a3b137d2c89e52a99d2ec7591a80f94ee674933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Tue, 5 Apr 2022 00:07:02 +0200 Subject: [PATCH 24/58] community/gnome-initial-setup: upgrade to 42.0.1 --- community/gnome-initial-setup/APKBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/community/gnome-initial-setup/APKBUILD b/community/gnome-initial-setup/APKBUILD index 94d7b95581d..0ce65868f20 100644 --- a/community/gnome-initial-setup/APKBUILD +++ b/community/gnome-initial-setup/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-initial-setup -pkgver=41.2 +pkgver=42.0.1 pkgrel=0 pkgdesc="A simple, easy,and safe way to prepare a new system" url="https://wiki.gnome.org/Design/OS/InitialSetup" @@ -10,13 +10,13 @@ arch="all !s390x !ppc64le !riscv64" license="GPL-2.0-or-later" depends="gsettings-desktop-schemas iso-codes dbus:org.freedesktop.Secrets" makedepends="meson cheese-dev ibus-dev networkmanager-dev polkit-dev - accountsservice-dev gnome-desktop-dev fontconfig-dev libgweather-dev + accountsservice-dev gnome-desktop-dev fontconfig-dev libgweather4-dev gtk+3.0-dev gnome-online-accounts-dev gdm-dev geocode-glib-dev geoclue-dev rest-dev libpwquality-dev webkit2gtk-dev libsecret-dev - libnma-dev krb5-dev" + libnma-dev krb5-dev libhandy1-dev" options="!check" # no tests subpackages="$pkgname-lang" -source="https://download.gnome.org/sources/gnome-initial-setup/${pkgver%.*}/gnome-initial-setup-$pkgver.tar.xz" +source="https://download.gnome.org/sources/gnome-initial-setup/${pkgver%%.*}/gnome-initial-setup-$pkgver.tar.xz" build() { abuild-meson \ @@ -30,5 +30,5 @@ package() { } sha512sums=" -20307a0c3cb22daf64da42fe6affa3de2a40e85afed253012837cac315df7c39b2761d7168563b326765e7f6f1271518b7e0d39874f4e166676db3190e8cc435 gnome-initial-setup-41.2.tar.xz +f2ee8deb5622064ebea9961185d4bebf13500c21e49bfae9eb463e98db7f43ea8d7c83e84744b83dc04819a7b7950d1664fa46068587f075846b506765c79588 gnome-initial-setup-42.0.1.tar.xz " -- GitLab From fd2cb76ff625b93c92d06b96f354985e24c75881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Tue, 5 Apr 2022 00:10:59 +0200 Subject: [PATCH 25/58] community/gnome-panel: upgrade to 3.44.0 --- community/gnome-panel/APKBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/community/gnome-panel/APKBUILD b/community/gnome-panel/APKBUILD index 461d293f44a..d7f94ee1e53 100644 --- a/community/gnome-panel/APKBUILD +++ b/community/gnome-panel/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-panel -pkgver=3.40.0 +pkgver=3.44.0 pkgrel=0 pkgdesc="Gnome Panel provides panels and default applets for the gnome-flashback desktop" url="https://wiki.gnome.org/Projects/GnomePanel" # s390x and riscv64 blocked by polkit arch="all !s390x !riscv64" license="GPL-2.0-or-later" -makedepends="gnome-desktop gtk+3.0-dev glib-dev pango-dev libwnck3-dev - gnome-menus-dev evolution-data-server-dev libgweather-dev dconf-dev +makedepends="gnome-desktop-dev gtk+3.0-dev glib-dev pango-dev libwnck3-dev + gnome-menus-dev evolution-data-server-dev libgweather4-dev dconf-dev libxrandr-dev elogind-dev gnome-desktop-dev gdm-dev polkit-dev itstool gtk-doc libxres-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" @@ -35,5 +35,5 @@ package() { } sha512sums=" -49d8fde009ccf139dcc1412863432e642c11e3c149c6f39ab8f51d8027880654625a997f58efe03234ea2716ad0316f7d5f60fb493e7e6cea366611b975effe6 gnome-panel-3.40.0.tar.xz +b3300f6943c970b9a2ea27b9459ab82e634226372006b7748551e6c8c24897c9df4ab2bc5528eae6758d9cd431cb2428465ef30fdcc012ddac7c69cd4f43f966 gnome-panel-3.44.0.tar.xz " -- GitLab From 2e951fc161babc7694b6112f399c10ad00f8e83b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Tue, 5 Apr 2022 00:14:40 +0200 Subject: [PATCH 26/58] community/gnome-calendar: upgrade to 42.0 --- community/gnome-calendar/APKBUILD | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/community/gnome-calendar/APKBUILD b/community/gnome-calendar/APKBUILD index 80666c4b086..7a8937632bd 100644 --- a/community/gnome-calendar/APKBUILD +++ b/community/gnome-calendar/APKBUILD @@ -1,17 +1,27 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-calendar -pkgver=41.2 +pkgver=42.0 pkgrel=0 pkgdesc="Calendar application for GNOME" url="https://wiki.gnome.org/Apps/Calendar" -# s390x and riscv64 blocked by rust -> libhandy1 +# s390x and riscv64 blocked by gtk4 arch="all !s390x !riscv64" license="GPL-3.0-or-later" depends="gsettings-desktop-schemas" -makedepends="meson libical-dev gsettings-desktop-schemas-dev evolution-data-server-dev - libsoup-dev libdazzle-dev glib-dev gtk+3.0-dev libgweather-dev geoclue-dev - geocode-glib-dev gtk-doc libhandy1-dev" +makedepends=" + evolution-data-server-dev + geoclue-dev + geocode-glib-dev + glib-dev + gsettings-desktop-schemas-dev + gtk4.0-dev + libadwaita-dev + libical-dev + libsoup-dev + libgweather4-dev + meson + " options="!check" # Can't be run on release builds and we don't want debug asserts subpackages="$pkgname-lang" source="https://download.gnome.org/sources/gnome-calendar/${pkgver%.*}/gnome-calendar-$pkgver.tar.xz" @@ -26,5 +36,5 @@ package() { } sha512sums=" -1540a1e24d54bb157fadabe4201a97f2cae2c9487e267fff98273aa0dfc3715c4f734ba1e459c3c296c470337547a2b303309911ee7762e17738b292c18cc1bb gnome-calendar-41.2.tar.xz +3a0950683bb0c5b57bd8fca3d49815bf1bf05005a075e50e8f4a61e6a5bc0f875230a89033bfd4945ed5550253ab4686788a1e2239eff4f76f58716b86cf6fbe gnome-calendar-42.0.tar.xz " -- GitLab From 75b353829ae801c55db87c1811476bbcf6c37f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Tue, 5 Apr 2022 14:48:05 +0200 Subject: [PATCH 27/58] community/gnome-weather: upgrade to 42.0 --- community/gnome-weather/APKBUILD | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/community/gnome-weather/APKBUILD b/community/gnome-weather/APKBUILD index c7bd669d1a5..38d279de140 100644 --- a/community/gnome-weather/APKBUILD +++ b/community/gnome-weather/APKBUILD @@ -1,15 +1,23 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-weather -pkgver=41.0 +pkgver=42.0 pkgrel=0 pkgdesc="GNOME Weather application" url="https://wiki.gnome.org/Apps/Weather" # s390x and riscv64 blocked by gjs arch="noarch !s390x !riscv64" license="GPL-2.0-only" -makedepends="meson glib-dev gobject-introspection-dev gtk+3.0-dev gjs-dev - geoclue-dev libgweather-dev libhandy1-dev" +makedepends=" + geoclue-dev + gjs-dev + glib-dev + gobject-introspection-dev + gtk4.0-dev + libadwaita-dev + libgweather4-dev + meson + " checkdepends="appstream-glib desktop-file-utils" subpackages="$pkgname-lang" source="https://download.gnome.org/sources/gnome-weather/${pkgver%.*}/gnome-weather-$pkgver.tar.xz" @@ -28,5 +36,5 @@ package() { } sha512sums=" -f625a83ecfffe1ad58aa268b6ab3009504f839f3d56e52c642bc23ee32c0b51638888de17a1b4bc0990b2fd6718a7266fe5cd79230594a06ae58a816308b2b99 gnome-weather-41.0.tar.xz +10471a32adc148fad393e03098396a3cfccc75d1cd18985cdd2c287927213aeb493f2878ea986e1d3a3af4b1d3f439afcdb96833d849bbd5fbe7aebb1d1992e6 gnome-weather-42.0.tar.xz " -- GitLab From fcc7cf962fec2fc3c16940037e36da07ac2bd310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Tue, 5 Apr 2022 15:23:08 +0200 Subject: [PATCH 28/58] community/libwnck3: upgrade to 40.1 --- community/libwnck3/APKBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/community/libwnck3/APKBUILD b/community/libwnck3/APKBUILD index 7cfd102a748..fbf439f4d4f 100644 --- a/community/libwnck3/APKBUILD +++ b/community/libwnck3/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Leonardo Arena # Maintainer: Rasmus Thomsen pkgname=libwnck3 -pkgver=3.36.0 +pkgver=40.1 pkgrel=0 pkgdesc="Window Navigator Construction Kit" url="https://gitlab.gnome.org/GNOME/libwnck" @@ -28,4 +28,6 @@ build() { package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output } -sha512sums="b7bf5d935327f61634a898594cf20a270e1b403c8df6c74e6ac20e22eea2845ac8c3007b31994728b74953e40c1015373efe10ed64243cf5e85fd210654aecb3 libwnck-3.36.0.tar.xz" +sha512sums=" +50ba20547e95280d10f1f66f36eea6c649b59d385da7a9217c295150520099585a5ff43c08a552afb8b0db3ee7305bbb2c38d0baed84cc6dc0942f3ca1e43e29 libwnck-40.1.tar.xz +" -- GitLab From d35cd2281ee63ea33d94b3836c73f6ff2809cb08 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Fri, 8 Apr 2022 23:22:03 +0200 Subject: [PATCH 29/58] community/mozjs91: new aport --- community/mozjs91/APKBUILD | 123 ++++++++++++++++++++++++ community/mozjs91/fix-i386-fdlibm.patch | 18 ++++ community/mozjs91/fix-musl-build.patch | 16 +++ community/mozjs91/fix-rust-target.patch | 28 ++++++ 4 files changed, 185 insertions(+) create mode 100644 community/mozjs91/APKBUILD create mode 100644 community/mozjs91/fix-i386-fdlibm.patch create mode 100644 community/mozjs91/fix-musl-build.patch create mode 100644 community/mozjs91/fix-rust-target.patch diff --git a/community/mozjs91/APKBUILD b/community/mozjs91/APKBUILD new file mode 100644 index 00000000000..092b0480ecb --- /dev/null +++ b/community/mozjs91/APKBUILD @@ -0,0 +1,123 @@ +# Contributor: Rasmus Thomsen +# Maintainer: Newbyte +pkgname=mozjs91 +pkgver=91.8.0 +pkgrel=0 +pkgdesc="Standalone Mozilla JavaScript engine (91 ESR)" +url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" +arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # limited by rust and cargo +license="MPL-2.0" +depends_dev=" + $pkgname + icu-dev + libffi-dev + nspr-dev + readline-dev + " +_llvmver=13 +makedepends=" + $depends_dev + autoconf2.13 + cargo + clang-dev~$_llvmver + linux-headers + lld + llvm$_llvmver + perl + python3 + rust + sed + zlib-dev + " +subpackages="$pkgname-dev" +source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-${pkgver}esr.source.tar.xz + fix-i386-fdlibm.patch + fix-musl-build.patch + fix-rust-target.patch + " +builddir="$srcdir"/firefox-$pkgver + +prepare() { + default_prepare + mkdir "$srcdir/mozbuild" + + cat > .mozconfig <<- END + ac_add_options --enable-application=js + mk_add_options MOZ_OBJDIR='${PWD}'/obj + ac_add_options --prefix=/usr + ac_add_options --enable-release + ac_add_options --enable-hardening + ac_add_options --enable-optimize="$CFLAGS -O2" + ac_add_options --enable-rust-simd + ac_add_options --enable-linker=lld + ac_add_options --disable-bootstrap + ac_add_options --disable-debug + ac_add_options --disable-debug-symbols + ac_add_options --disable-jemalloc + ac_add_options --disable-strip + + # System libraries + ac_add_options --with-system-zlib + ac_add_options --with-system-icu + + # Features + ac_add_options --enable-readline + ac_add_options --enable-shared-js + ac_add_options --enable-tests + ac_add_options --with-intl-api + END +} + +build() { + export LDFLAGS="$LDFLAGS -Wl,-z,stack-size=1048576" + + # FF doesn't have SIMD available on armhf/v7 + case "$CARCH" in + arm*) + echo 'ac_add_options --disable-rust-simd' >> .mozconfig + ;; + *) + echo 'ac_add_options --enable-rust-simd' >> .mozconfig + ;; + esac + + # disable debug on 32-bit (takes too much link memory) + case "$CARCH" in + arm*|x86) + echo 'ac_add_options --disable-debug-symbols' >> .mozconfig + echo 'ac_add_options --disable-debug' >> .mozconfig + # hardcoded in the file + sed -i 's|debug_info = "2"|debug_info = "0"|' \ + build/moz.configure/toolchain.configure + ;; + esac + + export MACH_USE_SYSTEM_PYTHON=1 + export MOZBUILD_STATE_PATH="$srcdir/mozbuild" + export MOZ_NOSPAM=1 + export PYTHON=/usr/bin/python3 + export RUST_TARGET="$CTARGET" + export SHELL=/bin/ash + + ./mach build +} + +check() { + obj/dist/bin/jsapi-tests \ + --format=none \ + --exclude-random \ + basic +} + +package() { + cd obj + make DESTDIR="$pkgdir" install + rm -f "$pkgdir"/usr/lib/*.ajs +} + +sha512sums=" +edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3 firefox-91.8.0esr.source.tar.xz +2eeb9d3039104ba91854ba54283289fbc0f282c703ac7fa7107646dccd290fe80d09f2ebe0e4b0268349c755b6d82fcbe2c3788a20e5dc28ce24c7d545efde1d fix-i386-fdlibm.patch +bc91c2fb15eb22acb8acc36d086fb18fbf6f202b4511d138769b5ecaaed4a673349c55f808270c762616fafa42e3b01e74dc0af1dcbeea1289e043926e2750c8 fix-musl-build.patch +0b222a36cf3fd446dfb7fd171d77c58c0f19bc4df8f61cb2d99f2dfa0998a24e4d11a92fb88a1144b1bdd8ace95a858dca0a5e9ad5a4ea37a13b2cb7c245758a fix-rust-target.patch +" diff --git a/community/mozjs91/fix-i386-fdlibm.patch b/community/mozjs91/fix-i386-fdlibm.patch new file mode 100644 index 00000000000..831e5e03678 --- /dev/null +++ b/community/mozjs91/fix-i386-fdlibm.patch @@ -0,0 +1,18 @@ +# error: typedef redefinition with different types ('__double_t' (aka 'double') vs 'long double') +# https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 + +--- a/modules/fdlibm/src/math_private.h ++++ b/modules/fdlibm/src/math_private.h +@@ -30,7 +30,12 @@ + * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t + */ + ++#if defined(__linux__) && defined(__i386__) ++// rely on glibc's double_t ++typedef long double __double_t; ++#else + typedef double __double_t; ++#endif + typedef __double_t double_t; + + /* diff --git a/community/mozjs91/fix-musl-build.patch b/community/mozjs91/fix-musl-build.patch new file mode 100644 index 00000000000..af394673990 --- /dev/null +++ b/community/mozjs91/fix-musl-build.patch @@ -0,0 +1,16 @@ +Upstream: No +Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: +https://github.com/void-linux/void-packages/issues/2598 +diff --git a/js/src/old-configure.in b/js/src/old-configure.in +--- a/js/src/old-configure.in ++++ b/js/src/old-configure.in +@@ -1272,6 +1272,9 @@ + *-android*|*-linuxandroid*) + : + ;; ++ *-musl*) ++ : ++ ;; + *) + AC_DEFINE(HAVE_THREAD_TLS_KEYWORD) + ;; diff --git a/community/mozjs91/fix-rust-target.patch b/community/mozjs91/fix-rust-target.patch new file mode 100644 index 00000000000..4d8918a2a54 --- /dev/null +++ b/community/mozjs91/fix-rust-target.patch @@ -0,0 +1,28 @@ +commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5 +Author: Daniel Kolesa +Date: Sun Jan 23 21:13:38 2022 +0100 + + bypass rust triplet checks and just force ours + +diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +index cd77d72b..0c03cab7 100644 +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -261,7 +261,7 @@ def rust_supported_targets(rustc): + data.setdefault(key, []).append(namespace(rust_target=t, target=info)) + return data + +- ++@imports("os") + def detect_rustc_target( + host_or_target, compiler_info, arm_target, rust_supported_targets + ): +@@ -383,7 +383,7 @@ def detect_rustc_target( + + return None + +- rustc_target = find_candidate(candidates) ++ rustc_target = os.environ["RUST_TARGET"] + + if rustc_target is None: + die("Don't know how to translate {} for rustc".format(host_or_target.alias)) -- GitLab From 2578b8b8d03723fedde17bd4fd7184f2f51c9168 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sat, 9 Apr 2022 12:53:18 +0200 Subject: [PATCH 30/58] community/gjs: upgrade to 1.72.0 --- community/gjs/APKBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/community/gjs/APKBUILD b/community/gjs/APKBUILD index d0d9e7c6f48..9326d8071a3 100644 --- a/community/gjs/APKBUILD +++ b/community/gjs/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gjs -pkgver=1.70.1 +pkgver=1.72.0 pkgrel=0 pkgdesc="GNOME javascript library" url="https://wiki.gnome.org/Projects/Gjs" -# s390x and riscv64 blocked by mozjs78 +# s390x and riscv64 blocked by mozjs91 arch="all !s390x !riscv64" license="MIT AND LGPL-2.0-or-later" -makedepends="dbus gobject-introspection-dev mozjs78-dev mozjs78 +makedepends="dbus gobject-introspection-dev mozjs91-dev mozjs91 gtk+3.0-dev cairo-dev meson libffi>=3.3" checkdepends="xvfb-run" subpackages="$pkgname-dev" @@ -33,5 +33,5 @@ package() { } sha512sums=" -194d8efeb37ecf7f3ea65c0bf0bbe2120524a11448423888d0785868297ebdea12b0ea4b28cb49d2596c7a3d73f13eb216072db8dca5e209193ba3dbbad78b6b gjs-1.70.1.tar.xz +224934eed511052d013cc7c2a29ccf79b14e5ed8c01db8071f07858387d7794b9156abd43ac494a13294248d9b6f2956d21c4e9581a41f5161043dff374f72f9 gjs-1.72.0.tar.xz " -- GitLab From fbead86ec670b1885edf75ba93216d83174c84e3 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sat, 9 Apr 2022 13:59:01 +0200 Subject: [PATCH 31/58] community/gnome-terminal: upgrade to 3.44.0 --- community/gnome-terminal/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/gnome-terminal/APKBUILD b/community/gnome-terminal/APKBUILD index 3d88baaed13..324cbc8ad44 100644 --- a/community/gnome-terminal/APKBUILD +++ b/community/gnome-terminal/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-terminal -pkgver=3.42.0 +pkgver=3.44.0 pkgrel=0 pkgdesc="GNOME terminal emulator application" url="https://wiki.gnome.org/Apps/Terminal" @@ -29,6 +29,6 @@ package() { } sha512sums=" -58afedc6118269435670223fb02d5e27046e8c4882371cd8d938c161480d3fbb0f214456b8757c5c5a7ef41124eab265e659bdf4c3987e5bf0b0c8ebd3e5f13a gnome-terminal-3.42.0.tar.xz +0cf039c0aa364a9ac63d9f24d466506a919cf733f2ee8dc1c6f42459e6c742bad678f7ad7cec3721e9512b8f414dc4c4c1f29057c73e5e4a870a04d6bcd98ed6 gnome-terminal-3.44.0.tar.xz 3bbc0e9dbbbfd4a3263b5d195a78df9cc70d13ae02d3a2981886001e79d92c2bfe4962954efba8fbab69f23e1778d5fbe3436f494b70e196ecedb02bf9d95400 fix-W_EXITCODE.patch " -- GitLab From bbef45779b7cd5598f77b966cc2cfdd198774197 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 17:34:58 +0200 Subject: [PATCH 32/58] community/jsonrpc-glib: upgrade to 3.42.0 --- community/jsonrpc-glib/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/jsonrpc-glib/APKBUILD b/community/jsonrpc-glib/APKBUILD index c2ba05d8ea4..d709e283ddc 100644 --- a/community/jsonrpc-glib/APKBUILD +++ b/community/jsonrpc-glib/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=jsonrpc-glib -pkgver=3.40.0 +pkgver=3.42.0 pkgrel=0 pkgdesc="Library to communicate using the JSON-RPC 2.0 specification" url="https://gitlab.gnome.org/GNOME/jsonrpc-glib" @@ -28,6 +28,6 @@ package() { } sha512sums=" -5d4fae86e7eeb029a8daf3eff26107a374ba1b68caa2862563e8d9854913ae306448f4c712be6f0f82961031f1b618aaba7ded154f81b4a023fa366c71f1b887 jsonrpc-glib-3.40.0.tar.xz +615e446dba2b1bbefe1bf8891449de9d39e3486fefda590781f59469ea50e6affa487bcb260bd3e21ca30e696b1dec7a761c8d93ec9c0894d9bb4c3d65f106dc jsonrpc-glib-3.42.0.tar.xz ec2eea185a86c6ac16fc51c7d67faca7805c69e6127f1288d551ba7249f898672a5a4ef1f2d05531f65e5d5087d4d576b251f3330806809bdeab6abd6593dc34 disable-flaky-test.patch " -- GitLab From 7f851ee3fd0329991e9eb88e49af0319a9f6cf44 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 17:35:16 +0200 Subject: [PATCH 33/58] community/gnome-builder: upgrade to 42.0 --- community/gnome-builder/APKBUILD | 13 ++- community/gnome-builder/fix-32bit-build.patch | 26 ------ .../fix-appstream-validation.patch | 27 ++++++ .../gnome-builder/fix-libportal-gtk3.patch | 93 ------------------- 4 files changed, 33 insertions(+), 126 deletions(-) delete mode 100644 community/gnome-builder/fix-32bit-build.patch create mode 100644 community/gnome-builder/fix-appstream-validation.patch delete mode 100644 community/gnome-builder/fix-libportal-gtk3.patch diff --git a/community/gnome-builder/APKBUILD b/community/gnome-builder/APKBUILD index 87fafad3b0c..bcaf93e8467 100644 --- a/community/gnome-builder/APKBUILD +++ b/community/gnome-builder/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-builder -pkgver=41.3 -pkgrel=2 +pkgver=42.0 +pkgrel=0 pkgdesc="Develop software for GNOME" url="https://wiki.gnome.org/Apps/Builder" # limited by polkit -> flatpak @@ -12,6 +12,7 @@ depends="flatpak-builder py3-lxml py3-gobject3" makedepends=" meson libdazzle-dev + libhandy1-dev glib-dev gtk+3.0-dev gtksourceview4-dev @@ -44,9 +45,8 @@ checkdepends="appstream-glib desktop-file-utils xvfb-run" subpackages="$pkgname-dev $pkgname-lang" source=" https://download.gnome.org/sources/gnome-builder/${pkgver%.*}/gnome-builder-$pkgver.tar.xz + fix-appstream-validation.patch fix-musl.patch - fix-libportal-gtk3.patch - fix-32bit-build.patch " build() { @@ -67,8 +67,7 @@ package() { } sha512sums=" -26ea632666991eeba5c5e6291b7e898e123623622989d96fa5e44156d08f44fae27f8ec341f01cbff5275becfa67b4d3b83239705535b60e323e03cfc9eebfe8 gnome-builder-41.3.tar.xz +da432a6eb958e5f35a409bdd5359ca3dd3bf7ac33156ec5bc910ef9e99baabf7e922e5a5ba5d57f0adcf3313b28858ec769f214d95ad73e6fb29bcd3c29dd834 gnome-builder-42.0.tar.xz +a1296f3ccedf268de6a64154ce8ba7f6f49595ba03945d96ce903a8230247b2c1f5b7b3dc61de16373b0583f31f1e8e8bbc1f33c6cad23b42e9f5c63168823bd fix-appstream-validation.patch ef7f75d316558e59ecb07b4fc8ef92abc51d78d6983021588546fadb57f90d971561be1f2491a2750e61e07c6d6200f3c199dab3db1060a2217ccbdb2505239e fix-musl.patch -24d6acf0378ba673ccc860e090affc1f5ef5f852289250e163892cfced6d33d93ffeaeec6ff584a36944c9b58f06213582a20be673253a777e03563c780e6b9b fix-libportal-gtk3.patch -c668c08d94ebcff7e9c810c92d487c0a039d23fab6efaa2d2b2ebaebfd5167d3f9d9e8b12127a8961bf0e7cda73fa1e3b82633c6bb53ac0889417114e080ffef fix-32bit-build.patch " diff --git a/community/gnome-builder/fix-32bit-build.patch b/community/gnome-builder/fix-32bit-build.patch deleted file mode 100644 index 101c6492c83..00000000000 --- a/community/gnome-builder/fix-32bit-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From fcf976d5fcfb81d14ea0ec9b9909bc9b8dc52a81 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 19 Nov 2021 08:27:28 -0600 -Subject: [PATCH] flatpak: attempt to fix build on i686 - -There may be more problems, but this should fix the first build failure. ---- - src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c b/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c -index 0f2da7456..6e9d82732 100644 ---- a/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c -+++ b/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c -@@ -597,7 +597,7 @@ is_known_worker (GTask *task, - } - - finish: -- g_debug ("RuntimeIsKnown => (%d, %"G_GSIZE_FORMAT")", found, download_size); -+ g_debug ("RuntimeIsKnown => (%d, %"G_GINT64_FORMAT")", found, download_size); - ipc_flatpak_service_complete_runtime_is_known (g_task_get_source_object (task), - g_steal_pointer (&state->invocation), - found, --- -GitLab - diff --git a/community/gnome-builder/fix-appstream-validation.patch b/community/gnome-builder/fix-appstream-validation.patch new file mode 100644 index 00000000000..b0f296d9607 --- /dev/null +++ b/community/gnome-builder/fix-appstream-validation.patch @@ -0,0 +1,27 @@ +From d7151679e0c925d27216256dc32fe67fb298d059 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha +Date: Mon, 21 Mar 2022 11:36:23 -0400 +Subject: [PATCH] appdata: Drop 42 pre-releases + +Fixes appstream validation +--- + data/appdata/org.gnome.Builder.appdata.xml.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/data/appdata/org.gnome.Builder.appdata.xml.in b/data/appdata/org.gnome.Builder.appdata.xml.in +index 1d55551ea..14d14df69 100644 +--- a/data/appdata/org.gnome.Builder.appdata.xml.in ++++ b/data/appdata/org.gnome.Builder.appdata.xml.in +@@ -91,9 +91,6 @@ + + + +- +- +- + + + +-- +GitLab + diff --git a/community/gnome-builder/fix-libportal-gtk3.patch b/community/gnome-builder/fix-libportal-gtk3.patch deleted file mode 100644 index 1cf7f32132f..00000000000 --- a/community/gnome-builder/fix-libportal-gtk3.patch +++ /dev/null @@ -1,93 +0,0 @@ -From b3bfa0df53a3749c3b73cb6c4bad5cab3fa549a1 Mon Sep 17 00:00:00 2001 -From: Abderrahim Kitouni -Date: Sat, 25 Dec 2021 16:25:43 +0100 -Subject: [PATCH] build: use libportal 0.5 - -This partly reverts 2aea4bd7d0ced77a7d0778517b4505af5dea2dac ---- - build-aux/flatpak/org.gnome.Builder.json | 7 ++++--- - meson.build | 2 +- - src/gstyle/gstyle-color-panel.c | 2 +- - src/plugins/devhelp/gbp-devhelp-page.c | 2 +- - src/plugins/open-with-external/gbp-owe-workbench-addin.c | 2 +- - 5 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json -index 02ac31ede..a32d29b92 100644 ---- a/build-aux/flatpak/org.gnome.Builder.json -+++ b/build-aux/flatpak/org.gnome.Builder.json -@@ -601,15 +601,16 @@ - "name" : "libportal", - "config-opts" : [ - "--libdir=/app/lib", -- "--buildtype=debugoptimized" -+ "--buildtype=debugoptimized", -+ "-Dbackends=gtk3" - ], - "buildsystem" : "meson", - "builddir" : true, - "sources" : [ - { - "type" : "archive", -- "url" : "https://github.com/flatpak/libportal/releases/download/0.4/libportal-0.4.tar.xz", -- "sha256" : "3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28" -+ "url" : "https://github.com/flatpak/libportal/releases/download/0.5/libportal-0.5.tar.xz", -+ "sha256" : "d8c8cb18a34e5eeb26a39c94044c955995b01de0e139caac5e18c076cf821b3b" - } - ] - }, -diff --git a/meson.build b/meson.build -index 01737034b..494e0d752 100644 ---- a/meson.build -+++ b/meson.build -@@ -284,7 +284,7 @@ libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.41.0') - libm_dep = cc.find_library('m', required: false) - libpangoft2_dep = dependency('pangoft2', version: '>= 1.38.0') - libpeas_dep = dependency('libpeas-1.0', version: '>= 1.22.0') --libportal_dep = dependency('libportal', version: '>= 0.3', required: false) -+libportal_dep = dependency('libportal-gtk3', required: false) - libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.28.0') - libvte_dep = dependency('vte-2.91', version: '>= 0.65.0') - libwebkit_dep = dependency('webkit2gtk-4.0', version: '>= 2.26', required: false) -diff --git a/src/gstyle/gstyle-color-panel.c b/src/gstyle/gstyle-color-panel.c -index 15742a7be..a6295c168 100644 ---- a/src/gstyle/gstyle-color-panel.c -+++ b/src/gstyle/gstyle-color-panel.c -@@ -30,7 +30,7 @@ - #include "gstyle-color.h" - - #include --#include -+#include - - #define HSV_TO_SCALE_FACTOR (1.0 / 256.0) - #define CIELAB_L_TO_SCALE_FACTOR (100.0 / 256.0) -diff --git a/src/plugins/devhelp/gbp-devhelp-page.c b/src/plugins/devhelp/gbp-devhelp-page.c -index 5d5c52b0d..2ac788414 100644 ---- a/src/plugins/devhelp/gbp-devhelp-page.c -+++ b/src/plugins/devhelp/gbp-devhelp-page.c -@@ -25,7 +25,7 @@ - #include - - #include --#include -+#include - - #include "gbp-devhelp-page.h" - #include "gbp-devhelp-search.h" -diff --git a/src/plugins/open-with-external/gbp-owe-workbench-addin.c b/src/plugins/open-with-external/gbp-owe-workbench-addin.c -index 51d2da844..816fe643f 100644 ---- a/src/plugins/open-with-external/gbp-owe-workbench-addin.c -+++ b/src/plugins/open-with-external/gbp-owe-workbench-addin.c -@@ -23,7 +23,7 @@ - #include "gbp-owe-workbench-addin.h" - - #include --#include -+#include - - struct _GbpOweWorkbenchAddin - { --- -GitLab - -- GitLab From 8212f3b354314f04a0455d1a2ea21e2581233f18 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 17:39:46 +0200 Subject: [PATCH 34/58] community/orca: upgrade to 42.0 --- community/orca/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/community/orca/APKBUILD b/community/orca/APKBUILD index a1f254cd7ec..6f82bf35dd6 100644 --- a/community/orca/APKBUILD +++ b/community/orca/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=orca -pkgver=41.0 -pkgrel=1 +pkgver=42.0 +pkgrel=0 pkgdesc="Orca is an extensible screen reader" url="https://wiki.gnome.org/Projects/Orca" arch="noarch !armhf" # missing gst-plugins-good @@ -34,5 +34,5 @@ package() { } sha512sums=" -abc085a5f48f3ec80baeafc4acb5aab0b413d76bfd536c59ad6db7b003250a51c2921989963393d96010ef773a3f75d90cf87cb5906547904901ad1a53750eef orca-41.0.tar.xz +dee0f65cd1055293d65eabb360b515763501812264440410332d7c0bf58eff63035f8fee07d61e5caed7c860cdce44ca30b187c6fc1c0417102fb577ff02e340 orca-42.0.tar.xz " -- GitLab From 80c476bf71f1728046a2d7214f497c55b58602eb Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 17:57:20 +0200 Subject: [PATCH 35/58] community/yelp: upgrade to 42.1 -docs subpackage was dropped as yelp no longer builds its docs. See https://gitlab.gnome.org/GNOME/yelp/-/commit/6c3b12129ee6789f1327532a74620645b4e56963 --- community/yelp/APKBUILD | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/community/yelp/APKBUILD b/community/yelp/APKBUILD index 2f9eb6757ec..780025bc882 100644 --- a/community/yelp/APKBUILD +++ b/community/yelp/APKBUILD @@ -1,16 +1,28 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=yelp -pkgver=41.2 +pkgver=42.1 pkgrel=0 pkgdesc="Help browser for GNOME desktop" url="https://wiki.gnome.org/Apps/Yelp" -arch="all" +# riscv64, s390x: blocked by libhandy1-dev +arch="all !riscv64 !s390x" license="GPL-2.0-or-later" depends="dconf desktop-file-utils hicolor-icon-theme yelp-xsl" -makedepends="glib-dev itstool bzip2-dev gtk+3.0-dev libgcrypt-dev xz-dev - libxml2-dev libxslt-dev sqlite-dev webkit2gtk-dev" -subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-lang" +makedepends=" + bzip2-dev + glib-dev + gtk+3.0-dev + itstool + libgcrypt-dev + libhandy1-dev + libxml2-dev + libxslt-dev + sqlite-dev + webkit2gtk-dev + xz-dev + " +subpackages="$pkgname-static $pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/yelp/${pkgver%.*}/yelp-$pkgver.tar.xz" prepare() { @@ -45,5 +57,5 @@ package() { } sha512sums=" -171020b258531d26d1ab6193222b1b31bbde0be7da87524911e38143a606f38b29f9d76cb600cffc71da63d81274f656c426e79101acfa64caaf29e1a44020bf yelp-41.2.tar.xz +3c8150503e828c8d2994b7af6f7c673b696b01f4a82abcbbc0395909a0e0eb2d64a9e445a5b1683a0c9aa0abc7040cc563917e55b126879ce7c4dda117bbf3db yelp-42.1.tar.xz " -- GitLab From da5ff7464595b4eba14c08912d9d07c56a169073 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 17:58:33 +0200 Subject: [PATCH 36/58] community/yelp-xsl: upgrade to 42.0 --- community/yelp-xsl/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/yelp-xsl/APKBUILD b/community/yelp-xsl/APKBUILD index fe5d6f04adc..b9deaef7f24 100644 --- a/community/yelp-xsl/APKBUILD +++ b/community/yelp-xsl/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Alan Lacerda # Maintainer: Alan Lacerda pkgname=yelp-xsl -pkgver=41.0 +pkgver=42.0 pkgrel=0 pkgdesc="XSL stylesheets for the yelp help browser" url="https://wiki.gnome.org/Apps/Yelp" @@ -35,5 +35,5 @@ package() { } sha512sums=" -c737fa9a580e82e7a1af8f08f9314a46cd4e7246a0a184e3ce4bc7c77538674ed6823d83ab5aaeaf77e1099033362be6ce33e1a37a85677b7efb39052b7e8776 yelp-xsl-41.0.tar.xz +70d86bedd00fd38ffefb82962b591b710aa6ba59f9a12c968d5c47afeed9f4afecfb5e1228fbaba3acab5d5673cb6511d3d51674f7602f5001835d9c134fedda yelp-xsl-42.0.tar.xz " -- GitLab From fac30e21f4d983cf664865378d2202f6474b3ed9 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 17:59:34 +0200 Subject: [PATCH 37/58] community/yelp-tools: upgrade to 42.0 --- community/yelp-tools/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/yelp-tools/APKBUILD b/community/yelp-tools/APKBUILD index 8eea1bb6cbb..8d8aff6505b 100644 --- a/community/yelp-tools/APKBUILD +++ b/community/yelp-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alan Lacerda # Maintainer: Alan Lacerda pkgname=yelp-tools -pkgver=41.0 +pkgver=42.0 pkgrel=0 pkgdesc="Collection of utilities to help create documentation" url="https://wiki.gnome.org/Apps/Yelp/Tools" @@ -22,5 +22,5 @@ package() { } sha512sums=" -76b8f9568942426698716d655bc2e7a614a26e40a820d1f4ce5021a54c6baa081d494bda06657cfc1c11999e14a8601c97ae51bb3519555b8ee1111489c0e10e yelp-tools-41.0.tar.xz +ff6168a33b2dedd12f7fb5d5aa6394a554b7ad8956cc7121e5f1a520f9fb20bd4cad93e22b5e8b2f8aa82ca5a1711a0634d8619c731e46730084e28f29725786 yelp-tools-42.0.tar.xz " -- GitLab From 59b63a6f1ce930ace824b410e1339b39d83f5320 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 18:08:07 +0200 Subject: [PATCH 38/58] community/libdazzle: upgrade to 3.44.0 --- community/libdazzle/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/community/libdazzle/APKBUILD b/community/libdazzle/APKBUILD index ab8f35a190c..c9560708a1e 100644 --- a/community/libdazzle/APKBUILD +++ b/community/libdazzle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=libdazzle -pkgver=3.42.0 +pkgver=3.44.0 pkgrel=0 pkgdesc="Library to delight your users with fancy features" url="https://gitlab.gnome.org/GNOME/libdazzle" @@ -9,7 +9,7 @@ arch="all" license="GPL-3.0-or-later" makedepends="gtk+3.0-dev vala gobject-introspection-dev gtk-doc meson" checkdepends="xvfb-run" -subpackages="$pkgname-dev" +subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/libdazzle/${pkgver%.*}/libdazzle-$pkgver.tar.xz" if [ "$CARCH" = "armhf" ]; then @@ -32,5 +32,5 @@ package() { } sha512sums=" -db6ac54deba034627726747b8c15472aa2f640617473825698e23ca6527d5b69e9103dd82141e82b7dd7fa8bd57eadf054cdd300d46e1b65ced0fffcbc55a301 libdazzle-3.42.0.tar.xz +eff3f65cbfd4f780afb4bda6137e8d4f1ee2cd0ab21288d07315415944ced1aa2d7ef89c2b7ebb373ac4c46b91d341bed063e9c7d1c21fa083514c8c3c9c518f libdazzle-3.44.0.tar.xz " -- GitLab From 338c02dc10cee4bd72146d9e4a69fbdacb26ab0e Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 18:09:42 +0200 Subject: [PATCH 39/58] community/simple-scan: upgrade to 42.0 --- community/simple-scan/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/simple-scan/APKBUILD b/community/simple-scan/APKBUILD index 452341fd31a..7267bfef0af 100644 --- a/community/simple-scan/APKBUILD +++ b/community/simple-scan/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena # Maintainer: Rasmus Thomsen pkgname=simple-scan -pkgver=40.5 +pkgver=42.0 pkgrel=0 pkgdesc="Simple Scan allows you to get images from a scanner" url="https://gitlab.gnome.org/GNOME/simple-scan" @@ -30,5 +30,5 @@ package() { } sha512sums=" -cf87a0dbaea09ee0aa0333d487179dc1ab661a7c13321ff92cd7c7de62f6f9cdcf4a858e1fb24df07fe4b0cb01694bea915c61e2c7ce6e44ecf549613ccbfa6f simple-scan-40.5.tar.xz +0ccbe82a85fa802f53899df6109be93d58adc5028e6d904da7fc91e25cfd225fff757a7b65380abd7d3e7dfd35feab586bcf5b7504cc46d42822d3b2179bdec0 simple-scan-42.0.tar.xz " -- GitLab From 1ee7949f828c96b0e2dfd5fe136ef0399164224b Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 18:17:31 +0200 Subject: [PATCH 40/58] community/gnome-music: upgrade to 42.0 -dbg subpackage was removed as abuild can't find the files necessary to create it. --- community/gnome-music/APKBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/community/gnome-music/APKBUILD b/community/gnome-music/APKBUILD index f7bbf7d9e79..c296588ed5e 100644 --- a/community/gnome-music/APKBUILD +++ b/community/gnome-music/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-music -pkgver=41.0 -pkgrel=1 +pkgver=42.0 +pkgrel=0 pkgdesc="Music is the new GNOME music playing application" url="https://wiki.gnome.org/Apps/Music" # s390x and riscv64 blocked by polkit -> tracker @@ -10,11 +10,11 @@ arch="all !s390x !riscv64" license="GPL-2.0-or-later" depends="grilo grilo-plugins gnome-online-accounts libdazzle libsoup py3-gobject3 tracker libmediaart py3-cairo gst-plugins-good tracker-miners" -makedepends="meson gnome-online-accounts-dev libdazzle-dev gtk+3.0-dev libhandy1-dev libsoup-dev +makedepends="meson gnome-online-accounts-dev gtk4.0-dev libadwaita-dev libsoup-dev gobject-introspection-dev grilo-dev grilo-plugins-dev tracker-dev py3-gobject3-dev libmediaart-dev py3-cairo-dev itstool" checkdepends="desktop-file-utils appstream-glib" -subpackages="$pkgname-dbg $pkgname-lang $pkgname-doc" +subpackages="$pkgname-lang $pkgname-doc" source="https://download.gnome.org/sources/gnome-music/${pkgver%.*}/gnome-music-$pkgver.tar.xz" build() { @@ -31,5 +31,5 @@ package() { } sha512sums=" -883f8862d5216ab30c3208a316378c2ef016ba52861c9261b8fa9ceb44f935e4dc35608ea66b333c3bf61c9dcc950fa338adfadc2d5e7f67a7a84467228d28a2 gnome-music-41.0.tar.xz +2e104188681337d200fabdfb2a332e4c01c8c0357580fc6f8c53fa0e44ebc4785c33acf0b32f201cad0acdfc0cb4a6dcf21b15842d0aa0b480add5f91d2a46e7 gnome-music-42.0.tar.xz " -- GitLab From 3ff74d88cbabd66fa0232baf38d7aac4ebecf433 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 18:22:56 +0200 Subject: [PATCH 41/58] community/tracker-miners: upgrade to 3.3.0 --- community/tracker-miners/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/community/tracker-miners/APKBUILD b/community/tracker-miners/APKBUILD index 758300c3208..f17eee331f5 100644 --- a/community/tracker-miners/APKBUILD +++ b/community/tracker-miners/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=tracker-miners -pkgver=3.1.3 -pkgrel=2 +pkgver=3.3.0 +pkgrel=0 pkgdesc="Data miners for tracker" url="https://gitlab.gnome.org/GNOME/tracker-miners" # s390x and riscv64 blocked by polkit -> networkmanager @@ -39,5 +39,5 @@ package() { } sha512sums=" -b9df7fef1463a4f80ce27b7c47b3fba9811e81a90bb60c60edbfac3520c5058dff63249f16f32bd9da51fa8b35085113960c82df63c98c74fcf165969c084406 tracker-miners-3.1.3.tar.xz +ef28abf48633125e2386cc6c9cc4afbc8c203cfd6fcd31eb6928eb6132e033be232e1141655b5d517e66170c5abb3799f9ea3c76f4b5db66e18524aea59f3969 tracker-miners-3.3.0.tar.xz " -- GitLab From 8fa0ba3b143d31386874b08163de18a15e8af76e Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 18:23:12 +0200 Subject: [PATCH 42/58] community/tracker: upgrade to 3.3.0 --- community/tracker/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/community/tracker/APKBUILD b/community/tracker/APKBUILD index b34ffe41b13..82f1dcadf8a 100644 --- a/community/tracker/APKBUILD +++ b/community/tracker/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=tracker -pkgver=3.2.0 -pkgrel=2 +pkgver=3.3.0 +pkgrel=0 pkgdesc="Personal search tool and storage system" url="https://wiki.gnome.org/Projects/Tracker" # s390x and riscv64 blocked by networkmanager -> polkit @@ -72,5 +72,5 @@ _testutils() { } sha512sums=" -45589f997d31c2c81ec70b89ae8319353611516bbcdca0339eef0511461cce4bdf3af13907b245c81d2d9b62e45647b4b1f57ed1dad37fb623fdfcc85639ab50 tracker-3.2.0.tar.xz +0a55a80b44c2267f149c4c83ecbe42ca27a0645bd4fc206984999520f6bed3b7c63c71f81450f40ce2896223ce17326add20e7f39a71c821d754f30b8ce157bc tracker-3.3.0.tar.xz " -- GitLab From add7addae6b3a3bc4d77a24995b88d6fee927f30 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 18:27:33 +0200 Subject: [PATCH 43/58] community/gnome-screenshot: upgrade to 41.0 --- community/gnome-screenshot/APKBUILD | 11 ++++-- .../fix-build-with-meson-0.60.0.patch | 36 +++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 community/gnome-screenshot/fix-build-with-meson-0.60.0.patch diff --git a/community/gnome-screenshot/APKBUILD b/community/gnome-screenshot/APKBUILD index aa233d24d23..031d3da27d6 100644 --- a/community/gnome-screenshot/APKBUILD +++ b/community/gnome-screenshot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-screenshot -pkgver=40.0 +pkgver=41.0 pkgrel=0 pkgdesc="Screenshot capture utility for GNOME" url="https://gitlab.gnome.org/GNOME/gnome-screenshot" @@ -12,7 +12,9 @@ depends="desktop-file-utils" makedepends="meson libcanberra-dev glib-dev itstool appstream-glib-dev libhandy1-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.gnome.org/sources/gnome-screenshot/${pkgver%.*}/gnome-screenshot-$pkgver.tar.xz" +source="https://download.gnome.org/sources/gnome-screenshot/${pkgver%.*}/gnome-screenshot-$pkgver.tar.xz + fix-build-with-meson-0.60.0.patch + " build() { abuild-meson . output @@ -27,4 +29,7 @@ package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output } -sha512sums="0889d7701711f17de68f8a55f512b7764fed087b1b2f86b372d1a38ee956f05ca8c833ca16a1de2396b07c01de79204d988192036780f521b82733436d019cb0 gnome-screenshot-40.0.tar.xz" +sha512sums=" +ab6c7e22cbca2739844707e59329ecd67901e04f968bd0b20a07dffff825e9772697ebf20a1ab2a920fa839ea40d0bd872d17db2b4cb7856a6f8ee4ec1426d19 gnome-screenshot-41.0.tar.xz +314fe977317b143d36796ab722bbd6f55083448b9737bb838ab21916c05db79925e337a7a84761dc270764b742bbef2d74600d349cd4182fcd787982db59ef1b fix-build-with-meson-0.60.0.patch +" diff --git a/community/gnome-screenshot/fix-build-with-meson-0.60.0.patch b/community/gnome-screenshot/fix-build-with-meson-0.60.0.patch new file mode 100644 index 00000000000..b21aa0490d4 --- /dev/null +++ b/community/gnome-screenshot/fix-build-with-meson-0.60.0.patch @@ -0,0 +1,36 @@ +From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001 +From: Jack Hill +Date: Thu, 18 Nov 2021 00:46:58 -0500 +Subject: [PATCH] meson: remove extraneous positional argument + +* data/meson.build (desktop_file) + (metainfo_file): Remove extraneous positional argument. + +Closes #186 +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd570b3..4e2e2e8 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,7 +1,6 @@ + gnome = import('gnome') + + desktop_file = i18n.merge_file( +- 'desktop', + type: 'desktop', + input: 'org.gnome.Screenshot.desktop.in', + output: 'org.gnome.Screenshot.desktop', +@@ -23,7 +22,6 @@ if desktop_file_validate.found() + endif + + metainfo_file = i18n.merge_file( +- 'appdata', + input: 'org.gnome.Screenshot.metainfo.xml.in', + output: 'org.gnome.Screenshot.metainfo.xml', + po_dir: join_paths(meson.current_source_dir(), '../po'), +-- +GitLab + -- GitLab From 9648faf1dba338758dd14f89ba1d5fbeaee039a1 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 18:33:44 +0200 Subject: [PATCH 44/58] community/gnome-font-viewer: upgrade to 42.0 --- community/gnome-font-viewer/APKBUILD | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/community/gnome-font-viewer/APKBUILD b/community/gnome-font-viewer/APKBUILD index 291ef24b480..43a243c0dd8 100644 --- a/community/gnome-font-viewer/APKBUILD +++ b/community/gnome-font-viewer/APKBUILD @@ -1,15 +1,23 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-font-viewer -pkgver=41.0 +pkgver=42.0 pkgrel=0 pkgdesc="View fonts on your system" url="https://gitlab.gnome.org/GNOME/gnome-font-viewer" -# s390x and riscv64 blocked by rust -> libhandy1 +# s390x and riscv64 blocked by rust -> libadwaita-dev arch="all !s390x !riscv64" license="GPL-2.0-or-later AND LGPL-2.1-or-later" -makedepends="glib-dev gtk+3.0-dev harfbuzz-dev fontconfig-dev freetype-dev - gnome-desktop-dev meson libhandy1-dev" +makedepends=" + fontconfig-dev + freetype-dev + glib-dev + gnome-desktop-dev + gtk4.0-dev + harfbuzz-dev + libadwaita-dev + meson + " options="!check" # no tests subpackages="$pkgname-lang" source="https://download.gnome.org/sources/gnome-font-viewer/${pkgver%.*}/gnome-font-viewer-$pkgver.tar.xz" @@ -24,5 +32,5 @@ package() { } sha512sums=" -09d9ddcdd18fd0023dff46e7197988473119e0d753b7814fdca0116c6831a93146301dd56ee77546121c573c8d93801b5d8fed0c46da47052e31749058c21d50 gnome-font-viewer-41.0.tar.xz +231aaf594b22741f8a138c0a6c764244eb947f9cf30385353f4dea13cfc7929f21a291f9a56810eb24862310ecab6b4555147ef6be9e7a5d3057ae05ebba76ec gnome-font-viewer-42.0.tar.xz " -- GitLab From caab423399795aeeab6738601abe23edecddadce Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 18:43:31 +0200 Subject: [PATCH 45/58] community/eog: upgrade to 42.0 --- .../eog/0001-Update-libportal-usage.patch | 80 ------------------- community/eog/APKBUILD | 30 +++++-- 2 files changed, 22 insertions(+), 88 deletions(-) delete mode 100644 community/eog/0001-Update-libportal-usage.patch diff --git a/community/eog/0001-Update-libportal-usage.patch b/community/eog/0001-Update-libportal-usage.patch deleted file mode 100644 index 733a4bafcbf..00000000000 --- a/community/eog/0001-Update-libportal-usage.patch +++ /dev/null @@ -1,80 +0,0 @@ -Patch merged upstream: -https://gitlab.gnome.org/GNOME/eog/-/merge_requests/115 - -From a06e6325907e136678b0bbe7058c25d688034afd Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Tue, 21 Dec 2021 16:35:36 -0600 -Subject: [PATCH] Update libportal usage - -libportal 0.5 is the first release with a stable API so some changes -were made. ---- - meson.build | 8 ++++++-- - org.gnome.Eog.json | 9 +++++---- - src/eog-util.c | 2 +- - 3 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/meson.build b/meson.build -index 9a32e4bb..9d49aa45 100644 ---- a/meson.build -+++ b/meson.build -@@ -165,11 +165,15 @@ config_h.set('HAVE_EXEMPI', enable_xmp) - # xdg-desktop-portal support with libportal (optional) - enable_libportal = get_option('libportal') - if enable_libportal -- libportal_dep = dependency('libportal', version: '>= 0.3', required: false) -+ libportal_dep = dependency('libportal', version: '>= 0.5', required: false) - assert(libportal_dep.found() and cc.has_header('libportal/portal.h', dependencies: libportal_dep), - 'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false') - -- common_deps += libportal_dep -+ libportal_gtk3_dep = dependency('libportal-gtk3', version: '>= 0.5', required: false) -+ assert(libportal_gtk3_dep.found() and cc.has_header('libportal-gtk3/portal-gtk3.h', dependencies: libportal_gtk3_dep), -+ 'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false') -+ -+ common_deps += [libportal_dep, libportal_gtk3_dep] - endif - config_h.set('HAVE_LIBPORTAL', enable_libportal) - -diff --git a/org.gnome.Eog.json b/org.gnome.Eog.json -index 94f09234..b7def6af 100644 ---- a/org.gnome.Eog.json -+++ b/org.gnome.Eog.json -@@ -48,16 +48,17 @@ - { - "name" : "libportal", - "config-opts" : [ -- "--libdir=/app/lib", -- "--buildtype=debugoptimized" -+ "--buildtype=debugoptimized", -+ "-Dbackends=gtk3", -+ "-Dintrospection=false", -+ "-Ddocs=false" - ], - "buildsystem" : "meson", -- "builddir" : true, - "sources" : [ - { - "type" : "git", - "url" : "https://github.com/flatpak/libportal.git", -- "tag" : "0.4" -+ "tag" : "0.5" - } - ] - }, -diff --git a/src/eog-util.c b/src/eog-util.c -index 90b9768e..56d23472 100644 ---- a/src/eog-util.c -+++ b/src/eog-util.c -@@ -45,7 +45,7 @@ - #include - #ifdef HAVE_LIBPORTAL - #include --#include -+#include - #endif - - void --- -2.31.1 - diff --git a/community/eog/APKBUILD b/community/eog/APKBUILD index ebaa6290d32..64ae4a7647a 100644 --- a/community/eog/APKBUILD +++ b/community/eog/APKBUILD @@ -1,19 +1,34 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=eog -pkgver=41.1 +pkgver=42.0 pkgrel=0 pkgdesc="An image viewer for GNOME" url="https://wiki.gnome.org/Apps/EyeOfGnome" arch="all !s390x !riscv64" # limited by librsvg -> rust license="GPL-2.0-or-later" depends="gsettings-desktop-schemas" -depends_dev="gvfs-dev libxml2-dev jpeg-dev libexif-dev lcms2-dev - libpeas-dev librsvg-dev gnome-desktop-dev exempi-dev libportal-dev" -makedepends="$depends_dev itstool libxml2-utils meson" +depends_dev=" + exempi-dev + gnome-desktop-dev + gvfs-dev + jpeg-dev + lcms2-dev + libexif-dev + libpeas-dev + libportal-dev + librsvg-dev + libxml2-dev + " +makedepends=" + $depends_dev + itstool + libhandy1-dev + libxml2-utils + meson + " subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.gnome.org/sources/eog/${pkgver%.*}/eog-$pkgver.tar.xz - 0001-Update-libportal-usage.patch" +source="https://download.gnome.org/sources/eog/${pkgver%.*}/eog-$pkgver.tar.xz" build() { abuild-meson \ @@ -30,6 +45,5 @@ package() { } sha512sums=" -0fa514dd6ef195e449bbde183f94850dfca764815a95423376bc0da422d07b6cbd7b35bbdd5ba9d8f995f55aae1e1b65d57626d1809cccf95389767d0ed594e8 eog-41.1.tar.xz -961703b824e7e46ac3afc8d990ea3e04d8162a44aa81116a795b933ff79a6d1173957239421459a24f5fe8259af5b21dec9f91b056ecc4ed7f79c6a58bb784b8 0001-Update-libportal-usage.patch +3901dbac9a371bac1e1bdc143e3d257a8e25fa2743a97bd9f9ecdb06e43cd5278edf33a46ab24c5e40babef6825181c986c99d9b4fafead71e04f51e65ae2acb eog-42.0.tar.xz " -- GitLab From 3fb8ee7cbaaaa9054754d48b9ed12eb7255b53e9 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 18:49:53 +0200 Subject: [PATCH 46/58] community/gnome-user-docs: upgrade to 42.0 --- community/gnome-user-docs/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/gnome-user-docs/APKBUILD b/community/gnome-user-docs/APKBUILD index 37ff30d24d1..796504a355b 100644 --- a/community/gnome-user-docs/APKBUILD +++ b/community/gnome-user-docs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-user-docs -pkgver=41.0 +pkgver=42.0 pkgrel=0 pkgdesc="GNOME User Documentation" url="https://gitlab.gnome.org/GNOME/gnome-user-docs" @@ -27,5 +27,5 @@ package() { } sha512sums=" -6e7c991c5ee1aa3863e915058826988786d94958e2f566218859b4ffe76bd32cfa6ecbbcc476ac10f9ffc2d5ad53950848242d78ec50a23c62f4116fc43cda21 gnome-user-docs-41.0.tar.xz +524dfeaf0ca77c19906395f81f45ac2a7873fc116a6794bae53130b32c1fcdd063566ee0ec4f3e51cfc18e12db8aed5219fd8817a7de3cae6d6a68f228212905 gnome-user-docs-42.0.tar.xz " -- GitLab From 789578020c4c954c84728257acbc1945fd8f63d1 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 18:58:02 +0200 Subject: [PATCH 47/58] community/gnome-system-monitor: upgrade to 42.0 --- community/gnome-system-monitor/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/gnome-system-monitor/APKBUILD b/community/gnome-system-monitor/APKBUILD index 5b48817beec..a6e618b0b39 100644 --- a/community/gnome-system-monitor/APKBUILD +++ b/community/gnome-system-monitor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-system-monitor -pkgver=41.0 +pkgver=42.0 pkgrel=0 pkgdesc="GNOME system monitor" url="https://www.gnome.org/" @@ -30,5 +30,5 @@ package() { } sha512sums=" -1eecddc479f0d9e986f1821a8c4b72246a6995f7853a6b35c8435d1aaa1afd7bc1df0cc0b9748785e4581563985652be19beb12b193ee17439ba4564febf5d20 gnome-system-monitor-41.0.tar.xz +880093fd75a87993ff8def1db9f6f090edaad43c6dc08564f61b9dbfa8c10df5e6d6a9a9072737d802503b34ba70de7bf7ef5aab2bf055ea68e795ec11a48bdd gnome-system-monitor-42.0.tar.xz " -- GitLab From ee479fda1f46b0618e9c843670f89fa0acc94261 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 19:13:02 +0200 Subject: [PATCH 48/58] community/gnome-maps: upgrade to 42.0 --- community/gnome-maps/APKBUILD | 11 ++++------- community/gnome-maps/meson-0.60.patch | 10 ---------- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 community/gnome-maps/meson-0.60.patch diff --git a/community/gnome-maps/APKBUILD b/community/gnome-maps/APKBUILD index 09477a26a28..9b41c21ad94 100644 --- a/community/gnome-maps/APKBUILD +++ b/community/gnome-maps/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-maps -pkgver=41.1 -pkgrel=1 +pkgver=42.0 +pkgrel=0 pkgdesc="simple map client" url="https://wiki.gnome.org/Apps/Maps" arch="all !s390x !riscv64" # limited by gjs @@ -13,9 +13,7 @@ makedepends="meson glib-dev gjs-dev gtk+3.0-dev gobject-introspection-dev geoclu libhandy1-dev" checkdepends="appstream-glib desktop-file-utils" subpackages="$pkgname-lang" -source="https://download.gnome.org/sources/gnome-maps/${pkgver%.*}/gnome-maps-$pkgver.tar.xz - meson-0.60.patch - " +source="https://download.gnome.org/sources/gnome-maps/${pkgver%.*}/gnome-maps-$pkgver.tar.xz" build() { abuild-meson . output @@ -31,6 +29,5 @@ package() { } sha512sums=" -ff750c009c0409bdf87a08b2a89296f5f214f8fa294c7470e99841fc6f155ae14cf9bfd388a65231e03c4c4fdbe5606c90b2bf5897e756a1699a19782f89a5db gnome-maps-41.1.tar.xz -20785b0a3b85210a96a64c3aac7d4849c0ed2cf334e243bf48a2d152c11cca5ac9919be4344d820fd5544872d1112f9bbeeb66c7e3af9f7d9ea4a6a9d75f8516 meson-0.60.patch +888caa6418a8afea6d334b90f28eb865e3955c0534df25d458e6b3a063944d09c46a3775a3d4953a968980446f2be69bd0c5c4183b3fc8419ed1f7bbb812429c gnome-maps-42.0.tar.xz " diff --git a/community/gnome-maps/meson-0.60.patch b/community/gnome-maps/meson-0.60.patch deleted file mode 100644 index ed10854b5bb..00000000000 --- a/community/gnome-maps/meson-0.60.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/data/meson.build -+++ b/data/meson.build -@@ -33,7 +33,6 @@ - appdata = app_id + '.appdata.xml' - - appdata_file = i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, -- GitLab From f0107bc2b5efab9d23d99d1143d6bffcb14bc5db Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 19:51:09 +0200 Subject: [PATCH 49/58] community/mutter: upgrade to 42.0 --- community/mutter/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/mutter/APKBUILD b/community/mutter/APKBUILD index 838a82406dd..8dc04663a97 100644 --- a/community/mutter/APKBUILD +++ b/community/mutter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=mutter -pkgver=41.4 +pkgver=42.0 pkgrel=0 pkgdesc="clutter-based window manager and compositor" url="https://wiki.gnome.org/Projects/Mutter/" @@ -101,6 +101,6 @@ package() { } sha512sums=" -ee3881f9047f0b9ef8598609e9ac90294cb36a7549fcc6a647a80553045ed315998d0dbac247887ae06b32126bab1525f13f7f92655b9103cac77750e347e405 mutter-41.4.tar.xz +ffcfbb1b6d3add84adf2d67d459905d164dc272289b645994288c376bc656481526d445cdfe6df027b88ab590258ee9d9d4ba251e03c6ef93d17f0758f75520d mutter-42.0.tar.xz 6f21171bbd0ad0fc67cbaf5fb1478b22b482a9ae33b9328cc51a5dd31bcf7d95cd41e6cbbac21d3d8801cc064a62a64ae38ed7d0501ab605b861058c32f3bc30 fixudev-req.patch " -- GitLab From 453c7a8ea159f3a13f400fe9fe2650adfe2f12e0 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 19:54:10 +0200 Subject: [PATCH 50/58] community/gnome-shell: upgrade to 42.0 --- community/gnome-shell/2078.patch | 82 -------------------------------- community/gnome-shell/APKBUILD | 6 +-- 2 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 community/gnome-shell/2078.patch diff --git a/community/gnome-shell/2078.patch b/community/gnome-shell/2078.patch deleted file mode 100644 index ad3b7ef3923..00000000000 --- a/community/gnome-shell/2078.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Thu, 23 Dec 2021 17:18:16 +0100 -Subject: [PATCH] build: Drop incorrect positional arg - -Unlike other targets that take a name, i18n.merge_file() does not. - -Part-of: ---- - data/meson.build | 2 +- - src/calendar-server/meson.build | 2 +- - subprojects/extensions-app/data/meson.build | 2 +- - subprojects/extensions-app/data/metainfo/meson.build | 2 +- - subprojects/extensions-tool/src/templates/meson.build | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index f924fdf806..76ae45c93a 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir) - desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false') - - foreach desktop_file : desktop_files -- i18n.merge_file('desktop', -+ i18n.merge_file( - input: configure_file( - input: desktop_file + '.in.in', - output: desktop_file + '.in', -diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build -index 7363282a59..8b4ef411c8 100644 ---- a/src/calendar-server/meson.build -+++ b/src/calendar-server/meson.build -@@ -27,7 +27,7 @@ configure_file( - install_dir: servicedir - ) - --i18n.merge_file('evolution-calendar.desktop', -+i18n.merge_file( - input: 'evolution-calendar.desktop.in', - output: 'evolution-calendar.desktop', - po_dir: po_dir, -diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build -index d7e7d4001c..4b601e8bd1 100644 ---- a/subprojects/extensions-app/data/meson.build -+++ b/subprojects/extensions-app/data/meson.build -@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir) - desktopconf.set('app_id', app_id) - desktopconf.set('prgname', prgname) - --i18n.merge_file('desktop', -+i18n.merge_file( - input: configure_file( - input: base_id + '.desktop.in.in', - output: desktop_file + '.in', -diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build -index c4962c0576..a19bfa80a4 100644 ---- a/subprojects/extensions-app/data/metainfo/meson.build -+++ b/subprojects/extensions-app/data/metainfo/meson.build -@@ -1,5 +1,5 @@ - metainfo = app_id + '.metainfo.xml' --i18n.merge_file(metainfo, -+i18n.merge_file( - input: base_id + '.metainfo.xml.in', - output: metainfo, - po_dir: po_dir, -diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build -index 670e2bf448..d693bfaddb 100644 ---- a/subprojects/extensions-tool/src/templates/meson.build -+++ b/subprojects/extensions-tool/src/templates/meson.build -@@ -4,7 +4,7 @@ template_metas = [ - ] - template_deps = [] - foreach template : template_metas -- template_deps += i18n.merge_file(template, -+ template_deps += i18n.merge_file( - input: template + '.in', - output: template, - po_dir: po_dir, --- -GitLab - diff --git a/community/gnome-shell/APKBUILD b/community/gnome-shell/APKBUILD index 23a8585cf3e..8da8885303e 100644 --- a/community/gnome-shell/APKBUILD +++ b/community/gnome-shell/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-shell -pkgver=41.4 +pkgver=42.0 pkgrel=0 pkgdesc="GNOME shell" url="https://wiki.gnome.org/Projects/GnomeShell" @@ -59,7 +59,6 @@ checkdepends=" subpackages="$pkgname-lang $pkgname-doc $pkgname-dbg" source="https://download.gnome.org/sources/gnome-shell/${pkgver%.*}/gnome-shell-$pkgver.tar.xz disable-telepathy-integration.patch - 2078.patch " options="!check" # Tests have circular dependency 'gnome-shell <-> gdm' @@ -84,7 +83,6 @@ package() { } sha512sums=" -6ed5f215fcf9a1cf450b406620568aeceb3d255e0bb979151ccd2260565748e69825d7f5f7fb0c6768ed584a530599a8dcbc713c1ec12617551ae9df782c5ad7 gnome-shell-41.4.tar.xz +39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935 gnome-shell-42.0.tar.xz 2ca70115fab957fdf276b7f0772786e1afd56b0b22bcfd92f5b5f1d29676dc97c19cfb079434d0dbf7b459f1d133dbd8d1faa0d88f7b94846040a23856f951f8 disable-telepathy-integration.patch -575ce955e1e98b3752c22713aa6a78b84a8ae924e315f6ee535f3ccdccf1b5bd119cc06e0394cdb5dc2bd587c1fca1f54459b1c5b2aecc3f14f1736992ad8d24 2078.patch " -- GitLab From 114c082fff55468f142586c15dbae9f1b4c9f140 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 19:56:02 +0200 Subject: [PATCH 51/58] community/gnome-shell-extensions: upgrade to 42.0 --- community/gnome-shell-extensions/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/community/gnome-shell-extensions/APKBUILD b/community/gnome-shell-extensions/APKBUILD index 426070bc3e9..770fa550010 100644 --- a/community/gnome-shell-extensions/APKBUILD +++ b/community/gnome-shell-extensions/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=gnome-shell-extensions -pkgver=41.0 +pkgver=42.0 pkgrel=0 pkgdesc="collection of extensions for GNOME Shell" url="https://wiki.gnome.org/Projects/GnomeShell/Extensions" @@ -29,5 +29,5 @@ package() { } sha512sums=" -4332821044029020404c0ed5d040b7d5e5548a67447517424a54ed4c586bad3461ab1e25f0dcb37c24ea2a1496d1cbf2b95f24de0eda79f0c6921b6b1f085f83 gnome-shell-extensions-41.0.tar.xz +d413f8a7c12c9e4c71a51b4f5c3cc8e0145b57eec24648e928f02ccdeb4a02b44ad3adf9668f3ba65870d772490f2389582f4f5e8f4037da3ab88a0bb5958f5d gnome-shell-extensions-42.0.tar.xz " -- GitLab From a0db15496c2d3b36c6163fea9885721f59bdaf1f Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sun, 10 Apr 2022 20:59:23 +0200 Subject: [PATCH 52/58] community/libnma: upgrade to 1.8.36 and enable libnma-gtk4 --- community/libnma/APKBUILD | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/community/libnma/APKBUILD b/community/libnma/APKBUILD index e7c32f2ce6a..750bece7029 100644 --- a/community/libnma/APKBUILD +++ b/community/libnma/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=libnma -pkgver=1.8.32 +pkgver=1.8.36 pkgrel=0 pkgdesc="NetworkManager GUI client library" url="https://wiki.gnome.org/Projects/NetworkManager/" @@ -9,8 +9,17 @@ url="https://wiki.gnome.org/Projects/NetworkManager/" arch="all !s390x !riscv64" license="LGPL-2.1-or-later" depends="mobile-broadband-provider-info" -makedepends="iso-codes-dev networkmanager-dev glib-dev gtk+3.0-dev gcr-dev - gobject-introspection-dev vala gtk-doc" +makedepends=" + gcr-dev + glib-dev + gobject-introspection-dev + gtk+3.0-dev + gtk4.0-dev + gtk-doc + iso-codes-dev + networkmanager-dev + vala + " subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/libnma/${pkgver%.*}/libnma-$pkgver.tar.xz" @@ -22,6 +31,7 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ + --with-libnma-gtk4 \ --enable-lto make } @@ -35,5 +45,5 @@ package() { } sha512sums=" -65244a8901322bc17d48c9cb809080790d5af0195b79becf0317da77b6c6a0fde3f8d3b752f5d7e59a5dba0970f4499077c5d9d6776912a72748290b8ac98e11 libnma-1.8.32.tar.xz +c3f675d773d1be9006c01c3149751c8da1d5d08467be6d9aa921da3d867fdc9e8b26c7e6c9bd46a6cfd38a7eb721f8bcc209b43d9789a0b55c6029e11ca0fd22 libnma-1.8.36.tar.xz " -- GitLab From 814225cbed72162e2691588bf169ec7efea18837 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Mon, 11 Apr 2022 18:16:20 +0200 Subject: [PATCH 53/58] community/gnome-control-center: upgrade to 42.0 cheese option was dropped upstream. See https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/5ca53a0a78108019bf37ba01b07ac25a123db34a --- community/gnome-control-center/APKBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/community/gnome-control-center/APKBUILD b/community/gnome-control-center/APKBUILD index edb007fb142..343aa7473d4 100644 --- a/community/gnome-control-center/APKBUILD +++ b/community/gnome-control-center/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Rasmus Thomsen # Maintainer: Pablo Correa Gomez pkgname=gnome-control-center -pkgver=41.4 -pkgrel=2 +pkgver=42.0 +pkgrel=0 pkgdesc="GNOME control center" url="https://gitlab.gnome.org/GNOME/gnome-control-center" # s390x and riscv64 blocked by polkit @@ -24,6 +24,7 @@ makedepends=" cups-dev docbook-xml docbook-xsl + gcr-dev gnome-bluetooth-dev gnome-desktop-dev gnome-online-accounts-dev @@ -33,6 +34,7 @@ makedepends=" ibus-dev itstool krb5-dev + libadwaita-dev libgtop-dev libgudev-dev libhandy1-dev @@ -59,7 +61,6 @@ source="https://download.gnome.org/sources/gnome-control-center/${pkgver%.*}/gno build() { abuild-meson \ - -Dcheese=true \ -Dibus=true \ . output @@ -85,6 +86,6 @@ package() { } sha512sums=" -63fa20041a06f5075d172b543176b4f037fcd623d9fa5ca5f785e047a9b95ccd002c423d29de673dcb28b7d99a83157b39d7bd65ef77fe70065e9a03b5ae38a4 gnome-control-center-41.4.tar.xz +d8097240444ab45174e89db0f543d6523051829b124933cdbb84b1bc5d2d6809ee810f6d2c09702da51c991fe11496635b3164b490ed1e2ac523481d5466cf3e gnome-control-center-42.0.tar.xz 350aa443149c71851ad4de0976c7fc5cb626ba0c57a8d41e6ef80da1c65ed84a4dfa2483ae92630a3b611c4bfa9360ded82b55e8cd0e3907294c025e4f6b1671 README.alpine " -- GitLab From 9a8ebe733931b263409a75df4a4a081f288708bf Mon Sep 17 00:00:00 2001 From: Newbyte Date: Tue, 12 Apr 2022 09:38:23 +0200 Subject: [PATCH 54/58] community/epiphany: upgrade to 42.0 Dropped patches are upstream. --- community/epiphany/APKBUILD | 10 +-- community/epiphany/libportal-0.5.patch | 85 ------------------- .../epiphany/remove-incorrect-args.patch | 35 -------- 3 files changed, 3 insertions(+), 127 deletions(-) delete mode 100644 community/epiphany/libportal-0.5.patch delete mode 100644 community/epiphany/remove-incorrect-args.patch diff --git a/community/epiphany/APKBUILD b/community/epiphany/APKBUILD index e8c3c42a8a1..7d659dc6041 100644 --- a/community/epiphany/APKBUILD +++ b/community/epiphany/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Rasmus Thomsen # Maintainer: Rasmus Thomsen pkgname=epiphany -pkgver=41.3 +pkgver=42.0 pkgrel=0 pkgdesc="A simple, clean, beautiful view of the web" url="https://wiki.gnome.org/Apps/Web" @@ -16,9 +16,7 @@ makedepends="meson iso-codes-dev gtk+3.0-dev gsettings-desktop-schemas-dev checkdepends="appstream-glib desktop-file-utils xvfb-run ibus" options="!check" # Fail due to our webkitgtk patches! subpackages="$pkgname-lang $pkgname-doc $pkgname-dbg" -source="https://download.gnome.org/sources/epiphany/${pkgver%.*}/epiphany-$pkgver.tar.xz - libportal-0.5.patch - remove-incorrect-args.patch" +source="https://download.gnome.org/sources/epiphany/${pkgver%.*}/epiphany-$pkgver.tar.xz" # secfixes: # 41.3-r0: @@ -42,7 +40,5 @@ package() { } sha512sums=" -1effef22291687c8ff2252eced24274db3b1f4afacfc3053a33cae85112759918f80d824bb02b7e17d95364eec0062cb3459a6079783d9c900874cc150ea98ba epiphany-41.3.tar.xz -307f96bcf9effdd9acc03063c4c50965d507b4f6957958eb55b26526ed7d8e8026f2fd04f51a41c7c311cc9f7c5206a75aff688ecea39502c84ca794e3d96708 libportal-0.5.patch -222ac6f568cd53549b4b2154db08ea4c1f6d1bded70b8e1ccf3009f4d955d0f32b5b981b2c7fc5976ad67951eeec62f2e219286d7fe5ab3a3edf881fbb3bb595 remove-incorrect-args.patch +225243cbae1659367e881991c191a766b47e0710a3e58c0eb56fba67ab8e527922a84e4663207a80d14da9c99102ea16c030f12f7444e6e2678b5c8cf7dc99e0 epiphany-42.0.tar.xz " diff --git a/community/epiphany/libportal-0.5.patch b/community/epiphany/libportal-0.5.patch deleted file mode 100644 index 39d7716fc17..00000000000 --- a/community/epiphany/libportal-0.5.patch +++ /dev/null @@ -1,85 +0,0 @@ -Patch-Source: https://gitlab.gnome.org/GNOME/epiphany/-/commit/84474398f6e59266b73170838219aa896729ce93.patch - -From 84474398f6e59266b73170838219aa896729ce93 Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Thu, 23 Dec 2021 14:51:50 -0600 -Subject: [PATCH] Port to libportal 0.5 - -This was an API breaking release that requires minor changes. ---- - lib/ephy-flatpak-utils.c | 2 +- - meson.build | 2 +- - org.gnome.Epiphany.Canary.json.in | 7 +++++-- - org.gnome.Epiphany.json | 7 +++++-- - 4 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/lib/ephy-flatpak-utils.c b/lib/ephy-flatpak-utils.c -index 818af95..aef937f 100644 ---- a/lib/ephy-flatpak-utils.c -+++ b/lib/ephy-flatpak-utils.c -@@ -29,7 +29,7 @@ - #include - #include - #if USE_LIBPORTAL --#include -+#include - #endif - #include - #include -diff --git a/meson.build b/meson.build -index 74eee8a..40dc740 100644 ---- a/meson.build -+++ b/meson.build -@@ -96,7 +96,7 @@ libhandy_dep = dependency('libhandy-1', version: '>= 1.1.0') - libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0') - libxml_dep = dependency('libxml-2.0', version: '>= 2.6.12') - nettle_dep = dependency('nettle', version: nettle_requirement) --portal_dep = dependency('libportal', version: '>= 0.0.2', required: get_option('libportal')) -+portal_dep = dependency('libportal-gtk3', version: '>= 0.5', required: get_option('libportal')) - sqlite3_dep = dependency('sqlite3', version: '>= 3.22') - - if get_option('soup2').enabled() -diff --git a/org.gnome.Epiphany.Canary.json.in b/org.gnome.Epiphany.Canary.json.in -index 17d4755..f7ffa12 100644 ---- a/org.gnome.Epiphany.Canary.json.in -+++ b/org.gnome.Epiphany.Canary.json.in -@@ -106,13 +106,15 @@ - "name" : "libportal", - "buildsystem" : "meson", - "config-opts" : [ -- "-Dgtk_doc=false" -+ "-Dbackends=gtk3", -+ "-Dintrospection=false", -+ "-Ddocs=false" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://github.com/flatpak/libportal.git", -- "tag" : "0.4" -+ "tag" : "0.5" - } - ] - }, -diff --git a/org.gnome.Epiphany.json b/org.gnome.Epiphany.json -index 77993c1..f45c1db 100644 ---- a/org.gnome.Epiphany.json -+++ b/org.gnome.Epiphany.json -@@ -103,13 +103,15 @@ - "name" : "libportal", - "buildsystem" : "meson", - "config-opts" : [ -- "-Dgtk_doc=false" -+ "-Dbackends=gtk3", -+ "-Dintrospection=false", -+ "-Ddocs=false" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://github.com/flatpak/libportal.git", -- "tag" : "0.4" -+ "tag" : "0.5" - } - ] - }, diff --git a/community/epiphany/remove-incorrect-args.patch b/community/epiphany/remove-incorrect-args.patch deleted file mode 100644 index 6fee19ee66c..00000000000 --- a/community/epiphany/remove-incorrect-args.patch +++ /dev/null @@ -1,35 +0,0 @@ -Patch-Source: https://gitlab.gnome.org/GNOME/nautilus/-/commit/42b0362e9844f4c5114b21464185620eaadcfcaa.patch - -From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001 -From: rvalue -Date: Wed, 24 Nov 2021 04:52:42 +0000 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -Part-of: ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 46df3fd80..eac6b8224 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -16,7 +16,6 @@ install_data( - desktop_conf = configuration_data() - desktop_conf.set('icon', application_id) - desktop = i18n.merge_file( -- 'desktop', - input: configure_file( - input: files('org.gnome.Epiphany.desktop.in.in'), - output: 'org.gnome.Epiphany.desktop.in', -@@ -32,7 +31,6 @@ desktop = i18n.merge_file( - appdata_conf = configuration_data() - appdata_conf.set('appid', application_id) - appdata = i18n.merge_file( -- 'appdata', - input: configure_file( - input: files('org.gnome.Epiphany.appdata.xml.in.in'), - output: 'org.gnome.Epiphany.appdata.xml.in', --- -GitLab - -- GitLab From 0af86e362ddf071688561636f43b538d1703f3d1 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Tue, 12 Apr 2022 10:00:57 +0200 Subject: [PATCH 55/58] community/libgweather4: new aport --- community/libgweather4/APKBUILD | 48 +++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 community/libgweather4/APKBUILD diff --git a/community/libgweather4/APKBUILD b/community/libgweather4/APKBUILD new file mode 100644 index 00000000000..fd282363505 --- /dev/null +++ b/community/libgweather4/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: Rasmus Thomsen +# Contributor: Natanael Copa +# Maintainer: Newbyte +pkgname=libgweather4 +pkgver=4.0.0 +pkgrel=0 +pkgdesc="GNOME weather library" +url="https://wiki.gnome.org/Projects/LibGWeather" +arch="all" +license="LGPL-2.1-or-later" +depends="tzdata gsettings-desktop-schemas" +makedepends=" + geocode-glib-dev + gi-docgen + glib-dev + gobject-introspection-dev + libsoup-dev + libxml2-dev + meson + py3-gobject3 + ttf-cantarell + vala + " +options="!check" # Fail due to musl locale support +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://download.gnome.org/sources/libgweather/${pkgver%.*}/libgweather-$pkgver.tar.xz" +builddir="$srcdir/libgweather-$pkgver" + +build() { + abuild-meson \ + -Dgtk_doc=true \ + -Denable_vala=true \ + . output + meson compile ${JOBS:+-j ${JOBS}} -C output +} + +check() { + meson test --no-rebuild -v -C output +} + +package() { + DESTDIR="$pkgdir" meson install --no-rebuild -C output +} + + +sha512sums=" +1441b8996a53b277e9453d3fcf32448800c963f40c32542f9055362bc3188dcf2e706466133d53b3f1b6343dc97b15cf5eabe16b950e7c9451cb79eeef87a9c3 libgweather-4.0.0.tar.xz +" -- GitLab From c818bbc4183b75ac7f05ecae1db8dc3a6dd0b4db Mon Sep 17 00:00:00 2001 From: Newbyte Date: Tue, 12 Apr 2022 10:01:22 +0200 Subject: [PATCH 56/58] community/gnome-maps: depend on libgweather Otherweise Maps starts up with `Unsatisfied dependency: GWeather`. Furthermore, Maps is not yet compatible with libweather4. --- community/gnome-maps/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/gnome-maps/APKBUILD b/community/gnome-maps/APKBUILD index 9b41c21ad94..3b8a85be43e 100644 --- a/community/gnome-maps/APKBUILD +++ b/community/gnome-maps/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="simple map client" url="https://wiki.gnome.org/Apps/Maps" arch="all !s390x !riscv64" # limited by gjs license="GPL-2.0-or-later" -depends="gfbgraph gjs geoclue libhandy1" +depends="gfbgraph gjs geoclue libgweather libhandy1" makedepends="meson glib-dev gjs-dev gtk+3.0-dev gobject-introspection-dev geoclue-dev libgee-dev folks-dev geocode-glib-dev libchamplain-dev libxml2-dev rest-dev libhandy1-dev" -- GitLab From 17c9672e5f8923757ef6b1acf046e97637f75c3b Mon Sep 17 00:00:00 2001 From: Newbyte Date: Tue, 12 Apr 2022 10:44:58 +0200 Subject: [PATCH 57/58] community/evince: explicitly depend on -libs Otherwise you can end up in siutations where the -libs subpackage doesn't match the main Evince package which usually will result in a crash on startup. --- community/evince/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community/evince/APKBUILD b/community/evince/APKBUILD index 96b31c64732..2e96c0cb248 100644 --- a/community/evince/APKBUILD +++ b/community/evince/APKBUILD @@ -9,7 +9,7 @@ url="https://wiki.gnome.org/Apps/Evince" # s390x and riscv64 blocked by librsvg -> adwaita-icon-theme arch="all !s390x !riscv64" license="GPL-2.0-or-later" -depends="adwaita-icon-theme gsettings-desktop-schemas" +depends="$pkgname-libs=$pkgver-r$pkgrel adwaita-icon-theme gsettings-desktop-schemas" depends_dev=" gobject-introspection-dev gtk+3.0-dev -- GitLab From abf3f4f92d1c3e62a764255f0d3d66165968d887 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Wed, 13 Apr 2022 10:53:44 +0200 Subject: [PATCH 58/58] community/xdg-desktop-portal-gnome: upgrade to 42.0.1 --- community/xdg-desktop-portal-gnome/APKBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/community/xdg-desktop-portal-gnome/APKBUILD b/community/xdg-desktop-portal-gnome/APKBUILD index 35af8658619..9f025a69f8e 100644 --- a/community/xdg-desktop-portal-gnome/APKBUILD +++ b/community/xdg-desktop-portal-gnome/APKBUILD @@ -1,7 +1,7 @@ # Contributor: knuxify # Maintainer: knuxify pkgname=xdg-desktop-portal-gnome -pkgver=41.1 +pkgver=42.0.1 pkgrel=0 pkgdesc="A backend implementation for xdg-desktop-portal for the GNOME desktop environment" url="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome" @@ -9,6 +9,7 @@ arch="all !riscv64 !s390x" # blocked by gtk4.0 license="LGPL-2.1-or-later" depends="xdg-desktop-portal xdg-desktop-portal-gtk" makedepends=" + gnome-desktop-dev gsettings-desktop-schemas-dev gtk4.0-dev libadwaita-dev @@ -35,6 +36,6 @@ package() { } sha512sums=" -e72dc6f1a5a6b67ea9334a832343473e5a26b21ea278edd69a1d4166bdd78b7bba896e866ffb92d832d362a9c1415ed6133dd849f3a71485ed13626d0b44f019 xdg-desktop-portal-gnome-41.1.tar.gz +ab1b60c94a7a5703daff33147ff04400b20eb8c15cc3e2d99f6675c7fa6db42de959f49fbd538287458fa12f6a0c4156f832dad249b908bba36c43771b20afc3 xdg-desktop-portal-gnome-42.0.1.tar.gz dfbd619bdda8f733476b8b541544e71122941ccc14efbda510c7b991e4f9dadf036e326d4f45ece12d72a0ae2e5e71271a916d4c08aa26fdfd0efe8e56937eff add-option-to-disable-systemd-service-file-build.patch " -- GitLab