diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2020-09-15 18:51:00 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2020-09-16 08:59:54 +0200 |
| commit | b474b008f215dc3bcd1ed3fc164e47f606d783d5 (patch) | |
| tree | 5849f269f652248ce4e65823d39f27f1f8c89e9d /source/l/glib2 | |
| parent | 4667441615bc9dd8d3aa4b11e0da0a1081eb3386 (diff) | |
| download | current-b474b008f215dc3bcd1ed3fc164e47f606d783d5.tar.gz current-b474b008f215dc3bcd1ed3fc164e47f606d783d5.tar.xz | |
Tue Sep 15 18:51:00 UTC 202020200915185100
a/libgudev-234-x86_64-1.txz: Upgraded.
ap/htop-3.0.2-x86_64-1.txz: Upgraded.
l/glib2-2.66.0-x86_64-2.txz: Rebuilt.
Build against system gtk-doc and don't bundle a newer version. You'll need
to reinstall the linuxdoc-tools package to restore the correct version of
gtk-doc. Thanks to chrisVV.
l/mozjs68-68.11.0esr-x86_64-2.txz: Removed.
l/mozjs78-78.2.0esr-x86_64-1.txz: Added.
This is needed by the new version of polkit.
l/polkit-0.118-x86_64-1.txz: Upgraded.
This requires the new mozjs78 package.
x/libva-2.9.0-x86_64-1.txz: Upgraded.
x/libva-utils-2.9.0-x86_64-1.txz: Upgraded.
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, 15 insertions, 1 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 new file mode 100644 index 000000000..e953d41c4 --- /dev/null +++ b/source/l/glib2/glib.allow.gtk-doc-1.32.diff @@ -0,0 +1,11 @@ +--- ./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 333fe5b6f..dd3ff57db 100755 --- a/source/l/glib2/glib2.SlackBuild +++ b/source/l/glib2/glib2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glib2 VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -80,6 +80,9 @@ find . \ # Get the local timezone link from /etc/localtime-copied-from: zcat $CWD/glib2.slackware.localtime.diff.gz | patch -p1 --verbose || exit 1 +# 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" |