[MacPorts] KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci modified

MacPorts noreply at macports.org
Sat Feb 14 04:50:32 PST 2015


Page "KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci" was changed by mk at macports.org
Diff URL: <https://trac.macports.org/wiki/KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci?action=diff&version=3>
Revision 3
Comment: Update
Changes:
-------8<------8<------8<------8<------8<------8<------8<------8<--------
Index: KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci
=========================================================================
--- KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci (version: 2)
+++ KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci (version: 3)
@@ -4,9 +4,9 @@
 
 {{{
 $ date; git diff production config
-Sun Aug 24 22:39:07 CEST 2014
+Sat Feb 14 13:49:27 CET 2015
 diff --git a/config/base/kf5-qt5 b/config/base/kf5-qt5
-index 2260aa6..573bc24 100644
+index 1f7cd4f..20c03f3 100644
 --- a/config/base/kf5-qt5
 +++ b/config/base/kf5-qt5
 @@ -20,7 +20,7 @@ general/vc: -qt5
@@ -15,17 +15,124 @@
  # KDE Frameworks
 -frameworks/kauth: kdesupport/polkit-qt-1
 +#frameworks/kauth: kdesupport/polkit-qt-1
- kde/*: general/kdesupport-svn
+ frameworks/ktexteditor: general/libgit2
+ 
+ # KDE Workspaces
+@@ -29,6 +29,7 @@ kde/applications/kate: general/libgit2
+ kde/applications/rocs: general/grantlee
  kde/workspace/plasma-workspace: general/libdbusmenu-qt
- 
-@@ -31,3 +31,7 @@ extragear/multimedia/plasma-mediacenter: general/mockcpp
+ kde/workspace/kio-extras: general/libssh
++#kde/workspace/kfilemetadata: general/poppler
+ 
+ # Extragear
+ extragear/kdevelop/kdevplatform: general/grantlee
+@@ -40,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]
+ 
++# Extragear Office
++# Do not depend on kdepimlibs on OSX/CI for now because of akonadi
++extragear/office/kmymoney: -kde/kdepimlibs
++
++# KDE/Applications
++kde/applications/kde-baseapps: -kde/kdelibs/baloo
++kde/applications/kde-baseapps: -kde/kdelibs/baloo-widgets
++kde/applications/kde-baseapps: -general/poppler
++
+ # 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
+--- a/config/base/stable-kf5-qt5
++++ b/config/base/stable-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
+ frameworks/ktexteditor: general/libgit2
+ 
+ # KDE Workspaces
+@@ -39,3 +39,8 @@ extragear/network/telepathy/*: general/telepathy-qt5
  playground/network/sflphone-kde[master]: -kde/kdelibs
  playground/network/sflphone-kde[master]: -kde/kdepimlibs
  playground/network/sflphone-kde[master]: kde/kdelibs[frameworks]
 +
-+# Extragear Office
-+# Do not depend on kdepimlibs on OSX/CI for now because of akonadi
-+extragear/office/kmymoney: -kde/kdepimlibs
++# KDE/Applications
++kde/applications/kde-baseapps: -kde/kdelibs/baloo
++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
+index 0000000..0b123b0
+--- /dev/null
++++ b/config/build/00-verbose-make-template/darwin-mavericks.cfg
+@@ -0,0 +1,2 @@
++[Build]
++#makeCommand=%(makeExecutable)s -l {loadLevel} -j {jobCount} VERBOSE=1
 diff --git a/config/build/alkimia/darwin-mavericks.cfg b/config/build/alkimia/darwin-mavericks.cfg
 new file mode 100644
 index 0000000..05215cd
@@ -34,35 +141,60 @@
 @@ -0,0 +1,2 @@
 +[DEFAULT]
 +configureExtraArgs=-I/opt/local/include -L/opt/local/lib
+diff --git a/config/build/ark/darwin-mavericks.cfg b/config/build/ark/darwin-mavericks.cfg
+new file mode 100644
+index 0000000..6f2b22b
+--- /dev/null
++++ b/config/build/ark/darwin-mavericks.cfg
+@@ -0,0 +1,2 @@
++[DEFAULT]
++configureExtraArgs=-DCMAKE_PREFIX_PATH=/opt/local
+diff --git a/config/build/bovo/darwin-mavericks.cfg b/config/build/bovo/darwin-mavericks.cfg
+new file mode 100644
+index 0000000..15ad40f
+--- /dev/null
++++ b/config/build/bovo/darwin-mavericks.cfg
+@@ -0,0 +1,2 @@
++[DEFAULT]
++configurePlatformArgs=-DCMAKE_INSTALL_BUNDLEDIR="Applications/KF5"
 diff --git a/config/build/darwin-mavericks.cfg b/config/build/darwin-mavericks.cfg
-index cb62c49..64f14f6 100644
+index cb62c49..e3042b9 100644
 --- a/config/build/darwin-mavericks.cfg
 +++ b/config/build/darwin-mavericks.cfg
-@@ -1,7 +1,9 @@
+@@ -1,7 +1,12 @@
  [DEFAULT]
 +scriptsLocation=/Users/marko/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
++configurePlatformArgs=-DCMAKE_INSTALL_BUNDLEDIR="Applications/KF5" -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/
++
++[Test]
++testsEnabled=False
 diff --git a/config/build/global.cfg b/config/build/global.cfg
-index 4052215..9dbe1e1 100644
+index b69a7b8..b3066e3 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
+@@ -89,4 +89,4 @@ extractionCommand=%(python3Executable)s %(scriptsLocation)s/kde-dev-scripts/cmak
+ metadataFilename={project}-{branchGroup}.json
+ localPrefix=/srv/jenkins/cmake-dependency-metadata/
+ remotePrefix=/srv/jenkins/cmake-dependency-metadata/
+-remoteHostPrefix=jenkins at build.kde.org:%(remotePrefix)s
+\ No newline at end of file
++remoteHostPrefix=jenkins at build.kde.org:%(remotePrefix)s
+diff --git a/config/build/kactivities/darwin-mavericks.cfg b/config/build/kactivities/darwin-mavericks.cfg
+new file mode 100644
+index 0000000..5512f48
+--- /dev/null
++++ b/config/build/kactivities/darwin-mavericks.cfg
+@@ -0,0 +1,2 @@
++[DEFAULT]
++configureExtraArgs=-DKACTIVITIES_ENABLE_EXCEPTIONS:BOOL=TRUE
 diff --git a/config/build/kconfig/darwin-mavericks.cfg b/config/build/kconfig/darwin-mavericks.cfg
 new file mode 100644
 index 0000000..28e02d7
@@ -71,42 +203,81 @@
 @@ -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 @@
+diff --git a/config/build/kdecoration/kf5-qt5-darwin-mavericks.cfg b/config/build/kdecoration/kf5-qt5-darwin-mavericks.cfg
+new file mode 100644
+index 0000000..11ad154
+--- /dev/null
++++ b/config/build/kdecoration/kf5-qt5-darwin-mavericks.cfg
+@@ -0,0 +1,2 @@
 +[DEFAULT]
 +configureExtraArgs=
+diff --git a/config/build/kdevelop/kf5-qt5-darwin-mavericks.cfg b/config/build/kdevelop/kf5-qt5-darwin-mavericks.cfg
+new file mode 100644
+index 0000000..11ad154
+--- /dev/null
++++ b/config/build/kdevelop/kf5-qt5-darwin-mavericks.cfg
+@@ -0,0 +1,2 @@
++[DEFAULT]
++configureExtraArgs=
+diff --git a/config/build/kdevplatform/kf5-qt5-darwin-mavericks.cfg b/config/build/kdevplatform/kf5-qt5-darwin-mavericks.cfg
+new file mode 100644
+index 0000000..db0b774
+--- /dev/null
++++ b/config/build/kdevplatform/kf5-qt5-darwin-mavericks.cfg
+@@ -0,0 +1,2 @@
++[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/project.cfg b/config/build/plasma-framework/project.cfg
-index 036a862..b1551be 100644
---- a/config/build/plasma-framework/project.cfg
-+++ b/config/build/plasma-framework/project.cfg
-@@ -1,3 +1,6 @@
-+[DEFAULT]
-+configureExtraArgs=-DBUILD_COVERAGE=ON
-+
- [Build]
- cmakeBuildType=Profile
- 
+diff --git a/config/build/plasma-framework/darwin-mavericks.cfg b/config/build/plasma-framework/darwin-mavericks.cfg
+new file mode 100644
+index 0000000..11ad154
+--- /dev/null
++++ b/config/build/plasma-framework/darwin-mavericks.cfg
+@@ -0,0 +1,2 @@
++[DEFAULT]
++configureExtraArgs=
 diff --git a/config/build/qt5/darwin-mavericks.cfg b/config/build/qt5/darwin-mavericks.cfg
 new file mode 100644
-index 0000000..31d3c16
+index 0000000..663ca0a
 --- /dev/null
 +++ b/config/build/qt5/darwin-mavericks.cfg
 @@ -0,0 +1,2 @@
 +[Build]
-+configureCommand=%(configureExecutable)s -debug -separate-debug-info -system-zlib -system-libpng -system-libjpeg -system-sqlite -dbus-linked -plugin-sql-mysql -nomake examples -confi
++configureCommand=%(configureExecutable)s -debug -separate-debug-info -system-zlib -system-libpng -system-libjpeg -system-sqlite -dbus-linked -plugin-sql-mysql -nomake examples -confirm-license -opensource -prefix {instPrefix} -no-framework -v -I/opt/local/include -L/opt/local/lib -no-glib -I/opt/local/lib/dbus-1.0/include -I/opt/local/include/dbus-1.0
+diff --git a/config/build/qtcurve/kf5-qt5-darwin-mavericks.cfg b/config/build/qtcurve/kf5-qt5-darwin-mavericks.cfg
+new file mode 100644
+index 0000000..ab97507
+--- /dev/null
++++ b/config/build/qtcurve/kf5-qt5-darwin-mavericks.cfg
+@@ -0,0 +1,2 @@
++[DEFAULT]
++configureExtraArgs=-DQTC_ENABLE_X11=false -DENABLE_QT4:BOOL=OFF -DENABLE_QT5:BOOL=ON -DENABLE_GTK2:BOOL=OFF
+diff --git a/config/build/trojita/kf5-qt5-darwin-mavericks.cfg b/config/build/trojita/kf5-qt5-darwin-mavericks.cfg
+new file mode 100644
+index 0000000..7671d5c
+--- /dev/null
++++ b/config/build/trojita/kf5-qt5-darwin-mavericks.cfg
+@@ -0,0 +1,5 @@
++[DEFAULT]
++configureExtraArgs=-DWITH_RAGEL=OFF -DWITH_ZLIB=ON -DWITH_QT5=1
++
++[Build]
++#deployInstallation=False
 }}}
-------8<------8<------8<------8<------8<------8<------8<------8<--------

--
Page URL: <https://trac.macports.org/wiki/KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci>
MacPorts <https://www.macports.org/>
Ports system for OS X

This is an automated message. Someone added your email address to be
notified of changes on 'KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci' page.
If it was not you, please report to .


More information about the macports-changes mailing list