Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5157bc552e1e76125ee8fde64288b87fc333996f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5157bc552e1e76125ee8fde64288b87fc333996f)
  • Date: Fri, 10 Mar 2017 12:15:17 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde5-graphics/okular/DEPENDS | 4 +++-
kde5-graphics/okular/HISTORY | 3 +++
kde5-graphics/okular/PRE_BUILD | 5 +++++
kde5-utils/kgpg/DEPENDS | 5 ++++-
kde5-utils/kgpg/HISTORY | 3 +++
5 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 5157bc552e1e76125ee8fde64288b87fc333996f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

okular - khtml only needed for CHM support

commit 59cb91967504a8b8535277fa1f81a65dfb6bb121
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kgpg - depends++

diff --git a/kde5-graphics/okular/DEPENDS b/kde5-graphics/okular/DEPENDS
index 647e149..3c0591d 100755
--- a/kde5-graphics/okular/DEPENDS
+++ b/kde5-graphics/okular/DEPENDS
@@ -18,7 +18,6 @@ depends kwallet5 &&
depends kwindowsystem &&
depends threadweaver &&
depends phonon4qt5 &&
-optional_depends khtml '' '' 'CHM plugin' &&
optional_depends libkexiv2 '' '' 'Support for image files' &&
optional_depends freetype2 '' '' 'freetype font support' &&
optional_depends -sub QT5 poppler '' '' 'PDF-plugin' &&
@@ -26,6 +25,9 @@ optional_depends libspectre '' '' 'render PS files'
&&
optional_depends tiff '' '' 'TIFF plugin' &&
optional_depends JPEG '' '' 'djvu-plugin' &&
optional_depends chmlib '' '' 'CHM plugin' &&
+if is_depends_enabled $SPELL chmlib; then
+ depends khtml
+fi &&
optional_depends djvulibre '' '' 'DejaVu plugin' &&
optional_depends ebook-tools '' '' 'read ebooks' &&
optional_depends mobipocket '' '' 'read Mobipocket documents' &&
diff --git a/kde5-graphics/okular/HISTORY b/kde5-graphics/okular/HISTORY
index 3c95901..c4a5b0f 100644
--- a/kde5-graphics/okular/HISTORY
+++ b/kde5-graphics/okular/HISTORY
@@ -1,3 +1,6 @@
+2017-03-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD DEPENDS: khtml only needed for CHM
+
2017-03-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 16.12.3

diff --git a/kde5-graphics/okular/PRE_BUILD b/kde5-graphics/okular/PRE_BUILD
new file mode 100755
index 0000000..c9b9255
--- /dev/null
+++ b/kde5-graphics/okular/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if ! is_depends_enabled $SPELL chmlib; then
+ sed -i "/KHtml/D" CMakeLists.txt
+fi
diff --git a/kde5-utils/kgpg/DEPENDS b/kde5-utils/kgpg/DEPENDS
index e22f90c..d59df28 100755
--- a/kde5-utils/kgpg/DEPENDS
+++ b/kde5-utils/kgpg/DEPENDS
@@ -15,4 +15,7 @@ depends ktextwidgets &&
depends kwidgetsaddons &&
depends kwindowsystem &&
depends kxmlgui &&
-depends gpgme
+depends gpgme &&
+depends boost &&
+depends akonadi-contacts &&
+depends kcontacts
diff --git a/kde5-utils/kgpg/HISTORY b/kde5-utils/kgpg/HISTORY
index 8a0c216..8a3b42d 100644
--- a/kde5-utils/kgpg/HISTORY
+++ b/kde5-utils/kgpg/HISTORY
@@ -1,3 +1,6 @@
+2017-03-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add pim stuff
+
2017-03-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 16.12.3




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5157bc552e1e76125ee8fde64288b87fc333996f), Treeve Jelbert, 03/10/2017

Archive powered by MHonArc 2.6.24.

Top of Page