Update to latest modulesets and bundler.

gpodder · Oct 2, 2023 · cab6fb4 · cab6fb4
1 parent e32e49f
commit cab6fb4
Show file tree

Hide file tree

Showing 12 changed files with 142 additions and 120 deletions.
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -15,15 +15,15 @@ mkdir -p "$HOME/.config"
 cp misc/jhbuildrc-custom "$HOME/.config/jhbuildrc-custom"
 
 git clone https://gitlab.gnome.org/GNOME/gtk-osx.git _gtk-osx
-# try latest commit (2023-07-04) -- sync with fetch_modules.sh
-(cd _gtk-osx && git checkout cdda75d9)
+# try latest commit (2023-08-20) -- sync with fetch_modules.sh
+(cd _gtk-osx && git checkout a27e8ff6)
 # don't silence curl errors when bootstrapping
 sed -i '' 's:curl -ks :curl -ksS :' _gtk-osx/gtk-osx-setup.sh
 # pipenv prior to 2022.11.4 doesn't support python 3.11
 #sed -i '' 's:pipenv==2020.11.15:pipenv==2022.11.4:' _gtk-osx/gtk-osx-setup.sh
 ./_gtk-osx/gtk-osx-setup.sh
 
 git clone https://gitlab.gnome.org/GNOME/gtk-mac-bundler.git _bundler
-# try latest commit (2023-07-02)
-(cd _bundler && git checkout 017747b4)
+# try latest commit (2023-08-17)
+(cd _bundler && git checkout 0a95b2d5)
 (cd _bundler && make install bindir=$HOME/.new_local/bin)
diff --git a/fetch_modules.sh b/fetch_modules.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 git clone https://gitlab.gnome.org/GNOME/gtk-osx.git _gtk-osx-modules
-# try latest commit (2023-07-04) -- sync with bootstrap.sh
-(cd _gtk-osx-modules && git checkout cdda75d9)
+# try latest commit (2023-08-20) -- sync with bootstrap.sh
+(cd _gtk-osx-modules && git checkout a27e8ff6)
 
 rsync -vrb --delete --exclude gpodder.modules --exclude patches/gpodder* _gtk-osx-modules/modulesets-stable/ modulesets/
 rsync -vrb --delete _gtk-osx-modules/patches modulesets/

diff --git a/modulesets/bootstrap.modules b/modulesets/bootstrap.modules
@@ -84,8 +84,7 @@
     <branch module="m4/m4-1.4.19.tar.xz"
             version="1.4.19"
             hash="sha256:63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96"
-            repo="ftp.gnu.org">
-    </branch>
+            repo="ftp.gnu.org" />
   </autotools>
   <!---->
   <autotools id="autoconf"
@@ -151,7 +150,6 @@
              autogen-sh="configure">
     <branch module="bison/bison-3.8.2.tar.xz"
             version="3.8.2"
-
             repo="ftp.gnu.org" />
     <dependencies>
       <dep package='flex' />

diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
@@ -73,8 +73,6 @@
     <branch module="gtk-doc/1.33/gtk-doc-1.33.2.tar.xz"
             version="1.33.2"
             hash="sha256:cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43" />
-    <dependencies>
-    </dependencies>
     <after>
       <dep package="python3" />
       <dep package="pygments" />

diff --git a/modulesets/gtk-osx-gstreamer.modules b/modulesets/gtk-osx-gstreamer.modules
@@ -24,9 +24,9 @@
   <meson id="liborc"
          mesonargs="-Dgtk_doc=disabled -Dbenchmarks=disabled -Dexamples=disabled -Dtests=disabled">
 
-    <branch module="orc/orc-0.4.33.tar.xz"
-            version="0.4.33"
-            hash="sha256:844e6d7db8086f793f57618d3d4b68d29d99b16034e71430df3c21cfd3c3542a" />
+    <branch module="orc/orc-0.4.34.tar.xz"
+            version="0.4.34"
+            hash="sha256:8f47abb3f097171e44eb807adcdabd860fba2effd37d8d3c4fbd5f341cadd41f" />
   </meson>
   <!---->
   <autotools id="faad2"
