diff options
Diffstat (limited to 'source/l/glib2')
-rw-r--r-- | source/l/glib2/glib.allow.gtk-doc-1.32.diff | 11 | ||||
-rwxr-xr-x | source/l/glib2/glib2.SlackBuild | 5 |
2 files changed, 1 insertions, 15 deletions
diff --git a/source/l/glib2/glib.allow.gtk-doc-1.32.diff b/source/l/glib2/glib.allow.gtk-doc-1.32.diff deleted file mode 100644 index e953d41c4..000000000 --- a/source/l/glib2/glib.allow.gtk-doc-1.32.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./docs/reference/meson.build.orig 2020-09-10 05:42:41.475683000 -0500 -+++ ./docs/reference/meson.build 2020-09-15 13:26:21.552796804 -0500 -@@ -52,7 +52,7 @@ - endif - # Check we have the minimum gtk-doc version required. Older versions won't - # generate correct documentation. -- dependency('gtk-doc', version : '>=1.32.1', -+ dependency('gtk-doc', version : '>=1.32', - fallback : ['gtk-doc', 'dummy_dep'], - default_options : ['tests=false']) - endif diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild index dc4bbfde8..f86924ff6 100755 --- a/source/l/glib2/glib2.SlackBuild +++ b/source/l/glib2/glib2.SlackBuild @@ -77,9 +77,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Allow the slightly older version of gtk-doc to avoid bundling a newer one: -zcat $CWD/glib.allow.gtk-doc-1.32.diff.gz | patch -p1 --verbose || exit 1 - # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -100,7 +97,7 @@ meson setup \ -Dselinux=disabled \ -Dfam=false \ -Dman=true \ - -Dgtk_doc=false \ + -Dgtk_doc=true \ -Dinstalled_tests=false \ .. || exit 1 "${NINJA:=ninja}" $NUMJOBS || exit 1 |