* [gentoo-commits] repo/gentoo:master commit in: kde-apps/okular/files/, kde-apps/okular/
@ 2017-11-10 10:40 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-11-10 10:40 UTC (permalink / raw
To: gentoo-commits
commit: 06c1ac768322d28e4e8ee00c81fe6c296c9a9459
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 10 10:40:07 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 10 10:40:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c1ac76
kde-apps/okular: Fix build w/ cmake-3.10
Package-Manager: Portage-2.3.8, Repoman-2.3.4
.../okular/files/okular-17.08.3-cmake-3.10.patch | 45 ++++++++++++++++++++++
kde-apps/okular/okular-17.08.3.ebuild | 2 +
2 files changed, 47 insertions(+)
diff --git a/kde-apps/okular/files/okular-17.08.3-cmake-3.10.patch b/kde-apps/okular/files/okular-17.08.3-cmake-3.10.patch
new file mode 100644
index 00000000000..33c56a6e7ec
--- /dev/null
+++ b/kde-apps/okular/files/okular-17.08.3-cmake-3.10.patch
@@ -0,0 +1,45 @@
+From f777e2a9241c4f384f60c467e226eee85fb5bc98 Mon Sep 17 00:00:00 2001
+From: Henrik Fehlauer <rkflx@lab12.net>
+Date: Sat, 4 Nov 2017 00:22:09 +0100
+Subject: Fix CMake Error in generators/spectre/CMakeLists.txt
+
+Summary:
+When porting from `add_library` to `okular_add_generator`, 2f9246ae42ce
+missed to remove `MODULE` for spectre, which is already implicitly added
+as can be seen [here](https://phabricator.kde.org/source/kcoreaddons/browse/master/KF5CoreAddonsMacros.cmake;83623a46c9862ee37535de93427dec0b0c55e24d$139).
+
+This causes the upcoming CMake 3.10 to print the error `Cannot find
+source file`, which can be fixed by removing the superfluous `MODULE`.
+
+BUG: 386176
+
+Test Plan:
+No error shown anymore with CMake 3.10.0-rc4. Still works with CMake
+3.5.1.
+
+Reviewers: #okular, ngraham
+
+Reviewed By: ngraham
+
+Tags: #okular
+
+Differential Revision: https://phabricator.kde.org/D8612
+---
+ generators/spectre/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generators/spectre/CMakeLists.txt b/generators/spectre/CMakeLists.txt
+index d808c36..5d6927d 100644
+--- a/generators/spectre/CMakeLists.txt
++++ b/generators/spectre/CMakeLists.txt
+@@ -24,7 +24,7 @@ ki18n_wrap_ui(okularGenerator_ghostview_SRCS
+ kconfig_add_kcfg_files(okularGenerator_ghostview_SRCS conf/gssettings.kcfgc )
+
+
+-okular_add_generator(okularGenerator_ghostview MODULE ${okularGenerator_ghostview_SRCS})
++okular_add_generator(okularGenerator_ghostview ${okularGenerator_ghostview_SRCS})
+
+ target_link_libraries(okularGenerator_ghostview okularcore ${LIBSPECTRE_LIBRARY} KF5::I18n Qt5::Xml)
+
+--
+cgit v0.11.2
diff --git a/kde-apps/okular/okular-17.08.3.ebuild b/kde-apps/okular/okular-17.08.3.ebuild
index 283bc3eb368..d5f22e6d85a 100644
--- a/kde-apps/okular/okular-17.08.3.ebuild
+++ b/kde-apps/okular/okular-17.08.3.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}
# bug 603116
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-cmake-3.10.patch" )
+
src_prepare() {
kde5_src_prepare
use mobile || cmake_comment_add_subdirectory mobile
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/okular/files/, kde-apps/okular/
@ 2018-09-12 17:03 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-09-12 17:03 UTC (permalink / raw
To: gentoo-commits
commit: 4b320689d35ef7882a004844400070f26557b458
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 17:02:50 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 17:02:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b320689
kde-apps/okular: Drop duplicate patch
Package-Manager: Portage-2.3.49, Repoman-2.3.10
kde-apps/okular/files/okular-tests.patch | 112 -------------------------------
kde-apps/okular/okular-18.04.3-r1.ebuild | 2 +-
kde-apps/okular/okular-18.04.3.ebuild | 2 +-
3 files changed, 2 insertions(+), 114 deletions(-)
diff --git a/kde-apps/okular/files/okular-tests.patch b/kde-apps/okular/files/okular-tests.patch
deleted file mode 100644
index 0e2cdaecd4a..00000000000
--- a/kde-apps/okular/files/okular-tests.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 5f093fa9798ad30cda115cea573d18296696a0a9 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 12 Oct 2017 14:09:09 +0200
-Subject: [PATCH] Move tests into existing (auto)tests subdirectories
-
----
- generators/chm/CMakeLists.txt | 12 +++---------
- generators/chm/autotests/CMakeLists.txt | 8 ++++++++
- generators/chm/autotests/chmgeneratortest.cpp | 2 +-
- generators/kimgio/CMakeLists.txt | 6 +-----
- generators/kimgio/tests/CMakeLists.txt | 5 +++++
- generators/kimgio/tests/kimgiotest.cpp | 2 +-
- 6 files changed, 19 insertions(+), 16 deletions(-)
- create mode 100644 generators/chm/autotests/CMakeLists.txt
- create mode 100644 generators/kimgio/tests/CMakeLists.txt
-
-diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
-index 9d82b9394..b3a33afe4 100644
---- a/generators/chm/CMakeLists.txt
-+++ b/generators/chm/CMakeLists.txt
-@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS
- okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
- target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml)
-
--########### autotests ###############
--
--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--ecm_add_test(autotests/chmgeneratortest.cpp
-- TEST_NAME "chmgeneratortest"
-- LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
--)
--
--target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
-+if(BUILD_TESTING)
-+ add_subdirectory(autotests)
-+endif()
-
- ########### install files ###############
- install( FILES okularChm.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
-diff --git a/generators/chm/autotests/CMakeLists.txt b/generators/chm/autotests/CMakeLists.txt
-new file mode 100644
-index 000000000..59753ca45
---- /dev/null
-+++ b/generators/chm/autotests/CMakeLists.txt
-@@ -0,0 +1,8 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+ecm_add_test(chmgeneratortest.cpp
-+ TEST_NAME "chmgeneratortest"
-+ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
-+)
-+
-+target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
-diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp
-index 6b0b8efc7..25fd6631a 100644
---- a/generators/chm/autotests/chmgeneratortest.cpp
-+++ b/generators/chm/autotests/chmgeneratortest.cpp
-@@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase()
- {
- Okular::SettingsCore::instance( QStringLiteral("ChmGeneratorTest") );
- m_document = new Okular::Document( 0 );
-- const QString testFile = QStringLiteral(KDESRCDIR "autotests/data/test.chm");
-+ const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
- QMimeDatabase db;
- const QMimeType mime = db.mimeTypeForFile( testFile );
- QCOMPARE( m_document->openDocument(testFile, QUrl(), mime), Okular::Document::OpenSuccess );
-diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt
-index b8cac76df..49f893bc1 100644
---- a/generators/kimgio/CMakeLists.txt
-+++ b/generators/kimgio/CMakeLists.txt
-@@ -13,13 +13,9 @@ okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp)
- target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)
-
- if(BUILD_TESTING)
-- add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
-- set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
-- ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
-- target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
-+ add_subdirectory(tests)
- endif()
-
--
- ########### install files ###############
- install( FILES okularKimgio.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
- install( PROGRAMS okularApplication_kimgio.desktop org.kde.mobile.okular_kimgio.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-diff --git a/generators/kimgio/tests/CMakeLists.txt b/generators/kimgio/tests/CMakeLists.txt
-new file mode 100644
-index 000000000..f31bf3fe8
---- /dev/null
-+++ b/generators/kimgio/tests/CMakeLists.txt
-@@ -0,0 +1,5 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+set( kimgiotest_SRCS kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
-+ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
-+target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
-diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp
-index b3039a6bb..78608df9d 100644
---- a/generators/kimgio/tests/kimgiotest.cpp
-+++ b/generators/kimgio/tests/kimgiotest.cpp
-@@ -9,7 +9,7 @@
-
-
- #include "../generator_kimgio.h"
--#include "../../settings_core.h"
-+#include "../../../settings_core.h"
-
- #include <core/observer.h>
- #include <core/page.h>
---
-2.14.2
-
diff --git a/kde-apps/okular/okular-18.04.3-r1.ebuild b/kde-apps/okular/okular-18.04.3-r1.ebuild
index 8811b8c2a78..f44e22fdae4 100644
--- a/kde-apps/okular/okular-18.04.3-r1.ebuild
+++ b/kde-apps/okular/okular-18.04.3-r1.ebuild
@@ -65,7 +65,7 @@ RDEPEND="${DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-tests.patch"
+ "${FILESDIR}/${PN}-18.08.0-tests.patch"
"${FILESDIR}/${P}-path-traversal-issue.patch"
)
diff --git a/kde-apps/okular/okular-18.04.3.ebuild b/kde-apps/okular/okular-18.04.3.ebuild
index da9ded78a2b..2a5d3374704 100644
--- a/kde-apps/okular/okular-18.04.3.ebuild
+++ b/kde-apps/okular/okular-18.04.3.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
)
"
-PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
+PATCHES=( "${FILESDIR}/${PN}-18.08.0-tests.patch" )
src_prepare() {
kde5_src_prepare
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/okular/files/, kde-apps/okular/
@ 2021-07-16 15:21 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-07-16 15:21 UTC (permalink / raw
To: gentoo-commits
commit: e4d8b169b44eca034e4a9850fa63d42ec5df2669
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 13:58:42 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 15:20:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d8b169
kde-apps/okular: Fix fictionbook loading
Upstream commit 504eec7688e7139e9d193fc2b3ddafac0f835b6f
See also: https://mail.kde.org/pipermail/distributions/2021-July/001034.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=439807
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../okular-21.04.3-fix-fictionbook-support.patch | 27 ++++++
kde-apps/okular/okular-21.04.3-r1.ebuild | 108 +++++++++++++++++++++
2 files changed, 135 insertions(+)
diff --git a/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch b/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch
new file mode 100644
index 00000000000..061db80d2bc
--- /dev/null
+++ b/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch
@@ -0,0 +1,27 @@
+From 504eec7688e7139e9d193fc2b3ddafac0f835b6f Mon Sep 17 00:00:00 2001
+From: Yaroslav Sidlovsky <zawertun@gmail.com>
+Date: Mon, 12 Jul 2021 11:06:26 +0300
+Subject: [PATCH] Fix non unique KPlugin Id for fictionbook generator
+
+BUG: 439807
+(cherry picked from commit 8dc58c7617abcacf9325e5b93a5e38149f6e2aaf)
+---
+ generators/fictionbook/libokularGenerator_fb.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json
+index 1ef01a2d5..3d499a50f 100644
+--- a/generators/fictionbook/libokularGenerator_fb.json
++++ b/generators/fictionbook/libokularGenerator_fb.json
+@@ -120,7 +120,7 @@
+ "Description[x-test]": "xxA renderer for FictionBook eBooksxx",
+ "Description[zh_CN]": "FictionBook 电子书渲染器",
+ "Description[zh_TW]": "FictionBook 電子書成像器",
+- "Id": "okular_fax",
++ "Id": "okular_fictionbook",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/x-fictionbook+xml"
+--
+GitLab
+
diff --git a/kde-apps/okular/okular-21.04.3-r1.ebuild b/kde-apps/okular/okular-21.04.3-r1.ebuild
new file mode 100644
index 00000000000..45e203a7aa5
--- /dev/null
+++ b/kde-apps/okular/okular-21.04.3-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
+HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kactivities-${KFMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kjs-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kpty-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/threadweaver-${KFMIN}:5
+ media-libs/freetype
+ >=media-libs/phonon-4.11.0
+ sys-libs/zlib
+ chm? (
+ dev-libs/chmlib
+ dev-libs/libzip:=
+ >=kde-frameworks/khtml-${KFMIN}:5
+ )
+ djvu? ( app-text/djvu )
+ epub? ( app-text/ebook-tools )
+ image-backend? (
+ >=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
+ >=kde-apps/libkexiv2-${PVCUT}:5
+ )
+ markdown? ( app-text/discount )
+ mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
+ pdf? ( app-text/poppler[nss,qt5] )
+ plucker? ( virtual/jpeg:0 )
+ postscript? ( app-text/libspectre )
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+ speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+ tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+ image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
+ qml? (
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-20.11.90-tests.patch" # bug 734138
+ "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
+ "${FILESDIR}/${P}-fix-fictionbook-support.patch" # KDE-bug 439807
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DOKULAR_UI=$(usex qml "both" "desktop")
+ $(cmake_use_find_package chm CHM)
+ $(cmake_use_find_package chm KF5KHtml)
+ $(cmake_use_find_package chm LibZip)
+ $(cmake_use_find_package djvu DjVuLibre)
+ $(cmake_use_find_package epub EPub)
+ $(cmake_use_find_package image-backend KF5KExiv2)
+ $(cmake_use_find_package markdown Discount)
+ $(cmake_use_find_package mobi QMobipocket)
+ $(cmake_use_find_package pdf Poppler)
+ $(cmake_use_find_package plucker JPEG)
+ $(cmake_use_find_package postscript LibSpectre)
+ $(cmake_use_find_package share KF5Purpose)
+ $(cmake_use_find_package speech Qt5TextToSpeech)
+ $(cmake_use_find_package tiff TIFF)
+ )
+ ecm_src_configure
+}
+
+src_test() {
+ # mainshelltest hangs, chmgeneratortest fails, bug #603116
+ # parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
+ local myctestargs=(
+ -E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
+ )
+
+ ecm_src_test
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/okular/files/, kde-apps/okular/
@ 2022-11-16 19:07 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-11-16 19:07 UTC (permalink / raw
To: gentoo-commits
commit: 85158026a6962c95119add10dd1d858d26d3a447
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 19:03:59 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 19:07:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85158026
kde-apps/okular: Drop version check broken by KF-5.100
Upstream commit d25eaebc8004aa69b4eca3cacfef2701e728c8ef
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ular-22.08.3-drop-broken-kf-version-check.patch | 30 ++++++++++++++++++++++
kde-apps/okular/okular-22.08.3.ebuild | 1 +
2 files changed, 31 insertions(+)
diff --git a/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch b/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch
new file mode 100644
index 000000000000..610f36663d27
--- /dev/null
+++ b/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch
@@ -0,0 +1,30 @@
+From d25eaebc8004aa69b4eca3cacfef2701e728c8ef Mon Sep 17 00:00:00 2001
+From: Jonathan Esk-Riddell <jr@jriddell.org>
+Date: Fri, 21 Oct 2022 11:47:53 +0100
+Subject: [PATCH] remove ecm_version check which breaks on 5.100, we already
+ depend on ecm 5.68 anyway so it serves no purpose
+
+---
+ CMakeLists.txt | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 98cfd2b17..3817078c2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -611,11 +611,7 @@ install(FILES okular.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
+ install( FILES okular_part.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+ install( FILES part/part.rc part/part-viewermode.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/okular )
+
+-if (${ECM_VERSION} STRGREATER "5.58.0")
+- install(FILES okular.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
+-else()
+- install(FILES okular.categories DESTINATION ${KDE_INSTALL_CONFDIR})
+-endif()
++install(FILES okular.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
+
+ ki18n_install(po)
+ if(KF5DocTools_FOUND)
+--
+GitLab
+
diff --git a/kde-apps/okular/okular-22.08.3.ebuild b/kde-apps/okular/okular-22.08.3.ebuild
index 9693c79978ad..2bd095913a16 100644
--- a/kde-apps/okular/okular-22.08.3.ebuild
+++ b/kde-apps/okular/okular-22.08.3.ebuild
@@ -70,6 +70,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
+ "${FILESDIR}/${P}-drop-broken-kf-version-check.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/okular/files/, kde-apps/okular/
@ 2023-02-18 13:06 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-02-18 13:06 UTC (permalink / raw
To: gentoo-commits
commit: cdddaea7a802a570a60e749b5179c0760d36e3fd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 10:44:02 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 13:06:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdddaea7
kde-apps/okular: Fix build with >=app-text/discount-3
Closes: https://bugs.gentoo.org/892633
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../okular/files/okular-22.12.2-discount-3.patch | 47 ++++++++++++++++++++++
kde-apps/okular/okular-22.12.2.ebuild | 1 +
2 files changed, 48 insertions(+)
diff --git a/kde-apps/okular/files/okular-22.12.2-discount-3.patch b/kde-apps/okular/files/okular-22.12.2-discount-3.patch
new file mode 100644
index 000000000000..e9fef2679adb
--- /dev/null
+++ b/kde-apps/okular/files/okular-22.12.2-discount-3.patch
@@ -0,0 +1,47 @@
+From f1f638c2c51a6ef699dee22f6e90aff67beff8ec Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 1 Feb 2023 22:01:52 +0100
+Subject: [PATCH] Compile with discount 3
+
+---
+ generators/markdown/converter.cpp | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/generators/markdown/converter.cpp b/generators/markdown/converter.cpp
+index 20d3c725f..3c8546b32 100644
+--- a/generators/markdown/converter.cpp
++++ b/generators/markdown/converter.cpp
+@@ -93,6 +93,8 @@ QTextDocument *Converter::convertOpenFile()
+ {
+ rewind(m_markdownFile);
+
++#if defined(MKD_NOLINKS)
++ // on discount 2 MKD_NOLINKS is a define
+ MMIOT *markdownHandle = mkd_in(m_markdownFile, 0);
+
+ int flags = MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK | MKD_TOC | MKD_IDANCHOR;
+@@ -103,6 +105,21 @@ QTextDocument *Converter::convertOpenFile()
+ Q_EMIT error(i18n("Failed to compile the Markdown document."), -1);
+ return nullptr;
+ }
++#else
++ // on discount 3 MKD_NOLINKS is an enum value
++ MMIOT *markdownHandle = mkd_in(m_markdownFile, nullptr);
++
++ mkd_flag_t *flags = mkd_flags();
++ mkd_set_flag_bitmap(flags, MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK | MKD_TOC | MKD_IDANCHOR);
++ if (!m_isFancyPantsEnabled) {
++ mkd_set_flag_num(flags, MKD_NOPANTS);
++ }
++ if (!mkd_compile(markdownHandle, flags)) {
++ Q_EMIT error(i18n("Failed to compile the Markdown document."), -1);
++ return nullptr;
++ }
++ mkd_free_flags(flags);
++#endif
+
+ char *htmlDocument;
+ const int size = mkd_document(markdownHandle, &htmlDocument);
+--
+GitLab
+
diff --git a/kde-apps/okular/okular-22.12.2.ebuild b/kde-apps/okular/okular-22.12.2.ebuild
index b53a5f62b2fd..02e1c3eb56af 100644
--- a/kde-apps/okular/okular-22.12.2.ebuild
+++ b/kde-apps/okular/okular-22.12.2.ebuild
@@ -72,6 +72,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
+ "${FILESDIR}/${PN}-22.12.2-discount-3.patch" # bug 892633
)
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/okular/files/, kde-apps/okular/
@ 2024-04-22 16:32 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2024-04-22 16:32 UTC (permalink / raw
To: gentoo-commits
commit: 83c1a0cd60ab8af045d8662c965635a863644cf2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 13:24:56 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 16:22:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83c1a0cd
kde-apps/okular: Fix musl build (implicit vasprintf decl)
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=398338
Upstream MR: https://invent.kde.org/graphics/okular/-/merge_requests/722
Cherry-picked from upstream's upstream:
https://github.com/jlaurens/synctex/commit/4b0590e7d1817b004c71635f9e721edf1e368228
Closes: https://bugs.gentoo.org/922345
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/okular-23.08.5-implicit-vasprintf.patch | 29 ++++++++++++++++++++++
kde-apps/okular/okular-23.08.5.ebuild | 1 +
kde-apps/okular/okular-24.02.2.ebuild | 1 +
3 files changed, 31 insertions(+)
diff --git a/kde-apps/okular/files/okular-23.08.5-implicit-vasprintf.patch b/kde-apps/okular/files/okular-23.08.5-implicit-vasprintf.patch
new file mode 100644
index 000000000000..685da3112291
--- /dev/null
+++ b/kde-apps/okular/files/okular-23.08.5-implicit-vasprintf.patch
@@ -0,0 +1,29 @@
+From a0f57bf7f984289c5b0ceefa2a784f97cd58428a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Germ=C3=A1n=20Poo-Caama=C3=B1o?= <gpoo@gnome.org>
+Date: Sat, 30 May 2020 16:15:27 -0400
+Subject: [PATCH] Fix implicit declaration of vasprintf
+
+Fix build when compiling with `-Werror=implicit-function-declaration`.
+---
+ core/synctex/synctex_parser.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/core/synctex/synctex_parser.c b/core/synctex/synctex_parser.c
+index 9eed566b3..a67006d39 100644
+--- a/core/synctex/synctex_parser.c
++++ b/core/synctex/synctex_parser.c
+@@ -55,6 +55,11 @@
+ * First level objects are sheets and forms, containing boxes, glues, kerns...
+ * The third tree allows to browse leaves according to tag and line.
+ */
++/* Declare _GNU_SOURCE for accessing vasprintf. For MSC compiler, vasprintf is
++ * defined in this file
++ */
++#define _GNU_SOURCE
++
+ #if defined(SYNCTEX_USE_LOCAL_HEADER)
+ #include "synctex_parser_local.h"
+ #else
+--
+2.44.0
+
diff --git a/kde-apps/okular/okular-23.08.5.ebuild b/kde-apps/okular/okular-23.08.5.ebuild
index abdf021dae88..25f6cf6f093a 100644
--- a/kde-apps/okular/okular-23.08.5.ebuild
+++ b/kde-apps/okular/okular-23.08.5.ebuild
@@ -72,6 +72,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
+ "${FILESDIR}/${P}-implicit-vasprintf.patch" # bug 922345; pending upstream
)
src_configure() {
diff --git a/kde-apps/okular/okular-24.02.2.ebuild b/kde-apps/okular/okular-24.02.2.ebuild
index f494535d9fcf..223ed8af1b50 100644
--- a/kde-apps/okular/okular-24.02.2.ebuild
+++ b/kde-apps/okular/okular-24.02.2.ebuild
@@ -66,6 +66,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-24.01.80-tests.patch" # bug 734138
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
+ "${FILESDIR}/${PN}-23.08.5-implicit-vasprintf.patch" # bug 922345; pending upstream
)
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-04-22 16:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-22 16:32 [gentoo-commits] repo/gentoo:master commit in: kde-apps/okular/files/, kde-apps/okular/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-02-18 13:06 Andreas Sturmlechner
2022-11-16 19:07 Andreas Sturmlechner
2021-07-16 15:21 Andreas Sturmlechner
2018-09-12 17:03 Andreas Sturmlechner
2017-11-10 10:40 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox