From 16c4108efdee84a002fc181f54191cc5a98e82fc Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sun, 17 Jan 2021 23:48:59 +0000 Subject: Sun Jan 17 23:48:59 UTC 2021 a/kernel-generic-5.10.8-x86_64-1.txz: Upgraded. a/kernel-huge-5.10.8-x86_64-1.txz: Upgraded. a/kernel-modules-5.10.8-x86_64-1.txz: Upgraded. a/mkinitrd-1.4.11-x86_64-17.txz: Rebuilt. Upgraded to busybox-1.32.1. ap/sc-im-20200904_bdd936a-x86_64-1.txz: Upgraded. d/kernel-headers-5.10.8-x86-1.txz: Upgraded. d/python-setuptools-51.3.1-x86_64-1.txz: Upgraded. k/kernel-source-5.10.8-noarch-1.txz: Upgraded. l/libical-3.0.9-x86_64-1.txz: Upgraded. l/pulseaudio-14.2-x86_64-1.txz: Upgraded. n/ModemManager-1.14.10-x86_64-1.txz: Upgraded. n/iptables-1.8.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.9-x86_64-1.txz: Upgraded. xfce/garcon-4.16.1-x86_64-1.txz: Upgraded. xfce/xfce4-whiskermenu-plugin-2.5.2-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- source/l/FTBFSlog | 10 ++++++ source/l/libical/libical.SlackBuild | 2 +- source/l/libnih/libnih.SlackBuild | 10 +++--- source/l/libunwind/libunwind.SlackBuild | 14 ++++---- .../libvisual-plugins/libvisual-plugins.SlackBuild | 10 +++--- source/l/ocl-icd/ocl-icd.SlackBuild | 14 ++++---- ...-the-PangoFont-find_shaper-virtual-method.patch | 39 ++++++++++++++++++++++ source/l/pygtk/pygtk.SlackBuild | 3 ++ 8 files changed, 76 insertions(+), 26 deletions(-) create mode 100644 source/l/pygtk/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch (limited to 'source/l') diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog index ecf14cab..896a5df3 100644 --- a/source/l/FTBFSlog +++ b/source/l/FTBFSlog @@ -1,3 +1,13 @@ +Sat Jan 16 18:38:19 UTC 2021 + libnih: add -fcommon to CFLAGS. + libunwind: add -fcommon to CFLAGS. + libvisual-plugins: add -fcommon to CFLAGS. + ocl-icd: add -fcommon to CFLAGS. + Thanks to nobodino. ++--------------------------+ +Fri Jan 15 20:07:01 UTC 2021 + pygtk: patched for recent pango. Thanks to nobodino. ++--------------------------+ Wed Mar 25 19:00:00 UTC 2020 serf: fix for python3 based scons. Thanks to nobodino and ponce. +--------------------------+ diff --git a/source/l/libical/libical.SlackBuild b/source/l/libical/libical.SlackBuild index 64225acc..3dff49df 100755 --- a/source/l/libical/libical.SlackBuild +++ b/source/l/libical/libical.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libical VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libnih/libnih.SlackBuild b/source/l/libnih/libnih.SlackBuild index 62e3895d..981c0515 100755 --- a/source/l/libnih/libnih.SlackBuild +++ b/source/l/libnih/libnih.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2014, 2015, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2014, 2015, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -49,16 +49,16 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC -fcommon" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" LIBDIRSUFFIX="" fi diff --git a/source/l/libunwind/libunwind.SlackBuild b/source/l/libunwind/libunwind.SlackBuild index 2c503569..ffc08e82 100755 --- a/source/l/libunwind/libunwind.SlackBuild +++ b/source/l/libunwind/libunwind.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -48,22 +48,22 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" + SLKCFLAGS="-O2 -march=i686 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC -fcommon" LIBDIRSUFFIX="64" elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16 -fcommon" LIBDIRSUFFIX="" else - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" LIBDIRSUFFIX="" fi diff --git a/source/l/libvisual-plugins/libvisual-plugins.SlackBuild b/source/l/libvisual-plugins/libvisual-plugins.SlackBuild index 4b669db5..f43ebc62 100755 --- a/source/l/libvisual-plugins/libvisual-plugins.SlackBuild +++ b/source/l/libvisual-plugins/libvisual-plugins.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2018, 2019, 2021 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -47,16 +47,16 @@ fi NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC -fcommon" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" LIBDIRSUFFIX="" fi diff --git a/source/l/ocl-icd/ocl-icd.SlackBuild b/source/l/ocl-icd/ocl-icd.SlackBuild index b9476b6e..255da596 100755 --- a/source/l/ocl-icd/ocl-icd.SlackBuild +++ b/source/l/ocl-icd/ocl-icd.SlackBuild @@ -1,9 +1,7 @@ #!/bin/bash -# Slackware build script for ocl-icd - # Copyright 2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2018, 2021 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -52,19 +50,19 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC -fcommon" LIBDIRSUFFIX="64" elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fcommon" LIBDIRSUFFIX="" else - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" LIBDIRSUFFIX="" fi diff --git a/source/l/pygtk/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch b/source/l/pygtk/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch new file mode 100644 index 00000000..ba4141e3 --- /dev/null +++ b/source/l/pygtk/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch @@ -0,0 +1,39 @@ +From 877164b6b70780468a31d8211f29421b6f34b0c8 Mon Sep 17 00:00:00 2001 +From: Mathieu Bridon +Date: Thu, 24 Oct 2019 22:58:36 +0200 +Subject: [PATCH] Drop the PangoFont find_shaper virtual method + +This API has been removed from Pango 1.44.6, because it was completely +unused by anything. + +However, PyGTK tries to bind everything, even unused API. + +Removing this from PyGTK means we can build it against the latest Pango +again. +--- + pango.defs | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/pango.defs b/pango.defs +index 2a79ecc..862667a 100644 +--- a/pango.defs ++++ b/pango.defs +@@ -1391,15 +1391,6 @@ + ) + ) + +-(define-virtual find_shaper +- (of-object "PangoFont") +- (return-type "PangoEngineShape*") +- (parameters +- '("PangoLanguage*" "lang") +- '("guint32" "ch") +- ) +-) +- + (define-virtual get_glyph_extents + (of-object "PangoFont") + (return-type "none") +-- +2.21.0 + diff --git a/source/l/pygtk/pygtk.SlackBuild b/source/l/pygtk/pygtk.SlackBuild index 6b95b6b4..29c4bbaf 100755 --- a/source/l/pygtk/pygtk.SlackBuild +++ b/source/l/pygtk/pygtk.SlackBuild @@ -83,6 +83,9 @@ find . \ # https://bugzilla.gnome.org/show_bug.cgi?id=660216 zcat $CWD/pygtk-fix-pango-object-leaks.patch.gz | patch -p1 --verbose || exit 1 +# Fix build against recent pango: +zcat $CWD/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ -- cgit v1.2.3