From 395928e3d022fe23a2348cda862dbea69c933119 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 21 Oct 2019 00:16:31 +0200 Subject: [PATCH 1/4] hooks/post-install: do remove lib32 symlink before checking for empty dirs this resulted in empty i686 packages never getting flagged as empty since the /usr/lib32 -> lib symlink was only removed after the check --- common/hooks/post-install/{98-lib32.sh => 00-lib32.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename common/hooks/post-install/{98-lib32.sh => 00-lib32.sh} (100%) diff --git a/common/hooks/post-install/98-lib32.sh b/common/hooks/post-install/00-lib32.sh similarity index 100% rename from common/hooks/post-install/98-lib32.sh rename to common/hooks/post-install/00-lib32.sh From 038e621b04fb791566d87094d653d24851d6bf6d Mon Sep 17 00:00:00 2001 From: John Date: Mon, 21 Oct 2019 00:13:40 +0200 Subject: [PATCH 2/4] hooks/post-install/03-remove-empty-dirs.sh: use find -delete instead of rmdir -p rmdir -p could end up deleting even /destdir when a empty package would not have any subpackages with a i686 masterdir. --- common/hooks/post-install/03-remove-empty-dirs.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/common/hooks/post-install/03-remove-empty-dirs.sh b/common/hooks/post-install/03-remove-empty-dirs.sh index 4b7122938ab..c54f458f61e 100644 --- a/common/hooks/post-install/03-remove-empty-dirs.sh +++ b/common/hooks/post-install/03-remove-empty-dirs.sh @@ -2,13 +2,9 @@ hook() { if [ -d "${PKGDESTDIR}" ]; then - find "${PKGDESTDIR}" -type d -empty|sort -r|while read f; do + find "${PKGDESTDIR}" -mindepth 1 -type d -empty -print -delete|sort -r|while read f; do _dir="${f##${PKGDESTDIR}}" - [ -z "${_dir}" ] && continue - rmdir --ignore-fail-on-non-empty -p "$f" &>/dev/null msg_warn "$pkgver: removed empty dir: ${_dir}\n" done - # Create PKGDESTDIR in case it has been removed previously. - mkdir -p ${PKGDESTDIR} fi } From 4b8fbe095b2fdf4ad6db953b8dd3574ec6d19150 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Mon, 21 Oct 2019 10:55:06 +0300 Subject: [PATCH 3/4] checkbashisms: update to 2.19.7. --- srcpkgs/checkbashisms/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/checkbashisms/template b/srcpkgs/checkbashisms/template index c10035c00a3..a89a7eb274e 100644 --- a/srcpkgs/checkbashisms/template +++ b/srcpkgs/checkbashisms/template @@ -1,6 +1,6 @@ # Template file for 'checkbashisms' pkgname=checkbashisms -version=2.19.6 +version=2.19.7 revision=1 archs=noarch wrksrc="devscripts-${version}" @@ -11,7 +11,7 @@ maintainer="Alessio Sergi " license="GPL-2.0-or-later" homepage="https://tracker.debian.org/pkg/devscripts" distfiles="${DEBIAN_SITE}/main/d/devscripts/devscripts_${version}.tar.xz" -checksum=3196092bd274db9aa1e34e68a0c94c6edb49a481dded1656fd9785831bfdcec4 +checksum=118f9431c6cd83b856007f54e33854f3212d28d0b20b4ebde0531ecd9fec78db pre_install() { sed -i "s|###VERSION###|${version}|" scripts/checkbashisms.pl From 839a60460efce98d3e3857d5adbfef95492d959f Mon Sep 17 00:00:00 2001 From: k4leg Date: Wed, 30 Oct 2019 20:59:30 +0300 Subject: [PATCH 4/4] plasma-workspace: dependencies fixed --- srcpkgs/plasma-workspace/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template index 2ea88567655..d316fed60c8 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -1,7 +1,7 @@ # Template file for 'plasma-workspace' pkgname=plasma-workspace version=5.17.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons" @@ -11,7 +11,8 @@ makedepends="qt5-devel qt5-declarative-devel qt5-script-devel plasma-framework-d baloo5-devel ktexteditor-devel kwin-devel libxcb-devel libXtst-devel libqalculate-devel prison-devel kholidays-devel ksolid-devel kpeople-devel libkscreen-devel kactivities5-stats-devel" -depends="kactivitymanagerd kwin iso-codes milou plasma-integration libxcb-devel" +depends="kactivitymanagerd kwin iso-codes milou plasma-integration libxcb-devel + xorg-server-xwayland qt5-wayland" short_desc="KDE Window manager" maintainer="John " license="GPL-2.0-or-later,GFDL-2.1, LGPL-2.1-or-later"