diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/ap/FTBFSlog | 3 | ||||
| -rwxr-xr-x | source/ap/a2ps/a2ps.SlackBuild | 1 | ||||
| -rw-r--r-- | source/ap/a2ps/a2ps.texinfo-6.7.patch | 40 | ||||
| -rwxr-xr-x | source/l/dconf/dconf.SlackBuild | 5 | ||||
| -rw-r--r-- | source/n/samba/samba.url | 4 | ||||
| -rwxr-xr-x | source/x/vulkan-sdk/fetch-sources.sh | 4 | ||||
| -rw-r--r-- | source/x/x11/build/xf86-video-modesetting | 1 | ||||
| -rw-r--r-- | source/x/x11/modularize | 2 | ||||
| -rw-r--r-- | source/x/x11/package-blacklist | 1 | ||||
| -rw-r--r-- | source/x/x11/slack-desc/xf86-video-modesetting | 19 |
10 files changed, 51 insertions, 29 deletions
diff --git a/source/ap/FTBFSlog b/source/ap/FTBFSlog index 7d3f26cb..7904c67c 100644 --- a/source/ap/FTBFSlog +++ b/source/ap/FTBFSlog @@ -1,3 +1,6 @@ +Mon Dec 9 21:33:37 UTC 2019 + Patched for texinfo-6.7. Thanks to Matteo Bernardini. ++--------------------------+ Tue Sep 10 17:52:32 UTC 2019 jove: patch to fix breakage from removal of stropts.h in glibc-2.30. +--------------------------+ diff --git a/source/ap/a2ps/a2ps.SlackBuild b/source/ap/a2ps/a2ps.SlackBuild index 26a51c19..81102d08 100755 --- a/source/ap/a2ps/a2ps.SlackBuild +++ b/source/ap/a2ps/a2ps.SlackBuild @@ -72,6 +72,7 @@ zcat $CWD/a2ps.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/a2ps.a2ps_cfg.in.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/a2ps-4.14-texinfo-nodes.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/a2ps-texi-comments.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/a2ps.texinfo-6.7.patch.gz | patch -p1 --verbose || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . diff --git a/source/ap/a2ps/a2ps.texinfo-6.7.patch b/source/ap/a2ps/a2ps.texinfo-6.7.patch new file mode 100644 index 00000000..df2a60f3 --- /dev/null +++ b/source/ap/a2ps/a2ps.texinfo-6.7.patch @@ -0,0 +1,40 @@ +https://bugs.gentoo.org/695918 + +The patchs fixes build failure against texinfo-6.7+: +``` +Malformed UTF-8 character: \xcb\xeb (unexpected non-continuation byte 0xeb, immediately after start byte 0xcb; +need 2 bytes, got 1) in pattern match (m//) at /usr/share/texinfo/Texinfo/ParserNonXS.pm line 3364. +Malformed UTF-8 character (fatal) at /usr/share/texinfo/Texinfo/ParserNonXS.pm line 3364. +make[2]: *** [Makefile:472: a2ps.info] Error 25 +``` + +Fixed-by: Neil Bothwick +--- a/doc/a2ps.texi~ 2019-11-24 18:51:07.000000000 +0000 ++++ a/doc/a2ps.texi 2019-11-24 18:56:30.390438433 +0000 +@@ -1,5 +1,6 @@ + \input texinfo @c -*- texinfo -*- + @c %**start of header ++@documentencoding ISO-8859-1 + @setfilename a2ps.info + @settitle General Purpose PostScript Generating Utility + @c @setchapternewpage odd + +--- a/doc/regex.texi~ 2002-03-04 18:46:24.000000000 +0000 ++++ a/doc/regex.texi 2019-11-24 18:56:42.861052598 +0000 +@@ -1,5 +1,6 @@ + \input texinfo + @c %**start of header ++@documentencoding ISO-8859-1 + @setfilename regex.info + @settitle Regex + @c %**end of header + +--- a/ogonkify/doc/ogonkify.texi~ 2007-12-29 02:09:38.000000000 +0000 ++++ a/ogonkify/doc/ogonkify.texi 2019-11-24 18:57:03.173424149 +0000 +@@ -1,5 +1,6 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header ++@documentencoding ISO-8859-1 + @setfilename ogonkify.info + @settitle Ogonkify + @setchapternewpage off diff --git a/source/l/dconf/dconf.SlackBuild b/source/l/dconf/dconf.SlackBuild index 927bba20..1aa481fc 100755 --- a/source/l/dconf/dconf.SlackBuild +++ b/source/l/dconf/dconf.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dconf VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -80,7 +80,8 @@ find . \ # Fix duplicate symbols at link time with meson-0.52.{0,1}: if [ "$(meson --version)" = "0.52.0" -o "$(meson --version)" = "0.52.1" ]; then - sed -i "s/link_whole: libdconf_common,/link_with: libdconf_common,/g" common/meson.build + sed -i 's|link_whole|link_with|' client/meson.build && + sed -i 's/module/& | grep -v mangle_path/' gsettings/abicheck.sh fi # Configure, build, and install: diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url index 9b10fe16..d20f67a8 100644 --- a/source/n/samba/samba.url +++ b/source/n/samba/samba.url @@ -1,2 +1,2 @@ -https://download.samba.org/pub/samba/stable/samba-4.11.2.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.11.2.tar.asc +https://download.samba.org/pub/samba/stable/samba-4.11.3.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.11.3.tar.asc diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh index 1331a721..48e51e3d 100755 --- a/source/x/vulkan-sdk/fetch-sources.sh +++ b/source/x/vulkan-sdk/fetch-sources.sh @@ -27,8 +27,8 @@ # # Example: VERSION=1.1.92.1 ./fetch-sources.sh -VERSION=${VERSION:-1.1.121.0} -BRANCH=${BRANCH:-sdk-1.1.121} +VERSION=${VERSION:-1.1.126.0} +BRANCH=${BRANCH:-sdk-1.1.126} rm -rf Vulkan-*-*.tar.?z glslang* SPIRV-Tools* SPIRV-Headers* \ Vulkan-Headers-sdk-${VERSION}* \ diff --git a/source/x/x11/build/xf86-video-modesetting b/source/x/x11/build/xf86-video-modesetting deleted file mode 100644 index b8626c4c..00000000 --- a/source/x/x11/build/xf86-video-modesetting +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/source/x/x11/modularize b/source/x/x11/modularize index 10d27a5b..f9a11d8b 100644 --- a/source/x/x11/modularize +++ b/source/x/x11/modularize @@ -65,7 +65,6 @@ iceauth ico imake inputproto -intel-gpu-tools kbproto libFS libICE @@ -194,7 +193,6 @@ xf86-video-i740 xf86-video-intel xf86-video-mach64 xf86-video-mga -xf86-video-modesetting xf86-video-neomagic xf86-video-nouveau xf86-video-nv diff --git a/source/x/x11/package-blacklist b/source/x/x11/package-blacklist index 603b8c31..8e2f3eb5 100644 --- a/source/x/x11/package-blacklist +++ b/source/x/x11/package-blacklist @@ -28,7 +28,6 @@ xf86-video-via xkbdata xphelloworld xrx -xf86-video-modesetting # Not applicable to us grandr diff --git a/source/x/x11/slack-desc/xf86-video-modesetting b/source/x/x11/slack-desc/xf86-video-modesetting deleted file mode 100644 index d6ffe28e..00000000 --- a/source/x/x11/slack-desc/xf86-video-modesetting +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -xf86-video-modesetting: xf86-video-modesetting (X.org modesetting fallback driver) -xf86-video-modesetting: -xf86-video-modesetting: xf86-video-modesetting is part of X11. -xf86-video-modesetting: -xf86-video-modesetting: For more information about the X.Org Foundation (the providers of the -xf86-video-modesetting: X.Org implementation of the X Window System), see their website: -xf86-video-modesetting: -xf86-video-modesetting: http://www.x.org -xf86-video-modesetting: -xf86-video-modesetting: -xf86-video-modesetting: |