Version 1.0.3

4 files changed, 13 insertions, 145 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a5414b8a676..d94ab4e39842 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Feb 10 15:10:00 UTC 2016
+# Thu Jul  7 12:16:52 UTC 2016
 pkgbase = drawpile
 	pkgdesc = Collaborative drawing program specially made for use with pen tablets
-	pkgver = 1.0.2
-	pkgrel = 4
+	pkgver = 1.0.3
+	pkgrel = 1
 	url = http://drawpile.net/
 	arch = i686
 	arch = x86_64
@@ -14,10 +14,8 @@ pkgbase = drawpile
 	makedepends = qt5-svg
 	makedepends = ninja
 	makedepends = cmake
-	source = http://drawpile.net/files/src/drawpile-1.0.2.tar.gz
-	source = drawpile103.patch
-	sha256sums = 012a470316ccca51a28700948cd3f866c9b7fcc8fa9bfa21f27f28e9dc53f019
-	sha256sums = f25371be6b712c079dc1e742f246e2b9b60a9c6b083c3cebf60916c80521e160
+	source = http://drawpile.net/files/src/drawpile-1.0.3.tar.gz
+	sha256sums = d224543869039acaaaf7e3116332013acd81230f10efa80017d5af512281f7c9
 
 pkgname = drawpile
 	pkgdesc = Collaborative drawing program specially made for use with pen tablets (meta package)
@@ -39,8 +37,8 @@ pkgname = drawpile-server
 	pkgdesc = Collaborative drawing program specially made for use with pen tablets (server)
 	depends = drawpile-common
 	depends = karchive
-	optdepends = libmicrohttpd: web-admin feature (server dependency)
-	optdepends = libsystemd: systemd and logging support (server dependency)
+	optdepends = libmicrohttpd: web-admin feature
+	optdepends = libsystemd: systemd and logging support
 
 pkgname = drawpile-common
 	pkgdesc = Collaborative drawing program specially made for use with pen tablets (common files)
diff --git a/PKGBUILD b/PKGBUILD
index 7e6929f9bf35..fe729fce4c0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,31 +4,18 @@
 
 pkgbase='drawpile'
 pkgname=("${pkgbase}"{,'-client','-server','-common'})
-pkgver=1.0.2
-pkgrel=4
+pkgver=1.0.3
+pkgrel=1
 pkgdesc='Collaborative drawing program specially made for use with pen tablets'
 arch=('i686' 'x86_64')
 url='http://drawpile.net/'
 license=('GPL3')
 makedepends=('karchive' 'qt5-multimedia' 'qt5-tools' 'qt5-svg' 'ninja' 'cmake')
-source=("http://drawpile.net/files/src/${pkgbase}-${pkgver}.tar.gz"
-	'drawpile103.patch')
-sha256sums=('012a470316ccca51a28700948cd3f866c9b7fcc8fa9bfa21f27f28e9dc53f019'
-	'f25371be6b712c079dc1e742f246e2b9b60a9c6b083c3cebf60916c80521e160')
+source=("http://drawpile.net/files/src/${pkgbase}-${pkgver}.tar.gz")
+sha256sums=('d224543869039acaaaf7e3116332013acd81230f10efa80017d5af512281f7c9')
 
 _cmakeargs+=('-Wno-dev')
 
