From 36d68814fddf092f31219ebc39216a441c0b16ff Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Sat, 1 Jun 2019 22:32:49 +0200 Subject: [PATCH] kde/* && main/buho: fix upstream compatiblity by renaming attica and phonon dependencies (!411) --- kde/attica-qt/APKBUILD | 36 ----------------------------------- kde/khtml/APKBUILD | 5 ++--- kde/ksysguard/APKBUILD | 4 ++-- kde/kwin/APKBUILD | 4 ++-- kde/phonon-qt5/APKBUILD | 32 ------------------------------- kde/plasma-workspace/APKBUILD | 4 ++-- main/buho/APKBUILD | 4 ++-- 7 files changed, 10 insertions(+), 79 deletions(-) delete mode 100644 kde/attica-qt/APKBUILD delete mode 100644 kde/phonon-qt5/APKBUILD diff --git a/kde/attica-qt/APKBUILD b/kde/attica-qt/APKBUILD deleted file mode 100644 index 55027fbdf..000000000 --- a/kde/attica-qt/APKBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Contributor: Bart Ribbers -# Maintainer: Bart Ribbers -pkgname=attica-qt -_pkgname="${pkgname/-qt/}" -pkgver=5.58.0 -pkgrel=1 -arch="all" -pkgdesc="Qt5 library that implements the Open Collaboration Services API" -url="https://community.kde.org/Frameworks" -license="LGPL-2.1" -depends_dev="qt5-qtbase-dev" -makedepends="$depends_dev extra-cmake-modules doxygen qt5-qttools-dev" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz" -subpackages="$pkgname-dev $pkgname-doc" -options="!check" # ProviderTest::testFetchInvalidProvider() fails with: Could not fetch provider -builddir="$srcdir/$_pkgname-$pkgver" - -build() { - cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_QCH=ON - make -} - -check() { - cd "$builddir" - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} -sha512sums="e33104beb353982e587384b1ddc831f640177d2b0e24ec2c7f378ef8e9b7e2a998e3425ebdb3c17cab56fe3873b296c86302e7a9a00641e06e8a2896163e7703 attica-5.58.0.tar.xz" diff --git a/kde/khtml/APKBUILD b/kde/khtml/APKBUILD index 2c05e6380..f54ee2192 100644 --- a/kde/khtml/APKBUILD +++ b/kde/khtml/APKBUILD @@ -2,13 +2,12 @@ # Maintainer: Bart Ribbers pkgname=khtml pkgver=5.58.0 -pkgrel=1 +pkgrel=2 pkgdesc="KHTML APIs" arch="all" url="https://community.kde.org/Frameworks" license="GPL-3.0" -depends="" -depends_dev="qt5-qtbase-dev karchive-dev kcodecs-dev kglobalaccel-dev ki18n-dev kiconthemes-dev kio-dev kcoreaddons-dev kconfig-dev kservice-dev kbookmarks-dev kwidgetsaddons-dev kcompletion-dev kitemviews-dev kjobwidgets-dev solid-dev kxmlgui-dev kconfigwidgets-dev kauth-dev kjs-dev kwallet-dev knotifications-dev kparts-dev ktextwidgets-dev sonnet-dev kwindowsystem-dev qt5-qtx11extras-dev phonon-qt5-dev giflib-dev libjpeg-turbo-dev" +depends_dev="qt5-qtbase-dev karchive-dev kcodecs-dev kglobalaccel-dev ki18n-dev kiconthemes-dev kio-dev kcoreaddons-dev kconfig-dev kservice-dev kbookmarks-dev kwidgetsaddons-dev kcompletion-dev kitemviews-dev kjobwidgets-dev solid-dev kxmlgui-dev kconfigwidgets-dev kauth-dev kjs-dev kwallet-dev knotifications-dev kparts-dev ktextwidgets-dev sonnet-dev kwindowsystem-dev qt5-qtx11extras-dev phonon-dev giflib-dev libjpeg-turbo-dev" makedepends="$depends_dev extra-cmake-modules gperf" source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/$pkgname-$pkgver.tar.xz" subpackages="$pkgname-dev $pkgname-lang" diff --git a/kde/ksysguard/APKBUILD b/kde/ksysguard/APKBUILD index f184716df..6ef1e2c91 100644 --- a/kde/ksysguard/APKBUILD +++ b/kde/ksysguard/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Bart Ribbers pkgname=ksysguard pkgver=5.15.5 -pkgrel=1 +pkgrel=2 pkgdesc="Track and control the processes running in your system" arch="all !armhf" url="https://userbase.kde.org/KSysGuard" license="GPL-2.0" -makedepends="extra-cmake-modules kdoctools-dev qt5-qtbase-dev libksysguard-dev attica-qt-dev kinit-dev kxmlgui-dev kconfig-dev kcoreaddons-dev kdbusaddons-dev ki18n-dev kiconthemes-dev kitemviews-dev kio-dev knotifications-dev kservice-dev kbookmarks-dev kwidgetsaddons-dev kcompletion-dev kjobwidgets-dev solid-dev kxmlgui-dev kconfigwidgets-dev kauth-dev kcodecs-dev kwindowsystem-dev knewstuff-dev" +makedepends="extra-cmake-modules kdoctools-dev qt5-qtbase-dev libksysguard-dev attica-dev kinit-dev kxmlgui-dev kconfig-dev kcoreaddons-dev kdbusaddons-dev ki18n-dev kiconthemes-dev kitemviews-dev kio-dev knotifications-dev kservice-dev kbookmarks-dev kwidgetsaddons-dev kcompletion-dev kjobwidgets-dev solid-dev kxmlgui-dev kconfigwidgets-dev kauth-dev kcodecs-dev kwindowsystem-dev knewstuff-dev" source="https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz" subpackages="$pkgname-doc $pkgname-lang" diff --git a/kde/kwin/APKBUILD b/kde/kwin/APKBUILD index 3daed0ec2..2ce23f6d7 100644 --- a/kde/kwin/APKBUILD +++ b/kde/kwin/APKBUILD @@ -3,13 +3,13 @@ pkgname=kwin pkgver=5.15.5 _pkgver="$pkgver" -pkgrel=2 +pkgrel=3 pkgdesc="An easy to use, but flexible, composited Window Manager" arch="all !armhf" url="https://www.kde.org/workspaces/plasmadesktop/" license="GPL-2.0" depends="xorg-server-xwayland qt5-qtmultimedia breeze" -depends_dev="qt5-qtdeclarative-dev qt5-qtscript-dev qt5-qtsensors-dev qt5-qtx11extras-dev kdecoration-dev kjobwidgets-dev kcmutils-dev kscreenlocker-dev breeze-dev kcompletion-dev plasma-framework-dev kinit-dev kio-dev xcb-util-keysyms-dev kcrash-dev kglobalaccel-dev knotifications-dev kiconthemes-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev ki18n-dev kpackage-dev kwidgetsaddons-dev kwindowsystem-dev kidletime-dev kauth-dev kcodecs-dev ktextwidgets-dev knewstuff-dev kservice-dev kxmlgui-dev kbookmarks-dev kwayland-dev attica-qt-dev sonnet-dev kitemviews-dev solid-dev kdeclarative-dev kactivities-dev" +depends_dev="qt5-qtdeclarative-dev qt5-qtscript-dev qt5-qtsensors-dev qt5-qtx11extras-dev kdecoration-dev kjobwidgets-dev kcmutils-dev kscreenlocker-dev breeze-dev kcompletion-dev plasma-framework-dev kinit-dev kio-dev xcb-util-keysyms-dev kcrash-dev kglobalaccel-dev knotifications-dev kiconthemes-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev ki18n-dev kpackage-dev kwidgetsaddons-dev kwindowsystem-dev kidletime-dev kauth-dev kcodecs-dev ktextwidgets-dev knewstuff-dev kservice-dev kxmlgui-dev kbookmarks-dev kwayland-dev attica-dev sonnet-dev kitemviews-dev solid-dev kdeclarative-dev kactivities-dev" makedepends="$depends_dev extra-cmake-modules qt5-qttools-dev kdoctools-dev libxkbcommon-dev libepoxy-dev libinput-dev xcb-util-cursor-dev libdrm-dev eudev-dev xcb-util-wm-dev" source="https://download.kde.org/stable/plasma/$pkgver/$pkgname-$_pkgver.tar.xz 0001-Revert-udev-Only-handle-devices-from-the-current-sea.patch diff --git a/kde/phonon-qt5/APKBUILD b/kde/phonon-qt5/APKBUILD deleted file mode 100644 index 0df77923c..000000000 --- a/kde/phonon-qt5/APKBUILD +++ /dev/null @@ -1,32 +0,0 @@ -pkgname=phonon-qt5 -pkgver=4.9.1 -pkgrel=1 -pkgdesc="KDE multimedia backend" -url="http://phonon.kde.org/" -arch="all" -license="LGPL" -depends= -depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev glib-dev" -makedepends="$depends_dev extra-cmake-modules cmake automoc4" -install="" -subpackages="$pkgname-dev" -source="http://download.kde.org/stable/phonon/$pkgver/${pkgname/-qt5/}-$pkgver.tar.xz" -builddir="$srcdir/${pkgname/-qt5/}-$pkgver" - -build() { - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=FALSE \ - -DPHONON_BUILD_PHONON4QT5=ON \ - -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces - make -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728 phonon-4.9.1.tar.xz" diff --git a/kde/plasma-workspace/APKBUILD b/kde/plasma-workspace/APKBUILD index effbb022c..b2d5416d0 100644 --- a/kde/plasma-workspace/APKBUILD +++ b/kde/plasma-workspace/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Bart Ribbers pkgname=plasma-workspace pkgver=5.15.5 -pkgrel=3 +pkgrel=4 pkgdesc="KDE Plasma Workspace" arch="all !armhf" url="https://www.kde.org/workspaces/plasmadesktop/" license="GPL-2.0" depends="kwin iso-codes qt5-qtwayland kactivitymanagerd kinit milou plasma-integration frameworkintegration" -depends_dev="krunner-dev kdesignerplugin-dev kdesignerplugin qt5-qtwayland-dev qt5-qtdeclarative-dev kxmlrpcclient-dev kdelibs4support-dev plasma-framework-dev knotifyconfig-dev kcmutils-dev kdesu-dev kwallet-dev ksysguard kwin-dev kguiaddons-dev kjsembed-dev knewstuff-dev qt5-qtx11extras-dev ktexteditor-dev libksysguard-dev kwallet-dev attica-qt-dev kitemmodels-dev kscreenlocker-dev qt5-qtscript-dev karchive-dev kcrash-dev kpackage-dev kactivities-dev kdeclarative-dev kpty-dev kjs-dev ktextwidgets-dev sonnet-dev kauth-dev kconfigwidgets-dev ki18n-dev kcodecs-dev kwidgetsaddons-dev kservice-dev kxmlgui-dev kwindowsystem-dev kcoreaddons-dev kconfig-dev kemoticons-dev kiconthemes-dev kinit-dev knotifications-dev kio-dev kbookmarks-dev kparts-dev kcompletion-dev kitemviews-dev kjobwidgets-dev solid-dev kunitconversion-dev kdbusaddons-dev kidletime-dev kglobalaccel-dev phonon-qt5-dev kwayland-dev baloo-dev prison-dev kholidays-dev networkmanager-qt-dev" +depends_dev="krunner-dev kdesignerplugin-dev kdesignerplugin qt5-qtwayland-dev qt5-qtdeclarative-dev kxmlrpcclient-dev kdelibs4support-dev plasma-framework-dev knotifyconfig-dev kcmutils-dev kdesu-dev kwallet-dev ksysguard kwin-dev kguiaddons-dev kjsembed-dev knewstuff-dev qt5-qtx11extras-dev ktexteditor-dev libksysguard-dev kwallet-dev attica-dev kitemmodels-dev kscreenlocker-dev qt5-qtscript-dev karchive-dev kcrash-dev kpackage-dev kactivities-dev kdeclarative-dev kpty-dev kjs-dev ktextwidgets-dev sonnet-dev kauth-dev kconfigwidgets-dev ki18n-dev kcodecs-dev kwidgetsaddons-dev kservice-dev kxmlgui-dev kwindowsystem-dev kcoreaddons-dev kconfig-dev kemoticons-dev kiconthemes-dev kinit-dev knotifications-dev kio-dev kbookmarks-dev kparts-dev kcompletion-dev kitemviews-dev kjobwidgets-dev solid-dev kunitconversion-dev kdbusaddons-dev kidletime-dev kglobalaccel-dev phonon-dev kwayland-dev baloo-dev prison-dev kholidays-dev networkmanager-qt-dev" makedepends="$depends_dev extra-cmake-modules kdoctools-dev gpsd iso-codes-dev libxtst-dev xcb-util-image-dev libxrender-dev" source="https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-lang" diff --git a/main/buho/APKBUILD b/main/buho/APKBUILD index bb46b93cb..515471cf5 100644 --- a/main/buho/APKBUILD +++ b/main/buho/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: Bart Ribbers pkgname=buho pkgver=0_git20190423 -pkgrel=0 +pkgrel=1 _commit="50e7c89b7e80dd633267b95c64f987cb8e3a4e36" pkgdesc="Note taking app based on MauiKit" arch="all" url="https://github.com/mauikit/buho" license="GPL-2.0+ GPL-3.0+" depends="mauikit" -makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev qt5-qtwebengine-dev mauikit-dev ki18n-dev knotifications-dev kconfig-dev kio-dev attica-qt-dev" +makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev qt5-qtwebengine-dev mauikit-dev ki18n-dev knotifications-dev kconfig-dev kio-dev attica-dev" source="$pkgname-$_commit.tar.gz::https://github.com/mauikit/$pkgname/archive/$_commit.tar.gz" options="!check" # No tests available builddir="$srcdir/$pkgname-$_commit"