Create package

6 files changed, 203 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..30037fb432de
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,29 @@
+pkgbase = xpiks-git
+	pkgdesc = Cross-Platform Image Keywording Software
+	pkgver = r3949.1f581c6f
+	pkgrel = 1
+	url = https://xpiksapp.com/
+	arch = x86_64
+	license = MPL
+	makedepends = git
+	depends = curl
+	depends = zlib
+	depends = qt5-base
+	depends = qt5-declarative
+	depends = qt5-quickcontrols
+	depends = qt5-svg
+	depends = qt5-graphicaleffects
+	depends = quazip
+	depends = perl-image-exiftool
+	conflicts = xpiks
+	source = xpiks::git+https://github.com/ribtoks/xpiks.git
+	source = xpiks-build_with_system_libquazip5.patch
+	source = xpiks-libxpks_stub.patch
+	source = xpiks.desktop
+	md5sums = SKIP
+	md5sums = 8d082ec0a08051aec943aa3c35486592
+	md5sums = c3b93f3c3410f76fc50b94a55b551e6b
+	md5sums = 4112f7181afe7e45eb878b8eccc91eaf
+
+pkgname = xpiks-git
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..c97359a2a6a8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+src/
+pkg/
+xpiks/
+xpiks-*.pkg.tar*
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..3e086936b5f2
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,85 @@
+# Maintainer: Evgeny Shvits <tony.darko@gmail.com>
+
+pkgname=xpiks-git
+pkgver=r3949.1f581c6f
+_gitname=xpiks
+pkgrel=1
+pkgdesc='Cross-Platform Image Keywording Software'
+arch=('x86_64')
+url='https://xpiksapp.com/'
+license=('MPL')
+depends=('curl' 'zlib' 'qt5-base' 'qt5-declarative' 'qt5-quickcontrols' 'qt5-svg' 'qt5-graphicaleffects' 'quazip' 'perl-image-exiftool')
+optdepends=()
+makedepends=('git')
+conflicts=('xpiks')
+
+source=(
+	"${_gitname}::git+https://github.com/ribtoks/xpiks.git"
+	"xpiks-build_with_system_libquazip5.patch"
+	"xpiks-libxpks_stub.patch"
+	"xpiks.desktop"
+	)
+md5sums=('SKIP'
+         '8d082ec0a08051aec943aa3c35486592'
+         'c3b93f3c3410f76fc50b94a55b551e6b'
+         '4112f7181afe7e45eb878b8eccc91eaf')
+
+pkgver() {
+  cd "$_gitname"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+	cd "${srcdir}/${_gitname}"
+	
+	#git apply ../xpiks-build_with_system_libquazip5.patch
+	git apply ../xpiks-libxpks_stub.patch
+	
+	git submodule update --init --recursive
+}
+
+build() {
+	cd "${srcdir}/${_gitname}"
+	
+	# delete build dir if exists
+	#[ -d "build" ] && rm -r build
+	
+	./scripts/build/build_vendors_linux.sh release
+	
+	[ ! -d "build" ] && mkdir build
+	cd build
+	
+	qmake ../src/xpiks-qt/xpiks-qt.pro "CONFIG+=release" \
+		QMAKE_CFLAGS="${CFLAGS}" \
+		QMAKE_CXXFLAGS="${CXXFLAGS}" \
+		QMAKE_LFLAGS='${LDFLAGS}' \
+		'QMAKE_RPATHDIR+=$ORIGIN'
+	
+	make
+}
+
+package() {
+	cd "${srcdir}/${_gitname}/build"
+	
+	install -Dm755 Xpiks "${pkgdir}/opt/Xpiks/Xpiks"
+	install -d "${pkgdir}/opt/Xpiks/translations/"
+	install -m644 translations/*.qm "${pkgdir}/opt/Xpiks/translations/"
+	install -m644 whatsnew.txt "${pkgdir}/opt/Xpiks/"
+	install -d "${pkgdir}/opt/Xpiks/dict/"
+	install -m644 dict/* "${pkgdir}/opt/Xpiks/dict/"
+	install -d "${pkgdir}/opt/Xpiks/ac_sources/"
+	install -m644 ac_sources/* "${pkgdir}/opt/Xpiks/ac_sources/"
+	
+	# install vendor libs
+	cd "${srcdir}/${_gitname}"
+	install -Dm644 libs/release/libface.so.1 "${pkgdir}/opt/Xpiks/libface.so.1"
+	install -Dm644 libs/release/libssdll.so.1 "${pkgdir}/opt/Xpiks/libssdll.so.1"
+		
+	# install icon
+	install -Dm644 src/xpiks-qt/debian/xpiks.png "${pkgdir}/usr/share/pixmaps/Xpiks.png"
+	
+	# install .desktop file
+	cd "${srcdir}"
+	install -Dm644 xpiks.desktop "${pkgdir}/usr/share/applications/xpiks.desktop"
+}
+
diff --git a/xpiks-build_with_system_libquazip5.patch b/xpiks-build_with_system_libquazip5.patch
new file mode 100644
index 000000000000..bd3dbd134bbe
--- /dev/null
+++ b/xpiks-build_with_system_libquazip5.patch
@@ -0,0 +1,35 @@
+diff --git a/src/xpiks-qt/Helpers/ziphelper.cpp b/src/xpiks-qt/Helpers/ziphelper.cpp
+index 1e3c99aa..8f53d404 100644
+--- a/src/xpiks-qt/Helpers/ziphelper.cpp
++++ b/src/xpiks-qt/Helpers/ziphelper.cpp
+@@ -10,7 +10,7 @@
+ 
+ #include "ziphelper.h"
+ #include <QFileInfo>
+-#include <quazip/JlCompress.h>
++#include <quazip5/JlCompress.h>
+ #include "filehelpers.h"
+ #include "../Common/logging.h"
+ 
+diff --git a/src/xpiks-qt/xpiks-qt.pro b/src/xpiks-qt/xpiks-qt.pro
+index d36ccb0d..d6cff7e5 100644
+--- a/src/xpiks-qt/xpiks-qt.pro
++++ b/src/xpiks-qt/xpiks-qt.pro
+@@ -635,7 +635,7 @@ LIBS += -lhunspell
+ LIBS += -lcurl
+ LIBS += -lface
+ LIBS += -lssdll
+-LIBS += -lquazip
++LIBS += -lquazip5
+ LIBS += -lz
+ LIBS += -lthmbnlr
+ LIBS += -lxpks
+@@ -735,7 +735,7 @@ win32 {
+ 
+ linux {
+     message("for Linux")
+-    INCLUDEPATH += "../../vendors/quazip"
++    #INCLUDEPATH += "../../vendors/quazip"
+     BUILDNO = $$system($$PWD/../../scripts/build/buildno.sh)
+ 
+     LIBS += -ldl
diff --git a/xpiks-libxpks_stub.patch b/xpiks-libxpks_stub.patch
new file mode 100644
index 000000000000..6467ca8b6e49
--- /dev/null
+++ b/xpiks-libxpks_stub.patch
@@ -0,0 +1,38 @@
+diff --git a/src/libxpks_stub/Microstocks/apisecretsstorage.cpp b/src/libxpks_stub/Microstocks/apisecretsstorage.cpp
+index 9f32d51c..ae784251 100644
+--- a/src/libxpks_stub/Microstocks/apisecretsstorage.cpp
++++ b/src/libxpks_stub/Microstocks/apisecretsstorage.cpp
+@@ -5,10 +5,33 @@
+ #include <QWriteLocker>
+ #include <QtGlobal>
+ 
++#include <Microstocks/microstockenums.h>
++
+ namespace libxpks {
+     namespace microstocks {
+         APISecretsStorage::APISecretsStorage()
+         {
++            /*
++             * Init keypairs
++             */
++            Encryption::SecretPair ShutterstockClientID, ShutterstockClientSecret, FotoliaAPIKey, GettyAPIKey;
++
++            ShutterstockClientID.m_Key = "MasterPassword";
++            ShutterstockClientID.m_Value = "28a2a9b917961a0cbc343c81b2dd0f6618377f9210aa3182e5cc9f5588f914d918ede1533c9e06b91769c89e80909743";
++
++            ShutterstockClientSecret.m_Key = "MasterPassword";
++            ShutterstockClientSecret.m_Value = "5092d9a967c2f19b57aac29bc09ac3b9e6ae5baec1a371331b73ff24f1625d95c4f3fef90bdacfbe9b0b3803b48c269192bc55f14bb9c2b5a16d650cd641b746eb384fcf9dbd53a96f1f81215921b04409f3635ecf846ffdf01ee04ba76624c9";
++
++            FotoliaAPIKey.m_Key = "MasterPassword";
++            FotoliaAPIKey.m_Value = "ad2954b4ee1e9686fbf8446f85e0c26edfae6003f51f49ca5559aed915879e733bbaf2003b3575bc0b96e682a30a69907c612865ec8f4ec2522131108a4a9f24467f1f83befc3d80201e5f906c761341";
++
++            GettyAPIKey.m_Key = "MasterPassword";
++            GettyAPIKey.m_Value = "17a45639c3bf88f7a6d549759af398090c3f420e53a61a06d7a2a2b153c89fc9470b2365dae8c6d92203287dc6f69f55b230835a8fb2a70b24e806771b750690";
++
++            m_Storage.insert(Microstocks::ShutterstockClientID, ShutterstockClientID);
++            m_Storage.insert(Microstocks::ShutterstockClientSecret, ShutterstockClientSecret);
++            m_Storage.insert(Microstocks::FotoliaAPIKey, FotoliaAPIKey);
++            m_Storage.insert(Microstocks::GettyAPIKey, GettyAPIKey);
+         }
+ 
+         bool APISecretsStorage::tryFindPair(int key, Encryption::SecretPair &secretPair) {
diff --git a/xpiks.desktop b/xpiks.desktop
new file mode 100644
index 000000000000..142411a0acc7
--- /dev/null
+++ b/xpiks.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Xpiks
+Exec=/opt/Xpiks/Xpiks
+GenericName=Xpiks
+Comment=Cross-platform (X) Photo Keywording Software
+Icon=Xpiks
+Type=Application
+Terminal=false
+StartupNotify=false
+Encoding=UTF-8
+Categories=Graphics;Photography;
+