From dc142e192a0d73ce69a40984dfafeff34e842e8d Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 17 Jan 2023 00:26:08 -0800 Subject: [PATCH 1/7] 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/patches/initial-exec.patch | 23 ++++++++ srcpkgs/webkit2gtk/template | 54 +++++++++++-------- 9 files changed, 62 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 create mode 100644 srcpkgs/webkit2gtk/patches/initial-exec.patch diff --git a/common/shlibs b/common/shlibs index ddd0a3266a36..f2f392b6b45f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -548,8 +548,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 @@ -1143,6 +1143,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 03d7dbe80713..540a14726eb1 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -303,6 +303,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(length, updatedLength); if constexpr (ViewClass::Adaptor::isFloat) { - if (std::isnan(static_cast(*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(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 "$") - set_property(TARGET "gir-${namespace}" PROPERTY GI_PACKAGE "${opt_PACKAGE}-${nsversion}") - endfunction() diff --git a/srcpkgs/webkit2gtk/patches/initial-exec.patch b/srcpkgs/webkit2gtk/patches/initial-exec.patch new file mode 100644 index 000000000000..579084bd6065 --- /dev/null +++ b/srcpkgs/webkit2gtk/patches/initial-exec.patch @@ -0,0 +1,23 @@ +Source: https://bugs.webkit.org/show_bug.cgi?id=254286 + +Usage initial-exec TLS is incompatible with dlopen() on musl. + +See also: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8570a2a280587a1e43ac11ad46ad62dfdd6c7b39 + .../platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +--- a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp ++++ a/Source/WebCore/platform/graphics/gbm/GraphicsContextGLANGLELinux.cpp +@@ -108,7 +108,11 @@ RefPtr GraphicsContextGLANGLE::readCompositedResults() + + bool GraphicsContextGLANGLE::makeContextCurrent() + { +- static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr }; ++ #ifdef __GLIBC__ ++ static thread_local TLS_MODEL_INITIAL_EXEC GraphicsContextGLANGLE* s_currentContext { nullptr }; ++ #else ++ static thread_local GraphicsContextGLANGLE* s_currentContext { nullptr }; ++ #endif + + if (s_currentContext == this) + return true; +-- diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index b836b379592a..e3c63b2e1ad3 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 " 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" @@ -109,6 +109,14 @@ case "$XBPS_TARGET_MACHINE" in ;; esac +case "$XBPS_TARGET_MACHINE" in + armv6*) + # Disable ANGLE on armv6 for now. + # Requires support for lock-free atomics (armv6k+). + configure_args+=" -DENABLE_WEBGL=OFF" + ;; +esac + # extra validation if [ "$build_option_sampling_profiler" -a -z "$build_option_jit" ]; then broken="sampling_profiler requires JIT" @@ -185,7 +193,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 +213,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 +227,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 +246,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 adeb969e10c2c520c15aacea273eef5257b1f242 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 21 Mar 2023 18:02:23 -0700 Subject: [PATCH 2/7] 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 9585cb69d29da47b14cb6acb0c824671b2c896d4 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 21 Mar 2023 18:06:20 -0700 Subject: [PATCH 3/7] 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 f2f392b6b45f..4af39bae735e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -617,6 +617,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 60dc8b010bf25e0ca6c4232aed8c36bcf2dd340f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 21 Mar 2023 18:06:29 -0700 Subject: [PATCH 4/7] 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 9cbc9e795fc11963801c53c5791e98fdec2607b5 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 21 Mar 2023 18:12:48 -0700 Subject: [PATCH 5/7] 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 3e7a7bed194ff988f02802ced0107cfdfa46f1c6 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 22 Mar 2023 02:44:37 -0700 Subject: [PATCH 6/7] 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 a92360e98674..264943b2328b 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,7 +1,7 @@ # Template file for 'gnome-builder' pkgname=gnome-builder -version=43.4 -revision=2 +version=44.1 +revision=1 build_style=meson build_helper=qemu configure_args="-Dhelp=true -Dnetwork_tests=false" @@ -10,23 +10,18 @@ hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-intro makedepends="cairo-devel clang enchant2-devel flatpak-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 " 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 2fa6457e6d3dde45a277bc2bb86ad075840b768d Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 30 Mar 2023 15:42:50 -0700 Subject: [PATCH 7/7] Komikku: rebuild for libwebkitgtk60 --- srcpkgs/Komikku/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template index fad699b5d4ac..ceb56424353c 100644 --- a/srcpkgs/Komikku/template +++ b/srcpkgs/Komikku/template @@ -1,7 +1,7 @@ # Template file for 'Komikku' pkgname=Komikku version=1.17.0 -revision=1 +revision=2 build_style=meson hostmakedepends="gettext glib-devel gobject-introspection pkg-config desktop-file-utils gtk-update-icon-cache" @@ -9,7 +9,7 @@ makedepends="gtk4-devel libadwaita-devel" depends="gtk4 libadwaita libnotify libsecret python3-BeautifulSoup4 python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser python3-gobject python3-keyring python3-lxml python3-magic python3-rarfile - python3-natsort python3-pure-protobuf python3-emoji libwebkit2gtk50 + python3-natsort python3-pure-protobuf python3-emoji libwebkitgtk60 python3-piexif" checkdepends="appstream-glib desktop-file-utils" short_desc="Online/offline manga reader for GNOME"