diff --git a/media-gfx/yacreader/patches/yacreader-9.0.0.patchset b/media-gfx/yacreader/patches/yacreader-9.0.0.patchset deleted file mode 100644 index 7b0c0f15d..000000000 --- a/media-gfx/yacreader/patches/yacreader-9.0.0.patchset +++ /dev/null @@ -1,174 +0,0 @@ -From d7222fff4dd126c2318fd0c617c0232396d0a45d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Tue, 6 Mar 2018 11:38:49 +0100 -Subject: Install path adjustments - - -diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro -index 8e2b9b6..a6a0bf8 100644 ---- a/YACReader/YACReader.pro -+++ b/YACReader/YACReader.pro -@@ -219,15 +219,25 @@ isEmpty(PREFIX) { - PREFIX = /usr - } - --BINDIR = $$PREFIX/bin --LIBDIR = $$PREFIX/lib --DATADIR = $$PREFIX/share -+!haiku { -+ BINDIR = $$PREFIX/bin -+ LIBDIR = $$PREFIX/lib -+ DATADIR = $$PREFIX/share -+} else { -+ BINDIR = $$PREFIX -+ LIBDIR = $$PREFIX -+ DATADIR = $$PREFIX -+} - - 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) { -@@ -236,7 +246,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 -@@ -248,10 +262,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 88a2c85..0c1cd08 100644 ---- a/YACReaderLibrary/YACReaderLibrary.pro -+++ b/YACReaderLibrary/YACReaderLibrary.pro -@@ -292,14 +292,25 @@ isEmpty(PREFIX) { - PREFIX = /usr - } - --BINDIR = $$PREFIX/bin --LIBDIR = $$PREFIX/lib --DATADIR = $$PREFIX/share -+!haiku { -+ BINDIR = $$PREFIX/bin -+ LIBDIR = $$PREFIX/lib -+ DATADIR = $$PREFIX/share -+} else { -+ BINDIR = $$PREFIX -+ LIBDIR = $$PREFIX -+ DATADIR = $$PREFIX -+} - - 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) { -@@ -308,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 -@@ -317,9 +332,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.16.2 - - -From 5219993f686a2bad6297eec59b0d16e954edaa06 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sat, 10 Mar 2018 20:33:12 +0100 -Subject: Library can open Reader now - - -diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp -index 95cc629..b76b92b 100644 ---- a/YACReaderLibrary/library_window.cpp -+++ b/YACReaderLibrary/library_window.cpp -@@ -1800,10 +1800,15 @@ void LibraryWindow::openComic() - yacreaderFound = QProcess::startDetached(QDir::cleanPath(QCoreApplication::applicationDirPath())+QString("/YACReader \"%1\" \"%2\" \"%3\"").arg(path).arg(QString("--comicId=") + QString::number(comicId)).arg(QString("--libraryId=") + QString::number(libraryId))/*.arg(page).arg(bookmark1).arg(bookmark2).arg(bookmark3).arg(brightness).arg(contrast).arg(gamma)*/,QStringList()); - #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 = QStringList() << path << (QString("--comicId=") + QString::number(comicId)) << (QString("--libraryId=") + QString::number(libraryId)); - yacreaderFound = QProcess::startDetached(QString("YACReader"),parameters); - #endif -+ -+#if defined Q_OS_HAIKU -+ QStringList parameters = QStringList() << path << (QString("--comicId=") + QString::number(comicId)) << (QString("--libraryId=") + QString::number(libraryId)); -+ yacreaderFound = QProcess::startDetached(QString(BINDIR)+"/YACReader",parameters); -+#endif - if(!yacreaderFound) - QMessageBox::critical(this,tr("YACReader not found"),tr("YACReader not found, YACReader should be installed in the same folder as YACReaderLibrary.")); - --- -2.16.2 diff --git a/media-gfx/yacreader/patches/yacreader-9.5.0.patchset b/media-gfx/yacreader/patches/yacreader-9.5.0.patchset new file mode 100644 index 000000000..0d16ec260 --- /dev/null +++ b/media-gfx/yacreader/patches/yacreader-9.5.0.patchset @@ -0,0 +1,147 @@ +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/yacreader-9.0.0.recipe b/media-gfx/yacreader/yacreader-9.5.0.recipe similarity index 75% rename from media-gfx/yacreader/yacreader-9.0.0.recipe rename to media-gfx/yacreader/yacreader-9.5.0.recipe index e1e636a38..495a446ac 100644 --- a/media-gfx/yacreader/yacreader-9.0.0.recipe +++ b/media-gfx/yacreader/yacreader-9.5.0.recipe @@ -5,8 +5,9 @@ HOMEPAGE="https://www.yacreader.com/" COPYRIGHT="2018 Luis Ángel San Martín Rodríguez" LICENSE="GNU GPL v3" REVISION="1" -SOURCE_URI="https://bitbucket.org/luisangelsm/yacreader/downloads/yacreader-$portVersion-src.tar.xz" -CHECKSUM_SHA256="60bfefeb4cd0ce9e60cd2a6b0f976315e1781c2c1f8c5f43128ff9ebee760cc0" +SOURCE_URI="https://github.com/YACReader/yacreader/archive/$portVersion.tar.gz" +CHECKSUM_SHA256="1104ffa78835b21a3cf611d42e52944ca413bf7feb38f7620fc07950e5f5ad40" +SOURCE_FILENAME="yacreader-$portVersion.tar.gz" PATCHES="yacreader-$portVersion.patchset" ADDITIONAL_FILES=" yacreader.rdef.in @@ -20,8 +21,8 @@ fi PROVIDES=" yacreader$secondaryArchSuffix = $portVersion - app:YACReader$secondaryArchSuffix = $portVersion - app:YACReaderLibrary$secondaryArchSuffix = $portVersion + app:YACReader = $portVersion + app:YACReaderLibrary = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -66,15 +67,26 @@ defineDebugInfoPackage yacreader$secondaryArchSuffix \ BUILD() { - qmake PREFIX=$appsDir/YACReader MANDIR=$manDir DOCDIR=$docDir . + qmake \ + PREFIX="$appsDir/YACReader" \ + MANDIR="$manDir" \ + DOCDIR="$docDir" \ + BINDIR="$appsDir"/YACReader \ + LIBDIR="$appsDir"/YACReader/lib \ + DATADIR="$appsDir"/YACReader/data \ + . make $jobArgs } INSTALL() { - mkdir -p $appsDir/YACReader + mkdir -p "$appsDir"/YACReader make install + # Cleanup + mv "$appsDir"/YACReader/bin/* "$appsDir"/YACReader + rm -rf "$appsDir"/YACReader/bin + local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" local MINOR="`echo "$portVersion" | cut -d. -f3`" @@ -94,12 +106,12 @@ INSTALL() > yacreader_library.rdef addResourcesToBinaries yacreader.rdef \ - $appsDir/YACReader/YACReader + "$appsDir"/YACReader/YACReader addResourcesToBinaries yacreader_library.rdef \ - $appsDir/YACReader/YACReaderLibrary + "$appsDir"/YACReader/YACReaderLibrary - addAppDeskbarSymlink $appsDir/YACReader/YACReader - addAppDeskbarSymlink $appsDir/YACReader/YACReaderLibrary + addAppDeskbarSymlink "$appsDir"/YACReader/YACReader + addAppDeskbarSymlink "$appsDir"/YACReader/YACReaderLibrary } TEST()