diff --git a/media-gfx/yacreader/patches/yacreader-9.8.2.patchset b/media-gfx/yacreader/patches/yacreader-9.15.0.patchset similarity index 60% rename from media-gfx/yacreader/patches/yacreader-9.8.2.patchset rename to media-gfx/yacreader/patches/yacreader-9.15.0.patchset index a314d2681..ae420a7bb 100644 --- a/media-gfx/yacreader/patches/yacreader-9.8.2.patchset +++ b/media-gfx/yacreader/patches/yacreader-9.15.0.patchset @@ -1,18 +1,18 @@ -From f22e620a0a9b93009bf23f1119caaee41df9b130 Mon Sep 17 00:00:00 2001 +From fe174c9fd1632f6d5985ff680c636882fdf3754a 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 067e78e..44e70ab 100644 +index b57683d..3dde52c 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro -@@ -209,7 +209,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" +@@ -218,7 +218,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" #MAKE INSTALL --INSTALLS += bin docs icon desktop translation manpage +-INSTALLS += bin docs icon desktop manpage +haiku { + INSTALLS += bin docs icon desktop translation manpage +} else { @@ -21,7 +21,7 @@ index 067e78e..44e70ab 100644 bin.path = $$BINDIR isEmpty(DESTDIR) { -@@ -218,7 +222,11 @@ isEmpty(DESTDIR) { +@@ -227,7 +231,11 @@ isEmpty(DESTDIR) { bin.files = $$DESTDIR/YACReader } @@ -34,18 +34,10 @@ index 067e78e..44e70ab 100644 #rename docs for better packageability docs.extra = cp ../README.md ../README -@@ -230,10 +238,18 @@ icon.files = ../YACReader.svg +@@ -239,7 +247,11 @@ 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 @@ -56,14 +48,14 @@ index 067e78e..44e70ab 100644 #remove leftover doc files when 'make clean' is invoked diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro -index ee810ec..4cf4aea 100644 +index d4ebf6d..3803fd1 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro -@@ -306,7 +306,11 @@ DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" +@@ -342,7 +342,11 @@ unix:!macx { DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\"" #MAKE INSTALL --INSTALLS += bin icon desktop server translation manpage +-INSTALLS += bin icon desktop server manpage +!haiku { + INSTALLS += bin icon desktop server translation manpage +} else { @@ -72,31 +64,10 @@ index ee810ec..4cf4aea 100644 bin.path = $$BINDIR isEmpty(DESTDIR) { -@@ -315,7 +319,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 -@@ -324,9 +332,17 @@ icon.files = ../YACReaderLibrary.svg +@@ -360,6 +364,10 @@ 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 @@ -106,25 +77,25 @@ index ee810ec..4cf4aea 100644 manpage.files = ../YACReaderLibrary.1 } -- -2.30.2 +2.48.1 -From a0788d2c79d95c0f34abf1c283ee7b940fccb64d Mon Sep 17 00:00:00 2001 +From 2b9472ed6ad4fd0185beb6ab5efd4393519d44f1 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_comic_opener.cpp b/YACReaderLibrary/library_comic_opener.cpp -index 36ebf74..62dc91a 100644 +index 595cdbf..e886e7f 100644 --- a/YACReaderLibrary/library_comic_opener.cpp +++ b/YACReaderLibrary/library_comic_opener.cpp -@@ -40,7 +40,11 @@ bool YACReader::openComic(const ComicDB &comic, +@@ -41,7 +41,11 @@ bool YACReader::openComic(const ComicDB &comic, - #if defined Q_OS_UNIX && !defined Q_OS_MAC + #if defined Q_OS_UNIX && !defined Q_OS_MACOS 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); ++ yacreaderFound = QProcess::startDetached(QString(BINDIR)+"/YACReader",parameters); +#else yacreaderFound = QProcess::startDetached(QStringLiteral("YACReader"), parameters); +#endif @@ -132,5 +103,5 @@ index 36ebf74..62dc91a 100644 return yacreaderFound; -- -2.30.2 +2.48.1 diff --git a/media-gfx/yacreader/yacreader-9.8.2.recipe b/media-gfx/yacreader/yacreader-9.15.0.recipe similarity index 92% rename from media-gfx/yacreader/yacreader-9.8.2.recipe rename to media-gfx/yacreader/yacreader-9.15.0.recipe index 39fa559e9..6ba26f4cc 100644 --- a/media-gfx/yacreader/yacreader-9.8.2.recipe +++ b/media-gfx/yacreader/yacreader-9.15.0.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="44268a0c07a5ba3c25202064c088b1deba7cb048f6cbfcf33b3538f18225ae62" +CHECKSUM_SHA256="d6b3a3e3d0031ff01e43bd943a40e147900c4102a96b6d49d91c0a2cc7a8137a" SOURCE_FILENAME="yacreader-$portVersion.tar.gz" PATCHES="yacreader-$portVersion.patchset" ADDITIONAL_FILES=" @@ -57,8 +57,8 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libgl$secondaryArchSuffix devel:libglu$secondaryArchSuffix - devel:libpoppler$secondaryArchSuffix >= 117 - devel:libpoppler_qt5$secondaryArchSuffix + devel:libpoppler$secondaryArchSuffix >= 146 + devel:libpoppler_qt5$secondaryArchSuffix >= 1.37.0 devel:libQt5Core$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix devel:libQt5Multimedia$secondaryArchSuffix @@ -70,6 +70,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:g++$secondaryArchSuffix + cmd:lrelease$secondaryArchSuffix >= 5 cmd:make cmd:pkg_config$secondaryArchSuffix cmd:qmake$secondaryArchSuffix >= 5 @@ -98,8 +99,7 @@ INSTALL() make install # Cleanup - mv "$appsDir"/YACReader/bin/* "$appsDir"/YACReader - rm -rf "$appsDir"/YACReader/{bin,lib} + rm -rf "$appsDir"/YACReader/{data/{applications,icons},lib} local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`"