Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e150e6ce1707eb0c80fd148505eff841a32cd6e0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e150e6ce1707eb0c80fd148505eff841a32cd6e0)
  • Date: Fri, 8 Dec 2023 16:14:21 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

kde-gear/okular/DEPENDS | 16 ++++++++++------
kde-gear/okular/HISTORY | 3 ++-
2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit e150e6ce1707eb0c80fd148505eff841a32cd6e0
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

okular: fix with DEPENDS updates

diff --git a/kde-gear/okular/DEPENDS b/kde-gear/okular/DEPENDS
index c433e2c..344ab1b 100755
--- a/kde-gear/okular/DEPENDS
+++ b/kde-gear/okular/DEPENDS
@@ -3,11 +3,13 @@ if is_depends_enabled $SPELL qt6base;then
depends qt5compat &&
depends qt6declarative &&
depends qt6svg &&
- optional_depends qt6speech '' '' 'speech synthesis support'
+ optional_depends qt6speech '' '' 'speech synthesis support' &&
+ optional_depends -sub QT6 poppler '' '' 'PDF plug-in'
else
depends qtdeclarative &&
depends qtsvg &&
- optional_depends qtspeech '' '' 'speech synthesis support'
+ optional_depends qtspeech '' '' 'speech synthesis support' &&
+ optional_depends -sub QT5 poppler '' '' 'PDF plug-in'
fi &&
depends kactivities &&
depends karchive &&
@@ -23,12 +25,15 @@ depends kio &&
depends kirigami2 &&
depends kparts &&
depends kservice &&
+depends kpty &&
depends kwindowsystem &&
depends threadweaver &&
depends zlib &&
-optional_depends kdoctools '' ' -DCMAKE_DISABLE_FIND_PACKAGE_KF6DocTools=1'
'build documentation' &&
+# kdoctools and purpose are required now, possible to override,
+# but likely asking for trouble
+depends kdoctools &&
+depends purpose &&
optional_depends kwallet '' '' 'password wallet' &&
-optional_depends purpose '' '' 'sharing menu' &&
optional_depends qca '' '' 'read encrypted ODT files' &&
optional_depends libkexiv2 '' '' 'Support for image files' &&
optional_depends freetype2 '' '' 'freetype font support' &&
@@ -44,5 +49,4 @@ optional_depends discount '' '' 'markdown support' &&
optional_depends djvulibre '' '' 'DejaVu plugin' &&
optional_depends ebook-tools '' '' 'read ebooks' &&
optional_depends mobipocket '' '' 'read Mobipocket documents' &&
-optional_depends phonon '' '' 'audio/video support in docs' &&
-optional_depends -sub ${QT} poppler '' '' 'PDF-plugin'
+optional_depends phonon '' '' 'audio/video support in docs'
diff --git a/kde-gear/okular/HISTORY b/kde-gear/okular/HISTORY
index bdb92be..daf5891 100644
--- a/kde-gear/okular/HISTORY
+++ b/kde-gear/okular/HISTORY
@@ -1,5 +1,6 @@
2023-12-08 Thomas Orgis <sobukus AT sourcemage.org>
- * DEPENDS: tweak &&s into &&
+ * DEPENDS: tweak &&s into && and fix sub-dep on poppler,
+ add kpty, make required stuff mandatory

2023-01-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: tweak



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e150e6ce1707eb0c80fd148505eff841a32cd6e0), Thomas Orgis, 12/08/2023

Archive powered by MHonArc 2.6.24.

Top of Page