yacreader, bump version (#6399)

This commit is contained in:
Schrijvers Luc
2021-11-13 08:04:49 +01:00
committed by GitHub
parent 79acfcf21f
commit d79ef89572
2 changed files with 25 additions and 25 deletions

View File

@@ -1,19 +1,19 @@
From 90c63cfd0424ddf22c77e6ed43ae88b453848444 Mon Sep 17 00:00:00 2001
From f22e620a0a9b93009bf23f1119caaee41df9b130 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 3aec879..e74219d 100644
index 067e78e..44e70ab 100644
--- a/YACReader/YACReader.pro
+++ b/YACReader/YACReader.pro
@@ -214,7 +214,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\""
@@ -209,7 +209,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\""
#MAKE INSTALL
-INSTALLS += bin docs icon desktop translation manpage
+!haiku {
+haiku {
+ INSTALLS += bin docs icon desktop translation manpage
+} else {
+ INSTALLS += bin docs translation manpage
@@ -21,7 +21,7 @@ index 3aec879..e74219d 100644
bin.path = $$BINDIR
isEmpty(DESTDIR) {
@@ -223,7 +227,11 @@ isEmpty(DESTDIR) {
@@ -218,7 +222,11 @@ isEmpty(DESTDIR) {
bin.files = $$DESTDIR/YACReader
}
@@ -34,7 +34,7 @@ index 3aec879..e74219d 100644
#rename docs for better packageability
docs.extra = cp ../README.md ../README
@@ -235,10 +243,18 @@ icon.files = ../YACReader.svg
@@ -230,10 +238,18 @@ icon.files = ../YACReader.svg
desktop.path = $$DATADIR/applications
desktop.files = ../YACReader.desktop
@@ -56,10 +56,10 @@ index 3aec879..e74219d 100644
#remove leftover doc files when 'make clean' is invoked
diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
index 2e6d688..622babe 100644
index ee810ec..4cf4aea 100644
--- a/YACReaderLibrary/YACReaderLibrary.pro
+++ b/YACReaderLibrary/YACReaderLibrary.pro
@@ -300,7 +300,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\""
@@ -306,7 +306,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\""
DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\""
#MAKE INSTALL
@@ -72,7 +72,7 @@ index 2e6d688..622babe 100644
bin.path = $$BINDIR
isEmpty(DESTDIR) {
@@ -309,7 +313,11 @@ isEmpty(DESTDIR) {
@@ -315,7 +319,11 @@ isEmpty(DESTDIR) {
bin.files = $$DESTDIR/YACReaderLibrary
}
@@ -85,7 +85,7 @@ index 2e6d688..622babe 100644
server.files = ../release/server
icon.path = $$DATADIR/icons/hicolor/scalable/apps
@@ -318,9 +326,17 @@ icon.files = ../YACReaderLibrary.svg
@@ -324,9 +332,17 @@ icon.files = ../YACReaderLibrary.svg
desktop.path = $$DATADIR/applications
desktop.files = ../YACReaderLibrary.desktop
@@ -106,31 +106,31 @@ index 2e6d688..622babe 100644
manpage.files = ../YACReaderLibrary.1
}
--
2.28.0
2.30.2
From 2765f61347829d4d7f2331774c4e045cc4306be4 Mon Sep 17 00:00:00 2001
From a0788d2c79d95c0f34abf1c283ee7b940fccb64d 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
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index 8da72b0..12c7df0 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -1756,7 +1756,11 @@ void LibraryWindow::openComic(const ComicDB &comic)
diff --git a/YACReaderLibrary/library_comic_opener.cpp b/YACReaderLibrary/library_comic_opener.cpp
index 36ebf74..62dc91a 100644
--- a/YACReaderLibrary/library_comic_opener.cpp
+++ b/YACReaderLibrary/library_comic_opener.cpp
@@ -40,7 +40,11 @@ bool YACReader::openComic(const ComicDB &comic,
#if defined Q_OS_UNIX && !defined Q_OS_MAC
QStringList parameters { currentPath(), QString("--comicId=%1").arg(comic.id), QString("--libraryId=%1").arg(libraryId) };
QStringList parameters { path, QString("--comicId=%1").arg(comic.id), QString("--libraryId=%1").arg(libraryId), labelParam };
+#if defined Q_OS_HAIKU
+ yacreaderFound = QProcess::startDetached(QString(BINDIR)+"/YACReader",parameters);
+#else
yacreaderFound = QProcess::startDetached(QStringLiteral("YACReader"), parameters);
yacreaderFound = QProcess::startDetached(QStringLiteral("YACReader"), parameters);
+#endif
#endif
if (!yacreaderFound) {
#ifdef Q_OS_WIN
return yacreaderFound;
--
2.28.0
2.30.2

View File

@@ -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="3"
REVISION="1"
SOURCE_URI="https://github.com/YACReader/yacreader/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="3468f30746e4666743aef6e11fb65bb815c9b66437df42cf46cd93d1a6b34f30"
CHECKSUM_SHA256="44268a0c07a5ba3c25202064c088b1deba7cb048f6cbfcf33b3538f18225ae62"
SOURCE_FILENAME="yacreader-$portVersion.tar.gz"
PATCHES="yacreader-$portVersion.patchset"
ADDITIONAL_FILES="
@@ -28,7 +28,7 @@ ADDITIONAL_FILES="
yacreader_library.rdef.in
"
ARCHITECTURES="all !x86_gcc2 ?x86"
ARCHITECTURES="all !x86_gcc2"
if [ "$targetArchitecture" = x86_gcc2 ]; then
SECONDARY_ARCHITECTURES="x86"
fi