-## Used for interactive makepkg later ##
-# msg  "If you wish to only install the server or client set '_build' to 'SERVER' or 'CLIENT' in the provided PKGBUILD file and recompile this package."
-# msg2 "The package 'customizepkg' may be helpful in this case."
-
-prepare() {
-	cd "${pkgbase}-${pkgver}"
-
-	msg2 'Applying patches of unofficial Drawpile 1.0.3'
-	patch -p1 -i '../drawpile103.patch'
-}
-
 build() {
 	cd "${pkgbase}-${pkgver}"
 
@@ -63,13 +50,12 @@ package_drawpile-client() {
 package_drawpile-server() {
 	pkgdesc+=' (server)'
 	depends=('drawpile-common' 'karchive')
-	optdepends=('libmicrohttpd: web-admin feature (server dependency)'
-		'libsystemd: systemd and logging support (server dependency)')
+	optdepends=('libmicrohttpd: web-admin feature'
+		'libsystemd: systemd and logging support')
 	cd "${pkgbase}-${pkgver}"
 
 	DESTDIR="${pkgdir}" ninja -C 'build' install
 	rm -rfv "${pkgdir}"/usr/{share,bin/drawpile{,-1.*}}
-	#find "${pkgdir}/usr/bin" -not -type d -not -name 'drawpile-srv' -exec rm -f {} \;
 }
 
 package_drawpile-common() {
diff --git a/drawpile.install b/drawpile.install
index bb7981908ba3..911e80648828 100644
--- a/drawpile.install
+++ b/drawpile.install
@@ -1,8 +1,4 @@
 # Colored makepkg-like functions
-msg_blue() {
-	printf "${blue}==>${bold} $1${all_off}\n"
-}
-
 note() {
 	printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
 }
@@ -13,7 +9,6 @@ yellow="${bold}$(tput setaf 3)"
 blue="${bold}$(tput setaf 4)"
 
 _update() {
-	msg_blue 'Updating desktop MIME database...'
 	update-desktop-database -q
 }
 
diff --git a/drawpile103.patch b/drawpile103.patch
deleted file mode 100644
index eba1428fcd89..000000000000
--- a/drawpile103.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff --git a/ChangeLog b/ChangeLog
-index feb0daf..76d59d9 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,7 @@
-+2015-1?-?? Version 1.0.3
-+ * Remember last used path when saving files
-+ * Support new miniupnpc library version
-+
- 2015-09-13 Version 1.0.2
-  * Fixed crash when smoother was set to zero
-  * Server: added command line option to enable split recording mode (new recording for each snapshot)
-diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
-index 30dde26..9bbf5f2 100644
---- a/src/client/CMakeLists.txt
-+++ b/src/client/CMakeLists.txt
-@@ -212,6 +212,7 @@ else()
- 	)
- 	qt5_add_resources( QtResource bundled/QtColorWidgets/color_widgets.qrc )
- 	include_directories("${CMAKE_CURRENT_SOURCE_DIR}/bundled/QtColorWidgets")
-+        add_definitions(-DQTCOLORPICKER_STATICALLY_LINKED)
- endif()
- 
- qt5_wrap_ui( UI_Headers ${UIs} )
-diff --git a/src/client/bundled/QtColorWidgets/color_utils.cpp b/src/client/bundled/QtColorWidgets/color_utils.cpp
-index b153158..1d829d6 100644
---- a/src/client/bundled/QtColorWidgets/color_utils.cpp
-+++ b/src/client/bundled/QtColorWidgets/color_utils.cpp
-@@ -22,6 +22,8 @@
- */
- #include "color_utils.hpp"
- 
-+#include <cmath>
-+
- namespace color_widgets {
- namespace detail {
- 
-diff --git a/src/client/mainwindow.cpp b/src/client/mainwindow.cpp
-index 5e15177..645326a 100644
---- a/src/client/mainwindow.cpp
-+++ b/src/client/mainwindow.cpp
-@@ -104,8 +104,8 @@
- namespace {
- 
- QString getLastPath() {
--	QSettings cfg;
--	return cfg.value("window/lastpath").toString();
-+	QFileInfo fi(QSettings().value("window/lastpath").toString());
-+	return fi.absoluteDir().absolutePath();
- }
- 
- void setLastPath(const QString &lastpath) {
-@@ -918,13 +918,8 @@ void MainWindow::open()
- 			QApplication::tr("All Files (*)");
- 
- 	// Get the file name to open
--#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
--	const QUrl file = QFileDialog::getOpenFileUrl(this,
--			tr("Open Image"), getLastPath(), filter);
--#else
- 	const QUrl file = QUrl::fromLocalFile(QFileDialog::getOpenFileName(this,
- 			tr("Open Image"), getLastPath(), filter));
--#endif
- 
- 	// Open the file if it was selected
- 	if(file.isValid()) {
-@@ -1035,7 +1030,6 @@ bool MainWindow::saveas()
- 	// Get the file name
- 	QString file = QFileDialog::getSaveFileName(this,
- 			tr("Save Image"), getLastPath(), filter.join(";;"), &selfilter);
--
- 	if(file.isEmpty()==false) {
- 
- 		// Set file suffix if missing
-@@ -1073,6 +1067,8 @@ bool MainWindow::saveas()
- 			_autosave->setEnabled(true);
- 			setWindowModified(false);
- 			updateTitle();
-+			setLastPath(file);
-+			addRecentFile(file);
- 			return true;
- 		}
- 	}
-diff --git a/src/client/net/upnp.cpp b/src/client/net/upnp.cpp
-index f31c972..543432a 100644
---- a/src/client/net/upnp.cpp
-+++ b/src/client/net/upnp.cpp
-@@ -92,7 +92,11 @@ bool UPnPClient::doDiscover()
- 		return true;
- 
- 	int error;
-+#if MINIUPNPC_API_VERSION < 14
- 	d->devices = upnpDiscover(2000, nullptr, nullptr, 0, 0, &error);
-+#else
-+	d->devices = upnpDiscover(2000, nullptr, nullptr, 0, 0, 2, &error);
-+#endif
- 	if(!d->devices) {
- 		qWarning("UPnP: Error (%d) discovering devices!", error);
- 		return false;
-diff --git a/src/shared/bundled/karchive/karchive_bundled.h b/src/shared/bundled/karchive/karchive_bundled.h
-index 29cffdd..78c9f86 100644
---- a/src/shared/bundled/karchive/karchive_bundled.h
-+++ b/src/shared/bundled/karchive/karchive_bundled.h
-@@ -28,6 +28,7 @@
- #include <QtCore/QString>
- #include <QtCore/QStringList>
- #include <QtCore/QHash>
-+#include <QtCore/QIODevice>
- 
- #ifdef Q_OS_WIN
- #include <qplatformdefs.h> // mode_t