From d43c2780ac3066c9bbfea11f1cf7d50d72d28d63 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Thu, 25 Jun 2020 16:26:10 +0200 Subject: [PATCH] main/{mauikit,vvave,pix,nota,index,buho}: drop, upstreamed to Alpine (MR 1311) --- main/buho/APKBUILD | 31 ------------------------------- main/index/APKBUILD | 26 -------------------------- main/mauikit/APKBUILD | 32 -------------------------------- main/nota/APKBUILD | 27 --------------------------- main/pix/APKBUILD | 30 ------------------------------ main/pix/fix-build.patch | 35 ----------------------------------- main/telepathy-ofono/APKBUILD | 4 ++-- main/vvave/APKBUILD | 30 ------------------------------ 8 files changed, 2 insertions(+), 213 deletions(-) delete mode 100644 main/buho/APKBUILD delete mode 100644 main/index/APKBUILD delete mode 100644 main/mauikit/APKBUILD delete mode 100644 main/nota/APKBUILD delete mode 100644 main/pix/APKBUILD delete mode 100644 main/pix/fix-build.patch delete mode 100644 main/vvave/APKBUILD diff --git a/main/buho/APKBUILD b/main/buho/APKBUILD deleted file mode 100644 index 5f251072a..000000000 --- a/main/buho/APKBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: Bart Ribbers -pkgname=buho -pkgver=0_git20190924 -pkgrel=1 -_commit="375480f43ca3f1eefb0fe029582426ad94e760ae" -pkgdesc="Note taking app based on MauiKit" -arch="all !armhf" # armhf blocked by qt5-qtdeclarative -url="https://invent.kde.org/kde/buho" -license="GPL-2.0-or-later" -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-dev" -source="$pkgname-$_commit.tar.gz::https://invent.kde.org/kde/buho/-/archive/$_commit.tar.gz" -options="!check" # No tests available -builddir="$srcdir/$pkgname-$_commit" - -build() { - cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib - - # Workaround for broken CMakeLists.txt - sed -i s/std=gnu90/std=c99/g CMakeFiles/buho.dir/flags.make - - make -} - -package() { - DESTDIR="$pkgdir" make install -} -sha512sums="5ab80674990634c3791e3e9efded2f03d1c671c043dd8c10bbab24903a01d2fcbd378b784ef7608e8d2db71ab8bdcb0d8c93ce00540cb97c753430498c5c2df0 buho-375480f43ca3f1eefb0fe029582426ad94e760ae.tar.gz" diff --git a/main/index/APKBUILD b/main/index/APKBUILD deleted file mode 100644 index 2abb5a0b2..000000000 --- a/main/index/APKBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Bart Ribbers -pkgname=index -pkgver=0_git20191001 -pkgrel=0 -_commit="82de927e6177d11c1cebe22b314c40cb23c91e3a" -pkgdesc="Index file manager based on MauiKit" -arch="all !armhf" # armhf blocked by qt5-qtdeclarative -url="https://invent.kde.org/kde/index-fm" -license="GPL-2.0-or-later" -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://invent.kde.org/kde/index-fm/-/archive/$_commit.tar.gz" -options="!check" # No tests available -builddir="$srcdir/$pkgname-fm-$_commit" - -build() { - cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - DESTDIR="$pkgdir" make install -} -sha512sums="2997dbfca1d4e1da2ad495b20b7bc7c3678b9f80ca717d68a7dbe4baf80803e11779f2ac489be4efe888a8a5a887a9a47075e01ebf5290d9ce5ee935be0c715a index-82de927e6177d11c1cebe22b314c40cb23c91e3a.tar.gz" diff --git a/main/mauikit/APKBUILD b/main/mauikit/APKBUILD deleted file mode 100644 index 89b0074dc..000000000 --- a/main/mauikit/APKBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Bart Ribbers -pkgname=mauikit -pkgver=0_git20191002 -pkgrel=2 -_commit="c7c58eab40317fd1fc48a9a407a0715d68c60b62" -pkgdesc="Kit for developing MAUI Apps" -arch="all !armhf" # armhf blocked by qt5-qtdeclarative -url="https://invent.kde.org/kde/mauikit" -license="GPL-2.0-or-later" -depends="kquicksyntaxhighlighter kirigami2" -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 syntax-highlighting-dev" -makedepends="$depends_dev extra-cmake-modules" -source="$pkgname-$_commit.tar.gz::https://invent.kde.org/kde/mauikit/-/archive/$_commit.tar.gz" -subpackages="$pkgname-dev" -builddir="$srcdir/$pkgname-$_commit" - -build() { - cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib - make -} - -check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -} - -package() { - DESTDIR="$pkgdir" make install -} -sha512sums="ea792d7c9ec31dfe2e999d06c8ec9e01d5bcba8df07bc1b9e08fc2d19ea2581944903bc53635dfb48a3e262a5baa94484b411052b126ec46aac31fe9e89cc67c mauikit-c7c58eab40317fd1fc48a9a407a0715d68c60b62.tar.gz" diff --git a/main/nota/APKBUILD b/main/nota/APKBUILD deleted file mode 100644 index 670d1cee5..000000000 --- a/main/nota/APKBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Bart Ribbers -pkgname=nota -pkgver=0_git20190923 -pkgrel=0 -_commit="bcafa4334b2458f2e153a591f25cb5309bbd638e" -pkgdesc="Nota is a simple and convergent text editor" -arch="all !armhf" # armhf blocked by qt5-qtdeclarative -url="https://invent.kde.org/kde/nota" -license="GPL-2.0-or-later" -depends="mauikit" -makedepends="extra-cmake-modules qt5-qtbase-dev mauikit-dev" -source="$pkgname-$_commit.tar.gz::https://invent.kde.org/kde/nota/-/archive/$_commit.tar.gz" -options="!check" # No tests available -builddir="$srcdir/$pkgname-$_commit" - -build() { - cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib - make -} - -package() { - DESTDIR="$pkgdir" make install -} -sha512sums="61b45cd7e7084200a28bcc1337684fa74390ab12a2d987b46b0ad16aaa227d98d869eda414b93d2849cdfde69d7e5a390bfded11973e647f6e1aa41360e9822a nota-bcafa4334b2458f2e153a591f25cb5309bbd638e.tar.gz" diff --git a/main/pix/APKBUILD b/main/pix/APKBUILD deleted file mode 100644 index e62590e18..000000000 --- a/main/pix/APKBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Bart Ribbers -pkgname=pix -_pkgname=maui-$pkgname -pkgver=0_git20190620 -pkgrel=1 -_commit="a41659898925a252a365334eaab986d647b967ad" -pkgdesc="Image gallery manager built with MauiKit" -arch="all !armhf" # armhf blocked by qt5-qtdeclarative -url="https://invent.kde.org/kde/maui-pix" -license="GPL-3.0-or-later" -depends="mauikit" -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://invent.kde.org/kde/$_pkgname/-/archive/$_commit.tar.gz - fix-build.patch" -options="!check" # No tests available -builddir="$srcdir/$_pkgname-$_commit" - -build() { - cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib - make -} - -package() { - DESTDIR="$pkgdir" make install -} -sha512sums="f35e47a1e6c699d79db7777ce8ec2a1de80279ef838d8f0e04880b9bba4f53ebaae8b04ab9134d9e738fe1221515fb747bdafae439701a36a6eda219abf7a148 pix-a41659898925a252a365334eaab986d647b967ad.tar.gz -1567f2467bdaef0f8b394a458fa4f1a8b3b77431662848a13a48cd2c781d3691b72ba574da7120922a15f48e5df3fb4c46f7ba52a37aea73ac76143ed378a227 fix-build.patch" diff --git a/main/pix/fix-build.patch b/main/pix/fix-build.patch deleted file mode 100644 index b53c86164..000000000 --- a/main/pix/fix-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a2f7ea..c319238 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,7 +62,7 @@ if (ANDROID) - target_link_libraries(vvave Qt5::AndroidExtras) - kde_source_files_enable_exceptions(pix src/pix.cpp) - else() -- find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config KIO Attica) -+ find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config KIO Attica SyntaxHighlighting) - find_package(Qt5 REQUIRED COMPONENTS WebEngine) - - target_link_libraries(pix KF5::ConfigCore KF5::Notifications KF5::KIOCore KF5::I18n KF5::Attica) -diff --git a/src/models/cloud/cloud.cpp b/src/models/cloud/cloud.cpp -index 22b4643..5e8c1bf 100644 ---- a/src/models/cloud/cloud.cpp -+++ b/src/models/cloud/cloud.cpp -@@ -33,7 +33,7 @@ Cloud::Cloud(QObject *parent) : BaseList (parent) - newItem[FMH::MODEL_KEY::TITLE] = item[FMH::MODEL_KEY::LABEL]; - - -- this->update(FM::toMap(newItem), this->pending.take(QString(item[FMH::MODEL_KEY::PATH]).replace(FMH::CloudCachePath+"opendesktop", FMH::PATHTYPE_NAME[FMH::PATHTYPE_KEY::CLOUD_PATH]))); -+ this->update(FM::toMap(newItem), this->pending.take(QString(item[FMH::MODEL_KEY::PATH]).replace(FMH::CloudCachePath+"opendesktop", FMH::PATHTYPE_SCHEME[FMH::PATHTYPE_KEY::CLOUD_PATH]))); - emit this->cloudImageReady(FM::toMap(newItem)); - }); - } -@@ -63,7 +63,7 @@ void Cloud::setList() - { - emit this->preListChanged(); - this->list.clear(); -- this->fm->getCloudServerContent(FMH::PATHTYPE_NAME[FMH::PATHTYPE_KEY::CLOUD_PATH]+"/"+this->account, FMH::FILTER_LIST[FMH::FILTER_TYPE::IMAGE], 3); -+ this->fm->getCloudServerContent(FMH::PATHTYPE_SCHEME[FMH::PATHTYPE_KEY::CLOUD_PATH]+"/"+this->account, FMH::FILTER_LIST[FMH::FILTER_TYPE::IMAGE], 3); - emit this->postListChanged(); - } - diff --git a/main/telepathy-ofono/APKBUILD b/main/telepathy-ofono/APKBUILD index 17be570e6..b3ebf7cae 100644 --- a/main/telepathy-ofono/APKBUILD +++ b/main/telepathy-ofono/APKBUILD @@ -9,7 +9,7 @@ arch="all" license="LGPL-2.1-or-later" depends="ofono" makedepends="cmake qt5-qtbase-dev libphonenumber-dev telepathy-qt-dev sqlite-dev telepathy-mission-control-dev libofono-qt-dev" -source="https://github.com/TelepathyIM/telepathy-ofono/archive/$_commiti/telepathy-ofono-$_comit.tar.gz" +source="https://github.com/TelepathyIM/telepathy-ofono/archive/$_commit/telepathy-ofono-$_comit.tar.gz" options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" @@ -26,4 +26,4 @@ package() { DESTDIR="$pkgdir" make -C build install } -sha512sums="946fa6f2af52f192fb4ad7bb130d28c9e4c698a10a1982a1ac4be69d4043621a5edd111a860d84bd7666778b388653167d28bae87e9e13a14c1fe5c1ff0685ad telepathy-ofono-817b61d214ad2be4f74d3facb4c090ac751faf5b.tar.gz" +sha512sums="946fa6f2af52f192fb4ad7bb130d28c9e4c698a10a1982a1ac4be69d4043621a5edd111a860d84bd7666778b388653167d28bae87e9e13a14c1fe5c1ff0685ad telepathy-ofono-.tar.gz" diff --git a/main/vvave/APKBUILD b/main/vvave/APKBUILD deleted file mode 100644 index 8194ee298..000000000 --- a/main/vvave/APKBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Bart Ribbers -pkgname=vvave -pkgver=0_git20190930 -pkgrel=0 -_commit="de835c501bce4939a04b35e3668578d9ff61c1c6" -pkgdesc="VVAVE Music Player" -arch="all !armhf" # armhf blocked by qt5-qtdeclarative -url="https://invent.kde.org/kde/vvave" -license="GPL-3.0-or-later" -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://invent.kde.org/kde/vvave/-/archive/$_commit.tar.gz" -options="!check" # No tests -builddir="$srcdir/$pkgname-$_commit" - -build() { - cmake \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -check() { - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -} - -package() { - DESTDIR="$pkgdir" make install -} -sha512sums="6c10d67d14f56e080521e7dbb82c3dde4031c040d53b063d443ab1f4adc7b408fedd7bd2f415bcff0f88f427d4d0b75f7299d54297676e5d3e20750cd9830bb4 vvave-de835c501bce4939a04b35e3668578d9ff61c1c6.tar.gz"