From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] webkit2gtk: update to 2.40.0.
Date: Wed, 22 Mar 2023 11:33:51 +0100 [thread overview]
Message-ID: <20230322103351.MPAwi8tVyx67p1w1cQvZPeEZaaLTEew_VhVV63KwO7U@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41698@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1294 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/41698
webkit2gtk: update to 2.40.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
Necessary for gnome 44.
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41698.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-41698.patch --]
[-- Type: text/x-diff, Size: 53669 bytes --]
From 18113cdc0ec45cb402433ca748d8f14d045c8769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 17 Jan 2023 00:26:08 -0800
Subject: [PATCH 01/16] webkit2gtk: update to 2.40.0.
libwebkit2gtk50 -> libwebkitgtk60
---
common/shlibs | 5 +-
srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} | 0
...ebkit2gtk50-devel => libwebkitgtk60-devel} | 0
srcpkgs/removed-packages/template | 2 +
.../patches/be-imagebufferbackend.patch | 8 ----
.../webkit2gtk/patches/be-typedarray.patch | 6 +--
.../webkit2gtk/patches/fix-cross-gir.patch | 27 -----------
srcpkgs/webkit2gtk/template | 46 +++++++++----------
8 files changed, 31 insertions(+), 63 deletions(-)
rename srcpkgs/{libwebkit2gtk50 => libwebkitgtk60} (100%)
rename srcpkgs/{libwebkit2gtk50-devel => libwebkitgtk60-devel} (100%)
delete mode 100644 srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
diff --git a/common/shlibs b/common/shlibs
index 9b12ff7dbe51..7742c1643e14 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -547,8 +547,8 @@ libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1
libjavascriptcoregtk-4.0.so.18 webkit2gtk-2.6.2_1
libwebkit2gtk-4.1.so.0 libwebkit2gtk41-2.38.0_1
libjavascriptcoregtk-4.1.so.0 libwebkit2gtk41-2.38.0_1
-libwebkit2gtk-5.0.so.0 libwebkit2gtk50-2.38.0_1
-libjavascriptcoregtk-5.0.so.0 libwebkit2gtk50-2.38.0_1
+libwebkitgtk-6.0.so.4 libwebkitgtk60-2.40.0_1
+libjavascriptcoregtk-6.0.so.1 libwebkitgtk60-2.40.0_1
libgimp-2.0.so.0 libgimp-2.10.0_1
libgimpwidgets-2.0.so.0 libgimp-2.10.0_1
libgimpui-2.0.so.0 libgimp-2.10.0_1
@@ -1140,6 +1140,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2
+libgsttranscoder-1.0.so.0 gst-plugins-bad1-1.18.4_2
libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
libgnome-desktop-3.so.20 gnome-desktop-43.0_1
libgnome-desktop-4.so.2 gnome-desktop-43.0_1
diff --git a/srcpkgs/libwebkit2gtk50 b/srcpkgs/libwebkitgtk60
similarity index 100%
rename from srcpkgs/libwebkit2gtk50
rename to srcpkgs/libwebkitgtk60
diff --git a/srcpkgs/libwebkit2gtk50-devel b/srcpkgs/libwebkitgtk60-devel
similarity index 100%
rename from srcpkgs/libwebkit2gtk50-devel
rename to srcpkgs/libwebkitgtk60-devel
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f3248a852a28..d33cbe27b3ea 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -300,6 +300,8 @@ replaces="
libunique1-devel<=1.1.6_12
libunique1<=1.1.6_12
libunique<=3.0.2_11
+ libwebkit2gtk50-devel<=2.38.1_2
+ libwebkit2gtk50<=2.38.1_2
libwnck2-devel<=2.30.7_8
libwnck2<=2.30.7_8
libxml2-python<=2.9.10_4
diff --git a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
index b466ef11c329..fd90cdb99ba3 100644
--- a/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
+++ b/srcpkgs/webkit2gtk/patches/be-imagebufferbackend.patch
@@ -225,14 +225,6 @@ index 9acf304d..618b7b26 100644
sourceRows += source.bytesPerRow;
destinationRows += destination.bytesPerRow;
}
-@@ -237,6 +373,7 @@ static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView
- void convertImagePixels(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
- {
- // We don't currently support converting pixel data with non-8-bit buffers.
-+ // BGRA8 is actually ARGB8 on BIG_ENDIAN.
- ASSERT(source.format.pixelFormat == PixelFormat::RGBA8 || source.format.pixelFormat == PixelFormat::BGRA8);
- ASSERT(destination.format.pixelFormat == PixelFormat::RGBA8 || destination.format.pixelFormat == PixelFormat::BGRA8);
-
diff --git a/Source/WebCore/platform/graphics/PixelFormat.h b/Source/WebCore/platform/graphics/PixelFormat.h
index 1ca711b8..4a7168f8 100644
--- a/Source/WebCore/platform/graphics/PixelFormat.h
diff --git a/srcpkgs/webkit2gtk/patches/be-typedarray.patch b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
index fe93c2761305..cbb706564fe9 100644
--- a/srcpkgs/webkit2gtk/patches/be-typedarray.patch
+++ b/srcpkgs/webkit2gtk/patches/be-typedarray.patch
@@ -165,9 +165,9 @@ diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunct
index df0435f6..3017563c 100644
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
-@@ -351,9 +351,36 @@ ALWAYS_INLINE EncodedJSValue genericType
- RELEASE_ASSERT(!thisObject->isDetached());
+@@ -385,9 +385,36 @@ ALWAYS_INLINE EncodedJSValue genericType
+ size_t searchLength = std::min<size_t>(length, updatedLength);
if constexpr (ViewClass::Adaptor::isFloat) {
- if (std::isnan(static_cast<double>(*targetOption))) {
+ double targetOptionLittleEndianAsDouble;
@@ -185,7 +185,7 @@ index df0435f6..3017563c 100644
+#endif
+
+ if (std::isnan(targetOptionLittleEndianAsDouble)) {
- for (; index < length; ++index) {
+ for (; index < searchLength; ++index) {
- if (std::isnan(static_cast<double>(array[index])))
+ double arrayElementLittleEndianAsDouble;
+#if CPU(BIG_ENDIAN)
diff --git a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch b/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
deleted file mode 100644
index 91ce6bc78551..000000000000
--- a/srcpkgs/webkit2gtk/patches/fix-cross-gir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Source/cmake/FindGI.cmake
-+++ b/Source/cmake/FindGI.cmake
-@@ -262,6 +262,7 @@ function(GI_INTROSPECT namespace nsversi
- foreach (dep IN LISTS opt_DEPENDENCIES)
- if (TARGET "gir-${dep}")
- get_property(dep_gir_path TARGET "gir-${dep}" PROPERTY GI_GIR_PATH)
-+ get_property(dep_gir_lib TARGET "gir-${dep}" PROPERTY GI_GIR_LIBRARY)
- if (dep_gir_path)
- list(APPEND scanner_flags "--include-uninstalled=${dep_gir_path}")
- list(APPEND gir_deps "${dep_gir_path}")
-@@ -271,6 +272,9 @@ function(GI_INTROSPECT namespace nsversi
- "been previously configured with GI_INTROSPECT()"
- )
- endif ()
-+ if (dep_gir_lib)
-+ list(APPEND scanner_flags "--library=${dep_gir_lib}")
-+ endif ()
- elseif (dep MATCHES "^([a-zA-Z0-9._-]+):([a-z0-9._\\+-]+)$")
- list(APPEND scanner_flags
- "--include=${CMAKE_MATCH_1}"
-@@ -395,5 +399,6 @@ function(GI_INTROSPECT namespace nsversi
-
- # Record in targets to use later on e.g. with gi-docgen.
- set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_PATH "${gir_path}")
-+ set_property(TARGET "gir-${namespace}" PROPERTY GI_GIR_LIBRARY "$<TARGET_FILE_BASE_NAME:${opt_TARGET}>")
- set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}")
- endfunction()
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index b836b379592a..1b4a114f746d 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,6 +1,6 @@
# Template file for 'webkit2gtk'
pkgname=webkit2gtk
-version=2.38.3
+version=2.40.0
revision=1
build_style=cmake
build_helper="gir"
@@ -19,25 +19,25 @@ configure_args="-DPORT=GTK -DUSE_LD_GOLD=OFF
# Don't remove which from hostmakedepends
# Otherwise, they invoke /usr/bin/ccache /usr/lib/ccache/bin/$CC
hostmakedepends="perl python3 pkg-config gperf flex ruby gettext glib-devel
- geoclue2 libharfbuzz which libpsl $(vopt_if gtk_doc 'gi-docgen')
+ geoclue2 libharfbuzz which libpsl unifdef $(vopt_if gtk_doc 'gi-docgen')
$(vopt_if wayland 'wayland-devel libxml2-devel')"
makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel
harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel sqlite-devel
libsoup-devel libsoup3-devel libxslt-devel gnutls-devel icu-devel enchant2-devel
dbus-glib-devel libwebp-devel gtk+3-devel gtk4-devel libgudev-devel
libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel
- woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel
+ woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-devel
qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel
libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel)
$(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')"
depends="gst-plugins-good1"
-short_desc="GTK+3 port of the WebKit2 browser engine"
+short_desc="GTK+3 port of the WebKit browser engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, BSD-2-Clause"
homepage="https://webkitgtk.org/"
distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz"
-checksum=41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a
-make_check=no
+checksum=a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393
+make_check=no # TODO
replaces="webkit2gtk-common>0"
@@ -185,7 +185,7 @@ webkit2gtk-devel_package() {
libwebkit2gtk41_package() {
depends="${depends}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
vmove usr/libexec/webkit2gtk-4.1
@@ -205,7 +205,7 @@ libwebkit2gtk41_package() {
libwebkit2gtk41-devel_package() {
depends="gtk+3-devel libsoup3-devel libwebkit2gtk41>=${version}_${revision}"
- short_desc="GTK+3 port of the WebKit2 browser engine (soup3) - development files"
+ short_desc="GTK+3 port of the WebKit browser engine (soup3) - development files"
pkg_install() {
vmove usr/include/webkitgtk-4.1
vmove "usr/lib/pkgconfig/*-4.1.pc"
@@ -219,17 +219,17 @@ libwebkit2gtk41-devel_package() {
}
}
-libwebkit2gtk50_package() {
+libwebkitgtk60_package() {
depends="${depends}"
- short_desc="GTK4 port of the WebKit2 browser engine"
+ short_desc="GTK4 port of the WebKit browser engine"
pkg_install() {
- vmove usr/libexec/webkit2gtk-5.0
- vmove usr/lib/webkit2gtk-5.0
+ vmove usr/libexec/webkitgtk-6.0
+ vmove usr/lib/webkitgtk-6.0
if [ "$build_option_gir" ]; then
- vmove "usr/lib/girepository-1.0/*-5.0.typelib"
+ vmove "usr/lib/girepository-1.0/*-6.0.typelib"
fi
- vmove "usr/lib/*-5.0.so.*"
- for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do
+ vmove "usr/lib/*-6.0.so.*"
+ for file in $(find ${DESTDIR}/usr/share/locale -name "*-6.0.mo"); do
vmove ${file/$DESTDIR/}
done
vlicense Source/WebCore/LICENSE-APPLE
@@ -238,18 +238,18 @@ libwebkit2gtk50_package() {
}
}
-libwebkit2gtk50-devel_package() {
- depends="gtk4-devel libsoup3-devel libwebkit2gtk50>=${version}_${revision}"
- short_desc="GTK4 port of the WebKit2 browser engine - development files"
+libwebkitgtk60-devel_package() {
+ depends="gtk4-devel libsoup3-devel libwebkitgtk60>=${version}_${revision}"
+ short_desc="GTK4 port of the WebKit browser engine - development files"
pkg_install() {
- vmove usr/include/webkitgtk-5.0
- vmove "usr/lib/pkgconfig/*-5.0.pc"
+ vmove usr/include/webkitgtk-6.0
+ vmove "usr/lib/pkgconfig/*-6.0.pc"
if [ "$build_option_gir" ]; then
- vmove "usr/share/gir-1.0/*-5.0.gir"
+ vmove "usr/share/gir-1.0/*-6.0.gir"
fi
if [ "$build_option_gtk_doc" ]; then
- vmove "usr/share/gtk-doc/html/*-5.0"
+ vmove "usr/share/gtk-doc/html/*-6.0"
fi
- vmove "usr/lib/*-5.0.so"
+ vmove "usr/lib/*-6.0.so"
}
}
From 8bc3031839fd94faf0676b979038bd8605f7e4e8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:02:23 -0700
Subject: [PATCH 02/16] evolution-data-server: update to 3.48.0.
---
srcpkgs/evolution-data-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index bf1db288cd12..2b9a35c99116 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,6 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
-version=3.46.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="gir qemu"
@@ -10,7 +10,7 @@ configure_args=" -DSYSCONF_INSTALL_DIR=/etc
hostmakedepends="flex glib-devel gperf gettext pkg-config libglib-devel
$(vopt_if gir vala)"
makedepends="boost-devel libcanberra-devel libgdata-devel libical-devel
- libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkit2gtk50-devel
+ libsecret-devel mit-krb5-devel libwebkit2gtk41-devel libwebkitgtk60-devel
libsoup3-devel libphonenumber-devel $(vopt_if gir vala-devel) gtk4-devel
libgweather-devel"
checkdepends="dbus"
@@ -20,7 +20,7 @@ license="LGPL-2.1-only"
homepage="https://wiki.gnome.org/Apps/Evolution"
changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/evolution-data-server/${version%.*}/evolution-data-server-${version}.tar.xz"
-checksum=0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee
+checksum=0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35
make_check=ci-skip # flaky in CI
build_options="gir"
From f2fc335a03ab91b3e797985856da8634ac1acc18 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:20 -0700
Subject: [PATCH 03/16] evolution: update to 3.48.0.
---
common/shlibs | 1 +
srcpkgs/evolution/template | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7742c1643e14..9e440b9bd467 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -616,6 +616,7 @@ libevolution-calendar.so evolution-3.28.0_1
libevolution-util.so evolution-3.28.0_1
libemail-engine.so evolution-3.28.0_1
libevolution-mail.so evolution-3.28.0_1
+libevolution-mail-composer.so evolution-3.48.0_1
libevolution-mail-formatter.so evolution-3.40.0_1
libevolution-shell.so evolution-3.28.0_1
libedata-cal-2.0.so.2 evolution-data-server-3.46.0_1
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index b9a63af09955..593659669c1e 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,6 +1,6 @@
# Template file for 'evolution'
pkgname=evolution
-version=3.46.3
+version=3.48.0
revision=1
build_style=cmake
build_helper="qemu"
@@ -20,7 +20,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Evolution"
changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=ae22107425d30d17a3a34c356cda5f40aad7846d76bdb608344518b5d429c1f3
+checksum=2d8472819589e92efcce4f2dc3bd124e93d379d3300978f69a9653c592a60ef6
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
From ef52903abdb35d8f9ef512d7eade6ad09d47a659 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:06:29 -0700
Subject: [PATCH 04/16] evolution-ews: update to 3.48.0.
---
srcpkgs/evolution-ews/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template
index 3f21ee7e882f..4d4b81d3e14b 100644
--- a/srcpkgs/evolution-ews/template
+++ b/srcpkgs/evolution-ews/template
@@ -1,6 +1,6 @@
# Template file for 'evolution-ews'
pkgname=evolution-ews
-version=3.46.3
+version=3.48.0
revision=1
build_style=cmake
configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Apps/Evolution"
changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-43/NEWS"
distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=0459ea40563638a5a594f42ddc1cc7191a2d3822c211ccfffbcd8b36d3264025
+checksum=166165bbea1441bb92f2a9348d9a7dec4882a0d31319cd2566571da6777ef2de
From 8981052c305ac034c4705b4785fe7591e14a60c6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 18:12:48 -0700
Subject: [PATCH 05/16] gnome-initial-setup: update to 44.0.
---
srcpkgs/gnome-initial-setup/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template
index b6adfa30f8fb..e07a42917c4f 100644
--- a/srcpkgs/gnome-initial-setup/template
+++ b/srcpkgs/gnome-initial-setup/template
@@ -1,12 +1,12 @@
# Template file for 'gnome-initial-setup'
pkgname=gnome-initial-setup
-version=43.2
+version=44.0
revision=1
build_style=meson
configure_args="-Dparental_controls=disabled -Dsystemd=false"
hostmakedepends="pkg-config glib-devel gettext"
makedepends="NetworkManager-devel accountsservice-devel libglib-devel
- gnome-desktop-devel cheese-devel libgweather-devel libwebkit2gtk50-devel
+ gnome-desktop-devel cheese-devel libgweather-devel libwebkitgtk60-devel
gnome-online-accounts-devel gdm-devel libpwquality-devel
mit-krb5-devel vala-devel libnma-devel polkit-devel
rest-devel libsecret-devel ibus-devel iso-codes geoclue2-devel
@@ -18,4 +18,4 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Design/OS/InitialSetup"
changelog="https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnome-initial-setup/${version%%.*}/gnome-initial-setup-${version}.tar.xz"
-checksum=23d7963a54d49594504d0eacd85096cafb5f86f1e74a58e040675b6e798ae698
+checksum=593cfc6dc8f82a98671b94c035b97dbe88ef56e708780b2ad1d2324e4d04bbff
From b2c99b33f82355db00d7b53e7a1efdd24cd9abab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:04:23 -0700
Subject: [PATCH 06/16] New package: libdex-0.2.0
---
common/shlibs | 1 +
srcpkgs/libdex-devel | 1 +
srcpkgs/libdex/template | 44 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 46 insertions(+)
create mode 120000 srcpkgs/libdex-devel
create mode 100644 srcpkgs/libdex/template
diff --git a/common/shlibs b/common/shlibs
index 9e440b9bd467..0e212ffd3104 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -430,6 +430,7 @@ libdvdread.so.8 libdvdread-6.1.1_1
libdvdnav.so.4 libdvdnav-4.1.3_1
libdvbpsi.so.10 libdvbpsi-1.3.1_1
libdca.so.0 libdca-0.0.5_1
+libdex-1.so.1 libdex-0.2.0_1
libmpeg2.so.0 libmpeg2-0.5.1_1
libmpeg2convert.so.0 libmpeg2-0.5.1_1
libmng.so.2 libmng-2.0.2_1
diff --git a/srcpkgs/libdex-devel b/srcpkgs/libdex-devel
new file mode 120000
index 000000000000..7f6d81db220a
--- /dev/null
+++ b/srcpkgs/libdex-devel
@@ -0,0 +1 @@
+libdex
\ No newline at end of file
diff --git a/srcpkgs/libdex/template b/srcpkgs/libdex/template
new file mode 100644
index 000000000000..783120b37e4d
--- /dev/null
+++ b/srcpkgs/libdex/template
@@ -0,0 +1,44 @@
+# Template file for 'libdex'
+pkgname=libdex
+version=0.2.0
+revision=1
+build_style=meson
+build_helper=gir
+configure_args="-Dexamples=false
+ -Ddocs=$(vopt_if gtk_doc true false)
+ -Dintrospection=$(vopt_if gir enabled disabled)
+ $(vopt_bool vala vapi)"
+hostmakedepends="pkg-config glib-devel gettext
+ $(vopt_if vala vala) $(vopt_if gtk_doc gi-docgen)"
+makedepends="glib-devel libgirepository-devel libatomic-devel
+ liburing-devel $(vopt_if vala 'vala vala-devel')"
+short_desc="Future-based programming for GLib-based applications"
+maintainer="oreo639 <oreo6391@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://gitlab.gnome.org/GNOME/libdex"
+changelog="https://gitlab.gnome.org/GNOME/libdex/-/raw/main/NEWS"
+distfiles="${GNOME_SITE}/libdex/${version%.*}/libdex-${version}.tar.xz"
+checksum=a0f7566260971a1e4aeb53a07d95c806091257b8789d6fad9931dba872c5070d
+
+# Package build options
+build_options="gir vala gtk_doc"
+build_options_default="gir vala gtk_doc"
+
+libdex-devel_package() {
+ depends="${sourcepkg}-${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0
+ fi
+ if [ "$build_option_vala" ]; then
+ vmove usr/share/vala
+ fi
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/doc
+ fi
+ }
+}
From 7a7281bf2a03396c2bdcde6ce70d110f6fb1ad29 Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emil.tomczyk@skni.umcs.pl>
Date: Sat, 18 Mar 2023 00:33:12 +0100
Subject: [PATCH 07/16] gtk4: update to 4.10.1.
---
srcpkgs/gtk4/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 7e08d3dd0ec0..6a50567f53a9 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,10 +1,11 @@
# Template file for 'gtk4'
pkgname=gtk4
-version=4.8.3
+version=4.10.1
revision=1
build_style=meson
build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
+configure_args="-Dman-pages=true -Dgtk_doc=true
+ -Dbuild-tests=false -Dbuild-testsuite=false
-Dbroadway-backend=$(vopt_if broadway true false)
-Dx11-backend=$(vopt_if x11 true false)
-Dwayland-backend=$(vopt_if wayland true false)
@@ -30,9 +31,9 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://www.gtk.org/"
#changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-8/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-10/NEWS"
distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=b362f968d085b4d3d9340d4d38c706377ded9d5374e694a2b6b7e6292e3cba74
+checksum=e8fcac04bc7715b9da667c911a5ee8f262e200d1d6a50adf23645ca8cfcd0311
# Package build options
build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker"
From 0a8f752b0dd94f9a762c216a7d0b1d818a0fe3be Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:15:19 -0700
Subject: [PATCH 08/16] libadwaita: update to 1.3.1.
---
srcpkgs/libadwaita/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index be7b11ce1478..69300f080e44 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
# Template file for 'libadwaita'
pkgname=libadwaita
-version=1.2.2
+version=1.3.1
revision=1
build_style=meson
build_helper="gir"
@@ -14,9 +14,9 @@ short_desc="GTK4 building blocks for modern adaptive applications"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-2/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-3/NEWS"
distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=6958df0511e33867970d1077e3330a6f8c232da8d43434b6d60133a6982b8596
+checksum=6b8bbf413c501b46c8616a0e5b836d7a34091140941412520bbd9ddda6df8cbd
make_check_pre="xvfb-run"
build_options="gir gtk_doc"
From ca2dda9b73b54d2508845b5c3eaea628a6efca65 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 21 Mar 2023 19:30:06 -0700
Subject: [PATCH 09/16] glib: update to 2.76.0.
---
...2f81cc59751fcc689731dcd60af5da5723ba.patch | 138 ++++++++++++++++++
.../glib/patches/disable-broken-tests.patch | 23 ++-
.../fix-segfault-g_param_value_is_valid.patch | 35 -----
srcpkgs/glib/patches/fix-test-cxxcpp.patch | 26 ++++
.../glib/patches/gnome-console-support.patch | 62 --------
srcpkgs/glib/patches/test-error-musl.patch | 50 -------
srcpkgs/glib/template | 15 +-
7 files changed, 186 insertions(+), 163 deletions(-)
create mode 100644 srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
delete mode 100644 srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
create mode 100644 srcpkgs/glib/patches/fix-test-cxxcpp.patch
delete mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch
diff --git a/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
new file mode 100644
index 000000000000..8a7c6e60c5b6
--- /dev/null
+++ b/srcpkgs/glib/patches/cc7f2f81cc59751fcc689731dcd60af5da5723ba.patch
@@ -0,0 +1,138 @@
+From cc7f2f81cc59751fcc689731dcd60af5da5723ba Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Mon, 13 Mar 2023 16:23:37 +0800
+Subject: [PATCH] gstrfuncs: Improve inline version of g_strdup() to avoid
+ breaking C++ code
+
+Wrap the logic into a G_ALWAYS_INLINE function, instead of using a
+complex statement-expression which is not allowed in braced initializer
+lists and expanded into some bad thing when it's used as
+`::g_strdup(...)`.
+
+We cannot use `__builtin_constant_p (str)` because GCC documentation
+clearly states that it always produces 0 when str is a const char *
+argument of an inline function. But `__builtin_constant_p (!str)`,
+`__builtin_constant_p (!!str)`, and
+`__builtin_constant_p (strlen (str))` functions properly with `-O1` or
+above enabled.
+
+Fixes #2936.
+---
+ glib/gstrfuncs.h | 43 ++++++++++++++++++++++++++-----------------
+ glib/tests/cxx.cpp | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 58 insertions(+), 17 deletions(-)
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 8a6830294f..cb021b658d 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -204,23 +204,6 @@ gboolean (g_str_has_prefix) (const gchar *str,
+ (g_str_has_suffix) (STR, SUFFIX) \
+ )
+
+-#define g_strdup(STR) \
+- (__builtin_constant_p ((STR)) ? \
+- (G_LIKELY ((STR) != NULL) ? \
+- G_GNUC_EXTENSION ({ \
+- const char *const ___str = ((STR)); \
+- const char *const __str = _G_STR_NONNULL (___str); \
+- const size_t __str_len = strlen (__str) + 1; \
+- char *__dup_str = (char *) g_malloc (__str_len); \
+- (char *) memcpy (__dup_str, __str, __str_len); \
+- }) \
+- : \
+- (char *) (NULL) \
+- ) \
+- : \
+- (g_strdup) ((STR)) \
+- )
+-
+ #endif /* !defined (__GI_SCANNER__) */
+ #endif /* !defined (__GTK_DOC_IGNORE__) */
+ #endif /* G_GNUC_CHECK_VERSION (2, 0) */
+@@ -318,6 +301,32 @@ GLIB_AVAILABLE_IN_ALL
+ gchar* g_strjoin (const gchar *separator,
+ ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINATED;
+
++#if G_GNUC_CHECK_VERSION(2, 0)
++#ifndef __GTK_DOC_IGNORE__
++#ifndef __GI_SCANNER__
++
++G_ALWAYS_INLINE static inline char *
++g_strdup_inline (const char *str)
++{
++ if (__builtin_constant_p (!str) && !str)
++ return NULL;
++
++ if (__builtin_constant_p (!!str) && !!str && __builtin_constant_p (strlen (str)))
++ {
++ const size_t len = strlen (str) + 1;
++ char *dup_str = (char *) g_malloc (len);
++ return (char *) memcpy (dup_str, str, len);
++ }
++
++ return g_strdup (str);
++}
++
++#define g_strdup(x) g_strdup_inline (x)
++
++#endif /* !defined (__GI_SCANNER__) */
++#endif /* !defined (__GTK_DOC_IGNORE__) */
++#endif /* G_GNUC_CHECK_VERSION (2, 0) */
++
+ /* Make a copy of a string interpreting C string -style escape
+ * sequences. Inverse of g_strescape. The recognized sequences are \b
+ * \f \n \r \t \\ \" and the octal format.
+diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp
+index 2431340092..bc7967ccee 100644
+--- a/glib/tests/cxx.cpp
++++ b/glib/tests/cxx.cpp
+@@ -349,6 +349,36 @@ test_strdup_macro (void)
+ g_free (str);
+ }
+
++static void
++test_strdup_macro_qualified (void)
++{
++ gchar *str;
++
++ g_assert_null (::g_strdup (NULL));
++
++ str = ::g_strdup ("C++ is cool too!");
++ g_assert_nonnull (str);
++ g_assert_cmpstr (str, ==, "C++ is cool too!");
++ g_free (str);
++}
++
++static void
++test_strdup_macro_nested_initializer (void)
++{
++ struct
++ {
++ char *p, *q;
++ } strings = {
++ g_strdup (NULL),
++ g_strdup ("C++ is cool too!"),
++ };
++
++ g_assert_null (strings.p);
++ g_assert_nonnull (strings.q);
++ g_assert_cmpstr (strings.q, ==, "C++ is cool too!");
++ g_free (strings.q);
++}
++
+ static void
+ test_str_has_prefix (void)
+ {
+@@ -527,6 +557,8 @@ main (int argc, char *argv[])
+ g_test_add_func ("/C++/str-equal", test_str_equal);
+ g_test_add_func ("/C++/strdup", test_strdup);
+ g_test_add_func ("/C++/strdup/macro", test_strdup_macro);
++ g_test_add_func ("/C++/strdup/macro/qualified", test_strdup_macro_qualified);
++ g_test_add_func ("/C++/strdup/macro/nested-initializer", test_strdup_macro_nested_initializer);
+ g_test_add_func ("/C++/str-has-prefix", test_str_has_prefix);
+ g_test_add_func ("/C++/str-has-prefix/macro", test_str_has_prefix_macro);
+ g_test_add_func ("/C++/str-has-suffix", test_str_has_suffix);
+--
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..f6e0328b214e 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
+@@ -63,7 +63,6 @@ gio_tests = {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'converter-stream' : {},
'credentials' : {},
'data-input-stream' : {},
'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+@@ -227,7 +226,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
@@ -16,7 +16,7 @@
'gdbus-peer-object-manager' : {},
'gdbus-sasl' : {},
'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+@@ -951,13 +949,6 @@ if not meson.is_cross_build()
test_resources_binary2,
]
endif
@@ -24,18 +24,17 @@
- gio_tests += {
- 'resources' : {
- 'extra_sources' : resources_extra_sources,
-- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'depends' : resource_plugin,
- },
- }
endif
- foreach test_name, extra_args : gio_tests
+ test_extra_programs_targets = {}
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index d74617823..1de81a825 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -12,22 +12,14 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
@@ -46,19 +45,19 @@ index d74617823..1de81a825 100644
'dataset' : {},
- 'date' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-- 'should_fail' : host_system == 'darwin',
+- 'can_fail' : host_system == 'darwin',
- },
'dir' : {},
'environment' : {
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
- 'should_fail' : host_system == 'darwin',
+ 'can_fail' : host_system == 'darwin',
},
- 'error' : {},
- 'fileutils' : {},
'gdatetime' : {
'suite' : ['slow'],
- },
-@@ -65,7 +57,6 @@ glib_tests = {
+ 'can_fail' : host_system == 'windows',
+@@ -70,7 +62,6 @@ glib_tests = {
'node' : {},
'once' : {},
'onceinit' : {},
diff --git a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch b/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
deleted file mode 100644
index cacaecb695d0..000000000000
--- a/srcpkgs/glib/patches/fix-segfault-g_param_value_is_valid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This fixes segfault when editing color of text in gimp.
-
-From ea3f17d598d550345e94e4571130e429443e91cb Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Sun, 25 Sep 2022 14:20:24 +0100
-Subject: [PATCH] Empty values are not valid GParamSpec
-
-The validate() vfunc for GParamSpecParam returns FALSE for empty GValue,
-which means the is_valid() vfunc should do the same.
-
-This avoids a segfault when calling g_param_value_is_valid() on a
-GParamSpecParam.
-
-Fixes: #2770
----
- gobject/gparamspecs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gobject/gparamspecs.c b/gobject/gparamspecs.c
-index f17b3488b9..17b8606572 100644
---- a/gobject/gparamspecs.c
-+++ b/gobject/gparamspecs.c
-@@ -894,6 +894,9 @@ param_param_is_valid (GParamSpec *pspec,
- {
- GParamSpec *param = value->data[0].v_pointer;
-
-+ if (param == NULL)
-+ return FALSE;
-+
- return g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_PARAM_SPEC_VALUE_TYPE (pspec));
- }
-
---
-GitLab
-
diff --git a/srcpkgs/glib/patches/fix-test-cxxcpp.patch b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
new file mode 100644
index 000000000000..2b1ad5b4e6ad
--- /dev/null
+++ b/srcpkgs/glib/patches/fix-test-cxxcpp.patch
@@ -0,0 +1,26 @@
+Fails to build on musl.
+../glib/tests/cxx.cpp:509:15: error: missing sentinel in function call [-Werror=format=]
+g_test_init (&argc, &argv, NULL);
+
+--- a/glib/tests/cxx.cpp
++++ a/glib/tests/cxx.cpp
+@@ -505,7 +505,7 @@ test_string_free (void)
+ int
+ main (int argc, char *argv[])
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+--- a/gio/tests/cxx.cpp
++++ a/gio/tests/cxx.cpp
+@@ -59,7 +59,7 @@ int
+ main (int argc, char **argv)
+ {
+ #if G_CXX_STD_CHECK_VERSION (11)
+- g_test_init (&argc, &argv, NULL);
++ g_test_init (&argc, &argv, nullptr);
+ #else
+ g_test_init (&argc, &argv, static_cast<void *>(NULL));
+ #endif
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
deleted file mode 100644
index b142aa0b7514..000000000000
--- a/srcpkgs/glib/patches/gnome-console-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Currently glib hardcodes a list of terminals and that list will not be expanding.
-The hope being that it will eventually be replaced with some kind of api.
-Until then, we might as well add gnome-console/kgx to the list
-
-See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
-Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 60d6debb2..a441bfec9 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc,
- int i, j;
- char **term_argv = NULL;
- int term_argc = 0;
-+ gboolean pass_cmd_as_single_arg = FALSE;
- char *check;
- char **the_argv;
-
-@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc,
- }
- else
- {
-+ if (check == NULL) {
-+ check = g_find_program_in_path ("kgx");
-+ if (check != NULL)
-+ pass_cmd_as_single_arg = TRUE;
-+ }
- if (check == NULL)
- check = g_find_program_in_path ("tilix");
- if (check == NULL)
-@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc,
- }
- }
-
-- real_argc = term_argc + *argc;
-+ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
- real_argv = g_new (char *, real_argc + 1);
-
- for (i = 0; i < term_argc; i++)
- real_argv[i] = term_argv[i];
-
-- for (j = 0; j < *argc; j++, i++)
-- real_argv[i] = (char *)the_argv[j];
-+ if (pass_cmd_as_single_arg) {
-+ char **quoted_argv = g_new (char *, *argc + 1);
-+
-+ for (j = 0; j < *argc; j++) {
-+ quoted_argv[j] = g_shell_quote (the_argv[j]);
-+ g_free (the_argv[j]);
-+ }
-+ quoted_argv[j] = NULL;
-+
-+ real_argv[i++] = g_strjoinv (" ", quoted_argv);
-+ g_strfreev (quoted_argv);
-+ } else {
-+ for (j = 0; j < *argc; j++, i++)
-+ real_argv[i] = (char *)the_argv[j];
-+ }
-
- real_argv[i] = NULL;
-
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
- ...)
- {
--#ifdef __linux__
-- /* Only worth testing this on Linux; if other platforms regress on this legacy
-- * behaviour, we don’t care. In particular, calling g_error_new_valist() with
-- * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
-- * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
-- * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+ /* Only worth testing this on Linux with glibc; if other platforms regress on
-+ * this legacy behaviour, we don’t care. In particular, calling
-+ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+ * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+ * fine: it’s a programmer error in either case. */
- const struct
- {
- GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
-
- va_end (ap);
- }
--#else /* if !__linux__ */
-- g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif /* !__linux__ */
-+#else /* if !__linux__ || !__GLIBC__ */
-+ g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
-
- static void
---
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index e250af446b0b..027d0cbea53d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
-version=2.74.0
-revision=3
+version=2.76.0
+revision=1
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
@@ -14,10 +14,10 @@ short_desc="GNU library of C routines"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-76/NEWS"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
+checksum=525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797
make_check_pre="dbus-run-session"
build_options="gtk_doc"
@@ -27,6 +27,13 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
+post_patch() {
+ # Timer test is flaky on 32 bit (does float comparisons)
+ if [ "${XBPS_TARGET_WORDSIZE}" = "32" ]; then
+ vsed -e "s/'timer' : {},//" -i glib/tests/meson.build
+ fi
+}
+
pre_check() {
# machine-id is a random, non-zero value
echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
From 30a71cc3ee7bf2b1c7581856b19a06cbf9d0c6b1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:23:31 -0700
Subject: [PATCH 10/16] libpanel: update to 1.2.0.
---
srcpkgs/libpanel/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template
index 27e92532463d..5df28807d162 100644
--- a/srcpkgs/libpanel/template
+++ b/srcpkgs/libpanel/template
@@ -1,6 +1,6 @@
# Template file for 'libpanel'
pkgname=libpanel
-version=1.0.2
+version=1.2.0
revision=1
build_style=meson
build_helper="gir"
@@ -10,10 +10,9 @@ short_desc="Dock/panel library for GTK 4"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libpanel"
-#changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/libpanel-1.0/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz"
-checksum=a672043a48ae20050097c9a9f9d98f2a73a1ec8547822ae7bba54d3cc88d7fe2
+checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2
pre_build() {
# help gi-docgen find gi files on cross
From 1ef6ed22276bed204c081e928e967c2f8ef8f9aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:27:04 -0700
Subject: [PATCH 11/16] gtksourceview5: update to 5.8.0.
---
srcpkgs/gtksourceview5/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index 711194803bb0..0d24076811d7 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,6 +1,6 @@
# Template file for 'gtksourceview5'
pkgname=gtksourceview5
-version=5.6.2
+version=5.8.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,10 +15,10 @@ short_desc="Text widget that extends GTK4 GtkTextView widget"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GtkSourceView"
-#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-6/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-8/NEWS"
distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=1f146c156f135a60499d979e3577c99b6e15a111445767abe6219bb34c545c77
+checksum=110dd4c20def21886fbf777298fe0ef8cc2ad6023b8f36c7424411a414818933
make_check_pre="xvfb-run"
# Package build options
From 81a48eeeba9cdcd1493d7218e1de9de06b0e85ae Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:33:38 -0700
Subject: [PATCH 12/16] jsonrpc-glib: update to 3.44.0.
---
srcpkgs/jsonrpc-glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template
index 4ee57547f9dd..42d6762a8c64 100644
--- a/srcpkgs/jsonrpc-glib/template
+++ b/srcpkgs/jsonrpc-glib/template
@@ -1,6 +1,6 @@
# Template file for 'jsonrpc-glib'
pkgname=jsonrpc-glib
-version=3.42.0
+version=3.44.0
revision=1
build_style=meson
build_helper="gir"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
changelog="https://gitlab.gnome.org/GNOME/jsonrpc-glib/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/jsonrpc-glib/${version%.*}/jsonrpc-glib-${version}.tar.xz"
-checksum=221989a57ca82a12467dc427822cd7651b0cad038140c931027bf1074208276b
+checksum=69406a0250d0cc5175408cae7eca80c0c6bfaefc4ae1830b354c0433bcd5ce06
build_options="gir vala gtk_doc"
build_options_default="gir vala gtk_doc"
From fca5884e0ebe40dbc1215af37a9316eb80ef1291 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:34:04 -0700
Subject: [PATCH 13/16] libpeas: update to 1.36.0.
---
srcpkgs/libpeas/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index f7eba85d8336..8c85745f9c00 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -1,7 +1,7 @@
# Template file for 'libpeas'
pkgname=libpeas
-version=1.34.0
-revision=2
+version=1.36.0
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Ddemos=false -Dvapi=true"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/Libpeas"
changelog="https://gitlab.gnome.org/GNOME/libpeas/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/libpeas/${version%.*}/libpeas-${version}.tar.xz"
-checksum=4305f715dab4b5ad3e8007daec316625e7065a94e63e25ef55eb1efb964a7bf0
+checksum=297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c
make_check_pre="xvfb-run"
libpeas-devel_package() {
From 37422f6cd038ddd3cadd771a4be1b40d5677b3ce Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:34:34 -0700
Subject: [PATCH 14/16] template-glib: update to 3.36.1.
---
srcpkgs/template-glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/template-glib/template b/srcpkgs/template-glib/template
index eaa26164b038..dd0e5c291710 100644
--- a/srcpkgs/template-glib/template
+++ b/srcpkgs/template-glib/template
@@ -1,6 +1,6 @@
# Template file for 'template-glib'
pkgname=template-glib
-version=3.36.0
+version=3.36.1
revision=1
build_style=meson
build_helper="gir"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/template-glib"
changelog="https://gitlab.gnome.org/GNOME/template-glib/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/template-glib/${version%.*}/template-glib-${version}.tar.xz"
-checksum=1c129525ae64403a662f7666f6358386a815668872acf11cb568ab39bba1f421
+checksum=3b167a17385ad745afbe20fadf8106c66d30c5bd746d5aa1d9bdb7e803f6a503
template-glib-devel_package() {
depends="${sourcepkg}>=${version}_${revision} libgirepository-devel
From 59dc9f90b4e0f0f7f31a9c5f4d74349cf0bca3c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 02:44:37 -0700
Subject: [PATCH 15/16] gnome-builder: update to 44.1.
---
srcpkgs/gnome-builder/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index b89928e1c7e4..f0f92deebd45 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,32 +1,27 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
-version=43.4
+version=44.1
revision=1
build_style=meson
build_helper=qemu
configure_args="-Dhelp=true -Dnetwork_tests=false"
hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
-makedepends="cairo-devel clang enchant2-devel flatpak-devel
+makedepends="cairo-devel clang enchant2-devel flatpak-devel gpgme-devel
gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
- libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkit2gtk50-devel
+ libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-devel
libadwaita-devel pcre2-devel libgit2-devel gobject-introspection
python3-gobject-devel sysprof-devel libportal-gtk4-devel
libsoup3-devel cmark-devel pango-devel libportal-devel
- libpanel-devel d-spy-devel editorconfig-devel"
+ libpanel-devel d-spy-devel editorconfig-devel libdex-devel"
depends="desktop-file-utils flatpak-builder python3-lxml python3-gobject"
checkdepends="xvfb-run cmark-devel"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
-changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-43/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS"
distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz"
-checksum=1e0d6d67845c19bec9e3add59695f9a531d72a0e542b203acc90fb381227c2bc
+checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e
make_check_pre="xvfb-run"
-
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
- makedepends+=" libexecinfo-devel"
- LIBS="-lexecinfo"
-fi
From 5a69579c983385ac110139be8a4ad11abd6eb8af Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 22 Mar 2023 03:18:30 -0700
Subject: [PATCH 16/16] Komikku: downgrade to 0.41.0.
Avoid dependency on libwebkit2gtk50, which is no longer provided by
webkit2gtk.
---
.../Komikku/patches/fix-appdata-file.patch | 39 +++++++++++++++++++
srcpkgs/Komikku/template | 13 ++++---
2 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Komikku/patches/fix-appdata-file.patch
diff --git a/srcpkgs/Komikku/patches/fix-appdata-file.patch b/srcpkgs/Komikku/patches/fix-appdata-file.patch
new file mode 100644
index 000000000000..f43a189bef7d
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-appdata-file.patch
@@ -0,0 +1,39 @@
+--- a/data/info.febvre.Komikku.appdata.xml.in
++++ b/data/info.febvre.Komikku.appdata.xml.in
+@@ -49,28 +49,28 @@
+
+ <screenshots>
+ <screenshot type="default">
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/library-with-categories.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/library-with-categories.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/preferences.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/preferences.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/explorer.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/explorer.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/categories-editor.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/categories-editor.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-info.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-info.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/card-chapters.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/card-chapters.png</image>
+ </screenshot>
+ <screenshot>
+- <image>https://gitlab.com/valos/Komikku/raw/master/screenshots/reader.png</image>
++ <image>https://gitlab.com/valos/Komikku/raw/main/screenshots/reader.png</image>
+ </screenshot>
+ </screenshots>
+
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 9c20078e9c42..214ec2616977 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,19 +1,20 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=1.1.0
-revision=2
+reverts="1.1.0_1 1.1.0_2"
+version=0.41.0
+revision=1
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config
desktop-file-utils gtk-update-icon-cache"
-makedepends="gtk4-devel libadwaita-devel"
-depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4
+makedepends="gtk+3-devel libhandy1-devel glade3-devel"
+depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4
python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser
python3-gobject python3-keyring python3-lxml python3-magic
- python3-natsort python3-pure-protobuf libwebkit2gtk50"
+ python3-natsort python3-pure-protobuf"
checkdepends="appstream-glib desktop-file-utils"
short_desc="Online/offline manga reader for GNOME"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=5b85b7a448fdf977dc6e4f40cf9e3384f0fcdad6c25f0d29d22f3769353a20eb
+checksum=ba46cd0a7331d774b598f5b3f6f7738fb9966ff9a3b5ad888bc604d7ea08a619
next prev parent reply other threads:[~2023-03-22 10:33 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-17 19:59 [PR PATCH] webkit2gtk: update to 2.39.4 oreo639
2023-01-17 20:03 ` [PR PATCH] [Updated] " oreo639
2023-01-17 20:23 ` oreo639
2023-01-17 20:26 ` oreo639
2023-01-17 20:53 ` oreo639
2023-01-17 20:55 ` oreo639
2023-03-22 0:49 ` oreo639
2023-03-22 10:19 ` [PR PATCH] [Updated] webkit2gtk: update to 2.40.0 oreo639
2023-03-22 10:33 ` oreo639 [this message]
2023-03-22 17:11 ` paper42
2023-03-22 20:48 ` [PR PATCH] [Updated] " oreo639
2023-03-22 22:44 ` oreo639
2023-03-23 17:33 ` [PR REVIEW] " paper42
2023-03-23 19:05 ` [PR PATCH] [Updated] " oreo639
2023-03-23 19:05 ` [PR REVIEW] " oreo639
2023-03-24 20:18 ` icp1994
2023-03-24 20:43 ` oreo639
2023-03-26 22:04 ` oreo639
2023-03-26 22:04 ` oreo639
2023-03-30 21:22 ` paper42
2023-03-30 22:34 ` oreo639
2023-03-30 22:54 ` [PR PATCH] [Updated] " oreo639
2023-04-01 19:48 ` oreo639
2023-04-01 19:50 ` oreo639
2023-04-02 9:04 ` paper42
2023-04-02 20:10 ` oreo639
2023-04-02 20:10 ` oreo639
2023-04-02 20:12 ` oreo639
2023-04-02 20:13 ` oreo639
2023-04-02 20:33 ` nekopsykose
2023-04-02 20:34 ` nekopsykose
2023-04-02 20:35 ` nekopsykose
2023-04-02 20:38 ` nekopsykose
2023-04-02 20:38 ` nekopsykose
2023-04-02 22:21 ` oreo639
2023-04-02 22:36 ` nekopsykose
2023-04-02 23:32 ` [PR PATCH] [Updated] " oreo639
2023-04-02 23:33 ` oreo639
2023-04-02 23:33 ` oreo639
2023-04-02 23:34 ` oreo639
2023-04-02 23:34 ` oreo639
2023-04-03 2:26 ` [PR PATCH] [Updated] " oreo639
2023-04-03 9:09 ` oreo639
2023-04-03 18:07 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230322103351.MPAwi8tVyx67p1w1cQvZPeEZaaLTEew_VhVV63KwO7U@z \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).