From d660cd0afb715c48e346b04688ddf113e1803d43 Mon Sep 17 00:00:00 2001
From: extrowerk <5569059+extrowerk@users.noreply.github.com>
Date: Sun, 6 Dec 2020 20:52:22 +0100
Subject: [PATCH] YACReader: bump (#5398)

---
 ...9.6.2.patchset => yacreader-9.7.1.patchset} | 18 +++++++++---------
 ...der-9.6.2.recipe => yacreader-9.7.1.recipe} |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename media-gfx/yacreader/patches/{yacreader-9.6.2.patchset => yacreader-9.7.1.patchset} (90%)
 rename media-gfx/yacreader/{yacreader-9.6.2.recipe => yacreader-9.7.1.recipe} (96%)

diff --git a/media-gfx/yacreader/patches/yacreader-9.6.2.patchset b/media-gfx/yacreader/patches/yacreader-9.7.1.patchset
similarity index 90%
rename from media-gfx/yacreader/patches/yacreader-9.6.2.patchset
rename to media-gfx/yacreader/patches/yacreader-9.7.1.patchset
index 0c57358cd..3e4ddcc32 100644
--- a/media-gfx/yacreader/patches/yacreader-9.6.2.patchset
+++ b/media-gfx/yacreader/patches/yacreader-9.7.1.patchset
@@ -1,11 +1,11 @@
-From 3d8c90f5ba0afd34338e64774834b893d59d424e Mon Sep 17 00:00:00 2001
+From 90c63cfd0424ddf22c77e6ed43ae88b453848444 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Thu, 27 Sep 2018 10:48:01 +0200
 Subject: Install adjustments for HAIKU
 
 
 diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro
-index ecad046..cd95170 100644
+index 3aec879..e74219d 100644
 --- a/YACReader/YACReader.pro
 +++ b/YACReader/YACReader.pro
 @@ -214,7 +214,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\""  "DATADIR=\\\"$$DATADIR\\\""
@@ -56,10 +56,10 @@ index ecad046..cd95170 100644
  
  #remove leftover doc files when 'make clean' is invoked
 diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
-index b39293f..9add1ed 100644
+index 2e6d688..622babe 100644
 --- a/YACReaderLibrary/YACReaderLibrary.pro
 +++ b/YACReaderLibrary/YACReaderLibrary.pro
-@@ -298,7 +298,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\""  "DATADIR=\\\"$$DATADIR\\\""
+@@ -300,7 +300,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\""  "DATADIR=\\\"$$DATADIR\\\""
  DEFINES += "LIBDIR=\\\"$$LIBDIR\\\""  "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\""
  
  #MAKE INSTALL
@@ -72,7 +72,7 @@ index b39293f..9add1ed 100644
  
  bin.path = $$BINDIR
  isEmpty(DESTDIR) {
-@@ -307,7 +311,11 @@ isEmpty(DESTDIR) {
+@@ -309,7 +313,11 @@ isEmpty(DESTDIR) {
    bin.files = $$DESTDIR/YACReaderLibrary
  }
  
@@ -85,7 +85,7 @@ index b39293f..9add1ed 100644
  server.files = ../release/server
  
  icon.path = $$DATADIR/icons/hicolor/scalable/apps
-@@ -316,9 +324,17 @@ icon.files = ../YACReaderLibrary.svg
+@@ -318,9 +326,17 @@ icon.files = ../YACReaderLibrary.svg
  desktop.path = $$DATADIR/applications
  desktop.files = ../YACReaderLibrary.desktop
  
@@ -106,10 +106,10 @@ index b39293f..9add1ed 100644
  manpage.files = ../YACReaderLibrary.1
  }
 -- 
-2.24.0
+2.28.0
 
 
-From d8e9672ab0309bca4cfccd7abf1a24c8d80be514 Mon Sep 17 00:00:00 2001
+From 2765f61347829d4d7f2331774c4e045cc4306be4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Thu, 27 Sep 2018 10:52:38 +0200
 Subject: Library can open Reader now
@@ -132,5 +132,5 @@ index 8da72b0..12c7df0 100644
          if (!yacreaderFound) {
  #ifdef Q_OS_WIN
 -- 
-2.24.0
+2.28.0
 
diff --git a/media-gfx/yacreader/yacreader-9.6.2.recipe b/media-gfx/yacreader/yacreader-9.7.1.recipe
similarity index 96%
rename from media-gfx/yacreader/yacreader-9.6.2.recipe
rename to media-gfx/yacreader/yacreader-9.7.1.recipe
index 68a261201..021abfe09 100644
--- a/media-gfx/yacreader/yacreader-9.6.2.recipe
+++ b/media-gfx/yacreader/yacreader-9.7.1.recipe
@@ -18,9 +18,9 @@ number, volumen, authors and more.
 HOMEPAGE="https://www.yacreader.com/"
 COPYRIGHT="2018 Luis Ángel San Martín Rodríguez"
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/YACReader/yacreader/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="e58cd10071180c759f53d74ac7049105b8608e63661bd1b68bcbd8fc8a534a80"
+CHECKSUM_SHA256="3468f30746e4666743aef6e11fb65bb815c9b66437df42cf46cd93d1a6b34f30"
 SOURCE_FILENAME="yacreader-$portVersion.tar.gz"
 PATCHES="yacreader-$portVersion.patchset"
 ADDITIONAL_FILES="
@@ -99,7 +99,7 @@ INSTALL()
 
 	# Cleanup
 	mv "$appsDir"/YACReader/bin/* "$appsDir"/YACReader
-	rm -rf "$appsDir"/YACReader/bin
+	rm -rf "$appsDir"/YACReader/{bin,lib}
 
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"