diff --git a/media-gfx/yacreader/patches/yacreader-9.5.0.patchset b/media-gfx/yacreader/patches/yacreader-9.5.0.patchset deleted file mode 100644 index 0d16ec260..000000000 --- a/media-gfx/yacreader/patches/yacreader-9.5.0.patchset +++ /dev/null @@ -1,147 +0,0 @@ -From e277b4771fc6b3e9136a434742e3b8ed9fbd07a0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Thu, 27 Sep 2018 10:48:01 +0200 -Subject: [PATCH] Install adjustments for HAIKU - ---- - YACReader/YACReader.pro | 24 ++++++++++++++++++++---- - YACReaderLibrary/YACReaderLibrary.pro | 24 ++++++++++++++++++++---- - 2 files changed, 40 insertions(+), 8 deletions(-) - -diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro -index 120ad83..ff8263f 100644 ---- a/YACReader/YACReader.pro -+++ b/YACReader/YACReader.pro -@@ -219,7 +219,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" - - #MAKE INSTALL - --INSTALLS += bin docs icon desktop translation manpage -+!haiku { -+ INSTALLS += bin docs icon desktop translation manpage -+} else { -+ INSTALLS += bin docs translation manpage -+} - - bin.path = $$BINDIR - isEmpty(DESTDIR) { -@@ -228,7 +232,11 @@ isEmpty(DESTDIR) { - bin.files = $$DESTDIR/YACReader - } - --docs.path = $$DATADIR/doc/yacreader -+isEmpty(DOCDIR) { -+ docs.path = $$DATADIR/doc/yacreader -+} else { -+ docs.path = $$DOCDIR/ -+} - - #rename docs for better packageability - docs.extra = cp ../README.txt ../README -@@ -240,10 +248,18 @@ icon.files = ../YACReader.svg - desktop.path = $$DATADIR/applications - desktop.files = ../YACReader.desktop - --translation.path = $$DATADIR/yacreader/languages -+!haiku { -+ translation.path = $$DATADIR/yacreader/languages -+} else { -+ translation.path = $$DATADIR/data/languages -+} - translation.files = ../release/languages/yacreader_* - --manpage.path = $$DATADIR/man/man1 -+isEmpty(MANDIR) { -+ manpage.path = $$DATADIR/man/man1 -+} else { -+ manpage.path = $$MANDIR/man1 -+} - manpage.files = ../YACReader.1 - - #remove leftover doc files when 'make clean' is invoked -diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro -index 203107c..55ee900 100644 ---- a/YACReaderLibrary/YACReaderLibrary.pro -+++ b/YACReaderLibrary/YACReaderLibrary.pro -@@ -295,7 +295,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" - DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\"" - - #MAKE INSTALL --INSTALLS += bin icon desktop server translation manpage -+!haiku { -+ INSTALLS += bin icon desktop server translation manpage -+} else { -+ INSTALLS += bin server translation manpage -+} - - bin.path = $$BINDIR - isEmpty(DESTDIR) { -@@ -304,7 +308,11 @@ isEmpty(DESTDIR) { - bin.files = $$DESTDIR/YACReaderLibrary - } - --server.path = $$DATADIR/yacreader -+!haiku { -+ server.path = $$DATADIR/yacreader -+} else { -+ server.path = $$DATADIR/data -+} - server.files = ../release/server - - icon.path = $$DATADIR/icons/hicolor/scalable/apps -@@ -313,9 +321,17 @@ icon.files = ../YACReaderLibrary.svg - desktop.path = $$DATADIR/applications - desktop.files = ../YACReaderLibrary.desktop - --translation.path = $$DATADIR/yacreader/languages -+!haiku { -+ translation.path = $$DATADIR/yacreader/languages -+} else { -+ translation.path = $$DATADIR/data/languages -+} - translation.files = ../release/languages/yacreaderlibrary_* - --manpage.path = $$DATADIR/man/man1 -+isEmpty(MANDIR) { -+ manpage.path = $$DATADIR/man/man1 -+} else { -+ manpage.path = $$MANDIR/man1 -+} - manpage.files = ../YACReaderLibrary.1 - } --- -2.19.0 - -From 595eac3bbfb2652fada3abe29b1948bfec2737cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Thu, 27 Sep 2018 10:52:38 +0200 -Subject: [PATCH] Library can open Reader now - ---- - YACReaderLibrary/library_window.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp -index 6a156ae..7e64a34 100644 ---- a/YACReaderLibrary/library_window.cpp -+++ b/YACReaderLibrary/library_window.cpp -@@ -1826,10 +1826,15 @@ void LibraryWindow::openComic(const ComicDB &comic) - yacreaderFound = QProcess::startDetached(QDir::cleanPath(QCoreApplication::applicationDirPath()+"/YACReader.exe"), parameters); - #endif - --#if defined Q_OS_UNIX && !defined Q_OS_MAC -+#if defined Q_OS_UNIX && !defined Q_OS_MAC && !defined Q_OS_HAIKU - QStringList parameters {currentPath(), QString("--comicId=%1").arg(comic.id), QString("--libraryId=%1").arg(libraryId)}; - yacreaderFound = QProcess::startDetached(QStringLiteral("YACReader"), parameters); - #endif -+ -+#if defined Q_OS_HAIKU -+ QStringList parameters {currentPath(), QString("--comicId=%1").arg(comic.id), QString("--libraryId=%1").arg(libraryId)}; -+ yacreaderFound = QProcess::startDetached(QString(BINDIR)+"/YACReader",parameters); -+#endif - if(!yacreaderFound) - { - #ifdef Q_OS_WIN --- -2.19.0 - diff --git a/media-gfx/yacreader/patches/yacreader-9.6.2.patchset b/media-gfx/yacreader/patches/yacreader-9.6.2.patchset new file mode 100644 index 000000000..0c57358cd --- /dev/null +++ b/media-gfx/yacreader/patches/yacreader-9.6.2.patchset @@ -0,0 +1,136 @@ +From 3d8c90f5ba0afd34338e64774834b893d59d424e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +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 +--- a/YACReader/YACReader.pro ++++ b/YACReader/YACReader.pro +@@ -214,7 +214,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" + + #MAKE INSTALL + +-INSTALLS += bin docs icon desktop translation manpage ++!haiku { ++ INSTALLS += bin docs icon desktop translation manpage ++} else { ++ INSTALLS += bin docs translation manpage ++} + + bin.path = $$BINDIR + isEmpty(DESTDIR) { +@@ -223,7 +227,11 @@ isEmpty(DESTDIR) { + bin.files = $$DESTDIR/YACReader + } + +-docs.path = $$DATADIR/doc/yacreader ++isEmpty(DOCDIR) { ++ docs.path = $$DATADIR/doc/yacreader ++} else { ++ docs.path = $$DOCDIR/ ++} + + #rename docs for better packageability + docs.extra = cp ../README.md ../README +@@ -235,10 +243,18 @@ icon.files = ../YACReader.svg + desktop.path = $$DATADIR/applications + desktop.files = ../YACReader.desktop + +-translation.path = $$DATADIR/yacreader/languages ++!haiku { ++ translation.path = $$DATADIR/yacreader/languages ++} else { ++ translation.path = $$DATADIR/data/languages ++} + translation.files = ../release/languages/yacreader_* + +-manpage.path = $$DATADIR/man/man1 ++isEmpty(MANDIR) { ++ manpage.path = $$DATADIR/man/man1 ++} else { ++ manpage.path = $$MANDIR/man1 ++} + manpage.files = ../YACReader.1 + + #remove leftover doc files when 'make clean' is invoked +diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro +index b39293f..9add1ed 100644 +--- a/YACReaderLibrary/YACReaderLibrary.pro ++++ b/YACReaderLibrary/YACReaderLibrary.pro +@@ -298,7 +298,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" + DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\"" + + #MAKE INSTALL +-INSTALLS += bin icon desktop server translation manpage ++!haiku { ++ INSTALLS += bin icon desktop server translation manpage ++} else { ++ INSTALLS += bin server translation manpage ++} + + bin.path = $$BINDIR + isEmpty(DESTDIR) { +@@ -307,7 +311,11 @@ isEmpty(DESTDIR) { + bin.files = $$DESTDIR/YACReaderLibrary + } + +-server.path = $$DATADIR/yacreader ++!haiku { ++ server.path = $$DATADIR/yacreader ++} else { ++ server.path = $$DATADIR/data ++} + server.files = ../release/server + + icon.path = $$DATADIR/icons/hicolor/scalable/apps +@@ -316,9 +324,17 @@ icon.files = ../YACReaderLibrary.svg + desktop.path = $$DATADIR/applications + desktop.files = ../YACReaderLibrary.desktop + +-translation.path = $$DATADIR/yacreader/languages ++!haiku { ++ translation.path = $$DATADIR/yacreader/languages ++} else { ++ translation.path = $$DATADIR/data/languages ++} + translation.files = ../release/languages/yacreaderlibrary_* + +-manpage.path = $$DATADIR/man/man1 ++isEmpty(MANDIR) { ++ manpage.path = $$DATADIR/man/man1 ++} else { ++ manpage.path = $$MANDIR/man1 ++} + manpage.files = ../YACReaderLibrary.1 + } +-- +2.24.0 + + +From d8e9672ab0309bca4cfccd7abf1a24c8d80be514 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +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) + + #if defined Q_OS_UNIX && !defined Q_OS_MAC + QStringList parameters { currentPath(), QString("--comicId=%1").arg(comic.id), QString("--libraryId=%1").arg(libraryId) }; ++#if defined Q_OS_HAIKU ++ yacreaderFound = QProcess::startDetached(QString(BINDIR)+"/YACReader",parameters); ++#else + yacreaderFound = QProcess::startDetached(QStringLiteral("YACReader"), parameters); ++#endif + #endif + if (!yacreaderFound) { + #ifdef Q_OS_WIN +-- +2.24.0 + diff --git a/media-gfx/yacreader/yacreader-9.5.0.recipe b/media-gfx/yacreader/yacreader-9.6.2.recipe similarity index 93% rename from media-gfx/yacreader/yacreader-9.5.0.recipe rename to media-gfx/yacreader/yacreader-9.6.2.recipe index 495a446ac..9d56463f4 100644 --- a/media-gfx/yacreader/yacreader-9.5.0.recipe +++ b/media-gfx/yacreader/yacreader-9.6.2.recipe @@ -6,7 +6,7 @@ COPYRIGHT="2018 Luis Ángel San Martín Rodríguez" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/YACReader/yacreader/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="1104ffa78835b21a3cf611d42e52944ca413bf7feb38f7620fc07950e5f5ad40" +CHECKSUM_SHA256="e58cd10071180c759f53d74ac7049105b8608e63661bd1b68bcbd8fc8a534a80" SOURCE_FILENAME="yacreader-$portVersion.tar.gz" PATCHES="yacreader-$portVersion.patchset" ADDITIONAL_FILES=" @@ -29,7 +29,7 @@ REQUIRES=" lib:libgl$secondaryArchSuffix lib:libglu$secondaryArchSuffix lib:libpoppler$secondaryArchSuffix - lib:libpoppler${secondaryArchSuffix}_qt5 + lib:libpoppler_qt5$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Multimedia$secondaryArchSuffix @@ -43,8 +43,8 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libgl$secondaryArchSuffix devel:libglu$secondaryArchSuffix - devel:libpoppler$secondaryArchSuffix - devel:libpoppler${secondaryArchSuffix}_qt5 + devel:libpoppler$secondaryArchSuffix >= 87 + devel:libpoppler_qt5$secondaryArchSuffix >= 1.19 devel:libQt5Core$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix devel:libQt5Multimedia$secondaryArchSuffix