Update to 1.6.3

PR:		215232
Submitted by:	lightside <lightside@gmx.com> (maintainer)

3 files changed, 4 insertions, 87 deletions

diff --git a/editors/focuswriter/Makefile b/editors/focuswriter/Makefile
index a3f121704ea7..ebacf36679c3 100644
--- a/editors/focuswriter/Makefile
+++ b/editors/focuswriter/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	focuswriter
-PORTVERSION=	1.6.2
+PORTVERSION=	1.6.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 
diff --git a/editors/focuswriter/distinfo b/editors/focuswriter/distinfo
index 15041735ba0e..73229eeb3418 100644
--- a/editors/focuswriter/distinfo
+++ b/editors/focuswriter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480811966
-SHA256 (gottcode-focuswriter-v1.6.2_GH0.tar.gz) = dcc2c9fe081421c8fad9e7c653134f93659a28b0071e9925f9094c246520de3d
-SIZE (gottcode-focuswriter-v1.6.2_GH0.tar.gz) = 10326671
+TIMESTAMP = 1481462900
+SHA256 (gottcode-focuswriter-v1.6.3_GH0.tar.gz) = 6a456a7da397b988bc05d3d92c57bc3070c3c7dcf1a0a62561deef99ea3f8dc9
+SIZE (gottcode-focuswriter-v1.6.3_GH0.tar.gz) = 10325804
diff --git a/editors/focuswriter/files/patch-QPrinter.diff b/editors/focuswriter/files/patch-QPrinter.diff
deleted file mode 100644
index b00bbda3e924..000000000000
--- a/editors/focuswriter/files/patch-QPrinter.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-# Origin: https://github.com/gottcode/focuswriter/commit/e7311fb017782a0bbf017d0055f6f01b36233b89
-# Subject: FIXED: Possible delay on start when creating non-native printer.
-# Origin: https://github.com/gottcode/focuswriter/commit/1423754c4eae874857ce34613bddead8224ee887
-# Subject: FIXED: Memory leak from creating multiple printers.
-
---- src/stack.cpp.orig	2016-10-13 09:37:59 UTC
-+++ src/stack.cpp
-@@ -55,6 +55,7 @@
- Stack::Stack(QWidget* parent) :
- 	QWidget(parent),
- 	m_symbols_dialog(0),
-+	m_printer(0),
- 	m_current_document(0),
- 	m_footer_margin(0),
- 	m_header_margin(0),
-@@ -78,17 +79,6 @@ Stack::Stack(QWidget* parent) :
- 	m_find_dialog = new FindDialog(this);
- 	connect(m_find_dialog, SIGNAL(findNextAvailable(bool)), this, SIGNAL(findNextAvailable(bool)));
- 
--	m_printer = new QPrinter(QPrinter::HighResolution);
--#if (QT_VERSION >= QT_VERSION_CHECK(5,3,0))
--	m_printer->setPageSize(QPageSize(QPageSize::Letter));
--	m_printer->setPageOrientation(QPageLayout::Portrait);
--	m_printer->setPageMargins(QMarginsF(1.0, 1.0, 1.0, 1.0), QPageLayout::Inch);
--#else
--	m_printer->setPageSize(QPrinter::Letter);
--	m_printer->setOrientation(QPrinter::Portrait);
--	m_printer->setPageMargins(1.0, 1.0, 1.0, 1.0, QPrinter::Inch);
--#endif
--
- 	connect(ActionManager::instance(), SIGNAL(insertText(QString)), this, SLOT(insertSymbol(QString)));
- 
- 	m_layout = new QGridLayout(this);
-@@ -397,6 +387,7 @@ void Stack::pasteUnformatted()
- 
- void Stack::pageSetup()
- {
-+	initPrinter();
- 	QPageSetupDialog dialog(m_printer, this);
- 	dialog.exec();
- }
-@@ -405,6 +396,7 @@ void Stack::pageSetup()
- 
- void Stack::print()
- {
-+	initPrinter();
- 	m_current_document->print(m_printer);
- }
- 
-@@ -835,3 +827,23 @@ void Stack::updateMenuIndexes()
- }
- 
- //-----------------------------------------------------------------------------
-+
-+void Stack::initPrinter()
-+{
-+	if (m_printer) {
-+		return;
-+	}
-+
-+	m_printer = new QPrinter(QPrinter::HighResolution);
-+#if (QT_VERSION >= QT_VERSION_CHECK(5,3,0))
-+	m_printer->setPageSize(QPageSize(QPageSize::Letter));
-+	m_printer->setPageOrientation(QPageLayout::Portrait);
-+	m_printer->setPageMargins(QMarginsF(1.0, 1.0, 1.0, 1.0), QPageLayout::Inch);
-+#else
-+	m_printer->setPageSize(QPrinter::Letter);
-+	m_printer->setOrientation(QPrinter::Portrait);
-+	m_printer->setPageMargins(1.0, 1.0, 1.0, 1.0, QPrinter::Inch);
-+#endif
-+}
-+
-+//-----------------------------------------------------------------------------
---- src/stack.h.orig	2016-10-13 09:37:59 UTC
-+++ src/stack.h
-@@ -140,6 +140,7 @@ private:
- #if (QT_VERSION < QT_VERSION_CHECK(5,6,0))
- 	qreal devicePixelRatioF() const { return devicePixelRatio(); }
- #endif
-+	void initPrinter();
- 
- private:
- 	AlertLayer* m_alerts;