From 4840d6e91fc250ba84177ebf4ef6032114b94278 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 7 Oct 2019 19:57:21 +1000
Subject: [PATCH] qPDFView: bump version

---
 ...17~beta1.patchset => qpdfview-0.4.18.patchset} |  8 ++++----
 ...0.4.17~beta1.recipe => qpdfview-0.4.18.recipe} | 15 ++++++---------
 2 files changed, 10 insertions(+), 13 deletions(-)
 rename app-text/qpdfview/patches/{qpdfview-0.4.17~beta1.patchset => qpdfview-0.4.18.patchset} (73%)
 rename app-text/qpdfview/{qpdfview-0.4.17~beta1.recipe => qpdfview-0.4.18.recipe} (84%)

diff --git a/app-text/qpdfview/patches/qpdfview-0.4.17~beta1.patchset b/app-text/qpdfview/patches/qpdfview-0.4.18.patchset
similarity index 73%
rename from app-text/qpdfview/patches/qpdfview-0.4.17~beta1.patchset
rename to app-text/qpdfview/patches/qpdfview-0.4.18.patchset
index 550f44b32..7a0b1c992 100644
--- a/app-text/qpdfview/patches/qpdfview-0.4.17~beta1.patchset
+++ b/app-text/qpdfview/patches/qpdfview-0.4.18.patchset
@@ -5,11 +5,11 @@ Subject: Haiku build fix
 
 
 diff --git a/application.pro b/application.pro
-index 7d0f0c0..ead2b6a 100644
+index 509f6e2..4893525 100644
 --- a/application.pro
 +++ b/application.pro
-@@ -242,6 +242,8 @@ lessThan(QT_MAJOR_VERSION, 5) : !without_magic {
-     SOURCES += sources/signalhandler.cpp
+@@ -262,6 +262,8 @@ static_resources {
+     RESOURCES += help.qrc translations.qrc
  }
  
 +haiku:LIBS += -lnetwork -lpoppler -lpoppler-qt5
@@ -18,5 +18,5 @@ index 7d0f0c0..ead2b6a 100644
  
  
 -- 
-2.13.1
+2.23.0
 
diff --git a/app-text/qpdfview/qpdfview-0.4.17~beta1.recipe b/app-text/qpdfview/qpdfview-0.4.18.recipe
similarity index 84%
rename from app-text/qpdfview/qpdfview-0.4.17~beta1.recipe
rename to app-text/qpdfview/qpdfview-0.4.18.recipe
index 6494b3dc3..201febdf0 100644
--- a/app-text/qpdfview/qpdfview-0.4.17~beta1.recipe
+++ b/app-text/qpdfview/qpdfview-0.4.18.recipe
@@ -4,10 +4,10 @@ DjVuLibre, CUPS and Qt, licensed under GPL version 2 or later."
 HOMEPAGE="https://launchpad.net/qpdfview/"
 COPYRIGHT="Adam Reichold et al."
 LICENSE="GNU GPL v2"
-REVISION="8"
-SOURCE_URI="$HOMEPAGE/trunk/0.4.17beta1/+download/qpdfview-0.4.17beta1.tar.gz"
-CHECKSUM_SHA256="60206c5f76410a35098e3c965552cec08cd85941776ea6f6b207d7ea63ce940f"
-SOURCE_DIR="qpdfview-0.4.17beta1"
+REVISION="1"
+SOURCE_URI="$HOMEPAGE/trunk/$portVersion/+download/qpdfview-$portVersion.tar.gz"
+CHECKSUM_SHA256="cc642e7fa74029373ca9b9fbc29adc4883f8b455130a78ad54746d6844a0396c"
+SOURCE_DIR="qpdfview-$portVersion"
 PATCHES="qpdfview-$portVersion.patchset"
 ADDITIONAL_FILES="qpdfview.rdef.in"
 
@@ -27,7 +27,6 @@ REQUIRES="
 	lib:libpoppler_qt5$secondaryArchSuffix
 	lib:libQt5Concurrent$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5DBus$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5PrintSupport$secondaryArchSuffix
 	lib:libQt5Sql$secondaryArchSuffix
@@ -37,7 +36,6 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libdbus_1$secondaryArchSuffix
 	devel:libdjvulibre$secondaryArchSuffix
 	devel:libGl$secondaryArchSuffix
 	devel:libmagic$secondaryArchSuffix
@@ -45,7 +43,6 @@ BUILD_REQUIRES="
 	devel:libpoppler_qt5$secondaryArchSuffix
 	devel:libQt5Concurrent$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5DBus$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5PrintSupport$secondaryArchSuffix
 	devel:libQt5Sql$secondaryArchSuffix
@@ -67,7 +64,7 @@ BUILD()
 
 	mkdir -p haiku_build && cd haiku_build
 	qmake ../qpdfview.pro \
-		CONFIG+="without_ps without_cups without_synctex" \
+		CONFIG+="without_ps without_cups without_synctex without_dbus without_signals" \
 		TARGET_INSTALL_PATH=$appsDir/qPDFView \
 		PLUGIN_INSTALL_PATH=$appsDir/qPDFView/lib \
 		MANUAL_INSTALL_PATH=$manDir
@@ -84,7 +81,7 @@ INSTALL()
 	# Icon
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
 
 	sed \
 		-e "s|@MAJOR@|$MAJOR|" \