From e927feb4d50cad8fecbda22f755679f99a3c0e50 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Wed, 15 May 2019 00:30:36 +0200 Subject: [PATCH] main/maui*: update to latest git (!366) Built and tested on x86_64, everything works as before. [ci:skip-build]: ollieparanoid made sure that this builds for all arches. --- main/buho/APKBUILD | 18 ++++++++++++------ main/index/APKBUILD | 10 +++++----- main/mauikit/APKBUILD | 9 ++++----- main/nota/APKBUILD | 8 ++++---- main/pix/APKBUILD | 16 ++++++++++------ main/vvave/APKBUILD | 8 ++++---- 6 files changed, 39 insertions(+), 30 deletions(-) diff --git a/main/buho/APKBUILD b/main/buho/APKBUILD index 6e4b8d8c4..bb46b93cb 100644 --- a/main/buho/APKBUILD +++ b/main/buho/APKBUILD @@ -1,26 +1,32 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=buho -pkgver=0_git20190105 +pkgver=0_git20190423 pkgrel=0 -_commit="17f53d30f8c957a781f4332c5754f424baec2532" +_commit="50e7c89b7e80dd633267b95c64f987cb8e3a4e36" pkgdesc="Note taking app based on MauiKit" arch="all" url="https://github.com/mauikit/buho" -license="unknown" +license="GPL-2.0+ GPL-3.0+" depends="mauikit" -makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev qt5-qtwebengine-dev mauikit-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-qt-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() { + # Building with CMake is broken currently, so build with qmake for now + #cmake \ + # -DCMAKE_BUILD_TYPE=Release \ + # -DCMAKE_INSTALL_PREFIX=/usr \ + # -DCMAKE_INSTALL_LIBDIR=lib qmake-qt5 make } package() { cd "$builddir" - make INSTALL_ROOT="$pkgdir" install + #DESTDIR="$pkgdir" make install + INSTALL_ROOT="$pkgdir" make install } -sha512sums="0b8843fb8a7062a6d4666a6cf4657aa50178bff350ea08bd1fd108859293f823f9f8a718215c53fbec00369107a9ae7cdd3d334eb78f94f88330599b0df5490a buho-17f53d30f8c957a781f4332c5754f424baec2532.tar.gz" +sha512sums="31bd1b76b0bf0cae72e0d990125784a94bff200e5dc670a1bf8ec6ada42261ccad09ac6706839a75c4a80dfac643afd9b572bd61e306de793e3d85dd887e8f75 buho-50e7c89b7e80dd633267b95c64f987cb8e3a4e36.tar.gz" diff --git a/main/index/APKBUILD b/main/index/APKBUILD index 2b236a971..051d2d3c0 100644 --- a/main/index/APKBUILD +++ b/main/index/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=index -pkgver=0_git20190208 -pkgrel=2 -_commit="f0859b889c5ed30771fdb2078330e361ecc8b4ca" +pkgver=0_git20190423 +pkgrel=0 +_commit="92fb54da15c57c75e97b496a27e360b1e7ed6d40" pkgdesc="Index file manager based on MauiKit" arch="all" url="https://github.com/mauikit/index" -license="unknown" +license="GPL-2.0+" depends="mauikit qmltermwidget" 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" @@ -26,4 +26,4 @@ package() { cd "$builddir" DESTDIR="$pkgdir" make install } -sha512sums="b3782105dfb7af47d5ea3855b94e977ec9da4bdeea1e32bfe5fc0e91c1e252c1ef8f5c541e39f7f7610278f2e515ecc6f3face5469f2c4adcecdea1f54079f9c index-f0859b889c5ed30771fdb2078330e361ecc8b4ca.tar.gz" +sha512sums="84b045931169c4f40d4f2b8619ad8a9692f9d556a0a068f8e867415469927239bd26d411cdaa29eeef15d2e8c5bde636a804c86ceedf90dc9e17262de1c30b8d index-92fb54da15c57c75e97b496a27e360b1e7ed6d40.tar.gz" diff --git a/main/mauikit/APKBUILD b/main/mauikit/APKBUILD index 19b86c44f..3ca7923c4 100644 --- a/main/mauikit/APKBUILD +++ b/main/mauikit/APKBUILD @@ -1,14 +1,13 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=mauikit -pkgver=0_git20190105 +pkgver=0_git20190423 pkgrel=0 -_commit="deca06385464ebb27cc7ab51ffd36ae534a7c3f3" +_commit="76895b879db16b38bd017bed7998ddf2b6c025e6" pkgdesc="Kit for developing MAUI Apps" arch="all" url="https://github.com/mauikit/mauikit" -license="unknown" -depends="" +license="GPL-2.0+ GPL-3.0+" 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/mauikit/$pkgname/archive/$_commit.tar.gz" @@ -32,4 +31,4 @@ package() { cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f530dd2bb9c6b1cc03ebf9d857b914dbec6bc08a8ef35a01f04ba955e883d428c2e29f9d49f27c4d3afa33a46a06c1167a7dc97e53ee22567f64660190d55da5 mauikit-deca06385464ebb27cc7ab51ffd36ae534a7c3f3.tar.gz" +sha512sums="a5342b708ccaa9ecc8e3c84df839939ac52bb8cf8ea5813b14ad5403f92c443a2e35539849a5797dddaaa49e4bed93b6a4a2cd6ba477bf1c75e0575b8e622433 mauikit-76895b879db16b38bd017bed7998ddf2b6c025e6.tar.gz" diff --git a/main/nota/APKBUILD b/main/nota/APKBUILD index 8a5d48333..b4fd4e53a 100644 --- a/main/nota/APKBUILD +++ b/main/nota/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=nota -pkgver=0_git20190205 +pkgver=0_git20190423 pkgrel=0 -_commit="89356cdcd02abfcad3ee15ce0da8b3cd5081e451" +_commit="03180ff74a2440a9268e4218b071426672d98ff7" pkgdesc="Nota is a simple and convergent text editor" arch="all" url="https://github.com/mauikit/nota" -license="unknown" +license="GPL-2.0+ GPL-3.0+" depends="mauikit" makedepends="extra-cmake-modules qt5-qtbase-dev mauikit-dev" source="$pkgname-$_commit.tar.gz::https://github.com/mauikit/$pkgname/archive/$_commit.tar.gz" @@ -26,4 +26,4 @@ package() { cd "$builddir" DESTDIR="$pkgdir" make install } -sha512sums="b9358e309ce1088cbf6ebab7098d8efc4d7b4870b7eb6c007973822b95c0d01103609a06fa95c6eb20c82c95fea26f8c8a6fd8e3e94cb379d0881dd40b28ac6e nota-89356cdcd02abfcad3ee15ce0da8b3cd5081e451.tar.gz" +sha512sums="66496e071a2695c3dbba6f0020cd84daf13bd14c1f7d06f5ec95f77cff0746fd6864cfdb6ae53b48d812fb89efedb24f46b4a5c427fd47bd77bf8da8c30ecf90 nota-03180ff74a2440a9268e4218b071426672d98ff7.tar.gz" diff --git a/main/pix/APKBUILD b/main/pix/APKBUILD index 563d196d3..0db06a7ea 100644 --- a/main/pix/APKBUILD +++ b/main/pix/APKBUILD @@ -1,26 +1,30 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=pix -pkgver=0_git20190105 +pkgver=0_git20190423 pkgrel=0 -_commit="9a4543b1ea31c8317a557f3e97e2437e5e625f82" +_commit="63d0aab7d656426cabcd82dd0f3643e92fac7d7d" pkgdesc="Image gallery manager built with MauiKit" arch="all" 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" +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 \ + -DCMAKE_INSTALL_LIBDIR=lib make } package() { cd "$builddir" - make INSTALL_ROOT="$pkgdir" install + DESTDIR="$pkgdir" make install } -sha512sums="b4e641e5e0874b07da0add3d96473fecb5f11e240a3e55d33beb4da3ba78c6dacf872949fbbe127394c779c996da7920bfe1409bdda8782cf815c1f9116e961f pix-9a4543b1ea31c8317a557f3e97e2437e5e625f82.tar.gz" +sha512sums="48befb1dc8f914d7dd76fccfbcfe4987e99d25a85aeca923250a4705fdc342076e98cbf71ac1cf412082c78b9c82bef4745b6961e4e26e9b86fcb949c1dbf9f4 pix-63d0aab7d656426cabcd82dd0f3643e92fac7d7d.tar.gz" diff --git a/main/vvave/APKBUILD b/main/vvave/APKBUILD index bac92c84f..d37be3ed9 100644 --- a/main/vvave/APKBUILD +++ b/main/vvave/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Bart Ribbers # Maintainer: Bart Ribbers pkgname=vvave -pkgver=0_git20190105 +pkgver=0_git20190423 pkgrel=0 -_commit="35f7eb5af0df395c39fce4514b9a265414a920f2" +_commit="59783779eb42d8c742a7f8e3aedaa68a6b44f4b5" pkgdesc="VVAVE Music Player" arch="all" url="https://github.com/mauikit/vvave" @@ -27,6 +27,6 @@ check() { package() { cd "$builddir" - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" make install } -sha512sums="9fe9698636c64a6f8177561af13f539b374d23b9cd39cf6d10f6c8e71b6c9e74f3c5a85a03ce8f9ba38b20b3634ccccc6c7eef32879cef5818c5da05af33fa7d vvave-35f7eb5af0df395c39fce4514b9a265414a920f2.tar.gz" +sha512sums="7b1f01f2c25d2aface1dee14ebe162f88cd69fff0dc2c237eada074e19fc4ae3f71be561f9281c485ca1d5df48e2d2cd3113aedc0c43353d20191b73ef407eaf vvave-59783779eb42d8c742a7f8e3aedaa68a6b44f4b5.tar.gz"