Changes between Version 3 and Version 4 of KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci

Timestamp:

Feb 14, 2015, 12:54:08 PM (9 years ago)

Author:

mkae (Marko Käning)

Comment:

another update (after having pulled the most recent production)

KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci

@@ -5 +5 @@
 {{{
 $ date; git diff production config
-Sat Feb 14 13:49:27 CET 2015
+Sat Feb 14 13:52:24 CET 2015
 diff --git a/config/base/kf5-qt5 b/config/base/kf5-qt5
-index 1f7cd4f..20c03f3 100644
+index 4ec4661..20c03f3 100644
 --- a/config/base/kf5-qt5
 +++ b/config/base/kf5-qt5
@@ -19 +19 @@
  
  # KDE Workspaces
-@@ -29,6 +29,7 @@ kde/applications/kate: general/libgit2
+@@ -29,7 +29,7 @@ kde/applications/kate: general/libgit2
  kde/applications/rocs: general/grantlee
  kde/workspace/plasma-workspace: general/libdbusmenu-qt
  kde/workspace/kio-extras: general/libssh
+-kde/workspace/kfilemetadata: general/poppler
 +#kde/workspace/kfilemetadata: general/poppler
  
  # Extragear
  extragear/kdevelop/kdevplatform: general/grantlee
-@@ -40,5 +41,14 @@ playground/network/sflphone-kde[master]: -kde/kdelibs
+@@ -41,5 +41,14 @@ playground/network/sflphone-kde[master]: -kde/kdelibs
  playground/network/sflphone-kde[master]: -kde/kdepimlibs
  playground/network/sflphone-kde[master]: kde/kdelibs[frameworks]
@@ -42 +43 @@
  # Books
  books/kf5book: general/snippetextractor
-diff --git a/config/base/latest-qt4 b/config/base/latest-qt4
-index 5712107..674835e 100644
---- a/config/base/latest-qt4
-+++ b/config/base/latest-qt4
-@@ -33,7 +33,6 @@ kde/*: general/kdesupport-svn
- kde/kdelibs: general/shared-desktop-ontologies
- kde/kdelibs: general/grantlee
- kde/kdelibs: general/libdbusmenu-qt
--kde/kdelibs/kfilemetadata: general/poppler
- kde/kdelibs/nepomuk-core: general/poppler
- kde/kdepimlibs: general/qjson
- kde/kde-runtime: general/libssh
-@@ -44,6 +43,8 @@ kde/kdegraphics/okular: general/poppler
- kde/kdebindings/pykde4: general/pyqt4
- kde/applications/kate: general/qjson
- kde/kdeedu/kstars: general/qjson
-+kde/workspace/baloo: general/qjson
-+kde/workspace/kfilemetadata: general/poppler
- 
- # Calligra
- calligra: general/vc
-diff --git a/config/base/oldstable-qt4 b/config/base/oldstable-qt4
-index 19ae46d..b1c9577 100644
---- a/config/base/oldstable-qt4
-+++ b/config/base/oldstable-qt4
-@@ -30,7 +30,6 @@ kde/*: general/kdesupport-svn
- kde/kdelibs: general/shared-desktop-ontologies
- kde/kdelibs: general/grantlee
- kde/kdelibs: general/libdbusmenu-qt
--kde/kdelibs/kfilemetadata: general/poppler
- kde/kdelibs/nepomuk-core: general/poppler
- kde/kdepimlibs: general/qjson
- kde/kde-runtime: general/libssh
-@@ -40,6 +39,7 @@ kde/kdepim-runtime: general/libkolab
- kde/kdegraphics/okular: general/poppler
- kde/kdebindings/pykde4: general/pyqt4
- kde/applications/kate: general/qjson
-+kde/workspace/kfilemetadata: general/poppler
- 
- # Calligra
- calligra: general/vc
 diff --git a/config/base/stable-kf5-qt5 b/config/base/stable-kf5-qt5
 index daf8160..dd17158 100644
@@ -105 +65 @@
 +kde/applications/kde-baseapps: -kde/kdelibs/baloo-widgets
 +kde/applications/kde-baseapps: -general/poppler
-diff --git a/config/base/stable-qt4 b/config/base/stable-qt4
-index c2a094a..96ded65 100644
---- a/config/base/stable-qt4
-+++ b/config/base/stable-qt4
-@@ -31,7 +31,6 @@ kde/*: general/kdesupport-svn
- kde/kdelibs: general/shared-desktop-ontologies
- kde/kdelibs: general/grantlee
- kde/kdelibs: general/libdbusmenu-qt
--kde/kdelibs/kfilemetadata: general/poppler
- kde/kdelibs/nepomuk-core: general/poppler
- kde/kdepimlibs: general/qjson
- kde/kde-runtime: general/libssh
-@@ -42,6 +41,8 @@ kde/kdegraphics/okular: general/poppler
- kde/kdebindings/pykde4: general/pyqt4
- kde/applications/kate: general/qjson
- kde/kdeedu/kstars: general/qjson
-+kde/workspace/baloo: general/qjson
-+kde/workspace/kfilemetadata: general/poppler
- 
- # Calligra
- calligra: general/vc
 diff --git a/config/build/00-verbose-make-template/darwin-mavericks.cfg b/config/build/00-verbose-make-template/darwin-mavericks.cfg
 new file mode 100644
@@ -228 +167 @@
 +[DEFAULT]
 +configureExtraArgs=-DBUILD_COVERAGE=OFF
-diff --git a/config/build/kdiagram/project.cfg b/config/build/kdiagram/project.cfg
-new file mode 100644
-index 0000000..07f7749
---- /dev/null
-+++ b/config/build/kdiagram/project.cfg
-@@ -0,0 +1,2 @@
-+[Test]
-+testTimePermitted=600
-diff --git a/config/build/konsole/kf5-qt5.cfg b/config/build/konsole/kf5-qt5.cfg
-index 82e7cb3..ae0d211 100644
---- a/config/build/konsole/kf5-qt5.cfg
-+++ b/config/build/konsole/kf5-qt5.cfg
-@@ -1,2 +1,5 @@
- [DEFAULT]
- configureExtraArgs=-DKONSOLE_BUILD_FONTEMBEDDER=TRUE
-+
-+[QualityCheck]
-+runCppcheck=True
 diff --git a/config/build/plasma-framework/darwin-mavericks.cfg b/config/build/plasma-framework/darwin-mavericks.cfg
 new file mode 100644