From 9db1b80f7add5c79c2a73a81cbec9d016a967a05 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Tue, 8 Oct 2019 22:49:01 +0200
Subject: [PATCH] main/pix: fix build (!671)

Part of the patch is submitted as MR upstream:
  https://invent.kde.org/kde/maui-pix/merge_requests/1
---
 main/pix/APKBUILD        |  8 +++++---
 main/pix/fix-build.patch | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 main/pix/fix-build.patch

diff --git a/main/pix/APKBUILD b/main/pix/APKBUILD
index a793f1023..6e705c02a 100644
--- a/main/pix/APKBUILD
+++ b/main/pix/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=pix
 _pkgname=maui-$pkgname
 pkgver=0_git20190620
-pkgrel=0
+pkgrel=1
 _commit="a41659898925a252a365334eaab986d647b967ad"
 pkgdesc="Image gallery manager built with MauiKit"
 arch="all"
@@ -11,7 +11,8 @@ 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"
+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"
 
@@ -26,4 +27,5 @@ build() {
 package() {
 	DESTDIR="$pkgdir" make install
 }
-sha512sums="f35e47a1e6c699d79db7777ce8ec2a1de80279ef838d8f0e04880b9bba4f53ebaae8b04ab9134d9e738fe1221515fb747bdafae439701a36a6eda219abf7a148  pix-a41659898925a252a365334eaab986d647b967ad.tar.gz"
+sha512sums="f35e47a1e6c699d79db7777ce8ec2a1de80279ef838d8f0e04880b9bba4f53ebaae8b04ab9134d9e738fe1221515fb747bdafae439701a36a6eda219abf7a148  pix-a41659898925a252a365334eaab986d647b967ad.tar.gz
+1567f2467bdaef0f8b394a458fa4f1a8b3b77431662848a13a48cd2c781d3691b72ba574da7120922a15f48e5df3fb4c46f7ba52a37aea73ac76143ed378a227  fix-build.patch"
diff --git a/main/pix/fix-build.patch b/main/pix/fix-build.patch
new file mode 100644
index 000000000..b53c86164
--- /dev/null
+++ b/main/pix/fix-build.patch
@@ -0,0 +1,35 @@
+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();
+ }
+