this was not fun to update, switch from qt5 to qt6
and there was an issue due to variables having the
same name as macros in sys/types.h
ok?
diff --git a/graphics/yacreader/Makefile b/graphics/yacreader/Makefile
index 73c917d6f15..2843f00dcca 100644
--- a/graphics/yacreader/Makefile
+++ b/graphics/yacreader/Makefile
@@ -1,7 +1,7 @@
COMMENT = read and manage your digital comic collection
-V = 9.12.0
-DISTNAME = yacreader-${V}.2304234
+V = 9.14.2
+DISTNAME = yacreader-${V}.2402143
PKGNAME = yacreader-${V}
CATEGORIES = graphics
@@ -13,10 +13,10 @@ MAINTAINER = Omar Polo <[email protected]>
# GPLv3
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Multimedia
-WANTLIB += Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickControls2
-WANTLIB += Qt5QuickWidgets Qt5Sql Qt5Svg Qt5Widgets c m poppler-qt5
-WANTLIB += unarr
+WANTLIB += ${COMPILER_LIBCXX} GL c m poppler-qt6 unarr
+WANTLIB += Qt6Core Qt6Gui Qt6Multimedia Qt6Network Qt6OpenGL Qt6OpenGLWidgets
+WANTLIB += Qt6Qml Qt6QmlModels Qt6Quick Qt6QuickControls2 Qt6QuickWidgets
+WANTLIB += Qt6Sql Qt6Svg Qt6Widgets Qt6Core5Compat
SITES = https://github.com/YACReader/yacreader/releases/download/${V}/
@@ -25,14 +25,14 @@ EXTRACT_SUFX = -src.tar.xz
# C++11
COMPILER = base-clang ports-gcc
-MODULES = devel/qmake x11/qt5
+MODULES = devel/qmake x11/qt6
BUILD_DEPENDS = archivers/xz
LIB_DEPENDS = archivers/unarr \
- print/poppler,-qt5 \
- x11/qt5/qtquickcontrols2 \
- x11/qt5/qtmultimedia \
- x11/qt5/qtsvg
+ print/poppler,-qt6 \
+ x11/qt6/qt5compat \
+ x11/qt6/qtmultimedia \
+ x11/qt6/qtsvg
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
diff --git a/graphics/yacreader/distinfo b/graphics/yacreader/distinfo
index 677c6e52ddc..ef32f6d39e0 100644
--- a/graphics/yacreader/distinfo
+++ b/graphics/yacreader/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yacreader-9.12.0.2304234-src.tar.xz) =
LwosIyQoadoXzctF1CRMDlWiku4h2AXAPToV5ZrvXBQ=
-SIZE (yacreader-9.12.0.2304234-src.tar.xz) = 1297460
+SHA256 (yacreader-9.14.2.2402143-src.tar.xz) =
n+XdnxQNU5Y0kIhA40vWs0dKDtZRLPwW3mUYXA8JilM=
+SIZE (yacreader-9.14.2.2402143-src.tar.xz) = 1365268
diff --git
a/graphics/yacreader/patches/patch-YACReaderLibrary_db_query_lexer_cpp
b/graphics/yacreader/patches/patch-YACReaderLibrary_db_query_lexer_cpp
new file mode 100644
index 00000000000..65079b2a90e
--- /dev/null
+++ b/graphics/yacreader/patches/patch-YACReaderLibrary_db_query_lexer_cpp
@@ -0,0 +1,35 @@
+avoid name collision with a macro defined in /usr/include/sys/types.h
+
+Index: YACReaderLibrary/db/query_lexer.cpp
+--- YACReaderLibrary/db/query_lexer.cpp.orig
++++ YACReaderLibrary/db/query_lexer.cpp
+@@ -22,9 +22,9 @@ Token QueryLexer::next()
+ case '=':
+ return equal();
+ case '<':
+- return minor();
++ return tok_minor();
+ case '>':
+- return major();
++ return tok_major();
+ case '"':
+ return quotedWord();
+ default:
+@@ -78,7 +78,7 @@ Token QueryLexer::quotedWord()
+ return Token(Token::Type::eof);
+ }
+
+-Token QueryLexer::minor()
++Token QueryLexer::tok_minor()
+ {
+ auto start = index;
+ get();
+@@ -91,7 +91,7 @@ Token QueryLexer::minor()
+ return Token(Token::Type::minor, input.substr(start, index - start));
+ }
+
+-Token QueryLexer::major()
++Token QueryLexer::tok_major()
+ {
+ auto start = index;
+ get();
diff --git a/graphics/yacreader/patches/patch-YACReaderLibrary_db_query_lexer_h
b/graphics/yacreader/patches/patch-YACReaderLibrary_db_query_lexer_h
new file mode 100644
index 00000000000..8f54da3eef2
--- /dev/null
+++ b/graphics/yacreader/patches/patch-YACReaderLibrary_db_query_lexer_h
@@ -0,0 +1,16 @@
+avoid name collision with a macro defined in /usr/include/sys/types.h
+
+Index: YACReaderLibrary/db/query_lexer.h
+--- YACReaderLibrary/db/query_lexer.h.orig
++++ YACReaderLibrary/db/query_lexer.h
+@@ -56,8 +56,8 @@ class QueryLexer (private)
+ Token single(Token::Type type);
+ Token word();
+ Token quotedWord();
+- Token minor();
+- Token major();
++ Token tok_minor();
++ Token tok_major();
+ Token equal();
+
+ bool isSpace(char c);
