From 0bf985f5e1b65feddfb504075e1746f4a70f6845 Mon Sep 17 00:00:00 2001 From: PureTryOut Date: Mon, 7 Jan 2019 19:35:11 +0100 Subject: [PATCH] main/maui*: update apps and plasma-angelfish (!136) This MR updates the app to the latest commit (currently from 2 days ago). It also updates plasma-angelfish, but I changed the $pkgrel to follow the format of the other Git packages. This also re-enables plasma-angelfish and vvave in the default Plasma Mobile installation, as they were previously disabled due to qt5-qtwebengine (which they depend on) requiring a soname bump upstream. --- kde/plasma-angelfish/APKBUILD | 15 +++++++------- main/index/APKBUILD | 14 ++++++------- .../index/remove-included-qmltermwidget.patch | 20 ------------------- main/mauikit/APKBUILD | 13 ++++++------ main/pix/APKBUILD | 10 +++++----- main/postmarketos-ui-plasma-mobile/APKBUILD | 4 ++-- main/vvave/APKBUILD | 10 +++++----- 7 files changed, 32 insertions(+), 54 deletions(-) delete mode 100644 main/index/remove-included-qmltermwidget.patch diff --git a/kde/plasma-angelfish/APKBUILD b/kde/plasma-angelfish/APKBUILD index 9fcc83cca..7a8182ff4 100644 --- a/kde/plasma-angelfish/APKBUILD +++ b/kde/plasma-angelfish/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Jonah Brüchert +# Maintainer: Bart Ribbers pkgname=plasma-angelfish -pkgver=0.20180828 -_commit=f86a7385161887dc698b69b367f0b2e7013dd968 +pkgver=0_git20190105 pkgrel=0 +_commit="bad30c68046d37c34f6b40df677212c9b71e6164" pkgdesc="Small Webbrowser for Plasma Mobile" url="https://phabricator.kde.org/source/plasma-angelfish/" arch="all" -license="GPLv3" +license="GPL-3.0" depends="kirigami2 plasma-framework" makedepends="cmake qt5-qtwebengine-dev kdeclarative-dev kirigami2-dev plasma-framework-dev kio-dev ki18n-dev extra-cmake-modules" -install="" -source="https://github.com/KDE/$pkgname/archive/$_commit.tar.gz" +source="$pkgname-$_commit.tar.gz::https://invent.kde.org/jbbgameich/$pkgname/-/archive/$_commit.tar.gz" +builddir="$srcdir/$pkgname-$_commit/build" prepare() { mkdir "$builddir" @@ -21,7 +22,7 @@ build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - cmake "$srcdir"/$pkgname-$_commit \ + cmake "$builddir"/.. \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ @@ -37,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ab6d4e439abd6c1d68fd5d8bd28132370014bd18f5b580919e22b3aabd39bcf4166747e21c229f5cda5e61f0ac5a1cbb3e616283acc5e6affd6a372e671518b5 f86a7385161887dc698b69b367f0b2e7013dd968.tar.gz" +sha512sums="99df4a4f5cd0307ce3a4409f5ff91a10dfd96dfbdf6453336caec48b593454263182049abb4b010741080e4b07f96010f65aa3874fc641f3ddad883c5941183d plasma-angelfish-bad30c68046d37c34f6b40df677212c9b71e6164.tar.gz" diff --git a/main/index/APKBUILD b/main/index/APKBUILD index e0a7c7ec4..10ddd4914 100644 --- a/main/index/APKBUILD +++ b/main/index/APKBUILD @@ -1,17 +1,16 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=index -pkgver=0_git20180903 -pkgrel=1 -_commit="113d6e0ba138d31c746421271b927efed8a7b25e" +pkgver=0_git20190105 +pkgrel=0 +_commit="88b6569e27b9b08f36141cb8fbca7941c897dd08" pkgdesc="Index file manager based on MauiKit" arch="all" -url="https://github.com/maui-project/index" +url="https://github.com/mauikit/index" license="unknown" depends="mauikit qmltermwidget" makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev mauikit-dev kservice-dev knotifications-dev ki18n-dev kio-dev" -source="$pkgname-$_commit.tar.gz::https://github.com/maui-project/$pkgname/archive/$_commit.tar.gz - remove-included-qmltermwidget.patch" +source="$pkgname-$_commit.tar.gz::https://github.com/mauikit/$pkgname/archive/$_commit.tar.gz" options="!check" # No tests available builddir="$srcdir/$pkgname-$_commit" @@ -24,5 +23,4 @@ package() { cd "$builddir" make INSTALL_ROOT="$pkgdir" install } -sha512sums="b46e93013c62ff9cc2e520e46012ae3a21823b3e2dadeddc2afc07d9c537de0be9a4823047dd203a3a344bd6e4ecf9e26d9a0813020effe759ef5ba8a2c37c4a index-113d6e0ba138d31c746421271b927efed8a7b25e.tar.gz -e371184dd4e2a03f232cfde3911ec7f76c715f056d650dbd1458606720d63bb699448b8bc7acde36fa77934956384a08b2664ea8afe1f4746a1be39559b9ddad remove-included-qmltermwidget.patch" +sha512sums="325a6f8e6d9d1e64afac4e2037539f210e9dbf2dee3aeba71faa6497f37b1b54bb98228a48a4a23f469e61b26afe54c411d04dc50730b3d9d50a88d5ac6a77b9 index-88b6569e27b9b08f36141cb8fbca7941c897dd08.tar.gz" diff --git a/main/index/remove-included-qmltermwidget.patch b/main/index/remove-included-qmltermwidget.patch deleted file mode 100644 index 60f66a4ac..000000000 --- a/main/index/remove-included-qmltermwidget.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: This patch disables building qmltermwidget as part of index - qmltermwidget is packaged as an external qml module, and including it in this package again would cause conflicts. - Instead of including qmltermwidget, the index package now depends on qmltermwidget. - . - index (0+git20180930-1) UNRELEASED; urgency=medium - . - * New snapshot -Author: Jonah Brüchert - ---- a/index.pro -+++ b/index.pro -@@ -4,7 +4,7 @@ CONFIG += ordered - - SUBDIRS += app - --linux:unix:!android { -+!linux:!unix:!android { - message(Building Terminal for Linux KDE) - SUBDIRS += $$PWD/kde/qmltermwidget - } diff --git a/main/mauikit/APKBUILD b/main/mauikit/APKBUILD index 41b262e0d..1dc11e7c3 100644 --- a/main/mauikit/APKBUILD +++ b/main/mauikit/APKBUILD @@ -1,18 +1,17 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=mauikit -pkgver=0_git20180903 +pkgver=0_git20190105 pkgrel=0 -_commit="e05cd66bed119df7ea9331194728c5c76b081804" +_commit="deca06385464ebb27cc7ab51ffd36ae534a7c3f3" pkgdesc="Kit for developing MAUI Apps" arch="all" -url="https://github.com/maui-project/mauikit" +url="https://github.com/mauikit/mauikit" license="unknown" depends="" -depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev qt5-qtquickcontrols2-dev ki18n-dev - knotifications-dev kconfig-dev kservice-dev kio-dev" +depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev qt5-qtquickcontrols2-dev qt5-qtwebengine-dev ki18n-dev knotifications-dev kconfig-dev kservice-dev kio-dev" makedepends="$depends_dev extra-cmake-modules" -source="$pkgname-$_commit.tar.gz::https://github.com/maui-project/$pkgname/archive/$_commit.tar.gz" +source="$pkgname-$_commit.tar.gz::https://github.com/mauikit/$pkgname/archive/$_commit.tar.gz" subpackages="$pkgname-dev" builddir="$srcdir/$pkgname-$_commit" @@ -34,4 +33,4 @@ package() { cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="766ff1b51f15c34ad22c3a6bcf39f80c71acebd02764ec06a09c5519d7beaa1e1974885c6424f28529e45af9076678e79e3a05b19256c4fb69c392f5f1651771 mauikit-e05cd66bed119df7ea9331194728c5c76b081804.tar.gz" +sha512sums="f530dd2bb9c6b1cc03ebf9d857b914dbec6bc08a8ef35a01f04ba955e883d428c2e29f9d49f27c4d3afa33a46a06c1167a7dc97e53ee22567f64660190d55da5 mauikit-deca06385464ebb27cc7ab51ffd36ae534a7c3f3.tar.gz" diff --git a/main/pix/APKBUILD b/main/pix/APKBUILD index 9beb13e70..563d196d3 100644 --- a/main/pix/APKBUILD +++ b/main/pix/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=pix -pkgver=0_git20180903 +pkgver=0_git20190105 pkgrel=0 -_commit="d242bf6304a562abd17bf5f75b65d962e0f67622" +_commit="9a4543b1ea31c8317a557f3e97e2437e5e625f82" pkgdesc="Image gallery manager built with MauiKit" arch="all" -url="https://github.com/maui-project/vvave" +url="https://github.com/mauikit/pix" license="GPL-3.0" depends="mauikit" makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev mauikit-dev kservice-dev knotifications-dev ki18n-dev kio-dev" -source="$pkgname-$_commit.tar.gz::https://github.com/maui-project/$pkgname/archive/$_commit.tar.gz" +source="$pkgname-$_commit.tar.gz::https://github.com/mauikit/$pkgname/archive/$_commit.tar.gz" options="!check" # No tests available builddir="$srcdir/$pkgname-$_commit" @@ -23,4 +23,4 @@ package() { cd "$builddir" make INSTALL_ROOT="$pkgdir" install } -sha512sums="beee43d5b2f890b4f8817e2573490acf8d54fe7e2157a13fb51e47e21c92b0f3349f6f0b3e4dee38053ed069b9cba0a6a60059eae7b492b59f1ebea9716c1906 pix-d242bf6304a562abd17bf5f75b65d962e0f67622.tar.gz" +sha512sums="b4e641e5e0874b07da0add3d96473fecb5f11e240a3e55d33beb4da3ba78c6dacf872949fbbe127394c779c996da7920bfe1409bdda8782cf815c1f9116e961f pix-9a4543b1ea31c8317a557f3e97e2437e5e625f82.tar.gz" diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index 17bbc2740..e573318b0 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-ui-plasma-mobile pkgver=1 -pkgrel=22 +pkgrel=23 pkgdesc="(Wayland) Mobile variant of KDE Plasma, optimized for touchscreen (slow without hardware acceleration!)" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" arch="noarch" @@ -10,7 +10,7 @@ depends="plasma-phone-components dbus dbus-x11 qmltermwidget plasma-settings breeze-icons postmarketos-demos kscreen qt5-qtvirtualkeyboard plasma-camera elisa pulseaudio pulseaudio-utils consolekit2 powerdevil polkit-kde-agent kwayland-integration postmarketos-artwork-wallpapers - okular pix index" + okular pix index vvave plasma-angelfish" makedepends="" install="$pkgname.post-install" subpackages="" diff --git a/main/vvave/APKBUILD b/main/vvave/APKBUILD index 7e5a2b4fd..844f9b341 100644 --- a/main/vvave/APKBUILD +++ b/main/vvave/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=vvave -pkgver=0_git20180903 +pkgver=0_git20190105 pkgrel=0 -_commit="52578925b1b04c1bb7b3714e9d27662b440d81f9" +_commit="35f7eb5af0df395c39fce4514b9a265414a920f2" pkgdesc="VVAVE Music Player" arch="all" -url="https://github.com/maui-project/vvave" +url="https://github.com/mauikit/vvave" license="GPL-3.0" depends="mauikit" makedepends="extra-cmake-modules mauikit-dev qt5-qtwebsockets-dev qt5-qtmultimedia-dev qt5-qtwebengine-dev taglib-dev" -source="$pkgname-$_commit.tar.gz::https://github.com/maui-project/$pkgname/archive/$_commit.tar.gz" +source="$pkgname-$_commit.tar.gz::https://github.com/mauikit/$pkgname/archive/$_commit.tar.gz" builddir="$srcdir/$pkgname-$_commit" build() { @@ -31,4 +31,4 @@ package() { cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="62b43c6481970780963cac09e977bccce04d14dd5559726dd8b1de4db279ecc30600a8854d8ea04648cb9a1675abea968381533b1afe3e228032d49daf1c5937 vvave-52578925b1b04c1bb7b3714e9d27662b440d81f9.tar.gz" +sha512sums="9fe9698636c64a6f8177561af13f539b374d23b9cd39cf6d10f6c8e71b6c9e74f3c5a85a03ce8f9ba38b20b3634ccccc6c7eef32879cef5818c5da05af33fa7d vvave-35f7eb5af0df395c39fce4514b9a265414a920f2.tar.gz"