Changes between Initial Version and Version 1 of KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci

Timestamp:

Aug 24, 2014, 8:34:02 PM (10 years ago)

Author:

mkae (Marko Käning)

Comment:

move "mp-osx-ci" repo's diff between branches 'mp-osx-ci' and 'production' to separate page

KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci

@@ +1 @@
+= Diff of branches mp-osx-ci and production for repository mp-osx-ci =
+
+{{{
+$ git diff production config
+diff --git a/config/base/kf5-qt5 b/config/base/kf5-qt5
+index 2260aa6..573bc24 100644
+--- a/config/base/kf5-qt5
++++ b/config/base/kf5-qt5
+@@ -20,7 +20,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..64f14f6 100644
+--- a/config/build/darwin-mavericks.cfg
++++ b/config/build/darwin-mavericks.cfg
+@@ -1,7 +1,9 @@
+ [DEFAULT]
++scriptsLocation=/Users/kdeci/scripts
+ opSys=darwin
+ architecture=mavericks
+ compiler=clang
++configurePlatformArgs=-DCMAKE_INSTALL_BUNDLEDIR="Applications/KF5" -DDATA_INSTALL_DIR="Library/Application Support" -DCMAKE_DISABLE_FIND_PACKAGE_X11=ON
+ 
+ [General]
+-installPrefix=/opt/kde/install/%(opSys)s/%(architecture)s/%(compiler)s/
+\ No newline at end of file
++installPrefix=/opt/kde/install/%(opSys)s/%(architecture)s/%(compiler)s/
+diff --git a/config/build/global.cfg b/config/build/global.cfg
+index 4052215..9dbe1e1 100644
+--- a/config/build/global.cfg
++++ b/config/build/global.cfg
+@@ -55,7 +55,7 @@ updateMimeDatabaseCommand=%(updateMimeDatabaseExecutable)s share/mime
+ deployInstallation=True
+ 
+ [Test]
+-testsEnabled=True
++testsEnabled=False
+ ctestCountTestsCommand=%(ctestExecutable)s -N
+ xvfbDisplayName=:99
+ xvfbCommand=%(xvfbExecutable)s %(xvfbDisplayName)s -ac -screen 0 1600x1200x24+32
+diff --git a/config/build/kconfig/darwin-mavericks.cfg b/config/build/kconfig/darwin-mavericks.cfg
+new file mode 100644
+index 0000000..28e02d7
+--- /dev/null
++++ b/config/build/kconfig/darwin-mavericks.cfg
+@@ -0,0 +1,2 @@
++[DEFAULT]
++configureExtraArgs=-DCMAKE_INSTALL_BUNDLEDIR="lib/libexec/kf5"
+diff --git a/config/build/kconfigwidgets/darwin-mavericks.cfg b/config/build/kconfigwidgets/darwin-mavericks.cfg
+new file mode 100644
+index 0000000..e44ae1c
+--- /dev/null
++++ b/config/build/kconfigwidgets/darwin-mavericks.cfg
+@@ -0,0 +1,2 @@
++[DEFAULT]
++configureExtraArgs=-DDATA_INSTALL_DIR="{instPrefix}/Library/Application Support"
+diff --git a/config/build/plasma-framework/darwin-mavericks.cfg b/config/build/plasma-framework/darwin-mavericks.cfg
+new file mode 100644
+index 0000000..3d76592
+--- /dev/null
++++ b/config/build/plasma-framework/darwin-mavericks.cfg
+@@ -0,0 +1,5 @@
++[DEFAULT]
++configureExtraArgs=
++
++[QualityCheck]
++runCppcheck=True
+}}}