@@ -44,9 +44,9 @@
     <branch module="2.16.01/nasm-2.16.01.tar.xz"
             version="2.16.01"
             hash="sha256:c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558"
-            repo="nasm" >
+            repo="nasm">
       <patch file="nasm-2.16.01-warnings.c-needs-srcdir-patch"
-             strip="1"/>
+             strip="1" />
     </branch>
   </autotools>
   <!---->
@@ -65,9 +65,9 @@
   </autotools>
   <!---->
   <meson id="gstreamer">
-    <branch module="gstreamer/gstreamer-1.22.0.tar.xz"
-            version="1.22.0"
-            hash="sha256:78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09">
+    <branch module="gstreamer/gstreamer-1.22.5.tar.xz"
+            version="1.22.5"
+            hash="sha256:4408d7930f381809e85917acc19712f173261ba85bdf20c5567b2a21b1193b61">
     </branch>
     <after>
       <dep package="glib" />
@@ -76,41 +76,40 @@
   <!---->
   <meson id="gst-plugins-base"
          mesonargs="-Dexamples=disabled -Ddoc=disabled">
-    <branch module="gst-plugins-base/gst-plugins-base-1.22.0.tar.xz"
-            version="1.22.0"
-            hash="sha256:f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d" />
+    <branch module="gst-plugins-base/gst-plugins-base-1.22.5.tar.xz"
+            version="1.22.5"
+            hash="sha256:edd4338b45c26a9af28c0d35aab964a024c3884ba6f520d8428df04212c8c93a" />
     <dependencies>
       <dep package="gstreamer" />
       <dep package="liborc" />
     </dependencies>
-    <after></after>
   </meson>
   <!---->
   <meson id="gst-plugins-good">
-    <branch module="gst-plugins-good/gst-plugins-good-1.22.0.tar.xz"
-            version="1.22.0"
-            hash="sha256:582e617271e7f314d1a2211e3e3856ae2e4303c8c0d6114e9c4a5ea5719294b0">
+    <branch module="gst-plugins-good/gst-plugins-good-1.22.5.tar.xz"
+            version="1.22.5"
+            hash="sha256:b67b31313a54c6929b82969d41d3cfdf2f58db573fb5f491e6bba5d84aea0778">
     </branch>
     <dependencies>
       <dep package="gstreamer" />
       <dep package="gst-plugins-base" />
     </dependencies>
   </meson>
   <!---->
-  <meson id="gst-plugins-ugly">
-    <branch module="gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz"
-            version="1.22.0"
-            hash="sha256:a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c" />
+  <meson id="gst-plugins-ugly" mesonargs="-Dgpl=enabled">
+    <branch module="gst-plugins-ugly/gst-plugins-ugly-1.22.5.tar.xz"
+            version="1.22.5"
+            hash="sha256:2680473b218158f18467cac3e1c50291b7ff4e0710dd350a59eaacbc29c09a54" />
     <dependencies>
       <dep package="gstreamer" />
       <dep package="gst-plugins-base" />
     </dependencies>
   </meson>
   <!---->
   <meson id="gst-plugins-bad">
-    <branch module="gst-plugins-bad/gst-plugins-bad-1.22.0.tar.xz"
-            version="1.22.0"
-            hash="sha256:3c9d9300f5f4fb3e3d36009379d1fb6d9ecd79c1a135df742b8a68417dd663a1" />
+    <branch module="gst-plugins-bad/gst-plugins-bad-1.22.5.tar.xz"
+            version="1.22.5"
+            hash="sha256:e64e75cdafd7ff2fc7fc34e855b06b1e3ed227cc06fa378d17bbcd76780c338c" />
     <dependencies>
       <dep package="gstreamer" />
       <dep package="gst-plugins-base" />
