haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-21 19:20:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Yacreader 9 (#2289)

Browse Source 
* YACReader 9~hg patchset.

* WIP

* Fix, patchset

* Remove unneeded deps

* Cleanup

* Library can find Reader now, thanks selmf!
This commit is contained in:
miqlas
2018-03-15 20:49:59 +01:00
committed by GitHub
parent 295b450c7c
commit 2c668cafde
5 changed files with 271 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
media-gfx/yacreader/additional-files/yacreader.rdef.in
View File

@@ -26,11 +26,13 @@ resource file_types message {
};
resource vector_icon {
$"6E6369660203FABE4A0500020606FE0FB754CA7BB9D5C4C9B9D5C4C9B840C38C"
$"B579BDF3B56EC198B573B874C2C8B511BCF0B501CA8DB50ED06BBDEBD06EB91D"
$"D068C46DBE08C66AC751C8A8BE08C66A0606FE0FB754CA7BB9D5C4C9B9D5C4C9"
$"B840C38CB579BDF3B56EC198B573B874C2C8B511BCF0B501CA8DB50ED06BBDEB"
$"D06EB91DD068C46DBE08C66AC751C8A8BE08C66A020A000100023F4FCD000000"
$"0000003F4FCDC03A0044DB190A010101123F4FCD0000000000003F4FCDC03A00"
$"44DB190117820204"
$"6E6369660203FFAA000500010214BD08C97ABD7FC995BD6DC915BE0EC842BDC5"
$"C8B0BE6FC7AEBEE6C661BED4C71ABEEEC618BEC3C592BEDBC5D5BEB9C575BE8A"
$"C571BEA3C573BD81C559BB70C527BC78C545BAA1C50FB910C4A0B9CEC4FEB7AE"
$"C3F1B68CC14EB6D2C2D0B648BFD2B6D4BCE1B651BE54B725BBFDB85EBA99B7A9"
$"BB3EB929B9DEBB00B8D1BA08B945BC27B846BE9EB7BABD5EB7F1BFB6B78AC1ED"
$"B770C0D0B765C385B780C667B8B3C50AB7D7C7B9B987C8D5BC40C87CBAC4C93C"
$"BDF1C86DC139C91FBFA2C76AC388C327C56DC5AAC4F9C2FDC575C2C8C5A5C2E2"
$"C584C208C699C03CC837C135C77BBF9FC8ADBE42C95BBEF5C90BBDE2C986020A"
$"0101001001158500040A00010000"
};

50
media-gfx/yacreader/additional-files/yacreader_library.rdef.in Normal file
View File

@@ -0,0 +1,50 @@
resource app_flags B_MULTIPLE_LAUNCH;
resource app_version {
major = @MAJOR@,
middle = @MIDDLE@,
minor = @MINOR@,
variety = B_APPV_FINAL,
internal = 0,
short_info = "Yet Another Comic Reader",
long_info = "A comic reader"
};
resource app_signature "application/x-vnd.yacreader";
resource file_types message {
"types" = "application",
"types" = "application/cbr",
"types" = "application/cbt",
"types" = "application/cbz",
"types" = "application/zip",
"types" = "application/rar",
"types" = "application/7z-compressed",
"types" = "application/tar",
"types" = "application/pdf"
};
resource vector_icon {
$"6E6369660203FFAA0003010000070214C8D5BC40C93CBDF1C87CBAC4C667B8B3"
$"C7B9B987C50AB7D7C1EDB770C385B780C0D0B765BE9EB7BABFB6B78ABD5EB7F1"
$"BB00B8D1BC27B846BA08B945B85EBA99B929B9DEB7A9BB3EB6D4BCE1B725BBFD"
$"B651BE54B68CC14EB648BFD2B6D2C2D0B910C4A0B7AEC3F1B9CEC4FEBB70C527"
$"BAA1C50FBC78C545BE8AC571BD81C559BEA3C573BEC3C592BEB9C575BEDBC5D5"
$"BEE6C661BEEEC618BED4C71ABE0EC842BE6FC7AEBDC5C8B0BD08C97ABD6DC915"
$"BD7FC995BE42C95BBDE2C986BEF5C90BC03CC837BF9FC8ADC135C77BC2C8C5A5"
$"C208C699C2E2C584C327C56DC2FDC575C5AAC4F9C86DC139C76AC388C91FBFA2"
$"0204BBF8C16ABC3BC16ABBB6C16ABB80C0F1BB80C134BB80C0AEBBF8C078BBB6"
$"C078BC3BC078BC71C0F1BC71C0AEBC71C1340204BBF8BF2DBC3BBF2DBBB6BF2D"
$"BB80BEB4BB80BEF7BB80BE72BBF8BE3BBBB6BE3BBC3BBE3BBC71BEB4BC71BE72"
$"BC71BEF70204BBF8BCF1BC3BBCF1BBB6BCF1BB80BC78BB80BCBABB80BC35BBF8"
$"BBFFBBB6BBFFBC3BBBFFBC71BC78BC71BC35BC71BCBA0206C3D3C16AC416C16A"
$"C3D3C16ABD69C16ABD69C16ABD27C16ABCF1C0F1BCF1C134BCF1C0AEBD69C078"
$"BD27C078BD69C078C3D3C078C3D3C078C416C078C44CC0F1C44CC0AEC44CC134"
$"0206C3D3BF2DC416BF2DC3D3BF2DBD69BF2DBD69BF2DBD27BF2DBCF1BEB4BCF1"
$"BEF7BCF1BE72BD69BE3BBD27BE3BBD69BE3BC3D3BE3BC3D3BE3BC416BE3BC44C"
$"BEB4C44CBE72C44CBEF70206C3D3BCF1C416BCF1C3D3BCF1BD69BCF1BD69BCF1"
$"BD27BCF1BCF1BC78BCF1BCBABCF1BC35BD69BBFFBD27BBFFBD69BBFFC3D3BBFF"
$"C3D3BBFFC416BBFFC44CBC78C44CBC35C44CBCBA020A0101001001158500040A"
$"00070001020304050600"
};

155
media-gfx/yacreader/patches/yacreader-8.5.0.patchset
View File

@@ -1,155 +0,0 @@
From 57c610116ae488f012ffa8d535ecdb272bf58fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Mon, 24 Jul 2017 18:34:40 +0200
Subject: [PATCH] Haiku patchset
---
YACReader/YACReader.pro | 11 +++++++++++
YACReaderLibrary/YACReaderLibrary.pro | 13 +++++++++++++
YACReaderLibrary/YACReaderLibraryServer.pro | 7 +++++++
YACReaderLibrary/server_config_dialog.cpp | 4 ++++
compileHAIKU.sh | 22 ++++++++++++++++++++++
compressed_archive/unarr/unarr-wrapper.pri | 14 +++++++++++++-
6 files changed, 70 insertions(+), 1 deletion(-)
create mode 100755 compileHAIKU.sh
diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro
index 57a500d..955e62a 100644
--- a/YACReader/YACReader.pro
+++ b/YACReader/YACReader.pro
@@ -68,6 +68,17 @@ LIBS += -L/usr/lib -lpoppler-qt5
}
+unix:haiku{
+
+CONFIG+=link_pkgconfig
+PKGCONFIG+=poppler poppler-qt5 Qt5Xml
+
+!CONFIG(no_opengl) {
+ LIBS += -lGLU
+}
+
+}
+
macx{
#INCLUDEPATH += "/Volumes/Mac OS X Lion/usr/X11/include"
#isEqual(QT_MAJOR_VERSION, 5) {
diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
index 15d78d9..0a3d00c 100644
--- a/YACReaderLibrary/YACReaderLibrary.pro
+++ b/YACReaderLibrary/YACReaderLibrary.pro
@@ -55,6 +55,19 @@ LIBS += -L/usr/lib -lpoppler-qt5
}
}
+unix:haiku{
+
+DEFINES += _BSD_SOURCE
+LIBS += -lnetwork -lbsd
+CONFIG+=link_pkgconfig
+PKGCONFIG+= poppler-qt5
+
+!CONFIG(no_opengl) {
+ LIBS += -lGLU
+}
+
+}
+
macx{
#INCLUDEPATH += "/Volumes/Mac OS X Lion/usr/X11/include"
#isEqual(QT_MAJOR_VERSION, 5) {
diff --git a/YACReaderLibrary/YACReaderLibraryServer.pro b/YACReaderLibrary/YACReaderLibraryServer.pro
index d377d56..5751332 100644
--- a/YACReaderLibrary/YACReaderLibraryServer.pro
+++ b/YACReaderLibrary/YACReaderLibraryServer.pro
@@ -32,6 +32,13 @@ INCLUDEPATH += /usr/include/poppler/qt5
LIBS += -L/usr/lib -lpoppler-qt5
}
+unix:haiku{
+DEFINES += _BSD_SOURCE
+LIBS += -lbsd
+CONFIG+=link_pkgconfig
+PKGCONFIG+= poppler-qt5
+}
+
macx{
LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
diff --git a/YACReaderLibrary/server_config_dialog.cpp b/YACReaderLibrary/server_config_dialog.cpp
index 5ce706d..44c99d9 100644
--- a/YACReaderLibrary/server_config_dialog.cpp
+++ b/YACReaderLibrary/server_config_dialog.cpp
@@ -41,6 +41,10 @@ bool ipComparator(const QString & ip1, const QString & ip2)
#include <string.h>
#include <arpa/inet.h>
+#ifdef Q_OS_HAIKU
+#include <ifaddrs.h>
+#endif
+
QList<QString> addresses()
{
struct ifaddrs * ifAddrStruct=NULL;
diff --git a/compileHAIKU.sh b/compileHAIKU.sh
new file mode 100755
index 0000000..468ed5b
--- /dev/null
+++ b/compileHAIKU.sh
@@ -0,0 +1,22 @@
+#! /bin/bash
+
+echo "Compiling YACReader"
+cd ./YACReader
+qmake YACReader.pro "CONFIG+=release"
+make -j 4
+cd ..
+
+echo "Compiling YACReaderLibrary"
+cd ./YACReaderLibrary
+qmake YACReaderLibrary.pro "CONFIG+=release"
+make -j 4
+cd ..
+
+echo "Compiling YACReaderLibraryServer"
+cd ./YACReaderLibrary
+make clean
+qmake YACReaderLibraryServer.pro "CONFIG+=release"
+make -j 4
+cd ..
+
+echo "Done!"
diff --git a/compressed_archive/unarr/unarr-wrapper.pri b/compressed_archive/unarr/unarr-wrapper.pri
index 2ba188c..31e3ef0 100644
--- a/compressed_archive/unarr/unarr-wrapper.pri
+++ b/compressed_archive/unarr/unarr-wrapper.pri
@@ -21,6 +21,18 @@ else:win32:exists (../../dependencies/unarr/unarr.dll) {
DEFINES+=use_unarr
}
+else:haiku:exists (/system/develop/headers/x86/unarr.h) {
+ message(Using system provided unarr installation)
+ LIBS+=-lunarr
+ DEFINES+=use_unarr
+ }
+
+else:haiku:exists (/system/develop/headers/unarr.h) {
+ message(Using system provided unarr installation)
+ LIBS+=-lunarr
+ DEFINES+=use_unarr
+ }
+
else:exists ($$PWD/unarr-master) {
message(Found unarr source-code)
message(Unarr will be build as a part of YACReader)
@@ -33,4 +45,4 @@ else:exists ($$PWD/unarr-master) {
else {
error(Missing dependency: unarr decrompression backend. Please install libunarr on your system\
or provide a copy of the unarr source code in compressed_archive/unarr/unarr-master)
- }
\ No newline at end of file
+ }
--
2.13.1

338
media-gfx/yacreader/patches/yacreader-9.0.0.patchset
View File

@@ -1,164 +1,174 @@
From 724bbecb35651fd6331dfd2fab34f283a8e744da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 22 Oct 2017 15:31:35 +0200
Subject: [PATCH] YACReader: Haiku patches
---
YACReader/YACReader.pro | 11 +++++++++++
YACReader/goto_flow_toolbar.h | 4 ++++
YACReaderLibrary/YACReaderLibrary.pro | 12 ++++++++++++
YACReaderLibrary/server_config_dialog.cpp | 4 ++++
YACReaderLibraryServer/YACReaderLibraryServer.pro | 7 +++++++
compileHAIKU.sh | 22 ++++++++++++++++++++++
compressed_archive/unarr/unarr-wrapper.pri | 14 +++++++++++++-
7 files changed, 73 insertions(+), 1 deletion(-)
create mode 100755 compileHAIKU.sh
diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro
index 57a500d..3cbaeca 100644
--- a/YACReader/YACReader.pro
+++ b/YACReader/YACReader.pro
@@ -68,6 +68,17 @@ LIBS += -L/usr/lib -lpoppler-qt5
}
+unix:haiku{
+
+CONFIG+=link_pkgconfig
+PKGCONFIG+=poppler poppler-qt5 Qt5Xml
+
+!CONFIG(no_opengl) {
+ LIBS += -lGLU
+ }
+
+}
+
macx{
#INCLUDEPATH += "/Volumes/Mac OS X Lion/usr/X11/include"
#isEqual(QT_MAJOR_VERSION, 5) {
diff --git a/YACReader/goto_flow_toolbar.h b/YACReader/goto_flow_toolbar.h
index 803026c..5bfc99f 100644
--- a/YACReader/goto_flow_toolbar.h
+++ b/YACReader/goto_flow_toolbar.h
@@ -2,7 +2,11 @@
#define GOTO_FLOW_TOOLBAR_H
#include <QWidget>
+#ifndef __HAIKU__
#include <QStackedWidget.h>
+#else
+#include <qstackedwidget.h>
+#endif
class QLineEdit;
class QIntValidator;
diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
index 53db0a0..1aec71f 100644
--- a/YACReaderLibrary/YACReaderLibrary.pro
+++ b/YACReaderLibrary/YACReaderLibrary.pro
@@ -55,6 +55,18 @@ LIBS += -L/usr/lib -lpoppler-qt5
}
}
+unix:haiku{
+
+DEFINES += _BSD_SOURCE
+LIBS += -lnetwork -lbsd
+CONFIG+=link_pkgconfig
+PKGCONFIG+= poppler-qt5
+
+!CONFIG(no_opengl) {
+ LIBS += -lGLU
+ }
+}
+
macx{
#INCLUDEPATH += "/Volumes/Mac OS X Lion/usr/X11/include"
#isEqual(QT_MAJOR_VERSION, 5) {
diff --git a/YACReaderLibrary/server_config_dialog.cpp b/YACReaderLibrary/server_config_dialog.cpp
index 5ce706d..44c99d9 100644
--- a/YACReaderLibrary/server_config_dialog.cpp
+++ b/YACReaderLibrary/server_config_dialog.cpp
@@ -41,6 +41,10 @@ bool ipComparator(const QString & ip1, const QString & ip2)
#include <string.h>
#include <arpa/inet.h>
+#ifdef Q_OS_HAIKU
+#include <ifaddrs.h>
+#endif
+
QList<QString> addresses()
{
struct ifaddrs * ifAddrStruct=NULL;
diff --git a/YACReaderLibraryServer/YACReaderLibraryServer.pro b/YACReaderLibraryServer/YACReaderLibraryServer.pro
index b6673d2..92c976e 100644
--- a/YACReaderLibraryServer/YACReaderLibraryServer.pro
+++ b/YACReaderLibraryServer/YACReaderLibraryServer.pro
@@ -32,6 +32,13 @@ INCLUDEPATH += /usr/include/poppler/qt5
LIBS += -L/usr/lib -lpoppler-qt5
}
+unix:haiku{
+DEFINES += _BSD_SOURCE
+LIBS += -lbsd
+CONFIG+=link_pkgconfig
+PKGCONFIG+= poppler-qt5
+}
+
macx{
LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
diff --git a/compileHAIKU.sh b/compileHAIKU.sh
new file mode 100755
index 0000000..468ed5b
--- /dev/null
+++ b/compileHAIKU.sh
@@ -0,0 +1,22 @@
+#! /bin/bash
+
+echo "Compiling YACReader"
+cd ./YACReader
+qmake YACReader.pro "CONFIG+=release"
+make -j 4
+cd ..
+
+echo "Compiling YACReaderLibrary"
+cd ./YACReaderLibrary
+qmake YACReaderLibrary.pro "CONFIG+=release"
+make -j 4
+cd ..
+
+echo "Compiling YACReaderLibraryServer"
+cd ./YACReaderLibrary
+make clean
+qmake YACReaderLibraryServer.pro "CONFIG+=release"
+make -j 4
+cd ..
+
+echo "Done!"
diff --git a/compressed_archive/unarr/unarr-wrapper.pri b/compressed_archive/unarr/unarr-wrapper.pri
index 2ba188c..31e3ef0 100644
--- a/compressed_archive/unarr/unarr-wrapper.pri
+++ b/compressed_archive/unarr/unarr-wrapper.pri
@@ -21,6 +21,18 @@ else:win32:exists (../../dependencies/unarr/unarr.dll) {
DEFINES+=use_unarr
}
+else:haiku:exists (/system/develop/headers/x86/unarr.h) {
+ message(Using system provided unarr installation)
+ LIBS+=-lunarr
+ DEFINES+=use_unarr
+ }
+
+else:haiku:exists (/system/develop/headers/unarr.h) {
+ message(Using system provided unarr installation)
+ LIBS+=-lunarr
+ DEFINES+=use_unarr
+ }
+
else:exists ($$PWD/unarr-master) {
message(Found unarr source-code)
message(Unarr will be build as a part of YACReader)
--
2.14.2
From d7222fff4dd126c2318fd0c617c0232396d0a45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
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?= <zmizsei@extrowerk.com>
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

60
media-gfx/yacreader/yacreader-8.5.0.recipe → media-gfx/yacreader/yacreader-9.0.0.recipe
View File

@@ -1,21 +1,23 @@
SUMMARY="A comic reader"
DESCRIPTION="YACReader is a Qt based comic reader for cross-platform reading \
and managing your digital comic collection."
HOMEPAGE="http://www.yacreader.com/"
COPYRIGHT="Luis Ángel San Martín Rodríguez"
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://bitbucket.org/luisangelsm/yacreader/downloads/yacreader-$portVersion-src.tar.xz"
CHECKSUM_SHA256="dfb6aa3c8f5971f85971123efb3322df77fbd40014025a8568e8337e1505d01d"
CHECKSUM_SHA256="60bfefeb4cd0ce9e60cd2a6b0f976315e1781c2c1f8c5f43128ff9ebee760cc0"
PATCHES="yacreader-$portVersion.patchset"
ADDITIONAL_FILES="yacreader.rdef.in"
ADDITIONAL_FILES="yacreader.rdef.in
yacreader_library.rdef.in"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="?x86"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
yacreader$secondaryArchSuffix = $portVersion
app:yacreader$secondaryArchSuffix = $portVersion
app:YACReader$secondaryArchSuffix = $portVersion
app:YACReaderLibrary$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -29,14 +31,9 @@ REQUIRES="
lib:libQt5Network$secondaryArchSuffix
lib:libQt5OpenGL$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libunarr$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:qmake$secondaryArchSuffix
cmd:make
cmd:g++$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libgl$secondaryArchSuffix
@@ -52,27 +49,32 @@ BUILD_REQUIRES="
devel:libQt5Widgets$secondaryArchSuffix
devel:libunarr$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:make
cmd:g++$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:qmake$secondaryArchSuffix >= 5
"
defineDebugInfoPackage yacreader$secondaryArchSuffix \
"$appsDir"/YACReader/YACReader \
"$appsDir"/YACReader/YACReaderLibrary
BUILD()
{
# The YACLibrary and Server requires Drag and Drop support in Qt.
# Without it they are useless. Really.
# Let's build only the standalone viewer for now.
cd YACReader
qmake YACReader.pro "CONFIG+=release"
qmake PREFIX=$appsDir/YACReader MANDIR=$manDir DOCDIR=$docDir .
make $jobArgs
}
INSTALL()
{
cd YACReader
mkdir -p $appsDir/YACReader
cp -R YACReader $appsDir/YACReader/
strip $appsDir/YACReader/YACReader
make install
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3`"
sed \
-e "s|@MAJOR@|$MAJOR|" \
-e "s|@MIDDLE@|$MIDDLE|" \
@@ -80,9 +82,23 @@ INSTALL()
$portDir/additional-files/yacreader.rdef.in \
> yacreader.rdef
sed \
-e "s|@MAJOR@|$MAJOR|" \
-e "s|@MIDDLE@|$MIDDLE|" \
-e "s|@MINOR@|$MINOR|" \
$portDir/additional-files/yacreader_library.rdef.in \
> yacreader_library.rdef
addResourcesToBinaries yacreader.rdef \
$appsDir/YACReader/YACReader
addResourcesToBinaries yacreader_library.rdef \
$appsDir/YACReader/YACReaderLibrary
addAppDeskbarSymlink $appsDir/YACReader/YACReader
addAppDeskbarSymlink $appsDir/YACReader/YACReaderLibrary
}
TEST()
{
make check
}