[geany/geany-osx] 634e1c: Update to latest version of gtk-osx modules - Commits

24 Mar 2023


      Branch:      refs/heads/master
Author:      Jiří Techet techet@gmail.com
Committer:   Jiří Techet techet@gmail.com
Date:        Fri, 24 Mar 2023 10:34:58 UTC
Commit:      634e1c176a4427b877744ceca44c45b48103d159
             https://github.com/geany/geany-osx/commit/634e1c176a4427b877744ceca44c45b481...
Log Message:
-----------
Update to latest version of gtk-osx modules
Modified Paths:
--------------
    modulesets-stable/gtk-osx-bootstrap.modules
    modulesets-stable/gtk-osx-random.modules
    modulesets-stable/gtk-osx.modules
    patches/gtk-3-24-36-frame_callback_crash.patch
    patches/shared-mime-info-2.1-freedesktop-generate.patch
Modified: modulesets-stable/gtk-osx-bootstrap.modules
26 lines changed, 1 insertions(+), 25 deletions(-)
===================================================================
@@ -29,9 +29,6 @@
   <repository name="git.gnome.org"
               href="https://gitlab.gnome.org/GNOME"
               type="git" />
-  <repository name="itstool"
-              href="http://files.itstool.org/"
-              type="tarball" />
   <repository name="github-tarball"
               href="https://github.com/"
               type="tarball" />
@@ -70,13 +67,7 @@
       <dep package="libjpeg" />
     </dependencies>
   </autotools>
-  <!--
-    The python package is in gtk-osx-python.modules. If you're
-    building "native" you can safely add python to the skip list, but
-    otherwise the links in the SDKs are messed up and libxml's python
-    module won't link. In case you're wondering, itstool
-    needs libxml2's python module.
-  -->
+  <!---->
   <autotools id="libxml2"
              autogen-sh="autoreconf"
              autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'>
@@ -105,20 +96,6 @@
     </dependencies>
   </autotools>
   <!---->
-  <autotools id="itstool"
-             autogen-sh="configure">
-    <branch module="itstool/itstool-2.0.6.tar.bz2"
-            version="2.0.6n"
-            hash="sha256:6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9"
-            repo="itstool">
-      <patch file="itstool-config-python.patch"
-             strip="1" />
-    </branch>
-    <dependencies>
-      <dep package="libxml2" />
-    </dependencies>
-  </autotools>
-  <!---->
   <meson id="gtk-doc"
          mesonargs="-Dyelp_manual=false -Dtests=false">
     <branch module="gtk-doc/1.33/gtk-doc-1.33.2.tar.xz"
@@ -127,7 +104,6 @@
     <dependencies>
       <dep package="libxml2" />
       <dep package="libxslt" />
-      <dep package="itstool" />
     </dependencies>
     <after>
       <dep package="python3" />
Modified: modulesets-stable/gtk-osx-random.modules
13 lines changed, 5 insertions(+), 8 deletions(-)
===================================================================
@@ -18,7 +18,7 @@
               href="https://ftp.gnu.org/gnu/"
               type="tarball" />
   <repository name="shared-mime-info"
-              href="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/"
+              href="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/"
               type="tarball" />
   <repository name="iso-codes"
               href="https://salsa.debian.org/iso-codes-team/iso-codes/uploads/"
@@ -179,14 +179,11 @@
     </dependencies>
   </autotools>
   <!---->
-  <meson id="shared-mime-info"
-         supports-non-srcdir-builds="no">
-    <branch module="0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-2.1.tar.xz"
-            version="2.1"
-            hash="sha256:b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563"
+  <meson id="shared-mime-info">
+    <branch module="2.2/shared-mime-info-2.2.tar.bz2"
+            version="2.2"
+            hash="sha256:418c480019d9865f67f922dfb88de00e9f38bf971205d55cdffab50432919e61"
             repo="shared-mime-info">
-      <patch file="shared-mime-info-2.1-freedesktop-generate.patch"
-             strip="1" />
     </branch>
     <dependencies>
       <dep package="glib" />
Modified: modulesets-stable/gtk-osx.modules
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -335,6 +335,8 @@
              strip="1" />
       <patch file="gtk-3-24-36-match-window-size.patch"
              strip="1" />
+      <patch file="gtk-3-24-36-frame_callback_crash.patch"
+             strip="1" />
     </branch>
     <dependencies>
       <dep package="glib" />
