Skip to Content.
Sympa Menu

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

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 (d1814e7edcba2e2f9b82bd9ab4b32f5d076973dd)
  • Date: Sun, 9 Dec 2018 19:31:46 +0000

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

kde-frameworks/kdelibs4support/DEPENDS | 4 +++-
kde-frameworks/kdelibs4support/HISTORY | 1 +
kde-frameworks/kdelibs4support/PRE_BUILD | 3 +++
kde-frameworks/kwallet5/DEPENDS | 4 +++-
kde-frameworks/kwallet5/HISTORY | 1 +
kde-frameworks/kwallet5/PRE_BUILD | 5 +++++
6 files changed, 16 insertions(+), 2 deletions(-)

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

kwallet5 - tweak

commit 4b6bbdaa51fda0559c8aaad473c3bc4d790242c4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdelibs4support - fix build

diff --git a/kde-frameworks/kdelibs4support/DEPENDS
b/kde-frameworks/kdelibs4support/DEPENDS
index 1669ef5..2758056 100755
--- a/kde-frameworks/kdelibs4support/DEPENDS
+++ b/kde-frameworks/kdelibs4support/DEPENDS
@@ -1,5 +1,6 @@
source $GRIMOIRE/KDE5_DEPENDS &&
depends qtx11extras &&
+depends qtsvg &&
depends kcompletion &&
depends kconfig &&
depends kconfigwidgets &&
@@ -25,4 +26,5 @@ depends kwidgetsaddons &&
depends kwindowsystem &&
depends kxmlgui &&
optional_depends SSL '' '' 'secure communications + https' &&
-optional_depends kdesignerplugin '' '' 'obsolete plugins for qtdesinger'
+optional_depends kdesignerplugin '' '' 'obsolete plugins for qtdesigner' &&
+optional_depends qttools '' '' 'qtdesigner plugins'
diff --git a/kde-frameworks/kdelibs4support/HISTORY
b/kde-frameworks/kdelibs4support/HISTORY
index 28640aa..2fa99d5 100644
--- a/kde-frameworks/kdelibs4support/HISTORY
+++ b/kde-frameworks/kdelibs4support/HISTORY
@@ -1,5 +1,6 @@
2018-12-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.53.0
+ * PRE_BUILD DEPENDS: fix build without qtdesigner

2018-11-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.52.0
diff --git a/kde-frameworks/kdelibs4support/PRE_BUILD
b/kde-frameworks/kdelibs4support/PRE_BUILD
index 60d1cc8..0257c21 100755
--- a/kde-frameworks/kdelibs4support/PRE_BUILD
+++ b/kde-frameworks/kdelibs4support/PRE_BUILD
@@ -7,4 +7,7 @@ sed -i '/KF5DesignerPlugin/D' cmake/modules/KDE4Macros.cmake \
CMakeLists.txt \
KF5KDELibs4SupportConfig.cmake.in &&
sed -i '/kf5designerplugin_add_plugin/,/\/designer/D' src/CMakeLists.txt
+fi &&
+if ! is_depends_enabled $SPELL qttools;then
+ sed -i 's/Designer//' CMakeLists.txt
fi
diff --git a/kde-frameworks/kwallet5/DEPENDS b/kde-frameworks/kwallet5/DEPENDS
index 131256f..385e222 100755
--- a/kde-frameworks/kwallet5/DEPENDS
+++ b/kde-frameworks/kwallet5/DEPENDS
@@ -1,5 +1,6 @@
source $GRIMOIRE/KDE5_DEPENDS &&
depends kconfig &&
+depends kconfigwidgets &&
depends kcoreaddons &&
depends kdbusaddons &&
depends ki18n &&
@@ -9,4 +10,5 @@ depends kservice &&
depends kwindowsystem &&
depends kwidgetsaddons &&
depends libgcrypt &&
-optional_depends gpgme '' '' 'GPG support'
+optional_depends gpgme '' '' 'GPG support' &&
+optional_depends kdoctools ' -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=1' ''
'build docs'
diff --git a/kde-frameworks/kwallet5/HISTORY b/kde-frameworks/kwallet5/HISTORY
index 829d276..bfc5b7f 100644
--- a/kde-frameworks/kwallet5/HISTORY
+++ b/kde-frameworks/kwallet5/HISTORY
@@ -1,5 +1,6 @@
2018-12-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.53.0
+ * DEPENDS: tweak

2018-11-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.52.0
diff --git a/kde-frameworks/kwallet5/PRE_BUILD
b/kde-frameworks/kwallet5/PRE_BUILD
new file mode 100755
index 0000000..fd00606
--- /dev/null
+++ b/kde-frameworks/kwallet5/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/qglobal.h/s|^//||' src/runtime/kwalletd/backend/blowfish.cc \
+ src/runtime/kwalletd/backend/sha1.cc
+#apply_patch_dir patches



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d1814e7edcba2e2f9b82bd9ab4b32f5d076973dd), Treeve Jelbert, 12/09/2018

Archive powered by MHonArc 2.6.24.

Top of Page