GNOME.org
 

[gtk-osx] Remove Obsolete Gtk2 and Python2 from all modulesets.

commit 01413efde859359e6305fca760737b682087fc83
Author: John Ralls <jralls ceridwen us>
Date:   Fri Jun 3 13:44:38 2022 -0700

    Remove Obsolete Gtk2 and Python2 from all modulesets.

 modulesets-stable/gtk-osx-bootstrap.modules |   1 -
 modulesets-stable/gtk-osx-obsolete.modules  | 264 ----------------------------
 modulesets-stable/gtk-osx-python.modules    |  74 +-------
 modulesets-stable/gtk-osx-random.modules    |   5 +-
 modulesets-stable/gtk-osx.modules           |  39 ----
 modulesets-unstable/gtk-osx-python.modules  |   6 +-
 modulesets-unstable/gtk-osx-random.modules  |  37 +++-
 modulesets/gtk-osx-bootstrap.modules        |   1 -
 modulesets/gtk-osx-python.modules           |  17 --
 modulesets/gtk-osx-random.modules           |   5 +-
 10 files changed, 36 insertions(+), 413 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index b6183a5..8e76d74 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -61,7 +61,6 @@
       <patch file="libxml2-python-config.patch" strip="1"/>
     </branch>
     <after>
-      <dep package="python2"/>
       <dep package="python3"/>
     </after>
   </autotools>
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index d9ec9e4..60370e9 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -16,26 +16,6 @@
   <repository type="tarball" name="github-tarball"
               href="https://github.com"/>
 
-  <metamodule id="meta-gtk-osx-python2-gtk2">
-    <dependencies>
-      <dep package="pycairo"/>
-      <dep package="pygobject2"/>
-      <dep package="pygtk"/>
-      <dep package="gtk-mac-integration-python"/>
-    </dependencies>
-  </metamodule>
-
-  <metamodule id="meta-gtk-osx-python2-gtk3">
-    <dependencies>
-      <dep package="pycairo"/>
-      <dep package="pygobject3-2"/>
-      <dep package="gtk-mac-integration-python"/>
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-gtk3"/>
-    </after>
-  </metamodule>
-
   <metamodule id="meta-gtk-osx-python3-gtk3">
     <dependencies>
       <dep package="pycairo"/>
@@ -47,20 +27,6 @@
     </after>
   </metamodule>
 
-  <!-- Python 2 end-of-life was 31 December 2020 and 2.7.18 was the last release. -->
-  <autotools id="python2" autogenargs="--enable-shared"
-            supports-non-srcdir-builds="no" autogen-sh="autoreconf">
-       <branch repo="python"
-               module="2.7.18/Python-2.7.18.tgz" version="2.7.18"
-               hash="sha256:da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814">
-  <!-- related to https://bugs.python.org/issue11445 -->
-  <patch file="python-ldflags.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package='readline'/>
-    </dependencies>
-  </autotools>
-
   <autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
     <branch repo="python" module="3.10.2/Python-3.10.2.tar.xz" version="3.10.2"
             hash="sha256:17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7"/>
@@ -77,48 +43,10 @@
            hash="sha256:5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c"/>
     <dependencies>
       <dep package="cairo"/>
-    </dependencies>
-    <after>
       <dep package="python3"/>
-      <dep package="python2"/>
       <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="meta-gtk-osx-gtk2"/>
-    </after>
-  </meson>
-
-  <!-- PyGObject 3.36 is the last version of PyGObject that supports
-       Python2. It's provided here for those laggards who haven't yet
-       migrated their projects to Python3. Don't expect it to stay
-       forever, migrate now! -->
-
-   <meson id="pygobject3-2" >
-    <branch version="3.36.1" module="pygobject/3.36/pygobject-3.36.1.tar.xz"
-           hash="sha256:d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f"/>
-    <dependencies>
-      <dep package="pycairo"/>
     </dependencies>