Modified: patches/gtk-3-24-36-frame_callback_crash.patch
98 lines changed, 98 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,98 @@
+From 33fd9eb472212014d42df5b8ec633184002c0dda Mon Sep 17 00:00:00 2001
+From: John Ralls jralls@ceridwen.us
+Date: Thu, 23 Mar 2023 11:32:15 -0700
+Subject: [PATCH] [quartz] Convert frame_link, windows_awaiting_frame to
+ GSList.
+
+We were't using GList's prev member; worse, we weren't setting it
+and that broke g_list_remove_link so that the link wasn't removed
+in _gdk_quartz_display_remove_frame_callback.
+
+Closes #5593
+---
+ gdk/quartz/gdkdisplay-quartz.c | 15 ++++++++++-----
+ gdk/quartz/gdkdisplay-quartz.h |  2 +-
+ gdk/quartz/gdkwindow-quartz.h  |  2 +-
+ 3 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c
+index 53726e38b6..3ace0170be 100644
+--- a/gdk/quartz/gdkdisplay-quartz.c
++++ b/gdk/quartz/gdkdisplay-quartz.c
+@@ -96,7 +96,6 @@ _gdk_quartz_display_add_frame_callback (GdkDisplay             *display,
+   display_quartz = GDK_QUARTZ_DISPLAY (display);
+ 
+   impl->frame_link.data = window;
+-  impl->frame_link.prev = NULL;
+   impl->frame_link.next = display_quartz->windows_awaiting_frame;
+ 
+   display_quartz->windows_awaiting_frame = &impl->frame_link;
+@@ -110,14 +109,14 @@ _gdk_quartz_display_remove_frame_callback (GdkDisplay             *display,
+                                            GdkWindow              *window)
+ {
+   GdkQuartzDisplay *display_quartz = GDK_QUARTZ_DISPLAY (display);
+-  GList *link;
++  GSList *link;
+ 
+-  link = g_list_find (display_quartz->windows_awaiting_frame, window);
++  link = g_slist_find (display_quartz->windows_awaiting_frame, window);
+ 
+   if (link != NULL)
+     {
+       display_quartz->windows_awaiting_frame =
+-        g_list_remove_link (display_quartz->windows_awaiting_frame, link);
++        g_slist_remove_link (display_quartz->windows_awaiting_frame, link);
+     }
+ 
+   if (display_quartz->windows_awaiting_frame == NULL)
+@@ -129,7 +128,7 @@ gdk_quartz_display_frame_cb (gpointer data)
+ {
+   GdkDisplayLinkSource *source;
+   GdkQuartzDisplay *display_quartz = data;
+-  GList *iter;
++  GSList *iter, **last_next = NULL;
+   gint64 presentation_time;
+   gint64 now;
+ 
+@@ -154,6 +153,12 @@ gdk_quartz_display_frame_cb (gpointer data)
+       GdkFrameClock *frame_clock = gdk_window_get_frame_clock (window);
+       GdkFrameTimings *timings;
+ 
++      /* Clear the frame_link */
++      iter->data = NULL;
++      if (last_next && *last_next)
++        *last_next = NULL;
++      last_next = &iter->next;
++
+       if (frame_clock == NULL)
+         continue;
+ 
+diff --git a/gdk/quartz/gdkdisplay-quartz.h b/gdk/quartz/gdkdisplay-quartz.h
+index 59245da7ca..dbe8f67e97 100644
+--- a/gdk/quartz/gdkdisplay-quartz.h
++++ b/gdk/quartz/gdkdisplay-quartz.h
+@@ -39,7 +39,7 @@ struct _GdkQuartzDisplay
+   GPtrArray *monitors;
+   /* This structure is not allocated. It points to an embedded
+    * GList in the GdkWindow. */
+-  GList   *windows_awaiting_frame;
++  GSList   *windows_awaiting_frame;
+   GSource *frame_source;
+ };
+ 
+diff --git a/gdk/quartz/gdkwindow-quartz.h b/gdk/quartz/gdkwindow-quartz.h
+index de9a5ebccf..7551e9be67 100644
+--- a/gdk/quartz/gdkwindow-quartz.h
++++ b/gdk/quartz/gdkwindow-quartz.h
+@@ -66,7 +66,7 @@ struct _GdkWindowImplQuartz
+   gint shadow_max;
+ 
+   gboolean use_cg_context;
+-  GList frame_link;
++  GSList frame_link;
+   gint pending_frame_counter;
+ };
+  
+-- 
+2.37.1 (Apple Git-137.1)
+
Modified: patches/shared-mime-info-2.1-freedesktop-generate.patch
27 lines changed, 0 insertions(+), 27 deletions(-)
===================================================================
@@ -1,27 +0,0 @@
---- a/data/freedesktop_generate.sh	2020-12-31 11:12:16.000000000 -0800
-+++ b/data/freedesktop_generate.sh	2021-11-07 13:50:19.000000000 -0800
-@@ -3,10 +3,17 @@
- src_root="$1"
- build_root="$2"
- 
--ninja -C "${build_root}" shared-mime-info-gmo
--
--itstool \
--    --its "${src_root}/data/its/shared-mime-info.its" \
--    --join "${src_root}/data/freedesktop.org.xml.in" \
--    -o "${build_root}/data/freedesktop.org.xml" \
--    "${build_root}/po/"*".gmo"
-+if test ! -d "${build_root}/po/de"; then
-+    ninja -C "${build_root}" shared-mime-info-gmo
-+    itstool \
-+        --its "${src_root}/data/its/shared-mime-info.its" \
-+        --join "${src_root}/data/freedesktop.org.xml.in" \
-+        -o "${build_root}/data/freedesktop.org.xml" \
-+        "${build_root}/po/"*".gmo"
-+else
-+    itstool \
-+        --its "${src_root}/data/its/shared-mime-info.its" \
-+        --join "${src_root}/data/freedesktop.org.xml.in" \
-+        -o "${build_root}/data/freedesktop.org.xml" \
-+        "${build_root}/po/"*"/LC_MESSAGES/shared-mime-info.mo"
-+fi
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    