@@ -120,9 +119,10 @@
   </meson>
   <!---->
   <meson id="gst-libav">
-    <branch module="gst-libav/gst-libav-1.22.0.tar.xz"
-            version="1.22.0"
-            hash="sha256:0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1" />
+    <branch module="gst-libav/gst-libav-1.22.5.tar.xz"
+            version="1.22.5"
+            hash="sha256:8583f0c1f4fcb01eed11fa1e3c21126543a8bd739ed4fc1db31f756a5ab01d9a">
+    </branch>
     <dependencies>
       <dep package="gstreamer" />
       <dep package="gst-plugins-base" />

diff --git a/modulesets/gtk-osx-gtkmm.modules b/modulesets/gtk-osx-gtkmm.modules
@@ -29,7 +29,7 @@
     gtkmm3 uses the older versions, gtkmm4 the new ones.
     Note that C++17 is supported only on macOS-10.13 and later.
   -->
-  <meson id="cairomm-1.14">
+  <meson id="cairomm3">
     <branch module="cairomm-1.14.2.tar.xz"
             version="1.14.2"
             hash="sha256:0126b9cc295dc36bc9c0860d5b720cb5469fd78d5620c8f10cc5f0c07b928de3"
@@ -49,8 +49,7 @@
     </dependencies>
   </meson>
   <!---->
-  <autotools id="glibmm-1.4"
-             autogen-sh="autoreconf">
+  <meson id="glibmm3">
     <branch module="glibmm/2.66/glibmm-2.66.6.tar.xz"
             version="2.66.6"
             hash="sha256:5358742598181e5351d7bf8da072bf93e6dd5f178d27640d4e462bc8f14e152f" />
@@ -59,7 +58,7 @@
       <dep package="libsigc++2" />
       <dep package="mm-common" />
     </dependencies>
-  </autotools>
+  </meson>
   <!---->
   <meson id="glibmm">
     <branch module="glibmm/2.76/glibmm-2.76.0.tar.xz"
@@ -73,13 +72,13 @@
     </dependencies>
   </meson>
   <!---->
-  <meson id="pangomm-1.4">
+  <meson id="pangomm3">
     <branch module="pangomm/2.42/pangomm-2.42.2.tar.xz"
             version="2.42.2"
             hash="sha256:1b24c92624ae1275ccb57758175d35f7c39ad3342d8c0b4ba60f0d9849d2d08a" />
     <dependencies>
-      <dep package="glibmm-2.4" />
-      <dep package="cairomm-1.14" />
+      <dep package="glibmm3" />
+      <dep package="cairomm3" />
       <dep package="pango" />
     </dependencies>
   </meson>
@@ -95,14 +94,14 @@
     </dependencies>
   </meson>
   <!---->
-  <meson id="atkmm-1.6">
+  <meson id="atkmm3">
     <branch module="atkmm/2.28/atkmm-2.28.3.tar.xz"
             version="2.28.3"
             hash="sha256:7c2088b486a909be8da2b18304e56c5f90884d1343c8da7367ea5cd3258b9969" />
     <dependencies>
-      <dep package="glibmm-2.4" />
-      <dep package="cairomm-1.14" />
-      <dep package="pangomm-1.4" />
+      <dep package="glibmm3" />
+      <dep package="cairomm3" />
+      <dep package="pangomm3" />
       <dep package="atk" />
     </dependencies>
   </meson>
@@ -140,10 +139,10 @@
              strip="1" />
     </branch>
     <dependencies>
-      <dep package="glibmm-2.4" />
-      <dep package="cairomm-1.14" />
-      <dep package="pangomm-1.4" />
-      <dep package="atkmm-1.6" />
+      <dep package="glibmm3" />
+      <dep package="cairomm3" />
+      <dep package="pangomm3" />
+      <dep package="atkmm3" />
       <dep package="gtk+-3.0" />
     </dependencies>
   </meson>