-    <after>
-      <dep package="python2"/>
-      <dep package="python3"/>
-    </after>
-   </meson>
-
-  <!-- PyGObject 3.36 is the last version of PyGObject that supports
-       Python2. It's provided here for those laggards who haven't yet
-       migrated their projects to Python3. Don't expect it to stay
-       forever, migrate now! -->
-
-   <meson id="pygobject3-2" >
-    <branch version="3.36.1" module="pygobject/3.36/pygobject-3.36.1.tar.xz"
-           hash="sha256:d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f"/>
-    <dependencies>
-      <dep package="pycairo"/>
-    </dependencies>
-    <after>
-      <dep package="python2"/>
-      <dep package="python3"/>
-    </after>
-   </meson>
+  </meson>
 
    <meson id="pygobject3" >
     <branch version="3.40.1" module="pygobject/3.40/pygobject-3.40.1.tar.xz"
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index af6233d..e929b1b 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -39,12 +39,9 @@
             hash="sha256:1de26310db465aca525679d3b5a3c1d8db2e067c4cbc0e5ddd015cd938bac68b"/>
     <dependencies>
       <dep package="graphviz"/>
-    </dependencies>
-    <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="meta-gtk-osx-gtk2"/>
-    </after>
+    </dependencies>
   </autotools>
 
   <autotools id="expat" autogen-sh="configure">
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 24a8251..49dd48e 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -60,16 +60,6 @@
     <branch repo="system"/>
   </systemmodule>
 
-  <metamodule id="meta-gtk-osx-gtk2">
-    <dependencies>
-      <dep package="gtk+-2.0"/>
-      <dep package="gtk-mac-integration"/>
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-    </after>
-  </metamodule>
-
   <metamodule id="meta-gtk-osx-gtk3">
     <dependencies>
       <dep package="gtk+-3.0"/>
@@ -257,35 +247,6 @@
             repo="hicolor"/>
   </autotools>
 
-  <!-- gtk2 has reached its end-of-life as of December 2020 and 2.24.33 is the final release. -->
-  <autotools id="gtk+-2.0" autogen-sh="autoreconf"
-             autogenargs="--with-gdktarget=quartz --enable-quartz-relocation --disable-introspection 
--disable-visibility">
-    <branch module="gtk+/2.24/gtk+-2.24.33.tar.xz" version="2.24.33"
-            hash="sha256:ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da">
-      <!--patch file="0004-Bug-571582-GtkSelection-implementation-for-quartz.patch" strip="1"/-->
-      <patch file="0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch" strip="1"/>
-      <patch file="0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch" strip="1"/>
-      <patch file="gtk+-2-m4-creation.patch" strip="1"/>
-      <!-- upstream bug https://bugzilla.gnome.org/show_bug.cgi?id=767091 -->
-      <patch file="gtk-gimp-dnd-bug767091.patch" strip="1"/>
-      <!-- upstream bug: https://gitlab.gnome.org/GNOME/gtk/issues/529 -->
-      <patch 
file="https://gitlab.gnome.org/GNOME/gtk/uploads/f0c19446b9cd1df467c4cc9050516d4b/0001-Bug-743717-Crashes-on-clipboard-operation-influence-.patch";
 strip="1"/>
-      <!-- upstream bug: https://gitlab.gnome.org/GNOME/gtk/issues/580 -->
-      <patch 
file="https://gitlab.gnome.org/GNOME/gtk/uploads/2a194d81de8e8346a81816870264b3bf/gdkimage.patch"; strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="pango"/>
-      <dep package="atk"/>
-      <dep package="gdk-pixbuf"/>
-      <dep package="gobject-introspection"/>
-      <dep package="hicolor-icon-theme"/>
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-bootstrap"/>
-    </after>
-  </autotools>
-
   <autotools id="xorg-util-macros">
     <branch repo="xorg" version="1.19.3"
             module="individual/util/util-macros-1.19.3.tar.bz2"
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 7431b89..fb1a822 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -34,13 +34,9 @@
     <branch module="pygobject/pycairo" repo="github" />
     <dependencies>
       <dep package="cairo"/>
