[gtk-osx] Update gtk-osx-random.modules
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Update gtk-osx-random.modules
- Date: Mon, 12 Apr 2021 21:34:13 +0000 (UTC)
commit a1cdd47e9c08c872bd37cc2986bd72032c463ea9
Author: John Ralls <jralls ceridwen us>
Date: Mon Apr 5 12:05:36 2021 -0700
Update gtk-osx-random.modules
modulesets-stable/gtk-osx-random.modules | 269 +++++++++++-----------
patches/amtk-build-on-macOS.patch | 15 ++
patches/devhelp-3-build-on-macOS.patch | 26 +++
patches/frodo-getopt-autotools.patch | 28 +++
patches/gtkspell-3-install.sh-wrong-sh-path.patch | 11 +
patches/xmlto-allow-net-access.patch | 27 +++
6 files changed, 247 insertions(+), 129 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 598d7ce0..7d96aea6 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -3,191 +3,212 @@
<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
<moduleset>
<repository type="tarball" name="ftp.gnome.org" default="yes"
- href="http://ftp.gnome.org/pub/GNOME/sources/"/>
-
- <repository type="tarball" name="ftp.gtk.org"
- href="https://ftp.gtk.org/pub/"/>
- <repository type="tarball" name="hadess"
- href="http://freedesktop.org/~hadess/"/>
+ href="http://download.gnome.org/sources/"/>
+ <repository type="tarball" name="github-tarball" href="https://github.com/"/>
+ <repository type="tarball" name="ftp.gnu.org" href="https://ftp.gnu.org/gnu/"/>
+ <repository type="tarball" name="shared-mime-info"
+ href="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/"/>
+ <repository type="tarball" name="iso-codes"
+ href="https://salsa.debian.org/iso-codes-team/iso-codes/uploads/"/>
<repository type="tarball" name="sourceforge"
href="http://downloads.sourceforge.net/sourceforge/"/>
- <repository type="git" name="github.com" href="git://github.com/"/>
- <repository type="tarball" name="github-tarball" href="https://github.com/"/>
- <repository type="tarball" name="dbus.freedesktop.org"
- href="http://dbus.freedesktop.org/releases/"/>
+ <repository type="tarball" name="graphviz"
+ href="https://gitlab.com/graphviz/graphviz/-/archive/"/>
<repository type="tarball" name="sqlite" href="http://www.sqlite.org/"/>
- <repository type="tarball" name="oracle"
- href="http://download.oracle.com/"/>
- <repository type="tarball" name="ftp.gnu.org"
- href="https://ftp.gnu.org/gnu/"/>
- <repository type="tarball" name="gmplib.org"
- href="ftp://ftp.gmplib.org/pub/"/>
- <repository type="git" name="git.gnome.org"
- href="https://gitlab.gnome.org/GNOME"/>
- <repository type="tarball" name="itstool"
- href="http://files.itstool.org/"/>
- <repository type="tarball" name="abisource/enchant"
- href="http://www.abisource.com/downloads/enchant/"/>
-
- <metamodule id="meta-gtk-osx-random">
+ <repository type="tarball" name="frodo"
+ href="http://frodo.looijaard.name/system/files/software/"/>
+ <repository type="tarball" name="paguire" href="https://releases.pagure.org/"/>
+ <repository type="tarball" name="pcre" href="https://ftp.pcre.org/pub/"/>
+
+ <autotools id="graphviz" supports-non-srcdir-builds="no"
+ autogen-template="pushd %(srcdir)s && ./autogen.sh && popd &&
%(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
+ autogenargs="--disable-sharp --disable-guile --disable-java --disable-lua --disable-ocaml
--disable-perl --disable-php --disable-r --disable-ruby --disable-tcl --with-pangocairo">
+ <branch module="2.47.0/graphviz-2.47.0.tar.bz2" version="2.47.0"
+ repo="graphviz"
+ hash="sha256:dade5b374ce483bf28f2e535baef02280ba8ab86fbe6e93252ab0de48396b714"/>
<dependencies>
- <dep package="devhelp"/>
- <dep package="shared-mime-info"/>
- <dep package="gossip"/>
- <dep package="vala"/>
- <dep package="glade3"/>
+ <dep package="pango"/>
<dep package="librsvg"/>
</dependencies>
</autotools>
<autotools id="vala" autogen-sh="configure">
- <branch repo="ftp.gnome.org" version="0.36.1"
- module="vala/0.36/vala-0.36.1.tar.xz"
- hash="sha256:13f4a3f99d983bf76e8d9dd736021ecc95f53ec1f9582423aa4b4be87455aa07"/>
+ <branch repo="ftp.gnome.org" version="0.52.0"
+ module="vala/0.52/vala-0.52.0.tar.xz"
+ 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>
</autotools>
-
<autotools id="expat" autogen-sh="configure">
<branch module="expat/expat-2.3.0.tar.bz2" version="2.3.0"
- repo="sourceforge"/>
+ repo="sourceforge"
+ hash="sha256:f122a20eada303f904d5e0513326c5b821248f2d4d2afbf5c6f1339e511c0586"/>
</autotools>
- </autotools>
-
- <autotools id="devhelp-gtk3" autogen-sh="configure">
- <branch module="devhelp/3.24/devhelp-3.24.0.tar.xz" version="3.24.0"
- hash="sha256:4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430"/>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="meta-gtk-osx-themes"/>
- <dep package="meta-gtk-osx-gtk3"/>
- </after>
+ <meson id="amtk" >
+ <branch module="amtk/5.3/amtk-5.3.1.tar.xz" version="5.3.1"
+ hash="sha256:d5aa236c5d71dc41aa4674f345560a67a27f21c0efc97c9b3da09cb582b4638b">
+ <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/amtk-build-on-macOS.patch";
strip="1"/>
+ </branch>
<dependencies>
+ <dep package="gtk+-3.0"/>
+ </dependencies>
+ </meson>
+
+ <meson id="devhelp-gtk3">
+ <branch module="devhelp/3.38/devhelp-3.38.1.tar.xz" version="3.38.1"
+ hash="sha256:4da8f5951b3a5920df73d057beab3ebe1855a75eae41208a9d89305a6b114a8f">
+ <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/devhelp-3-build-on-macOS.patch";
strip="1"/>
+ </branch>
+ <dependencies>
<dep package="webkit2gtk3"/>
+ <dep package="amtk"/>
<dep package="gsettings-desktop-schemas"/>
<!-- Without shared-mime-info, HTML documents display as plain text -->
<dep package="shared-mime-info"/>
</dependencies>
- </autotools>
+ </meson>
-<!-- Glade 3.10 is the first stable series for Gtk+-3. Note the name
- change back to just "glade"-->
- <autotools id="glade" autogen-sh="configure"
- autogenargs='--disable-scrollkeeper --disable-introspection CPPFLAGS="$CPPFLAGS -xobjective-c"'>
- <branch module="glade/3.22/glade-3.22.1.tar.xz" version="3.22.1"
- hash="sha256:dff89a2ef2eaf000ff2a46979978d03cb9202cb04668e01d0ea5c5bb5547e39a">
- <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/glade-3.22.1-xslproc.patch";
strip="1"/>
+ <meson id="glade" mesonargs="-Dmac_bundle=true -Dman=false" >
+ <branch module="glade/3.38/glade-3.38.2.tar.xz" version="3.38.2"
+ hash="sha256:98fc87647d88505c97dd2f30f2db2d3e9527515b3af11694787d62a8d28fbab7">
</branch>
<dependencies>
<dep package="itstool"/>
- </dependencies>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="meta-gtk-osx-themes"/>
<dep package="meta-gtk-osx-gtk3"/>
- </after>
- </autotools>
-
+ </dependencies>
+ </meson>
+
+ <!-- gtksourceview got a major version ahead: 4.x.x supports recent versions of gtk+-3 and 5.x.x is for
gtk4.
+ -->
+ <meson id="gtksourceview3">
+ <branch module="gtksourceview/4.8/gtksourceview-4.8.1.tar.xz"
+ version="4.8.1"
+ hash="sha256:d163d71b5fcafbc5b1eec6dd841edbdbcddd3a7511cd5fdcffd86b8bbfe69ac1">
</branch>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="meta-gtk-osx-gtk2"/>
- </after>
- </autotools>
+ <dependencies>
+ <dep package="gtk+-3.0"/>
+ </dependencies>
+ </meson>
+
+ <autotools id="libpcre2" autogen-sh="configure">
+ <branch repo="pcre" version="20.36"
+ module="pcre/pcre2-10.36.tar.bz2"
+ hash="sha256:a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c"/>
+ </autotools>
+
+ <meson id="gtksourceview4">
+ <branch module="gtksourceview/5.0/gtksourceview-5.0.0.tar.xz"
+ version="5.0.0"
+ hash="sha256:64826633c0c8d2c6a6eb4ec653215ef04e31e13a2d4156a09ca5fd9013acd9c3">
+ </branch>
+ <dependencies>
+ <dep package="gtk-4"/>
+ <dep package="libpcre2"/>
+ </dependencies>
+ </meson>
- <autotools id="gtksourceview3" autogen-sh="configure">
- <branch module="gtksourceview/3.24/gtksourceview-3.24.4.tar.xz"
- version="3.24.4" hash="sha256:207fb1958087d89393521eafac05f6dd67448ef6edb43ec2c708a79f3b1aa793">
+ <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="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/frodo-getopt-autotools.patch";
strip="1"/>
</branch>
- <after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="meta-gtk-osx-gtk3"/>
- </after>
</autotools>
-
- <autotools id="lcms" autogen-sh="configure">
- <branch module="lcms/lcms2-2.9.tar.gz" version="2.9" repo="sourceforge" />
+ <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="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/xmlto-allow-net-access.patch"/>
+ </branch>
+ <dependencies>
+ <dep package="frodo-getopt"/>
+ </dependencies>
</autotools>
- <autotools id="shared-mime-info" autogen-sh="configure"
- autogenargs="--disable-default-make-check ac_cv_func_fdatasync=no"
- supports-non-srcdir-builds="no" >
- <branch module="shared-mime-info-1.9.tar.xz" version="1.9"
- repo="hadess">
+ <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">
</branch>
<dependencies>
<dep package="glib"/>
+ <dep package="xmlto"/>
</dependencies>
- </autotools>
+ </meson>
- <autotools id="gsettings-desktop-schemas" autogen-sh="configure"
- autogenargs="--enable-introspection=yes">
- <branch module="gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.0.tar.xz"
- version="3.24.0"
- hash="sha256:f6573a3f661d22ff8a001cc2421d8647717f1c0e697e342d03c6102f29bbbb90"/>
+ <meson id="gsettings-desktop-schemas">
+ <branch module="gsettings-desktop-schemas/40/gsettings-desktop-schemas-40.0.tar.xz"
+ version="40.0"
+ hash="sha256:f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685"/>
<dependencies>
<dep package="gobject-introspection"/>
</dependencies>
- </autotools>
+ </meson>
-<!-- SQLite3 is provided by MacOSX in /usr/lib/libsqlite.3.dylib -->
+<!-- SQLite3 is also available from the macOS SDK -->
<autotools id="sqlite" autogenargs="--disable-tcl --enable-threadsafe"
autogen-sh="configure">
- <branch module="2017/sqlite-autoconf-3180000.tar.gz" version='3.18.0'
- repo="sqlite"/>
- </autotools>
-
+ <branch module="2021/sqlite-autoconf-3350400.tar.gz" version='3.35.4'
+ repo="sqlite"
+ hash="sha256:7771525dff0185bfe9638ccce23faa0e1451757ddbda5a6c853bb80b923a512d"/>
</autotools>
<!-- Goocanvas2 is for gtk+-3. -->
<autotools id="goocanvas2" supports-non-srcdir-builds="no">
- <branch module="goocanvas/2.0/goocanvas-2.0.2.tar.xz" version="2.0.2"
- hash="sha256:f20e5fbef8d1a2633033edbd886dd13146a1b948d1813a9c353a80a29295d1d0"/>
- <branch repo="git.gnome.org" module="goocanvas" checkoutdir="goocanvas2"/>
+ <branch module="goocanvas/2.0/goocanvas-2.0.4.tar.xz" version="2.0.4"
+ hash="sha256:c728e2b7d4425ae81b54e1e07a3d3c8a4bd6377a63cffa43006045bceaa92e90"/>
<after>
<dep package="gtk+-3.0"/>
</after>
</autotools>
-<!-- Libart_lgpl is deprecated by gnome. This is probably the last release. -->
- <autotools id="libart_lgpl">
- <branch module="libart_lgpl/2.3/libart_lgpl-2.3.21.tar.bz2"
- version="2.3.21"
hash="sha256:fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa"/>
+<!-- Goocanvas3 is for gtk-4. -->
+
+ <autotools id="goocanvas3" supports-non-srcdir-builds="no">
+ <branch module="goocanvas/3.0/goocanvas-3.0.0.tar.xz" version="3.0.0"
+ hash="sha256:670a7557fe185c2703a14a07506156eceb7cea3b4bf75076a573f34ac52b401a"/>
<after>
- <dep package="meta-gtk-osx-bootstrap"/>
- <dep package="meta-gtk-osx-gtk2"/>
+ <dep package="gtk-4"/>
</after>
</autotools>
<autotools id="hunspell" autogen-sh="autoreconf">
- <branch module="hunspell/hunspell/archive/v1.6.1.tar.gz" version="1.6.1"
- repo="github-tarball" checkoutdir="hunspell-1.6.1"/>
+ <branch module="hunspell/hunspell/archive/v1.7.0.tar.gz" version="1.7.0"
+ repo="github-tarball" checkoutdir="hunspell-1.7.0"
+ rename-tarball="hunspell-1.7.0.tar.gz"
+ hash="sha256:bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a"/>
</autotools>
<autotools id="enchant" autogen-sh="configure"
- autogenargs="--with-myspell-dir=/Library/Dictionaries">
- <branch module="1.6.0/enchant-1.6.0.tar.gz" version="1.6.0"
- repo="abisource/enchant">
- <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/enchant-gsize.patch";
- strip="1"/>
- <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/enchant-env.patch";
- strip="1"/>
+ autogenargs="--enable-relocatable" >
+ <branch module="AbiWord/enchant/releases/download/v2.2.15/enchant-2.2.15.tar.gz"
+ repo="github-tarball" version="2.2.15"
+ hash="sha256:3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03">
</branch>
<dependencies>
<dep package="glib"/>
</dependencies>
+ <after>
+ <dep package="hunspell"/>
+ </after>
</autotools>
<autotools id="gtkspell3" autogen-sh="configure" autogenargs="--enable-vala=no">
- <branch module="gtkspell/gtkspell3-3.0.9.tar.xz" repo="sourceforge"
- version="3.0.9">
+ <branch module="gtkspell/gtkspell3-3.0.10.tar.xz" repo="sourceforge"
+ version="3.0.10"
+ hash="sha256:b040f63836b347eb344f5542443dc254621805072f7141d49c067ecb5a375732">
<patch
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/0001-Enable-use-of-XDG_DATA_DIRS-for-locating-iso-code-fi.patch";
strip="1"/>
+ <patch
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gtkspell-3-install.sh-wrong-sh-path.patch";
strip="1"/>
</branch>
<dependencies>
<dep package="enchant"/>
@@ -195,33 +216,23 @@
</dependencies>
</autotools>
- <autotools id="libgsf" autogenargs="--without-python">
- <branch module="libgsf/1.14/libgsf-1.14.41.tar.xz" version="1.14.41"
- hash="sha256:150b98586a1021d5c49b3d4d065d0aa3e3674ae31db131af5372499d2d3f08d3">
- </branch>
- </autotools>
-
<autotools id="gmp">
- <branch repo="ftp.gnu.org" module="gmp/gmp-6.1.2.tar.bz2" version="6.1.2">
- </branch>
- </autotools>
-
- <autotools id="libunistring" autogen-sh="configure">
- <branch repo="ftp.gnu.org" module="libunistring/libunistring-0.9.7.tar.gz"
- version="0.9.7">
+ <branch repo="ftp.gnu.org" module="gmp/gmp-6.2.1.tar.bz2" version="6.2.1"
+ hash="sha256:eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c">
</branch>
</autotools>
<autotools id='readline' autogen-sh="configure">
<branch repo="ftp.gnu.org" module="readline/readline-8.1.tar.gz"
- version="8.1">
+ version="8.1"
+ hash="sha256:f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02">
</branch>
</autotools>
- <autotools id='readline' autogen-sh="configure">
- <branch repo="ftp.gnu.org" module="readline/readline-8.1.tar.gz"
- version="8.1">
- </branch>
+ <autotools id="iso-codes" autogen-sh="configure">
+ <branch module="049ce6aac94d842be809f4063950646c/iso-codes-4.1.tar.xz"
+ version="4.1" repo="iso-codes"
+ hash="sha256:67117fb76f32c8fb5e37d2d60bce238f1f8e865cc7b569a57cbc3017ca15488a"/>
</autotools>
</moduleset>
diff --git a/patches/amtk-build-on-macOS.patch b/patches/amtk-build-on-macOS.patch
new file mode 100644
index 00000000..f4053553
--- /dev/null
+++ b/patches/amtk-build-on-macOS.patch
@@ -0,0 +1,15 @@
+diff -u /Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/amtk-5.3.1/amtk/meson.build\~
/Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/amtk-5.3.1/amtk/meson.build
+--- a/amtk/meson.build 2021-01-11 01:38:22.000000000 -0800
++++ b/amtk/meson.build 2021-04-09 10:30:46.000000000 -0700
+@@ -71,7 +71,8 @@
+ amtk_lib_link_args = []
+ amtk_lib_link_depends = []
+
+-if meson.get_compiler('c').get_argument_syntax() != 'msvc'
++if meson.get_compiler('c').get_argument_syntax() != 'msvc' and\
++ meson.get_compiler('c').get_linker_id() != 'ld64'
+ symbol_map = meson.current_source_dir() / 'symbol.map'
+ amtk_lib_link_args = '-Wl,--version-script,' + symbol_map
+ amtk_lib_link_depends = symbol_map
+
+Diff finished. Fri Apr 9 14:41:36 2021
diff --git a/patches/devhelp-3-build-on-macOS.patch b/patches/devhelp-3-build-on-macOS.patch
new file mode 100644
index 00000000..6c6f1fa3
--- /dev/null
+++ b/patches/devhelp-3-build-on-macOS.patch
@@ -0,0 +1,26 @@
+diff -u /Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/devhelp-3.38.1/devhelp/meson.build\~
/Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/devhelp-3.38.1/devhelp/meson.build
+--- a/devhelp/meson.build 2020-11-20 05:48:48.000000000 -0800
++++ b/devhelp/meson.build 2021-04-09 10:39:31.000000000 -0700
+@@ -92,12 +92,18 @@
+ )
+
+ symbol_map = meson.current_source_dir() / 'symbol.map'
++devhelp_link_args = []
++devhelp_link_depends = []
++if meson.get_compiler('c').get_linker_id() != 'ld64'
++ devhelp_link_args = '-Wl,--version-script,' + symbol_map
++ devhelp_link_depends = symbol_map
++endif
+
+ libdevhelp_shared_lib = shared_library(
+ 'devhelp-@0@'.format(LIBDEVHELP_API_VERSION),
+ link_whole: libdevhelp_static_lib,
+- link_args: '-Wl,--version-script,' + symbol_map,
+- link_depends: symbol_map,
++ link_args: devhelp_link_args,
++ link_depends: devhelp_link_depends,
+ version: LIBDEVHELP_LT_VERSION,
+ install: true
+ )
+
+Diff finished. Fri Apr 9 14:44:01 2021
diff --git a/patches/frodo-getopt-autotools.patch b/patches/frodo-getopt-autotools.patch
new file mode 100644
index 00000000..dd374a2c
--- /dev/null
+++ b/patches/frodo-getopt-autotools.patch
@@ -0,0 +1,28 @@
+--- a/Makefile 2014-11-24 04:33:39.000000000 -0800
++++ b/Makefile 2021-04-09 15:26:46.000000000 -0700
+@@ -1,7 +1,7 @@
+ .SUFFIXES:
+
+ DESTDIR=
+-prefix=/usr/local
++prefix=${PREFIX}
+ bindir=$(prefix)/bin
+ mandir=$(prefix)/man
+ man1dir=$(mandir)/man1
+@@ -43,7 +43,7 @@
+ -Wnested-externs -Winline
+ OPTIMIZE=-O3 -fno-strength-reduce
+ CFLAGS=$(WARNINGS) $(OPTIMIZE)
+-LDFLAGS=
++LDFLAGS=-L ${PREFIX}/lib -lintl
+
+ sources=getopt.c
+ ifeq ($(LIBCGETOPT),0)
+
+Diff finished. Fri Apr 9 15:28:12 2021
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e69de29..b53cf7a 100644
+--- a/configure
++++ b/configure
+@@ -0,0 +1,1 @@
++ #Do Nothing
diff --git a/patches/gtkspell-3-install.sh-wrong-sh-path.patch
b/patches/gtkspell-3-install.sh-wrong-sh-path.patch
new file mode 100644
index 00000000..0d1c4883
--- /dev/null
+++ b/patches/gtkspell-3-install.sh-wrong-sh-path.patch
@@ -0,0 +1,11 @@
+diff -u
/Users/john/Development/Gramps-Build/gramps-master-git-10.12-x86_64/src/gtkspell3-3.0.10/build/install-sh\~
/Users/john/Development/Gramps-Build/gramps-master-git-10.12-x86_64/src/gtkspell3-3.0.10/build/install-sh
+--- a/build/install-sh 2018-09-19 13:27:56.000000000 -0700
++++ b/build/install-sh 2021-04-10 17:42:24.000000000 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/bin/sh
++#!/bin/sh
+ # install - install a program, script, or datafile
+
+ scriptversion=2018-03-11.20; # UTC
+
+Diff finished. Sat Apr 10 17:42:32 2021
diff --git a/patches/xmlto-allow-net-access.patch b/patches/xmlto-allow-net-access.patch
new file mode 100644
index 00000000..a4f1280f
--- /dev/null
+++ b/patches/xmlto-allow-net-access.patch
@@ -0,0 +1,27 @@
+diff -u /Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/xmlto-0.0.28/xmlto.in\~
/Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/xmlto-0.0.28/xmlto.in
+--- a/xmlto.in 2015-11-16 06:07:10.000000000 -0800
++++ b/xmlto.in 2021-04-10 13:33:24.000000000 -0700
+@@ -225,7 +225,7 @@
+ export VERBOSE
+
+ # Disable network entities
+-XSLTOPTS="$XSLTOPTS --nonet"
++XSLTOPTS="$XSLTOPTS"
+
+ # The names parameter for the XSLT stylesheet
+ XSLTPARAMS=""
+@@ -542,10 +542,10 @@
+
+ [ "$VERBOSE" -ge 1 ] && \
+ echo >&2 \
+- "\"${XMLLINT_PATH}\" --noout --nonet --xinclude --postvalid --noent ${SEARCHPATH_FORMATTED}
\"${INPUT_FILE}\""
++ "\"${XMLLINT_PATH}\" --noout --xinclude --postvalid --noent ${SEARCHPATH_FORMATTED} \"${INPUT_FILE}\""
+ # eval is for SEARCHPATH_FORMATTED's proper expansion
+ # make sure expansions are protected from eval
+- eval "\"${XMLLINT_PATH}\" --noout --nonet --xinclude --postvalid --noent ${SEARCHPATH_FORMATTED}
\"${INPUT_FILE}\"" 2>"${VALIDATION}"
++ eval "\"${XMLLINT_PATH}\" --noout --xinclude --postvalid --noent ${SEARCHPATH_FORMATTED}
\"${INPUT_FILE}\"" 2>"${VALIDATION}"
+ xmllint_status=$?
+
+ if [ $xmllint_status -ne 0 ]
+
+Diff finished. Sat Apr 10 13:33:31 2021
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
