diff --git a/desktop/toolkit/glade/actions.py b/desktop/toolkit/glade/actions.py index 86bee2a500..eb6a99d65b 100644 --- a/desktop/toolkit/glade/actions.py +++ b/desktop/toolkit/glade/actions.py @@ -10,6 +10,7 @@ from pisi.actionsapi import shelltools def setup(): + shelltools.system("sed -i 's/webkit2gtk-4.0/webkit2gtk-4.1/' meson.build") mesontools.configure("--prefix=/usr -Dgtk_doc=true -Dgladeui=true -Dgjs=auto") def build(): diff --git a/desktop/toolkit/glade/files/fix-build.diff b/desktop/toolkit/glade/files/fix-build.diff new file mode 100644 index 0000000000..9b5772dd1a --- /dev/null +++ b/desktop/toolkit/glade/files/fix-build.diff @@ -0,0 +1,26 @@ +diff --git i/src/meson.build w/src/meson.build +index 40c730a0..56f4e47d 100644 +--- i/src/meson.build ++++ w/src/meson.build +@@ -1,18 +1,18 @@ + fs = import('fs') + + if fs.exists('../.git') +- vcs_tag(input: 'version.h.in', output: 'version.h') ++ version_h = vcs_tag(input: 'version.h.in', output: 'version.h')[0] + else + config = configuration_data() + config.set ('VCS_TAG', glade_version) +- configure_file( ++ version_h = configure_file( + input: 'version.h.in', + output: 'version.h', + configuration: config + ) + endif + +-sources = files( ++sources = [version_h] + files( + 'glade-intro.c', + 'glade-preferences.c', + 'glade-settings.c', diff --git a/desktop/toolkit/glade/pspec.xml b/desktop/toolkit/glade/pspec.xml index 17b390ee5f..d3bd2ecadf 100755 --- a/desktop/toolkit/glade/pspec.xml +++ b/desktop/toolkit/glade/pspec.xml @@ -15,22 +15,23 @@ org.gnome.Glade GTK+ Form Designer Glade is a RAD tool to enable quick and easy development of user interfaces for the GTK+ toolkit and the GNOME desktop environment. - http://ftp.acc.umu.se/pub/GNOME/sources/glade/3.40/glade-3.40.0.tar.xz + https://gitlab.gnome.org/Archive/glade/-/archive/1fbca367cf33991f1d8d20a256ca704eb778fca9/glade-1fbca367cf33991f1d8d20a256ca704eb778fca9.tar.bz2 meson + gjs-devel gtk3-devel python3-devel gobject-introspection-devel python-devel python-pygobject3-devel - webkit2gtk-devel + webkit2gtk-4.1-devel intltool gtk-doc libxml2-devel itstool - + fix-build.diff @@ -38,6 +39,7 @@ glade + gjs gtk3 cairo glib2 @@ -45,7 +47,7 @@ python3 libxml2 pango - webkit2gtk + webkit2gtk-4.1 /usr/bin @@ -94,6 +96,13 @@ + + 2024-12-26 + 3.40.0 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2023-11-03 3.40.0