aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrahmanshaber <rahmanshaber@yahoo.com>2021-06-09 05:30:56 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2021-06-09 06:35:46 +0000
commit4628561ec471fe1c0ea4c25019c0afe5d0514859 (patch)
treeda943a308a3a40dacb4b401a15421887084a08ea
parent34980940caf728888b6942185cf6022d4a03f7ea (diff)
downloadaports-4628561ec471fe1c0ea4c25019c0afe5d0514859.tar.gz
aports-4628561ec471fe1c0ea4c25019c0afe5d0514859.tar.bz2
aports-4628561ec471fe1c0ea4c25019c0afe5d0514859.tar.xz
community/coretoppings: upgrade to 4.2.0
-rw-r--r--community/coretoppings/APKBUILD22
-rw-r--r--community/coretoppings/fix-qt5.12-build.patch13
2 files changed, 12 insertions, 23 deletions
diff --git a/community/coretoppings/APKBUILD b/community/coretoppings/APKBUILD
index 59293d840a..e0db10332b 100644
--- a/community/coretoppings/APKBUILD
+++ b/community/coretoppings/APKBUILD
@@ -1,27 +1,29 @@
# Contributor: rahmanshaber <rahmanshaber@yahoo.com>
# Maintainer: rahmanshaber <rahmanshaber@yahoo.com>
pkgname=coretoppings
-pkgver=4.1.0
+pkgver=4.2.0
pkgrel=0
pkgdesc="An activity viewer from the CoreApps family."
-arch="" # FTBFS "all !armhf !s390x !mips64" # qt5-qtlocation, polkit
+arch="all !armhf !s390x !mips64" # qt5-qtlocation, polkit
url="https://gitlab.com/cubocore"
license="GPL-3.0-or-later"
depends="qt5-qtsvg"
-makedepends="qt5-qtbase-dev libcprime-dev qt5-qtx11extras-dev qt5-qtconnectivity-dev qt5-qtlocation-dev libcsys-dev libdbusmenu-qt-dev libxcomposite-dev xcb-util-dev libxrender-dev xcb-util-wm-dev"
-source="$pkgname-$pkgver.tar.gz::https://gitlab.com/cubocore/coretoppings/-/archive/v$pkgver/coretoppings-v$pkgver.tar.gz
- fix-qt5.12-build.patch"
+makedepends="qt5-qtbase-dev libcprime-dev qt5-qtx11extras-dev qt5-qtconnectivity-dev qt5-qtlocation-dev libcsys-dev libdbusmenu-qt-dev libxcomposite-dev xcb-util-dev libxrender-dev xcb-util-wm-dev cmake ninja"
+source="$pkgname-$pkgver.tar.gz::https://gitlab.com/cubocore/coretoppings/-/archive/v$pkgver/coretoppings-v$pkgver.tar.gz"
builddir="$srcdir/$pkgname-v$pkgver"
options="!check" # No test suite
build() {
- qmake-qt5
- make
+ cmake -B build \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_BUILD_TYPE=None
+ cmake --build build
}
package() {
- INSTALL_ROOT="$pkgdir" make install
+ DESTDIR="$pkgdir" cmake --install build
}
-sha512sums="bbad49c322f5fbf39633a6a56269b3bddde42c8e515b6c25471dbf74f59f24b2217a89593d06b67dda6cca0ef3fc93b50fec1ab7cd523ff23b3c8bad76f0d71e coretoppings-4.1.0.tar.gz
-a7094149d1f2da50baf9d6eb618016eef94a751a27ebe9ae19d00d83f2749f220a9e3d1847482e3c183a5f8e2a91c7ee97f52d95427d8e0d96c7f13ef49dc1fb fix-qt5.12-build.patch"
+sha512sums="f3d433db645308183e51fb250895088e6fca6d32f1d1ffcf8e758d749daa09a96707549d4b51c8ac51711481e78d7c4be1d4dfe496f32dd28bd14cb0b5da4af7 coretoppings-4.2.0.tar.gz"
diff --git a/community/coretoppings/fix-qt5.12-build.patch b/community/coretoppings/fix-qt5.12-build.patch
deleted file mode 100644
index 37f641c23c..0000000000
--- a/community/coretoppings/fix-qt5.12-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sni/statusnotifierbutton.cpp b/sni/statusnotifierbutton.cpp
-index d07eb6b0163fc33db8e4e03731df7ee31ce671b2..c339657d538ded7544520386a31e01237e423304 100644
---- a/sni/statusnotifierbutton.cpp
-+++ b/sni/statusnotifierbutton.cpp
-@@ -267,7 +267,7 @@ void StatusNotifierButton::mouseReleaseEvent(QMouseEvent *event)
- {
- if (event->button() == Qt::LeftButton)
- interface->Activate(QCursor::pos().x(), QCursor::pos().y());
-- else if (event->button() == Qt::MidButton)
-+ else if (event->button() == Qt::MiddleButton)
- interface->SecondaryActivate(QCursor::pos().x(), QCursor::pos().y());
- else if (Qt::RightButton == event->button())
- {