Merge pull request #15826 from Rmys/master

glade rebuild

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():

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',

desktop/toolkit/glade/pspec.xml

@@ -15,22 +15,23 @@
         <Icon>org.gnome.Glade</Icon>
         <Summary>GTK+ Form Designer</Summary>
         <Description>Glade is a RAD tool to enable quick and easy development of user interfaces for the GTK+ toolkit and the GNOME desktop environment.</Description>
-        <Archive sha1sum="2ef25e073ba21ad02fc268419949079d857e828f" type="tarxz">http://ftp.acc.umu.se/pub/GNOME/sources/glade/3.40/glade-3.40.0.tar.xz</Archive>
+        <Archive sha1sum="49bad4aa63a01df259bdbe48e73c8d614fbea4b7" type="tarbz2">https://gitlab.gnome.org/Archive/glade/-/archive/1fbca367cf33991f1d8d20a256ca704eb778fca9/glade-1fbca367cf33991f1d8d20a256ca704eb778fca9.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>meson</Dependency>
+            <Dependency>gjs-devel</Dependency>
             <Dependency>gtk3-devel</Dependency>
             <Dependency>python3-devel</Dependency>
             <Dependency>gobject-introspection-devel</Dependency>
             <Dependency>python-devel</Dependency>
             <Dependency>python-pygobject3-devel</Dependency>
-            <Dependency>webkit2gtk-devel</Dependency>
+            <Dependency>webkit2gtk-4.1-devel</Dependency>
             <Dependency>intltool</Dependency>
             <Dependency>gtk-doc</Dependency>
             <Dependency>libxml2-devel</Dependency>
             <Dependency>itstool</Dependency>
         </BuildDependencies>
         <Patches>
-<!--             <Patch level="1">6da47128e8.patch</Patch> -->
+            <Patch level="1">fix-build.diff</Patch>
 <!--             <Patch level="1">efdd5338b0.patch</Patch> -->
         </Patches>
     </Source>
@@ -38,6 +39,7 @@
     <Package>
         <Name>glade</Name>
         <RuntimeDependencies>
+            <Dependency>gjs</Dependency>
             <Dependency>gtk3</Dependency>
             <Dependency>cairo</Dependency>
             <Dependency>glib2</Dependency>
@@ -45,7 +47,7 @@
             <Dependency>python3</Dependency>
             <Dependency>libxml2</Dependency>
             <Dependency>pango</Dependency>
-            <Dependency>webkit2gtk</Dependency>
+            <Dependency>webkit2gtk-4.1</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
@@ -94,6 +96,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2024-12-26</Date>
+            <Version>3.40.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="4">
             <Date>2023-11-03</Date>
             <Version>3.40.0</Version>