QuaZip issue has been fixed upstream

3 files changed, 18 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7404bb22e21..a14f688018e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Dec 14 02:43:20 UTC 2015
+# Tue Dec 22 00:14:09 UTC 2015
 pkgbase = screencloud-git
 	pkgdesc = An easy to use screenshot sharing tool. Experimental Qt5 UI. Development version.
-	pkgver = 1.2.0.16.g18b2795
+	pkgver = 1.2.0.r46.g5a493dd
 	pkgrel = 2
 	url = https://screencloud.net/
 	install = screencloud-git.install
@@ -18,12 +18,10 @@ pkgbase = screencloud-git
 	depends = xdg-utils
 	depends = hicolor-icon-theme
 	optdepends = python-crypto: for SFTP support
-	provides = screencloud=1.2.0.16.g18b2795
+	provides = screencloud=1.2.0.r46.g5a493dd
 	conflicts = screencloud
-	source = git+https://github.com/olav-st/screencloud.git#branch=qt5-port
-	source = quazip_qt5_fix.patch
+	source = git+https://github.com/olav-st/screencloud.git
 	sha512sums = SKIP
-	sha512sums = e37e6cc4425aef3fc0f4c5dd1580ee1da6ed4b1e1e69eabcd802cc05a4465d984d89894e1b3aa10fab3536007f72dd811e495516620b17dd86900fbf66200787
 
 pkgname = screencloud-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 0693697f6ea2..04a7b97d04b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=screencloud
 pkgname=${_pkgname}-git
-pkgver=1.2.0.16.g18b2795
+pkgver=1.2.0.r46.g5a493dd
 pkgrel=2
 pkgdesc='An easy to use screenshot sharing tool. Experimental Qt5 UI. Development version.'
 arch=('i686' 'x86_64')
@@ -20,44 +20,41 @@ conflicts=("${_pkgname}")
 install=${pkgname}.install
 
 source=(
-	"git+https://github.com/olav-st/${_pkgname}.git#branch=qt5-port"
-	'quazip_qt5_fix.patch'
+	"git+https://github.com/olav-st/${_pkgname}.git"
 )
 sha512sums=(
 	'SKIP'
-	'e37e6cc4425aef3fc0f4c5dd1580ee1da6ed4b1e1e69eabcd802cc05a4465d984d89894e1b3aa10fab3536007f72dd811e495516620b17dd86900fbf66200787'
 )
 
 pkgver() {
 	# Updating package version
 	cd ${srcdir}/${_pkgname}
-	git describe --long --tags | sed 's/^v//;s/-/./g'
+	(
+		set -o pipefail
+		git describe --long --tags 2>/dev/null | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' ||
+		printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	)
 }
 
 prepare() {
-	# QuaZip Qt5 patch
-	cd ${srcdir}/${_pkgname}
-	patch -p1 < ../quazip_qt5_fix.patch
-	
 	# Create build directory
 	mkdir -p ${srcdir}/build
 }
 
+# Needed for the self-compiled version
+_SCREENCLOUD_CONSUMER_KEY='ef5d77317892721a0acebbbc8157272b055da8074'
+_SCREENCLOUD_CONSUMER_SECRET='2d745141473f640b566aba29147fd672'
+
 build() {
-	# Needed for the self-compiled version
-	local _consumer_key='ef5d77317892721a0acebbbc8157272b055da8074'
-	local _consumer_secret='2d745141473f640b566aba29147fd672'
-	
 	# Building package
 	cd ${srcdir}/build
 	cmake ../${_pkgname}/${_pkgname} \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \
-		-DCONSUMER_KEY_SCREENCLOUD=${_consumer_key} \
-		-DCONSUMER_SECRET_SCREENCLOUD=${_consumer_secret} \
+		-DCONSUMER_KEY_SCREENCLOUD=${_SCREENCLOUD_CONSUMER_KEY} \
+		-DCONSUMER_SECRET_SCREENCLOUD=${_SCREENCLOUD_CONSUMER_SECRET} \
 		-DQT_USE_QT5=ON \
-		-DPYTHON_USE_PYTHON3=ON \
-		-DPYTHONQT_QTALL_INCLUDE_DIR=/usr/include/PythonQt/extensions/PythonQt_QtAll
+		-DPYTHON_USE_PYTHON3=ON
 }
 
 package() {
diff --git a/quazip_qt5_fix.patch b/quazip_qt5_fix.patch
deleted file mode 100644
index 7bedd6fc55ab..000000000000
--- a/quazip_qt5_fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -uprNEBZ --suppress-blank-empty a/screencloud/cmake/modules/FindQuaZip.cmake b/screencloud/cmake/modules/FindQuaZip.cmake
---- a/screencloud/cmake/modules/FindQuaZip.cmake	2015-11-16 03:23:29.536136000 -0600
-+++ b/screencloud/cmake/modules/FindQuaZip.cmake	2015-11-16 03:27:13.890465223 -0600
-@@ -11,12 +11,16 @@ IF (QUAZIP_INCLUDE_DIR)
-   SET(QUAZIP_FIND_QUIETLY TRUE)
- ENDIF (QUAZIP_INCLUDE_DIR)
-
--FIND_PATH(QUAZIP_INCLUDE_DIR quazip/quazip.h
-+# QuaZip Qt 5
-+# FIND_PATH(QUAZIP_INCLUDE_DIR quazip/quazip.h
-+FIND_PATH(QUAZIP_INCLUDE_DIR quazip5/quazip.h
- ${CMAKE_INCLUDE_PATH}
- ${CMAKE_INSTALL_PREFIX}/include
- )
-
--FIND_LIBRARY(QUAZIP_LIBRARY NAMES quazip )
-+# QuaZip Qt 5
-+# FIND_LIBRARY(QUAZIP_LIBRARY NAMES quazip )
-+FIND_LIBRARY(QUAZIP_LIBRARY NAMES quazip5)
-
- # handle the QUIETLY and REQUIRED arguments and set QUAZIP_FOUND to TRUE if
- # all listed variables are TRUE
-diff -uprNEBZ --suppress-blank-empty a/screencloud/src/plugin/pluginmanager.h b/screencloud/src/plugin/pluginmanager.h
---- a/screencloud/src/plugin/pluginmanager.h	2015-11-16 03:24:10.286318000 -0600
-+++ b/screencloud/src/plugin/pluginmanager.h	2015-11-16 03:28:10.470713876 -0600
-@@ -24,8 +24,8 @@
- #include <QNetworkAccessManager>
- #include <QNetworkRequest>
- #include <QNetworkReply>
--#include <quazip/quazipfile.h>
--#include <quazip/quazip.h>
-+#include <quazip5/quazipfile.h>
-+#include <quazip5/quazip.h>
- #include <utils/network.h>
- #include <QDomDocument>
- #include <QInputDialog>