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

List:       kde-commits
Subject:    [digikam-software-compilation] project/appimage: polish
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2016-09-29 19:26:10
Message-ID: E1bpgyA-0006Ye-8N () code ! kde ! org
[Download RAW message or body]

Git commit e3f48acd5dfb640c601cc745adac089245bde577 by Gilles Caulier.
Committed on 29/09/2016 at 19:25.
Pushed by cgilles into branch 'master'.

polish

M  +2    -10   project/appimage/01-build-linux.sh
M  +2    -2    project/appimage/02-build-extralibs.sh
M  +10   -11   project/appimage/3rdparty/ext_boost/CMakeLists.txt
M  +2    -2    project/appimage/config.sh

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

diff --git a/project/appimage/01-build-linux.sh b/project/appimage/01-build-linux.sh
index da28b1e..145d624 100755
--- a/project/appimage/01-build-linux.sh
+++ b/project/appimage/01-build-linux.sh
@@ -44,8 +44,8 @@ yum -y install centos-release-scl-rh
 yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++
 . /opt/rh/devtoolset-3/enable
 
-# remove system based qt devel package to prevent conflict with new one.
-yum -y erase qt-devel
+# remove system based devel package to prevent conflict with new one.
+yum -y erase qt-devel boost-devel
 
 # Workaround for: On CentOS 6, .pc files in /usr/lib/pkgconfig are not recognized
 # However, this is where .pc files get installed when bulding libraries... (FIXME)
@@ -66,14 +66,6 @@ git_pull_rebase_helper
 ./build.sh
 cd /
 
-# A krita build layout looks like this:
-# krita/ -- the source directory
-# krita/3rdparty -- the cmake3 definitions for the dependencies
-# d -- downloads of the dependencies from files.kde.org
-# b -- build directory for the dependencies
-# krita_build -- build directory for krita itself
-# krita.appdir -- install directory for krita and the dependencies
-
 # Create the build dir for the 3rdparty deps
 if [ ! -d /b ] ; then
     mkdir /b
diff --git a/project/appimage/02-build-extralibs.sh b/project/appimage/02-build-extralibs.sh
index 2a53fce..032a4f3 100755
--- a/project/appimage/02-build-extralibs.sh
+++ b/project/appimage/02-build-extralibs.sh
@@ -49,7 +49,7 @@ cmake3 $ORIG_WD/3rdparty \
 #cmake3 --build . --config RelWithDebInfo --target ext_zlib -- -j4
 #cmake3 --build . --config RelWithDebInfo --target ext_tiff -- -j4
 #cmake3 --build . --config RelWithDebInfo --target ext_jpeg -- -j4
-#cmake3 --build . --config RelWithDebInfo --target ext_boost -- -j4
+cmake3 --build . --config RelWithDebInfo --target ext_boost -- -j4
 #cmake3 --build . --config RelWithDebInfo --target ext_eigen3 -- -j4
 #cmake3 --build . --config RelWithDebInfo --target ext_exiv2 -- -j4
 #cmake3 --build . --config RelWithDebInfo --target ext_lcms2 -- -j4
@@ -57,7 +57,7 @@ cmake3 $ORIG_WD/3rdparty \
 #cmake3 --build . --config RelWithDebInfo --target ext_opencv -- -j4
 #cmake3 --build . --config RelWithDebInfo --target ext_lensfun -- -j4
 #cmake3 --build . --config RelWithDebInfo --target ext_qt -- -j4
-cmake --build . --config RelWithDebInfo --target ext_qtwebkit -- -j4
+#cmake3 --build . --config RelWithDebInfo --target ext_qtwebkit -- -j4
 
 #cmake3 --build . --config RelWithDebInfo --target ext_extra_cmake_modules -- -j4
 #cmake3 --build . --config RelWithDebInfo --target ext_kconfig -- -j4
diff --git a/project/appimage/3rdparty/ext_boost/CMakeLists.txt \
b/project/appimage/3rdparty/ext_boost/CMakeLists.txt index 7f97c41..11ad8c9 100755
--- a/project/appimage/3rdparty/ext_boost/CMakeLists.txt
+++ b/project/appimage/3rdparty/ext_boost/CMakeLists.txt
@@ -71,18 +71,17 @@ elseif(MINGW)
        DEPENDEES install
    )
 else()
-	ExternalProject_Add( ext_boost
-        	DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-	        URL http://files.kde.org/krita/build/dependencies/boost_1_61_0.tar.bz2
-        	URL_MD5 6095876341956f65f9d35939ccea1a9f
+   ExternalProject_Add( ext_boost
+            DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+            URL http://downloads.sourceforge.net/project/boost/boost/1.62.0/boost_1_62_0.tar.bz2
  
-        	CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.sh --prefix=${PREFIX_ext_boost} \
                --with-libraries=system
-	        BUILD_COMMAND <SOURCE_DIR>/b2 install
-	        INSTALL_COMMAND ""
-        	INSTALL_DIR ${PREFIX_ext_boost}
+            CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.sh --prefix=${PREFIX_ext_boost} \
--with-libraries=system +            BUILD_COMMAND <SOURCE_DIR>/b2 install
+            INSTALL_COMMAND ""
+            INSTALL_DIR ${PREFIX_ext_boost}
 
-	        UPDATE_COMMAND ""
-        	ALWAYS 0
-	        BUILD_IN_SOURCE 1
+            UPDATE_COMMAND ""
+            ALWAYS 0
+            BUILD_IN_SOURCE 1
 )
 endif()
diff --git a/project/appimage/config.sh b/project/appimage/config.sh
index e717dd7..12409c1 100644
--- a/project/appimage/config.sh
+++ b/project/appimage/config.sh
@@ -17,7 +17,7 @@ DK_BUILDTEMP=~/dktemp
 # digiKam tag version from git. Official tarball do not include extra shared libraries.
 # The list of tags can be listed with this url: https://quickgit.kde.org/?p=digikam.git&a=tags
 # If you want to package current implemntation from git, use "master" as tag.
-#DK_VERSION=v5.2.0
-DK_VERSION=master
+DK_VERSION=v5.2.0
+#DK_VERSION=master
 # Installer sub version to differentiates newer updates of the installer itself, even if the \
underlying application hasn't changed.  DK_EPOCH="-01"


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