-    </dependencies>
-    <after>
       <dep package="python3"/>
-      <dep package="python"/>
-      <dep package="meta-gtk-osx-gtk2"/>
       <dep package="meta-gtk-osx-gtk3"/>
-    </after>
+    </dependencies>
  </meson>
 
   <meson id="pygobject3" >
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index 7ce8d2e..3b257a8 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -41,12 +41,9 @@
             hash="sha256:1de26310db465aca525679d3b5a3c1d8db2e067c4cbc0e5ddd015cd938bac68b"/>
     <dependencies>
       <dep package="graphviz"/>
-    </dependencies>
-    <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="meta-gtk-osx-gtk2"/>
-    </after>
+    </dependencies>
   </autotools>
 
 <!-- Vala is written in vala, so you need vala to build it. If you
@@ -118,7 +115,37 @@
     </dependencies>
   </meson>
 
-<!-- shared-mime-info goes here after we figure out what to do with it. -->
+<autotools id="frodo-getopt" autogen-sh="configure"
+             supports-non-srcdir-builds="no">
+    <branch repo="frodo" version="1.1.6" module="getopt/getopt-1.1.6.tar.gz"
+            hash="sha256:d0bf1dc642a993e7388a1cddfb9409bed375c21d5278056ccca3a0acd09dc5fe">
+       <patch file="frodo-getopt-autotools.patch" strip="1"/>
+    </branch>
+  </autotools>
+
+  <autotools id="xmlto" autogen-sh="autoreconf">
+    <branch module="xmlto/xmlto-0.0.28.tar.bz2"
+            version="0.0.28" repo="paguire"
+            hash="sha256:1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276">
+      <patch file="xmlto-allow-net-access.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="frodo-getopt"/>
+    </dependencies>
+  </autotools>
+
+  <meson id="shared-mime-info" supports-non-srcdir-builds="no" >
+    <branch module="0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-2.1.tar.xz"
+            repo="shared-mime-info" version="2.1"
+            hash="sha256:b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563">
+      <patch file="shared-mime-info-2.1-freedesktop-generate.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="xmlto"/>
+    </dependencies>
+  </meson>
+
   <meson id="gsettings-desktop-schemas">
     <branch/>
     <dependencies>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 694e358..1ac9a39 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -59,7 +59,6 @@
       <patch file="libxml2-python-config.patch" strip="1"/>
     </branch>
     <after>
-      <dep package="python2"/>
       <dep package="python3"/>
     </after>
   </autotools>
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index a0d59b2..d5e8f7d 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -40,23 +40,6 @@
     </after>
   </meson>
 
-  <!-- PyGObject 3.36 is the last version of PyGObject that supports
-       Python2. It's provided here for those laggards who haven't yet
-       migrated their projects to Python3. Don't expect it to stay
-       forever, migrate now! -->
-
-   <meson id="pygobject3-2" >
-    <branch version="3.36.1" module="pygobject/3.36/pygobject-3.36.1.tar.xz"
-           hash="sha256:d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f"/>
-    <dependencies>
-      <dep package="pycairo"/>
-    </dependencies>
-    <after>
-      <dep package="python2"/>
-      <dep package="python3"/>
-    </after>
-   </meson>
-
   <meson id="pygobject3">
     <branch tag="pygobject-3-40" module="pygobject" checkoutdir="pygobject3"/>
     <dependencies>
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index 660f604..bc853bb 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -40,12 +40,9 @@
             hash="sha256:1de26310db465aca525679d3b5a3c1d8db2e067c4cbc0e5ddd015cd938bac68b"/>
     <dependencies>
       <dep package="graphviz"/>
-    </dependencies>
-    <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="meta-gtk-osx-gtk2"/>
-    </after>
+    </dependencies>
   </autotools>
 
   <autotools id="expat" autogen-sh="configure">
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]