[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam-software-compilation] /: port++
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2016-03-31 18:22:11
Message-ID: E1alhER-0008EW-BG () scm ! kde ! org
[Download RAW message or body]

Git commit 4a17afeffc4447e8e793cee9945596e59aabd995 by Gilles Caulier.
Committed on 31/03/2016 at 18:21.
Pushed by cgilles into branch 'master'.

port++

M  +2    -2    bootstrap.macports
M  +9    -2    project/macosx/bundle/02-build-digikam.sh
M  +2    -1    project/macosx/bundle/KF5DEPENDENCIES

http://commits.kde.org/scratch/mwiesweg/digikam-sc/4a17afeffc4447e8e793cee9945596e59aabd995


diff --git a/bootstrap.macports b/bootstrap.macports
index 51e239f..508fdfa 100755
--- a/bootstrap.macports
+++ b/bootstrap.macports
@@ -74,8 +74,8 @@ cmake -G "$MAKEFILES_TYPE" . \
       -DCMAKE_INSTALL_NAME_DIR=${INSTALL_PREFIX}/lib \
       -DCMAKE_SYSTEM_PREFIX_PATH="${INSTALL_PREFIX};/usr" \
       -DCMAKE_MODULE_PATH="${INSTALL_PREFIX}/share/cmake/Modules;${INSTALL_PREFIX}/share/cmake-3.3/Modules" \
                \
-      -DCMAKE_INSTALL_BUNDLEDIR=${BUNDLE_INSTALL_DIR} \
-      -DDATA_INSTALL_DIR=${BUNDLE_DATA_INSTALL_DIR} \
+      -DKDE_INSTALL_BUNDLEDIR=${BUNDLE_INSTALL_DIR} \
+      -DKDE_INSTALL_DATADIR=${BUNDLE_DATA_INSTALL_DIR} \
       -DQT_QT_INCLUDE_DIR=${QT_INCLUDE_DIR} \
       -DQT_LIBRARY_DIR=${QTDIR}/lib \
       -DQT_QMAKE_EXECUTABLE=${QTDIR}/bin/qmake \
diff --git a/project/macosx/bundle/02-build-digikam.sh \
b/project/macosx/bundle/02-build-digikam.sh index 27d4161..ddeaf17 100755
--- a/project/macosx/bundle/02-build-digikam.sh
+++ b/project/macosx/bundle/02-build-digikam.sh
@@ -60,18 +60,25 @@ InstallKDEExtraLib "kdbusaddons"
 InstallKDEExtraLib "ki18n"
 InstallKDEExtraLib "kcrash"
 InstallKDEExtraLib "kdoctools"
+
+ln -s "${INSTALL_PREFIX}/share/kf5/" "/private/var/root/Library/Application \
Support/kf5" +
 InstallKDEExtraLib "kcodecs"
 InstallKDEExtraLib "kauth"
 InstallKDEExtraLib "kguiaddons"
 InstallKDEExtraLib "kwidgetsaddons"
 InstallKDEExtraLib "kitemviews"
 InstallKDEExtraLib "kcompletion"
-
 InstallKDEExtraLib "kconfigwidgets"
 InstallKDEExtraLib "kiconthemes"
+InstallKDEExtraLib "kservice"
+InstallKDEExtraLib "sonnet"
+InstallKDEExtraLib "ktextwidgets"
+InstallKDEExtraLib "attica"
+InstallKDEExtraLib "kglobalaccel"
 InstallKDEExtraLib "kxmlgui"
 InstallKDEExtraLib "kbookmarks"
-InstallKDEExtraLib "kservice"
+InstallKDEExtraLib "kjobwidgets"
 InstallKDEExtraLib "kio"
 InstallKDEExtraLib "knotifications"
 InstallKDEExtraLib "knotifyconfig"
diff --git a/project/macosx/bundle/KF5DEPENDENCIES \
b/project/macosx/bundle/KF5DEPENDENCIES index f997d63..1e90100 100644
--- a/project/macosx/bundle/KF5DEPENDENCIES
+++ b/project/macosx/bundle/KF5DEPENDENCIES
@@ -9,7 +9,8 @@ ki18n               : qt5script
 kcrash              : kwindowsystem, kcoreaddons                                     \
: -  kdoctools           : docbook-xml, docbook-xsl, , karchive, ki18n, p5-uri, \
docbookxml4, docbookxsl, libxslt, libxml2                    : \
MEINPROC_NO_KARCHIVE=OFF  ktextwidgets        : kcompletion, kconfig, kconfigwidgets, \
                ki18n, kiconthemes, kservice, kwidgetsaddons, kwindowsystem, sonnet   \
                : -
-kxmlgui             : kcoreaddons, kitemviews, kconfig, kconfigwidgets, ki18n, \
kiconthemes, ktextwidgets, kwidgetsaddons, kwindowsystem : \
FORCE_DISABLE_KGLOBALACCEL=OFF +kxmlgui             : kcoreaddons, kitemviews, \
kconfig, kconfigwidgets, ki18n, kiconthemes, ktextwidgets, kwidgetsaddons, 				: +   \
: kglobalaccel, kwindowsystem 																						: FORCE_DISABLE_KGLOBALACCEL=OFF  \
kconfigwidgets      : kguiaddons, kwidgetsaddons, ki18n, kauth, kcoreaddons, kcodecs, \
kconfig, kdoctools                                : -  kiconthemes         : \
kconfigwidgets, ki18n, kcoreaddons, kwidgetsaddons, kitemviews                        \
: -  kbookmarks          : kcodecs, kconfigwidgets, kconfig, kcoreaddons, \
kiconthemes, kwidgetsaddons, kxmlgui                               : -


[prev in list] [next in list] [prev in thread] [next in thread]