From 0eea0f62d298c91818c5842cd7877a5052afc38b Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 3 Aug 2021 06:55:27 +0000 Subject: Tue Aug 3 06:55:27 UTC 2021 a/libcgroup-0.41-x86_64-10.txz: Rebuilt. Added LANG=C to the build script. ap/diffutils-3.8-x86_64-1.txz: Upgraded. d/re2c-2.2-x86_64-1.txz: Upgraded. d/rust-1.54.0-x86_64-2.txz: Rebuilt. Move bash completions to /usr/share/bash-completion/completions/. Thanks to Robby Workman. kde/calligra-3.2.1-x86_64-10.txz: Rebuilt. Recompiled against poppler-21.08.0. kde/cantor-21.04.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.08.0. kde/kfilemetadata-5.84.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.08.0. kde/kile-2.9.93-x86_64-10.txz: Rebuilt. Recompiled against poppler-21.08.0. kde/kitinerary-21.04.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.08.0. kde/krita-4.4.5-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.08.0. kde/okular-21.04.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.08.0. l/jasper-2.0.33-x86_64-1.txz: Upgraded. l/poppler-21.08.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/python-charset-normalizer-2.0.4-x86_64-1.txz: Upgraded. n/libmbim-1.26.0-x86_64-1.txz: Upgraded. x/libXfont2-2.0.5-x86_64-1.txz: Upgraded. x/libXft-2.3.4-x86_64-1.txz: Upgraded. x/xeyes-1.2.0-x86_64-1.txz: Upgraded. x/xorg-cf-files-1.0.7-x86_64-1.txz: Upgraded. x/xwd-1.0.8-x86_64-1.txz: Upgraded. xfce/mousepad-0.5.6-x86_64-1.txz: Upgraded. --- source/a/libcgroup/libcgroup.SlackBuild | 7 +- .../ap/diffutils/diffutils-sdiff-no-waitpid.patch | 24 ------ source/ap/diffutils/diffutils.SlackBuild | 9 +-- source/ap/diffutils/diffutils.mkdir_p.diff | 11 --- source/d/rust/rust.SlackBuild | 9 ++- source/kde/kde/build/calligra | 2 +- source/kde/kde/build/cantor | 2 +- source/kde/kde/build/kfilemetadata | 2 +- source/kde/kde/build/kile | 2 +- source/kde/kde/build/kitinerary | 2 +- source/kde/kde/build/krita | 2 +- source/kde/kde/build/okular | 2 +- source/kde/kde/patch/calligra.patch | 1 + ...ate-of-Commit-62f51070-to-make-it-compile.patch | 86 ++++++++++++++++++++++ source/kde/kde/patch/kitinerary.patch | 2 + .../e99d101e2bd4c32566e238ce1340a93781e19eee.patch | 53 +++++++++++++ source/x/x11/build/libXfont2 | 2 +- source/x/x11/build/libXft | 2 +- source/x/x11/build/xeyes | 2 +- source/x/x11/build/xorg-cf-files | 2 +- source/x/x11/build/xwd | 2 +- source/xfce/mousepad/mousepad.url | 2 +- 22 files changed, 169 insertions(+), 59 deletions(-) delete mode 100644 source/ap/diffutils/diffutils-sdiff-no-waitpid.patch delete mode 100644 source/ap/diffutils/diffutils.mkdir_p.diff create mode 100644 source/kde/kde/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch create mode 100644 source/kde/kde/patch/kitinerary.patch create mode 100644 source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch (limited to 'source') diff --git a/source/a/libcgroup/libcgroup.SlackBuild b/source/a/libcgroup/libcgroup.SlackBuild index 4e8a8a100..83720f47d 100755 --- a/source/a/libcgroup/libcgroup.SlackBuild +++ b/source/a/libcgroup/libcgroup.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2011, 2014, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2011, 2014, 2017, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,10 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcgroup VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-9} +BUILD=${BUILD:-10} + +# Without this, we get syntax errors starting rc.cgred: +LANG=C # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/diffutils/diffutils-sdiff-no-waitpid.patch b/source/ap/diffutils/diffutils-sdiff-no-waitpid.patch deleted file mode 100644 index c8eefb44b..000000000 --- a/source/ap/diffutils/diffutils-sdiff-no-waitpid.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur diffutils-2.9.orig/src/sdiff.c diffutils-2.9.new/src/sdiff.c ---- diffutils-2.9.orig/src/sdiff.c 2010-02-11 03:39:17.000000000 -0600 -+++ diffutils-2.9.new/src/sdiff.c 2010-02-14 02:28:19.077953690 -0600 -@@ -715,7 +715,7 @@ - ck_fclose (out); - - { -- int wstatus; -+ int wstatus = 0; - int werrno = 0; - - #if ! (HAVE_WORKING_FORK || HAVE_WORKING_VFORK) -@@ -724,11 +724,6 @@ - werrno = errno; - #else - ck_fclose (diffout); -- while (waitpid (diffpid, &wstatus, 0) < 0) -- if (errno == EINTR) -- checksigs (); -- else -- perror_fatal ("waitpid"); - diffpid = 0; - #endif - diff --git a/source/ap/diffutils/diffutils.SlackBuild b/source/ap/diffutils/diffutils.SlackBuild index 3653a4a59..eab4ff941 100755 --- a/source/ap/diffutils/diffutils.SlackBuild +++ b/source/ap/diffutils/diffutils.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=diffutils VERSION=${VERSION:-$(echo diffutils-*.tar.xz | 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 @@ -77,13 +77,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/diffutils-sdiff-no-waitpid.patch.gz | patch -p1 || exit 1 -# Prevent ruining sdiff.1 by touching it so it won't "regenerate": -touch man/sdiff.1 - -# Fix installation of NLS files: -zcat $CWD/diffutils.mkdir_p.diff.gz | patch -p1 || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/ap/diffutils/diffutils.mkdir_p.diff b/source/ap/diffutils/diffutils.mkdir_p.diff deleted file mode 100644 index 4ebaf69b7..000000000 --- a/source/ap/diffutils/diffutils.mkdir_p.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./po/Makefile.in.in.orig 2013-03-23 09:51:10.000000000 -0500 -+++ ./po/Makefile.in.in 2013-10-03 16:25:59.778992814 -0500 -@@ -42,7 +42,7 @@ - mkinstalldirs = $(SHELL) @install_sh@ -d - install_sh = $(SHELL) @install_sh@ - MKDIR_P = @MKDIR_P@ --mkdir_p = @mkdir_p@ -+mkdir_p = @MKDIR_P@ - - GMSGFMT_ = @GMSGFMT@ - GMSGFMT_no = @GMSGFMT@ diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 9015b5897..230567294 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" VERSION=${VERSION:-1.54.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. # YES is probably better (when it works...) @@ -246,6 +246,13 @@ sed -i "s,/tmp/package-rust/,/,g" $PKG/usr/lib$LIBDIRSUFFIX/rustlib/install.log # And a little compression doesn't hurt either: gzip -9 $PKG/usr/lib$LIBDIRSUFFIX/rustlib/manifest-* +# Move bash completions to the system location: +if [ -d $PKG/etc/bash_completion.d ]; then + mkdir -p $PKG/usr/share/bash-completion + mv $PKG/etc/bash_completion.d $PKG/usr/share/bash-completion/completions + rmdir $PKG/etc 2> /dev/null +fi + # Correct permissions on shared libraries: find $PKG/usr/lib$LIBDIRSUFFIX -name "*.so" -exec chmod 755 "{}" \+ diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra index ec635144f..f599e28b8 100644 --- a/source/kde/kde/build/calligra +++ b/source/kde/kde/build/calligra @@ -1 +1 @@ -9 +10 diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/cantor +++ b/source/kde/kde/build/cantor @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile index ec635144f..f599e28b8 100644 --- a/source/kde/kde/build/kile +++ b/source/kde/kde/build/kile @@ -1 +1 @@ -9 +10 diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kitinerary +++ b/source/kde/kde/build/kitinerary @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/okular +++ b/source/kde/kde/build/okular @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/patch/calligra.patch b/source/kde/kde/patch/calligra.patch index 583d2efc9..8e93a639c 100644 --- a/source/kde/kde/patch/calligra.patch +++ b/source/kde/kde/patch/calligra.patch @@ -1,2 +1,3 @@ # Fix blank page in calligragemini cat $CWD/patch/calligra/calligragemini_fix_blank_page_without_libgit2.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch b/source/kde/kde/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch new file mode 100644 index 000000000..46f6dd044 --- /dev/null +++ b/source/kde/kde/patch/calligra/0053-Partial-update-of-Commit-62f51070-to-make-it-compile.patch @@ -0,0 +1,86 @@ +From c7636fb343c848000300a9429410b74d17a4d54d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= +Date: Tue, 8 Jun 2021 05:13:23 +0000 +Subject: [PATCH 53/54] Partial update of Commit 62f51070 to make it + compileable again + +Cmake to 3.16 +Fix Fontconfig's FOUND variable +Fix Fontconfig's include_dirs variable +Use Correct Target to link FontConfig and Freetype +--- + CMakeLists.txt | 14 +++++--------- + libs/text/CMakeLists.txt | 4 ++-- + 2 files changed, 7 insertions(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1ce210ebe01..71272ffef2d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.16) + + project(calligra) + +@@ -168,6 +168,8 @@ calligra_set_productset(${PRODUCTSET}) + ## Look for ECM, Qt, KF5 ## + ########################### + ########################## ++set(REQUIRED_KF5_VERSION "5.7.0") ++set(REQUIRED_QT_VERSION "5.3.0") + + find_package(ECM 5.19 REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +@@ -199,9 +201,6 @@ include(MacroOptionalFindPackage) + include(MacroEnsureVersion) + include(MacroDesktopToJson) + +- +-set(REQUIRED_KF5_VERSION "5.7.0") +- + find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED + COMPONENTS + Archive +@@ -251,9 +250,6 @@ if(${KF5_VERSION} VERSION_LESS "5.16.0") + set(CALLIGRA_OLD_PLUGIN_METADATA TRUE) + endif() + +- +-set(REQUIRED_QT_VERSION "5.3.0") +- + find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED + COMPONENTS + Core +@@ -641,8 +637,8 @@ if(NOT WIN32 AND NOT APPLE) + ) + endif() + +-if(NOT FONTCONFIG_FOUND OR NOT FREETYPE_FOUND) +- set(FONTCONFIG_INCLUDE_DIR "") ++if(NOT Fontconfig_FOUND OR NOT FREETYPE_FOUND) ++ set(Fontconfig_INCLUDE_DIRS "") + set(FREETYPE_INCLUDE_DIRS "") + else() + add_definitions( -DSHOULD_BUILD_FONT_CONVERSION ) +diff --git a/libs/text/CMakeLists.txt b/libs/text/CMakeLists.txt +index 16d7e066fa2..429afe79704 100644 +--- a/libs/text/CMakeLists.txt ++++ b/libs/text/CMakeLists.txt +@@ -152,11 +152,11 @@ if( SHOULD_BUILD_FEATURE_RDF ) + endif() + + if( FONTCONFIG_FOUND ) +- target_link_libraries(kotext PRIVATE ${FONTCONFIG_LIBRARIES}) ++ target_link_libraries(kotext PRIVATE Fontconfig::Fontconfig) + endif() + + if( FREETYPE_FOUND ) +- target_link_libraries(kotext PRIVATE ${FREETYPE_LIBRARIES}) ++ target_link_libraries(kotext PRIVATE Freetype::Freetype) + endif() + + +-- +2.31.1 + diff --git a/source/kde/kde/patch/kitinerary.patch b/source/kde/kde/patch/kitinerary.patch new file mode 100644 index 000000000..0ecbe2e43 --- /dev/null +++ b/source/kde/kde/patch/kitinerary.patch @@ -0,0 +1,2 @@ +# Fix for recent poppler: +cat $CWD/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch b/source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch new file mode 100644 index 000000000..1bc9dc377 --- /dev/null +++ b/source/kde/kde/patch/kitinerary/e99d101e2bd4c32566e238ce1340a93781e19eee.patch @@ -0,0 +1,53 @@ +From e99d101e2bd4c32566e238ce1340a93781e19eee Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras +Date: Mon, 2 Aug 2021 01:01:31 +0300 +Subject: [PATCH] Fix build with poppler 21.8.0 + +parseDateString() now takes "const GooString *" as the date argument in +order to support unicode date strings. Adjust parsePdfDateTime() to use +the same string type (instead of "const char *") when compiling against +poppler 21.8.0. + +https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/880 +--- + src/lib/pdf/pdfdocument.cpp | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/lib/pdf/pdfdocument.cpp b/src/lib/pdf/pdfdocument.cpp +index 8f0f4cd..0eabf45 100644 +--- a/src/lib/pdf/pdfdocument.cpp ++++ b/src/lib/pdf/pdfdocument.cpp +@@ -201,7 +201,11 @@ int PdfDocument::fileSize() const + } + + #ifdef HAVE_POPPLER ++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0) ++static QDateTime parsePdfDateTime(const GooString *str) ++#else + static QDateTime parsePdfDateTime(const char *str) ++#endif + { + int year, month, day, hour, min, sec, tzHours, tzMins; + char tz; +@@ -233,7 +237,9 @@ QDateTime PdfDocument::creationTime() const + if (!dt) { + return {}; + } +-#if KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0) ++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0) ++ return parsePdfDateTime(dt.get()); ++#elif KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0) + return parsePdfDateTime(dt->c_str()); + #else + return parsePdfDateTime(dt->getCString()); +@@ -250,7 +256,9 @@ QDateTime PdfDocument::modificationTime() const + if (!dt) { + return {}; + } +-#if KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0) ++#if KPOPPLER_VERSION >= QT_VERSION_CHECK(21, 8, 0) ++ return parsePdfDateTime(dt.get()); ++#elif KPOPPLER_VERSION >= QT_VERSION_CHECK(0, 72, 0) + return parsePdfDateTime(dt->c_str()); + #else + return parsePdfDateTime(dt->getCString()); diff --git a/source/x/x11/build/libXfont2 b/source/x/x11/build/libXfont2 index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXfont2 +++ b/source/x/x11/build/libXfont2 @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/libXft b/source/x/x11/build/libXft index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/libXft +++ b/source/x/x11/build/libXft @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xeyes b/source/x/x11/build/xeyes index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xeyes +++ b/source/x/x11/build/xeyes @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xorg-cf-files b/source/x/x11/build/xorg-cf-files index 1e8b31496..d00491fd7 100644 --- a/source/x/x11/build/xorg-cf-files +++ b/source/x/x11/build/xorg-cf-files @@ -1 +1 @@ -6 +1 diff --git a/source/x/x11/build/xwd b/source/x/x11/build/xwd index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xwd +++ b/source/x/x11/build/xwd @@ -1 +1 @@ -4 +1 diff --git a/source/xfce/mousepad/mousepad.url b/source/xfce/mousepad/mousepad.url index d2288df40..32d6296d1 100644 --- a/source/xfce/mousepad/mousepad.url +++ b/source/xfce/mousepad/mousepad.url @@ -1 +1 @@ -https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-0.5.5.tar.bz2 +https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-0.5.6.tar.bz2 -- cgit v1.2.3