From 8a666ce1a938f61cedc20b338b9421a477f031df Mon Sep 17 00:00:00 2001 From: PureTryOut Date: Mon, 11 Feb 2019 17:26:08 +0100 Subject: [PATCH] kde/qmlkonsole: new aport (!214) This aport replaces qmltermwidget, which is now used as a submodule instead. kde/qmltermwidget is moved to main/qmltermwidget and uses a different upstream source, and Index is updated to use it from it's new source --- kde/qmlkonsole/APKBUILD | 38 +++++++++++++++++++++ kde/qmltermwidget/APKBUILD | 29 ---------------- main/index/APKBUILD | 17 +++++---- main/postmarketos-ui-plasma-mobile/APKBUILD | 5 ++- main/qmltermwidget/APKBUILD | 29 ++++++++++++++++ 5 files changed, 79 insertions(+), 39 deletions(-) create mode 100644 kde/qmlkonsole/APKBUILD delete mode 100644 kde/qmltermwidget/APKBUILD create mode 100644 main/qmltermwidget/APKBUILD diff --git a/kde/qmlkonsole/APKBUILD b/kde/qmlkonsole/APKBUILD new file mode 100644 index 000000000..6fe5add20 --- /dev/null +++ b/kde/qmlkonsole/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Bart Ribbers +# Maintainer: Bart Ribbers +pkgname=qmlkonsole +pkgver=0_git20190105 +pkgrel=0 +_commit="9476213a11e16c6155c324fa4a21190369464bad" +pkgdesc="Terminal app for Plasma Mobile" +arch="all" +url="https://invent.kde.org/jbbgameich/qmlkonsole" +license="GPL-3.0-or-later" +depends="qmltermwidget" +makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev qt5-qtquickcontrols2-dev" +source="https://invent.kde.org/jbbgameich/qmlkonsole/-/archive/9476213a11e16c6155c324fa4a21190369464bad/qmlkonsole-9476213a11e16c6155c324fa4a21190369464bad.tar.gz" +builddir="$srcdir/$pkgname-$_commit/build" + +prepare() { + mkdir "$builddir" +} + +build() { + cd "$builddir" + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + DESTDIR="$pkgdir" make install +} + +sha512sums="3adade1839da9ab395c79645036cf9ef6ae481c644926f5bfcf8f7cb53a89790d207442aae0ca0d68d28fb207187f57e76a6ea0031d309f6b8cda09b7629cf81 qmlkonsole-9476213a11e16c6155c324fa4a21190369464bad.tar.gz" diff --git a/kde/qmltermwidget/APKBUILD b/kde/qmltermwidget/APKBUILD deleted file mode 100644 index 15e6f2ee2..000000000 --- a/kde/qmltermwidget/APKBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Contributor: Bart Ribbers -# Maintainer: Bart Ribbers -pkgname=qmltermwidget -pkgver=0.1.0_git20170914 -pkgrel=0 -_commit="fb525b7185acf3b91ba58051c337ae33294a7da7" -arch="all" -url="https://github.com/notmart/qmltermwidget" -license="GPL-2.0" -pkgdesc="QML port of qtermwidget" -depends="" -makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev" -source="https://github.com/notmart/$pkgname/archive/$_commit.tar.gz" -options="!check" -builddir="$srcdir/$pkgname-$_commit" - -build() { - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_QCH=ON - make -} - -package() { - cd "$builddir" - make DESTDIR="${pkgdir}" install -} -sha512sums="08c0c344cd1d6354cd51fd272a400a28e0b447f12a588d534ec85ea25db74cff585570bbc8cacdfb460bec7c8eba0649f7813a3d8edc9cb6d69e3307aaefafce fb525b7185acf3b91ba58051c337ae33294a7da7.tar.gz" diff --git a/main/index/APKBUILD b/main/index/APKBUILD index 2e65d08b7..6caa93685 100644 --- a/main/index/APKBUILD +++ b/main/index/APKBUILD @@ -1,26 +1,29 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=index -pkgver=0_git20190105 -pkgrel=1 -_commit="88b6569e27b9b08f36141cb8fbca7941c897dd08" +pkgver=0_git20190208 +pkgrel=0 +_commit="f0859b889c5ed30771fdb2078330e361ecc8b4ca" pkgdesc="Index file manager based on MauiKit" arch="all" 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" +makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev mauikit-dev kservice-dev knotifications-dev ki18n-dev kio-dev" source="$pkgname-$_commit.tar.gz::https://github.com/mauikit/$pkgname/archive/$_commit.tar.gz" options="!check" # No tests available builddir="$srcdir/$pkgname-$_commit" build() { - qmake-qt5 + cd "$builddir" + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr make } package() { cd "$builddir" - make INSTALL_ROOT="$pkgdir" install + DESTDIR="$pkgdir" make install } -sha512sums="325a6f8e6d9d1e64afac4e2037539f210e9dbf2dee3aeba71faa6497f37b1b54bb98228a48a4a23f469e61b26afe54c411d04dc50730b3d9d50a88d5ac6a77b9 index-88b6569e27b9b08f36141cb8fbca7941c897dd08.tar.gz" +sha512sums="b3782105dfb7af47d5ea3855b94e977ec9da4bdeea1e32bfe5fc0e91c1e252c1ef8f5c541e39f7f7610278f2e515ecc6f3face5469f2c4adcecdea1f54079f9c index-f0859b889c5ed30771fdb2078330e361ecc8b4ca.tar.gz" diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index e9416a81b..39f0e2e70 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -6,10 +6,9 @@ pkgrel=27 pkgdesc="(Wayland) Mobile variant of KDE Plasma, optimized for touchscreen (slow without hardware acceleration!)" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" arch="noarch" -license="GPL3+" +license="GPL-3.0-or-later" # dbus-x11 provides dbus-launch -depends="plasma-phone-components dbus dbus-x11 qmltermwidget plasma-settings breeze-icons postmarketos-demos kscreen qt5-qtvirtualkeyboard plasma-camera pulseaudio pulseaudio-utils consolekit2 powerdevil polkit-kde-agent kwayland-integration postmarketos-artwork-wallpapers okular pix index vvave plasma-angelfish" -makedepends="" +depends="plasma-phone-components dbus dbus-x11 plasma-settings breeze-icons postmarketos-demos kscreen qt5-qtvirtualkeyboard plasma-camera pulseaudio pulseaudio-utils consolekit2 powerdevil polkit-kde-agent kwayland-integration postmarketos-artwork-wallpapers okular qmlkonsole pix index vvave plasma-angelfish" install="$pkgname.post-install" subpackages="" source="start_plasma.sh kwinrc kdeglobals qtlogging.ini org.kde.phone.homescreen.js" diff --git a/main/qmltermwidget/APKBUILD b/main/qmltermwidget/APKBUILD new file mode 100644 index 000000000..360ac28ce --- /dev/null +++ b/main/qmltermwidget/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: Bart Ribbers +# Maintainer: Bart Ribbers +pkgname=qmltermwidget +pkgver=0.2.0 +pkgrel=0 +arch="all" +url="https://github.com/swordfish90/qmltermwidget" +license="GPL-2.0" +pkgdesc="QML port of qtermwidget" +makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev" +source="$pkgname-$pkgver.tar.gz::https://github.com/swordfish90/$pkgname/archive/$pkgver.tar.gz" +options="!check" # Requires X11 running + +build() { + cd "$builddir" + qmake-qt5 + make +} + +check() { + cd "$builddir" + /usr/lib/qt5/bin/qmlscene -l . test-app/test-app.qml +} + +package() { + cd "$builddir" + INSTALL_ROOT="$pkgdir" make install +} +sha512sums="544d57296de6999b86bf2b921d1d93ac5d7eddd02eea436df4ecea0966c82389e716310fd7e4d13dd918bc1b3fd2d02f953c713dc5b4abcfc56d3f3f617adf43 qmltermwidget-0.2.0.tar.gz"