Changes between Version 27 and Version 28 of KDEProblems/KDEMacPortsCI/Status

Timestamp:

May 25, 2014, 4:16:51 PM (10 years ago)

Author:

mkae (Marko Käning)

Comment:

move removal of kauth's dep on polkit-qt-1 up and add git diff stuff

KDEProblems/KDEMacPortsCI/Status

@@ -141 +141 @@
 == Keeping build environment up-to-date ==
 
+
+For KF5 one has to modify the configuration settings by commenting out the kauth dependency on polkit-qt-1,
+since that dependency is only needed on Linux:
+{{{
+$ cd ~/scripts
+$ ./update-setup.sh
+$ vi config/base/kf5-qt5 
+$ grep kauth config/base/kf5-qt5
+#frameworks/kauth: kdesupport/polkit-qt-1
+$
+}}}
+
 In order to always have the latest KDE/CI running it makes sense to temporally stash away the changes made locally and upgrade via git
 {{{
 $ # Check what has changed locally:
 $ git diff
+iff --git a/config/base/kf5-qt5 b/config/base/kf5-qt5
+index 16abdf6..fff9647 100644
+--- a/config/base/kf5-qt5
++++ b/config/base/kf5-qt5
+@@ -18,7 +18,7 @@ general/vc: -qt5
+ general/shared-desktop-ontologies: -qt5
+ 
+ # KDE Frameworks
+-frameworks/kauth: kdesupport/polkit-qt-1
++#frameworks/kauth: kdesupport/polkit-qt-1
+ kde/*: general/kdesupport-svn
+ kde/workspace/plasma-workspace: general/libdbusmenu-qt
+ 
 diff --git a/config/build/darwin-mavericks.cfg b/config/build/darwin-mavericks.cfg
 index cb62c49..0648464 100644
@@ -186 +211 @@
 $ cd ~/scripts; git stash; git pull; git stash pop
 }}}
-
-One also has to modify the configuration settings for KF5 after every run of {{{./update-setup.sh}}}:
-{{{
-$ cd ~/scripts
-$ ./update-setup.sh
-$ vi config/base/kf5-qt5 
-$ grep kauth config/base/kf5-qt5
-#frameworks/kauth: kdesupport/polkit-qt-1
-$
-}}}
-since that dependency is only needed on Linux!