wok-current rev 25590
Update cacerts, up elfutils url, fix pkg-config, py3k rebuild, and xorg build with gcc 6
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Thu Aug 24 14:03:59 2023 +0000 (10 months ago) |
| parents | edb76739478c |
| children | 4f8f52451ff7 |
| files | cacerts/receipt elfutils/receipt pkg-config/receipt py3k/receipt xorg-libXss/receipt xorg-libdmx-dev/receipt xorg-libdmx/receipt xorg-libxshmfence-dev/receipt xorg-libxshmfence/receipt xorg-server/receipt xorg-server/stuff/xorg-gcc6.patch xorg-setxkbmap/receipt xorg-xinput/receipt xorg-xrdb/receipt |
line diff
1.1 --- a/cacerts/receipt Wed Jul 26 08:57:30 2023 +0000 1.2 +++ b/cacerts/receipt Thu Aug 24 14:03:59 2023 +0000 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="cacerts" 1.7 -VERSION="20220208" 1.8 +VERSION="20230815" 1.9 CATEGORY="security" 1.10 SHORT_DESC="Certificate Authority Certificates." 1.11 MAINTAINER="al.bobylev@gmail.com"
2.1 --- a/elfutils/receipt Wed Jul 26 08:57:30 2023 +0000 2.2 +++ b/elfutils/receipt Thu Aug 24 14:03:59 2023 +0000 2.3 @@ -7,8 +7,8 @@ 2.4 MAINTAINER="pascal.bellard@slitaz.org" 2.5 LICENSE="GPL2" 2.6 TARBALL="$PACKAGE-$VERSION.tar.bz2" 2.7 -WEB_SITE="https://fedorahosted.org/elfutils/" 2.8 -WGET_URL="https://fedorahosted.org/releases/e/l/$PACKAGE/$VERSION/$TARBALL" 2.9 +WEB_SITE="https://sourceware.org/elfutils/" 2.10 +WGET_URL="https://sourceware.org/$PACKAGE/ftp/$VERSION/$TARBALL" 2.11 HOST_ARCH="i486 arm" 2.12 2.13 DEPENDS="glibc-base"
3.1 --- a/pkg-config/receipt Wed Jul 26 08:57:30 2023 +0000 3.2 +++ b/pkg-config/receipt Thu Aug 24 14:03:59 2023 +0000 3.3 @@ -29,7 +29,7 @@ 3.4 # Rules to configure and make the package. 3.5 compile_rules() 3.6 { 3.7 - autoconf 3.8 + autoreconf 3.9 sed -i 's/\$(LN).*pkg-config\$(EXEEXT) \$(host_tool)/echo \1/' Makefile* 3.10 case "$ARCH" in 3.11 arm)
4.1 --- a/py3k/receipt Wed Jul 26 08:57:30 2023 +0000 4.2 +++ b/py3k/receipt Thu Aug 24 14:03:59 2023 +0000 4.3 @@ -13,8 +13,8 @@ 4.4 4.5 DEPENDS="openssl bzlib readline sqlite zlib xorg-libXss ncursesw gdbm \ 4.6 tk xorg-libXext" 4.7 -BUILD_DEPENDS="readline-dev gdbm-dev openssl-dev sqlite-dev zlib-dev tk-dev \ 4.8 -ncursesw-dev liblzma-dev wget" 4.9 +BUILD_DEPENDS="bzip2-dev readline-dev gdbm-dev openssl-dev sqlite-dev \ 4.10 +zlib-dev tk-dev ncursesw-dev liblzma-dev wget" 4.11 4.12 # What is the latest version available today? 4.13 current_version()
5.1 --- a/xorg-libXss/receipt Wed Jul 26 08:57:30 2023 +0000 5.2 +++ b/xorg-libXss/receipt Thu Aug 24 14:03:59 2023 +0000 5.3 @@ -13,7 +13,7 @@ 5.4 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 5.5 5.6 DEPENDS="xorg-libXext" 5.7 -BUILD_DEPENDS="xorg-scrnsaverproto" 5.8 +BUILD_DEPENDS="xorg-libXext-dev xorg-scrnsaverproto" 5.9 5.10 HOST_ARCH="i486 arm" 5.11
6.1 --- a/xorg-libdmx-dev/receipt Wed Jul 26 08:57:30 2023 +0000 6.2 +++ b/xorg-libdmx-dev/receipt Thu Aug 24 14:03:59 2023 +0000 6.3 @@ -8,7 +8,7 @@ 6.4 LICENSE="MIT" 6.5 WEB_SITE="https://www.x.org/wiki/" 6.6 6.7 -DEPENDS="pkg-config xorg-dmxproto" 6.8 +DEPENDS="pkg-config xorg-libXext-dev xorg-libdmx xorg-dmxproto" 6.9 WANTED="xorg-libdmx" 6.10 6.11 # Rules to gen a SliTaz package suitable for Tazpkg.
7.1 --- a/xorg-libdmx/receipt Wed Jul 26 08:57:30 2023 +0000 7.2 +++ b/xorg-libdmx/receipt Thu Aug 24 14:03:59 2023 +0000 7.3 @@ -12,8 +12,8 @@ 7.4 TARBALL="$SOURCE-$VERSION.tar.bz2" 7.5 WGET_URL="$XORG_MIRROR/lib/$TARBALL" 7.6 7.7 -DEPENDS="" 7.8 -BUILD_DEPENDS="xorg-dmxproto" 7.9 +DEPENDS="xorg-libX11 xorg-libXext" 7.10 +BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-dmxproto" 7.11 7.12 current_version() 7.13 {
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/xorg-libxshmfence-dev/receipt Thu Aug 24 14:03:59 2023 +0000 8.3 @@ -0,0 +1,25 @@ 8.4 +# SliTaz package receipt. 8.5 + 8.6 +PACKAGE="xorg-libxshmfence-dev" 8.7 +VERSION="1.3" 8.8 +CATEGORY="x-window" 8.9 +SHORT_DESC="X11 shared memory fences - development files." 8.10 +MAINTAINER="maintainer@slitaz.org" 8.11 +LICENSE="MIT" 8.12 +WEB_SITE="https://xorg.freedesktop.org/" 8.13 + 8.14 +SOURCE="libxshmfence" 8.15 +DEPENDS="pkg-config xorg-libX11-dev xorg-libxshmfence" 8.16 +WANTED="xorg-libxshmfence" 8.17 + 8.18 +HOST_ARCH="i486 arm" 8.19 + 8.20 +# Rules to gen a SliTaz package suitable for Tazpkg. 8.21 +genpkg_rules() 8.22 +{ 8.23 + mkdir -p $fs/usr/lib 8.24 + 8.25 + cp -a $install/usr/lib/*.*a $fs/usr/lib 8.26 + cp -a $install/usr/lib/pkgconfig $fs/usr/lib 8.27 + cp -a $install/usr/include $fs/usr 8.28 +}
9.1 --- a/xorg-libxshmfence/receipt Wed Jul 26 08:57:30 2023 +0000 9.2 +++ b/xorg-libxshmfence/receipt Thu Aug 24 14:03:59 2023 +0000 9.3 @@ -12,6 +12,8 @@ 9.4 TARBALL="$SOURCE-$VERSION.tar.bz2" 9.5 WGET_URL="https://www.x.org/releases/individual/lib/$TARBALL" 9.6 9.7 +BUILD_DEPENDS="xorg-xproto" 9.8 + 9.9 current_version() 9.10 { 9.11 wget -O - $(dirname $WGET_URL) 2>/dev/null | \
10.1 --- a/xorg-server/receipt Wed Jul 26 08:57:30 2023 +0000 10.2 +++ b/xorg-server/receipt Thu Aug 24 14:03:59 2023 +0000 10.3 @@ -32,6 +32,9 @@ 10.4 { 10.5 cd $src 10.6 10.7 + # Patch to build with gcc > 5 10.8 + patch -p1 < $stuff/xorg-gcc6.patch 10.9 + 10.10 # Xephyr make possible to use Xorg in a chroot. 10.11 ./configure \ 10.12 --prefix=/usr \
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/xorg-server/stuff/xorg-gcc6.patch Thu Aug 24 14:03:59 2023 +0000 11.3 @@ -0,0 +1,48 @@ 11.4 +From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001 11.5 +From: Egbert Eich <eich@freedesktop.org> 11.6 +Date: Tue, 3 Mar 2015 16:27:05 +0100 11.7 +Subject: symbols: Fix sdksyms.sh to cope with gcc5 11.8 + 11.9 +Gcc5 adds additional lines stating line numbers before and 11.10 +after __attribute__() which need to be skipped. 11.11 + 11.12 +Signed-off-by: Egbert Eich <eich@freedesktop.org> 11.13 +Tested-by: Daniel Stone <daniels@collabora.com> 11.14 +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 11.15 +--- 11.16 + hw/xfree86/sdksyms.sh | 14 +++++++++++++- 11.17 + 1 file changed, 13 insertions(+), 1 deletion(-) 11.18 + 11.19 +diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh 11.20 +index 2305073a0..05ac41096 100755 11.21 +--- a/hw/xfree86/sdksyms.sh 11.22 ++++ b/hw/xfree86/sdksyms.sh 11.23 +@@ -350,13 +350,25 @@ BEGIN { 11.24 + if (sdk) { 11.25 + n = 3; 11.26 + 11.27 ++ # skip line numbers GCC 5 adds before __attribute__ 11.28 ++ while ($n == "" || $0 ~ /^# [0-9]+ "/) { 11.29 ++ getline; 11.30 ++ n = 1; 11.31 ++ } 11.32 ++ 11.33 + # skip attribute, if any 11.34 + while ($n ~ /^(__attribute__|__global)/ || 11.35 + # skip modifiers, if any 11.36 + $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ || 11.37 + # skip pointer 11.38 +- $n ~ /^[a-zA-Z0-9_]*\*$/) 11.39 ++ $n ~ /^[a-zA-Z0-9_]*\*$/) { 11.40 + n++; 11.41 ++ # skip line numbers GCC 5 adds after __attribute__ 11.42 ++ while ($n == "" || $0 ~ /^# [0-9]+ "/) { 11.43 ++ getline; 11.44 ++ n = 1; 11.45 ++ } 11.46 ++ } 11.47 + 11.48 + # type specifier may not be set, as in 11.49 + # extern _X_EXPORT unsigned name(...) 11.50 +-- 11.51 +cgit v1.2.1
12.1 --- a/xorg-setxkbmap/receipt Wed Jul 26 08:57:30 2023 +0000 12.2 +++ b/xorg-setxkbmap/receipt Thu Aug 24 14:03:59 2023 +0000 12.3 @@ -13,6 +13,7 @@ 12.4 WGET_URL="$XORG_MIRROR/app/$TARBALL" 12.5 12.6 DEPENDS="xorg-xkeyboard-config" 12.7 +BUILD_DEPENDS="xorg-libxkbfile-dev" 12.8 12.9 HOST_ARCH="i486 arm" 12.10
13.1 --- a/xorg-xinput/receipt Wed Jul 26 08:57:30 2023 +0000 13.2 +++ b/xorg-xinput/receipt Thu Aug 24 14:03:59 2023 +0000 13.3 @@ -13,7 +13,7 @@ 13.4 WGET_URL="$XORG_MIRROR/app/$TARBALL" 13.5 13.6 DEPENDS="xorg-libXi" 13.7 -BUILD_DEPENDS="xorg-libXi-dev" 13.8 +BUILD_DEPENDS="xorg-libXi-dev xorg-libXrandr-dev xorg-libXinerama-dev" 13.9 13.10 HOST_ARCH="i486 arm" 13.11
14.1 --- a/xorg-xrdb/receipt Wed Jul 26 08:57:30 2023 +0000 14.2 +++ b/xorg-xrdb/receipt Thu Aug 24 14:03:59 2023 +0000 14.3 @@ -13,7 +13,7 @@ 14.4 WGET_URL="$XORG_MIRROR/app/$TARBALL" 14.5 14.6 DEPENDS="xorg-libXmu" 14.7 -BUILD_DEPENDS="pkg-config" 14.8 +BUILD_DEPENDS="pkg-config xorg-libXmu-dev" 14.9 14.10 current_version() 14.11 {