[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam-software-compilation] project: polish
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2016-05-27 6:55:51
Message-ID: E1b6BgV-0005Vg-B3 () scm ! kde ! org
[Download RAW message or body]
Git commit 364373e3b7e4c21517ea4f69684cf2a5580b52dc by Gilles Caulier.
Committed on 27/05/2016 at 06:46.
Pushed by cgilles into branch 'master'.
polish
M +6 -4 project/macosx/01-build-macports.sh
M +0 -1 project/macosx/03-build-digikam.sh
M +3 -38 project/macosx/common.sh
M +27 -26 project/mxe/02-build-extralibs.sh
http://commits.kde.org/scratch/mwiesweg/digikam-sc/364373e3b7e4c21517ea4f69684cf2a5580b52dc
diff --git a/project/macosx/01-build-macports.sh \
b/project/macosx/01-build-macports.sh index 1c0ce0e..6fe91d7 100755
--- a/project/macosx/01-build-macports.sh
+++ b/project/macosx/01-build-macports.sh
@@ -154,11 +154,13 @@ if [[ $CONTINUE_INSTALL == 0 ]]; then
echo -e "\n\n"
echo "---------- Configuring MacPorts"
+
./configure --prefix="$INSTALL_PREFIX" \
- --with-applications-dir="$INSTALL_PREFIX/Applications" \
- --with-no-root-privileges \
- --with-install-user="$(id -n -u)" \
- --with-install-group="$(id -n -g)"
+ --with-applications-dir="$INSTALL_PREFIX/Applications" \
+ --with-no-root-privileges \
+ --with-install-user="$(id -n -u)" \
+ --with-install-group="$(id -n -g)"
+
echo -e "\n\n"
echo "---------- Building MacPorts"
diff --git a/project/macosx/03-build-digikam.sh b/project/macosx/03-build-digikam.sh
index 89e2948..6a2d514 100755
--- a/project/macosx/03-build-digikam.sh
+++ b/project/macosx/03-build-digikam.sh
@@ -117,4 +117,3 @@ fi
export PATH=$ORIG_PATH
TerminateScript
-
diff --git a/project/macosx/common.sh b/project/macosx/common.sh
index 7b810ad..94c1187 100755
--- a/project/macosx/common.sh
+++ b/project/macosx/common.sh
@@ -344,24 +344,8 @@ InstallCorePackages()
OsxCodeName
-if [[ $CONTINUE_INSTALL == 0 ]]; then
-
- # Remove kdelibs Avahi dependency. For details see bug \
https://bugs.kde.org/show_bug.cgi?id=257679#c6
- echo "---------- Removing Avahi dependency from kdelibs4"
- sed -e "s/port:avahi *//" -e "s/-DWITH_Avahi=ON/-DWITH_Avahi=OFF/" -i \
".orig-avahi" "`port file kdelibs4`"
-
- if [[ $MAJOR_OSX_VERSION -lt 9 ]]; then
-
- # QtCurve and Akonadi do not compile fine with older clang compiler due to \
C++11 syntax
- # See details here : https://trac.macports.org/wiki/LibcxxOnOlderSystems
- echo "---------- Ajust C++11 compilation rules for older OSX release"
- echo -e "\ncxx_stdlib libc++\nbuildfromsource \
always\ndelete_la_files yes\n" >> \
$INSTALL_PREFIX/etc/macports/macports.conf
-
- fi
-
-fi
-
# With OSX less than El Capitan, we need a more recent Clang compiler than one \
provided by XCode. +
if [[ $MAJOR_OSX_VERSION -lt 10 ]]; then
echo "---------- Install more recent Clang compiler from Macports for specific \
ports" @@ -370,24 +354,6 @@ if [[ $MAJOR_OSX_VERSION -lt 10 ]]; then
port select --set clang mp-clang-3.4
fi
-# With older OSX release, there are some problem to link with cxx_stdlib option.
-if [[ $MAJOR_OSX_VERSION -lt 8 ]]; then
- # ncurses fixes
- NCURSES_PORT_TMP=$INSTALL_PREFIX/var/tmp_ncurses
- if [ -d "$NCURSES_PORT_TMP" ] ; then
- rm -fr $NCURSES_PORT_TMP
- fi
- mkdir $NCURSES_PORT_TMP
- chown -R 777 $NCURSES_PORT_TMP
- cd $NCURSES_PORT_TMP
-
- svn co -r 131830 \
http://svn.macports.org/repository/macports/trunk/dports/devel/ncurses
- cd ncurses
- port install
-
- port install icu configure.compiler=macports-clang-3.4
-fi
-
echo -e "\n"
port install dbus
@@ -419,11 +385,10 @@ port install p5-uri
exit -1
+# TODO check if these packages below still necessary
+
port install liblqr
port install hugin
-
-# For Kipi-plugins
-
port install enblend
port install sane-backends
diff --git a/project/mxe/02-build-extralibs.sh b/project/mxe/02-build-extralibs.sh
index cabe07a..2b8199e 100755
--- a/project/mxe/02-build-extralibs.sh
+++ b/project/mxe/02-build-extralibs.sh
@@ -103,31 +103,31 @@ exit
# Build KF5 frameworks in a temporary directory and installation
# See KF5DEPENDENCIES details about the big puzzle
-InstallKDEExtraLib "extra-cmake-modules"
-InstallKDEExtraLib "kconfig"
-InstallKDEExtraLib "breeze-icons"
-InstallKDEExtraLib "kcoreaddons"
-InstallKDEExtraLib "kwindowsystem"
-InstallKDEExtraLib "solid"
-InstallKDEExtraLib "threadweaver"
-InstallKDEExtraLib "karchive"
-InstallKDEExtraLib "kdbusaddons"
-InstallKDEExtraLib "ki18n"
-InstallKDEExtraLib "kcrash"
-InstallKDEExtraLib "kcodecs"
-InstallKDEExtraLib "kauth"
-InstallKDEExtraLib "kguiaddons"
-InstallKDEExtraLib "kwidgetsaddons"
-InstallKDEExtraLib "kitemviews"
-InstallKDEExtraLib "kcompletion"
-InstallKDEExtraLib "kconfigwidgets"
-InstallKDEExtraLib "kiconthemes"
-InstallKDEExtraLib "kservice"
-InstallKDEExtraLib "kglobalaccel"
-InstallKDEExtraLib "kxmlgui" "$ORIG_WD/patches/kxmlgui-drop-ktextwidgets.patch"
-InstallKDEExtraLib "kbookmarks"
-InstallKDEExtraLib "kjobwidgets"
-InstallKDEExtraLib "kio" "$ORIG_WD/patches/kio-drop-ktextwidgets.patch"
+InstallKDEExtraLib "extra-cmake-modules" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kconfig" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "breeze-icons" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kcoreaddons" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kwindowsystem" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "solid" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "threadweaver" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "karchive" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kdbusaddons" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "ki18n" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kcrash" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kcodecs" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kauth" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kguiaddons" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kwidgetsaddons" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kitemviews" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kcompletion" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kconfigwidgets" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kiconthemes" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kservice" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kglobalaccel" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kxmlgui" \
"$ORIG_WD/patches/kxmlgui-drop-ktextwidgets.patch" "-DBUILD_TESTING=OFF -Wno-dev" \
+InstallKDEExtraLib "kbookmarks" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kjobwidgets" "" \
"-DBUILD_TESTING=OFF -Wno-dev" +InstallKDEExtraLib "kio" \
"$ORIG_WD/patches/kio-drop-ktextwidgets.patch" "-DBUILD_TESTING=OFF -Wno-dev"
#################################################################################################
# Build KF5 extra components
@@ -164,7 +164,8 @@ cd $ORIG_WD/png2ico
cmake . \
-DCMAKE_BUILD_TYPE=debug \
- -DCMAKE_COLOR_MAKEFILE=ON
+ -DCMAKE_COLOR_MAKEFILE=ON \
+ -Wno-dev
make -j$CPU_CORES
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic