From kde-commits  Thu Mar 31 22:09:53 2016
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: Thu, 31 Mar 2016 22:09:53 +0000
To: kde-commits
Subject: [digikam-software-compilation] /: port++
Message-Id: <E1alkmn-0007CV-Eo () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=145946220302847

Git commit d67fe9a6495f0970be7c2be4d4b5cd0c049e9e89 by Gilles Caulier.
Committed on 31/03/2016 at 22:09.
Pushed by cgilles into branch 'master'.

port++

M  +4    -3    bootstrap.macports
M  +2    -0    project/macosx/bundle/02-build-digikam.sh
M  +3    -2    project/macosx/bundle/KF5DEPENDENCIES
M  +11   -3    project/macosx/common/common.sh

http://commits.kde.org/scratch/mwiesweg/digikam-sc/d67fe9a6495f0970be7c2be4=
d4b5cd0c049e9e89

diff --git a/bootstrap.macports b/bootstrap.macports
index 508fdfa..8fd4b7b 100755
--- a/bootstrap.macports
+++ b/bootstrap.macports
@@ -1,6 +1,6 @@
 #!/bin/bash
 =

-# Copyright (c) 2008-2015, Gilles Caulier, <caulier dot gilles at gmail do=
t com>
+# Copyright (c) 2008-2016, Gilles Caulier, <caulier dot gilles at gmail do=
t com>
 #
 # Redistribution and use is allowed according to the terms of the BSD lice=
nse.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -54,10 +54,11 @@ cmake -G "$MAKEFILES_TYPE" . \
       -DCMAKE_BUILD_TYPE=3D${BUILD_TYPE} \
       -DCMAKE_INSTALL_PREFIX=3D${INSTALL_PREFIX}/ \
       -DCMAKE_OSX_ARCHITECTURES=3D${TARGET_TYPE} \
+      $ADDITIONAL_CMAKE_FLAGS \
       -DBUILD_TESTING=3DOFF \
       -DDIGIKAMSC_CHECKOUT_PO=3DOFF \
       -DDIGIKAMSC_COMPILE_PO=3DOFF \
-      -DDIGIKAMSC_COMPILE_DOC=3DON \
+      -DDIGIKAMSC_COMPILE_DOC=3DOFF \
       -DDIGIKAMSC_COMPILE_LIBKIPI=3DOFF \
       -DDIGIKAMSC_COMPILE_LIBKSANE=3DOFF \
       -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=3DOFF \
@@ -67,7 +68,7 @@ cmake -G "$MAKEFILES_TYPE" . \
       -DENABLE_AKONADICONTACTSUPPORT=3DOFF \
       -DENABLE_INTERNALMYSQL=3DOFF \
       -DENABLE_MYSQLSUPPORT=3DOFF \
-      -DENABLE_MEDIAPLAYER=3DON \
+      -DENABLE_MEDIAPLAYER=3DOFF \
       -DAPPLE_SUPPRESS_X11_WARNING=3DON \
       -DCMAKE_COLOR_MAKEFILE=3DON \
       -DCMAKE_BUILD_WITH_INSTALL_RPATH=3DON \
diff --git a/project/macosx/bundle/02-build-digikam.sh b/project/macosx/bun=
dle/02-build-digikam.sh
index ddeaf17..5b8d5cf 100755
--- a/project/macosx/bundle/02-build-digikam.sh
+++ b/project/macosx/bundle/02-build-digikam.sh
@@ -61,6 +61,7 @@ InstallKDEExtraLib "ki18n"
 InstallKDEExtraLib "kcrash"
 InstallKDEExtraLib "kdoctools"
 =

+# NOTE : see http://kde-core-devel.kde.narkive.com/Uoj5HRzH/building-kio-o=
n-mac
 ln -s "${INSTALL_PREFIX}/share/kf5/" "/private/var/root/Library/Applicatio=
n Support/kf5"
 =

 InstallKDEExtraLib "kcodecs"
@@ -80,6 +81,7 @@ InstallKDEExtraLib "kxmlgui"
 InstallKDEExtraLib "kbookmarks"
 InstallKDEExtraLib "kjobwidgets"
 InstallKDEExtraLib "kio"
