Apply old patch for libxml2.

gpodder · Mar 4, 2023 · 77a7956 · 77a7956
1 parent faabce9
commit 77a7956
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/fetch_modules.sh b/fetch_modules.sh
@@ -6,4 +6,8 @@ rsync -vrb --delete _gtk-osx-modules/patches modulesets/
 (cd _gtk-osx-modules/ && git log -1) > modulesets/upstream-ref
 rm -Rf _gtk-osx-modules
 
-#(cd modulesets && patch -p1 < ../github.patch)
+# Disable check for brotli when building freetype
+#(cd modulesets && patch -p1 < ../github-brotli.patch)
+
+# gtk-osx 2023-02-26 is missing a patch that was applied for older versions
+(cd modulesets && patch -p1 < ../libxml2.patch)
diff --git a/github.patch → github-brotli.patch b/github.patch → github-brotli.patch
diff --git a/libxml2.patch b/libxml2.patch
@@ -0,0 +1,13 @@
+diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
+index ffbb73d..d2cb1e9 100644
+--- a/modulesets/gtk-osx-bootstrap.modules
++++ b/modulesets/gtk-osx-bootstrap.modules
+@@ -82,6 +82,8 @@
+     <branch module="libxml2/2.10/libxml2-2.10.3.tar.xz"
+             version="2.10.3"
+             hash="sha256:5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c">
++      <patch file="libxml2-python-config.patch"
++             strip="1" />
+     </branch>
+     <after>
+       <dep package="python3" />
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
@@ -82,6 +82,8 @@
     <branch module="libxml2/2.10/libxml2-2.10.3.tar.xz"
             version="2.10.3"
             hash="sha256:5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c">
+      <patch file="libxml2-python-config.patch"
+             strip="1" />
     </branch>
     <after>
       <dep package="python3" />