From abc6e4a3726105e782bbd1671c1c33d5f83ffa16 Mon Sep 17 00:00:00 2001 From: triallax Date: Sat, 12 Aug 2023 20:34:53 +0100 Subject: [PATCH 1/2] gtk4: update to 4.12.3. --- common/shlibs | 2 +- srcpkgs/gtk4/template | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/shlibs b/common/shlibs index c2b72edb77cd2..002069dcf5f1a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3634,7 +3634,7 @@ libflite_cmu_us_kal.so.1 flite-2.1_1 libflite_usenglish.so.1 flite-2.1_1 libflite_cmulex.so.1 flite-2.1_1 libflite_cmu_us_kal16.so.1 flite-2.2_1 -libgtk-4.so.1 gtk4-4.0.0_1 +libgtk-4.so.1 gtk4-4.12.0_1 libmodule.so.5 libmodule-5.0.0_1 libgnustep-gui.so.0 gnustep-gui-0.30.0_1 libmhash.so.2 mhash-0.9.9.9_1 diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index b40d51d432537..6a4e20357a86f 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -1,10 +1,10 @@ # Template file for 'gtk4' pkgname=gtk4 -version=4.10.4 +version=4.12.3 revision=1 build_style=meson build_helper="gir" -configure_args="-Dman-pages=true -Dgtk_doc=true -Dbuild-tests=false +configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false -Dbuild-testsuite=false -Dbuild-examples=false $(vopt_bool broadway broadway-backend) $(vopt_bool x11 x11-backend) @@ -16,7 +16,7 @@ configure_args="-Dman-pages=true -Dgtk_doc=true -Dbuild-tests=false $(vopt_feature tracker tracker)" hostmakedepends="gettext-devel glib-devel gi-docgen perl pkg-config sassc gettext libxslt docbook-xsl python3-docutils - $(vopt_if wayland 'wayland-devel wayland-protocols')" + $(vopt_if wayland 'wayland-devel wayland-protocols') shaderc" makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel') @@ -30,10 +30,10 @@ short_desc="GIMP ToolKit (v4)" maintainer="Michal Vasilek " 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-10/NEWS" +# changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/main/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-12/NEWS" distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz" -checksum=7725400482e0685e28265e226c62847f4e73cfca9e9b416ac5838207f5377a24 +checksum=148ce262f6c86487455fb1d9793c3f58bc3e1da477a29617fadb0420f5870a89 # Package build options build_options="broadway cloudproviders colord cups gir vulkan wayland x11 tracker" From 7d448da11c7cef5dbf16177e9ae7c1ce932b30e9 Mon Sep 17 00:00:00 2001 From: Emi Vasilek Date: Sat, 7 Oct 2023 18:18:42 +0200 Subject: [PATCH 2/2] libadwaita: update to 1.4.0. --- common/shlibs | 2 +- srcpkgs/libadwaita/patches/disable-broken-tests.patch | 10 ---------- srcpkgs/libadwaita/template | 10 +++++----- 3 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch diff --git a/common/shlibs b/common/shlibs index 002069dcf5f1a..f9b49065263bf 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3487,7 +3487,7 @@ liburiparser.so.1 uriparser-0.8.6_1 libcpptest.so.1 cpptest-2.0.0_1 libhandy-0.0.so.0 libhandy-0.0.3_1 libhandy-1.so.0 libhandy1-0.90.0_1 -libadwaita-1.so.0 libadwaita-1.0.0alpha2_1 +libadwaita-1.so.0 libadwaita-1.4.0_1 libswitchboard-2.0.so.0 switchboard-2.3.2_1 libcodecore.so.0 libio.elementary.code-3.0_1 libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1 diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch deleted file mode 100644 index dba1ca021140c..0000000000000 --- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -36,7 +36,6 @@ - 'test-preferences-group', - 'test-preferences-page', - 'test-preferences-row', -- 'test-preferences-window', - 'test-split-button', - 'test-squeezer', - 'test-status-page', diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template index 9957cf5ff38f5..1869ddde4ff0b 100644 --- a/srcpkgs/libadwaita/template +++ b/srcpkgs/libadwaita/template @@ -1,6 +1,6 @@ # Template file for 'libadwaita' pkgname=libadwaita -version=1.3.1 +version=1.4.0 revision=1 build_style=meson build_helper="gir" @@ -8,15 +8,15 @@ configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc) $(vopt_bool gir vapi) $(vopt_feature gir introspection)" hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen) $(vopt_if gir vala-devel) gettext sassc" -makedepends="gtk4-devel libglib-devel harfbuzz-devel" +makedepends="gtk4-devel libglib-devel harfbuzz-devel AppStream-devel" checkdepends="xvfb-run cantarell-fonts" short_desc="GTK4 building blocks for modern adaptive applications" maintainer="Michal Vasilek " license="LGPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/libadwaita/" -changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-3/NEWS" +changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-4/NEWS" distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz" -checksum=6b8bbf413c501b46c8616a0e5b836d7a34091140941412520bbd9ddda6df8cbd +checksum=e51a098a54d43568218fc48fcf52e80e36f469b3ce912d8ce9c308a37e9f47c2 make_check_pre="xvfb-run" build_options="gir gtk_doc" @@ -30,7 +30,7 @@ pre_build() { } libadwaita-devel_package() { - depends="${sourcepkg}>=${version}_${revision} gtk4-devel" + depends="${sourcepkg}>=${version}_${revision} gtk4-devel AppStream-devel" short_desc+=" - development files" pkg_install() { vmove "usr/lib/*.so"