+InstallKDEExtraLib "phonon" "-DPHONON_BUILD_PHONON4QT5=3DON -DPHONON_BUILD=
_DESIGNER_PLUGIN=3DOFF -DPHONON_BUILD_EXPERIMENTAL=3DOFF" "http://download.=
kde.org/stable/phonon/4.8.3/src/"
 InstallKDEExtraLib "knotifications"
 InstallKDEExtraLib "knotifyconfig"
 =

diff --git a/project/macosx/bundle/KF5DEPENDENCIES b/project/macosx/bundle/=
KF5DEPENDENCIES
index 1e90100..95ddfa3 100644
--- a/project/macosx/bundle/KF5DEPENDENCIES
+++ b/project/macosx/bundle/KF5DEPENDENCIES
@@ -17,5 +17,6 @@ kbookmarks          : kcodecs, kconfigwidgets, kconfig, k=
coreaddons, kiconthemes
 kio                 : karchive, kconfig, kcoreaddons, kdbusaddons, ki18n, =
kservice, kdoctools, solid, kbookmarks, kcompletion,          :
                     : kconfigwidgets, kiconthemes, kitemviews, kjobwidgets=
, kwidgetsaddons, kwidowsystem                                : KIOCORE_ONL=
Y=3DOFF
 kservice            : kcrash, kconfig, kcoreaddons, kdbusaddons, ki18n, kd=
octools                                                       : -
-knotifications      : kwindowsystem, kconfig, kcodecs, kcoreaddons, phonon=
4qt5                                                          : -
-knotifyconfig       : kcompletion, phonon4qt5, kio, kconfig, ki18n        =
                                                              : =

+phonon				: opengl, 																													: PHONON_BUILD_PHONON4QT5=
=3DON PHONON_BUILD_DESIGNER_PLUGIN=3DOFF PHONON_BUILD_EXPERIMENTAL=3DOFF
+knotifications      : kwindowsystem, kconfig, kcodecs, kcoreaddons, phonon=
                                                          : -
+knotifyconfig       : kcompletion, phonon, kio, kconfig, ki18n            =
                                                          : =

diff --git a/project/macosx/common/common.sh b/project/macosx/common/common=
.sh
index 114a549..da0399d 100755
--- a/project/macosx/common/common.sh
+++ b/project/macosx/common/common.sh
@@ -136,12 +136,20 @@ echo -e "---------- Detected OSX version 10.$MAJOR_OS=
X_VERSION and code name $OS
 =

 ########################################################################
 # Install extra KF5 frameworks library
-# argument : library name =

+# arguments : library name, additional cmake flags, download url =

 #
 InstallKDEExtraLib()
 {
 =

 LIB_NAME=3D$1
+ADDITIONAL_CMAKE_FLAGS=3D$2
+DURL=3D$3
+
+if [[ $3 =3D=3D "" ]]; then
+	DURL=3D$KD_URL
+else
+	DURL=3D$3
+fi
 =

 if [ $SILENT_OP -ne 0 ]; then
     VERBOSE_MAKE=3D"-s"
@@ -166,9 +174,9 @@ cd "$KD_BUILDTEMP"
 echo -e "\n\n"
 =

 echo "---------- Downloading $LIB_NAME $KD_VERSION"
-echo "---------- URL: $KD_URL/$KD_VERSION/$LIB_NAME-$KD_VERSION.tar.xz"
+echo "---------- URL: $DURL/$KD_VERSION/$LIB_NAME-$KD_VERSION.tar.xz"
 =

-curl -L -o "$LIB_NAME-$KD_VERSION.tar.xz" "$KD_URL/$KD_VERSION/$LIB_NAME-$=
KD_VERSION.0.tar.xz" $VERBOSE_CONF
+curl -L -o "$LIB_NAME-$KD_VERSION.tar.xz" "$DURL/$KD_VERSION/$LIB_NAME-$KD=
_VERSION.0.tar.xz" $VERBOSE_CONF
 if [ $? -ne 0 ] ; then
     echo "---------- Cannot download $LIB_NAME-$KD_VERSION.tar.xz archive."
     echo "---------- Aborting..."