'[krita/krita/3.2] packaging/linux/appimage: Add building gmic-qt to the appimage scripts'

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

List:       kde-commits
Subject:    [krita/krita/3.2] packaging/linux/appimage: Add building gmic-qt to the appimage scripts
From:       Boudewijn Rempt <null () kde ! org>
Date:       2017-08-12 9:56:56
Message-ID: E1dgTA8-0004AG-QK () code ! kde ! org
[Download RAW message or body]

Git commit 07d0d70c669a897ecc381f9ccd80ca1b455dd75b by Boudewijn Rempt.
Committed on 12/08/2017 at 09:56.
Pushed by rempt into branch 'krita/3.2'.

Add building gmic-qt to the appimage scripts

M  +3    -3    packaging/linux/appimage/build-deps.sh
M  +26   -0    packaging/linux/appimage/build-krita.sh
M  +47   -20   packaging/linux/appimage/build-release.sh

https://commits.kde.org/krita/07d0d70c669a897ecc381f9ccd80ca1b455dd75b

diff --git a/packaging/linux/appimage/build-deps.sh \
b/packaging/linux/appimage/build-deps.sh index a106d5ed9b2..bba31b81bb9 100644
--- a/packaging/linux/appimage/build-deps.sh
+++ b/packaging/linux/appimage/build-deps.sh
@@ -40,7 +40,8 @@ yum -y install epel-release
 # we need to be up to date in order to install the xcb-keysyms dependency
 yum -y update
 # base dependencies and Qt5.
-yum -y install wget tar bzip2 git libtool which fuse fuse-devel libpng-devel \
automake libtool mesa-libEGL cppunit-devel cmake3 glibc-headers libstdc++-devel \
gcc-c++ freetype-devel fontconfig-devel libxml2-devel libstdc++-devel \
libXrender-devel patch xcb-util-keysyms-devel libXi-devel mesa-libGL-devel \
mesa-libGLU-devel libxcb libxcb-devel xcb-util xcb-util-devel glibc-devel \
xkeyboard-config +yum -y install wget tar bzip2 git libtool which fuse fuse-devel \
libpng-devel automake libtool mesa-libEGL cppunit-devel cmake3 glibc-headers \
libstdc++-devel gcc-c++ freetype-devel fontconfig-devel libxml2-devel libstdc++-devel \
libXrender-devel patch xcb-util-keysyms-devel libXi-devel mesa-libGL-devel libxcb \
libxcb-devel xcb-util xcb-util-devel libcurl-devel +
 
 
 # Newer compiler than what comes with CentOS 6
@@ -58,7 +59,6 @@ fi
 
 cd /AppImageKit/
 git_pull_rebase_helper
-git checkout stable/v1.0
 ./build.sh
 cd /
 
@@ -113,7 +113,7 @@ cmake3 --build . --config RelWithDebInfo --target ext_lcms2
 cmake3 --build . --config RelWithDebInfo --target ext_ocio
 cmake3 --build . --config RelWithDebInfo --target ext_openexr
 cmake3 --build . --config RelWithDebInfo --target ext_vc
-#cmake3 --build . --config RelWithDebInfo --target ext_png
+cmake3 --build . --config RelWithDebInfo --target ext_png
 cmake3 --build . --config RelWithDebInfo --target ext_tiff
 cmake3 --build . --config RelWithDebInfo --target ext_jpeg
 cmake3 --build . --config RelWithDebInfo --target ext_libraw
diff --git a/packaging/linux/appimage/build-krita.sh \
b/packaging/linux/appimage/build-krita.sh index 00a79f3913f..f64f22e8dda 100644
--- a/packaging/linux/appimage/build-krita.sh
+++ b/packaging/linux/appimage/build-krita.sh
@@ -55,6 +55,31 @@ ln -sf /usr/share/pkgconfig /usr/lib/pkgconfig
 # krita_build -- build directory for krita itself
 # krita.appdir -- install directory for krita and the dependencies
 
+# fetch and build gmic
+if [ ! -d /gmic ] ; then
+	git clone  --depth 1 https://github.com/dtschump/gmic.git
+fi
+
+cd /gmic/
+git_pull_rebase_helper
+cd /
+make -C gmic/src CImg.h gmic_stdlib.h
+
+# fetch and build gmic-qt
+if [ ! -d /gmic-qt ] ; then
+	git clone  --depth 1 https://github.com/c-koi/gmic-qt.git
+fi
+
+cd /gmic-qt/
+git_pull_rebase_helper
+
+cd /
+mkdir gmic-qt-build
+cd  gmic-qt-build
+cmake3 ../gmic-qt -DGMIC_QT_HOST=krita
+cp gmic_krita_qt /krita.appdir/usr/bin
+
+
 # Get Krita
 if [ ! -d /krita ] ; then
 	git clone  --depth 1 https://github.com/KDE/krita.git /krita
@@ -78,6 +103,7 @@ cmake3 ../krita \
     -DCMAKE_INSTALL_PREFIX:PATH=/krita.appdir/usr \
     -DDEFINE_NO_DEPRECATED=1 \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DPACKAGERS_BUILD=1 \
     -DBUILD_TESTING=FALSE \
     -DKDE4_BUILD_TESTS=FALSE \
     -DHAVE_MEMORY_LEAK_TRACKER=FALSE
diff --git a/packaging/linux/appimage/build-release.sh \
b/packaging/linux/appimage/build-release.sh index 1bf69d31b6b..7c7a3e4a389 100644
--- a/packaging/linux/appimage/build-release.sh
+++ b/packaging/linux/appimage/build-release.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RELEASE=krita-3.0.99.90
+RELEASE=3.2.0-rc.3
 
 # Enter a CentOS 6 chroot (you could use other methods)
 # git clone https://github.com/probonopd/AppImageKit.git
@@ -28,6 +28,10 @@ grep -r "CentOS release 6" /etc/redhat-release || exit 1
 # clean up
 rm -rf /out/*
 rm -rf /krita.appdir
+rm -rf /krita_build
+rm -rf /gmic-qt-build
+mkdir gmic-qt-build
+mkdir /krita_build
 
 # qjsonparser, used to add metadata to the plugins needs to work in a en_US.UTF-8 \
environment. That's  # not always set correctly in CentOS 6.7
@@ -59,16 +63,49 @@ ln -s lib lib64
 # Use the new compiler
 . /opt/rh/devtoolset-3/enable
 
+cd /
+
+git_pull_rebase_helper()
+{
+	git reset --hard HEAD
+        git pull
+
+}
+# fetch and build gmic
+if [ ! -d /gmic ] ; then
+	git clone  --depth 1 https://github.com/dtschump/gmic.git
+fi
+
+cd /gmic/
+git_pull_rebase_helper
+cd /
+make -C gmic/src CImg.h gmic_stdlib.h
+
+# fetch and build gmic-qt
+if [ ! -d /gmic-qt ] ; then
+	git clone  --depth 1 https://github.com/c-koi/gmic-qt.git
+fi
+
+cd /gmic-qt/
+git_pull_rebase_helper
+
+cd /gmic-qt-build
+cmake3 ../gmic-qt -DGMIC_QT_HOST=krita
+make -j4
+cp gmic_krita_qt /krita.appdir/usr/bin
+
 # fetch and build krita
 cd /
-wget http://files.kde.org/krita/3/source/$RELEASE.tar.xz
-tar -xf $RELEASE.tar.xz
+#wget http://files.kde.org/krita/krita-$RELEASE.tar.gz
+#wget http://www.valdyas.org/~boud/krita-$RELEASE.tar.gz
+#wget http://download.kde.org/unstable/krita/$RELEASE/krita-$RELEASE.tar.gz
+tar -xf krita-$RELEASE.tar.gz
 cd /krita_build
-rm -rf *
-cmake3 ../$RELEASE \
+cmake3 ../krita-$RELEASE \
     -DCMAKE_INSTALL_PREFIX:PATH=/krita.appdir/usr \
     -DDEFINE_NO_DEPRECATED=1 \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DPACKAGERS_BUILD=1 \
     -DBUILD_TESTING=FALSE \
     -DKDE4_BUILD_TESTS=FALSE \
     -DHAVE_MEMORY_LEAK_TRACKER=FALSE
@@ -95,7 +132,9 @@ cp $(ldconfig -p | grep libEGL.so.1 | cut -d ">" -f 2 | xargs) \
./usr/lib/ # Othe  #cp $(ldconfig -p | grep libxcb.so.1 | cut -d ">" -f 2 | xargs) \
./usr/lib/   cp $(ldconfig -p | grep libfreetype.so.6 | cut -d ">" -f 2 | xargs) \
./usr/lib/ # For Fedora 20  
+
 ldd usr/bin/krita | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' \
./usr/lib || true +ldd usr/bin/gmic_krita_qt | grep "=>" | awk '{print $3}' | xargs \
-I '{}' cp -v '{}' ./usr/lib || true  #ldd usr/lib64/krita/*.so  | grep "=>" | awk \
'{print $3}' | xargs -I '{}' cp -v '{}' ./usr/lib || true  #ldd \
usr/lib64/plugins/imageformats/*.so  | grep "=>" | awk '{print $3}' | xargs -I '{}' \
cp -v '{}' ./usr/lib || true  
@@ -153,7 +192,7 @@ rm -f usr/lib/libpthread.so.0 || true
 rm -f usr/lib/libresolv.so.2 || true
 rm -f usr/lib/libroken.so.18 || true
 rm -f usr/lib/librt.so.1 || true
-rm -f usr/lib/libsasl2.so.2 || true
+#rm -f usr/lib/libsasl2.so.2 || true
 rm -f usr/lib/libSM.so.6 || true
 rm -f usr/lib/libusb-1.0.so.0 || true
 rm -f usr/lib/libuuid.so.1 || true
@@ -184,6 +223,8 @@ rm -rf usr/share/ECM/ || true
 rm -rf usr/share/gettext || true
 rm -rf usr/share/pkgconfig || true
 
+mv usr/share/locale usr/share/krita || true
+
 strip usr/lib/kritaplugins/* usr/bin/* usr/lib/* || true
 
 # Since we set /krita.appdir as the prefix, we need to patch it away too (FIXME)
@@ -221,14 +262,6 @@ cd /
 
 APP=krita
 
-# Source functions
-wget -q https://github.com/probonopd/AppImages/raw/master/functions.sh -O \
                ./functions.sh
-. ./functions.sh
-
-# Install desktopintegration in usr/bin/krita.wrapper -- feel free to edit it
-cd /krita.appdir
-get_desktopintegration krita
-
 cd /
 
 VER=$(grep "#define KRITA_VERSION_STRING" krita_build/libs/version/kritaversion.h | \
cut -d '"' -f 2) @@ -250,9 +283,3 @@ rm -f /out/*.AppImage || true
 AppImageKit/AppImageAssistant.AppDir/package /krita.appdir/ /out/$APPIMAGE
 
 chmod a+rwx /out/$APPIMAGE # So that we can edit the AppImage outside of the Docker \
                container
-
-cd /krita.appdir
-mv AppRun krita
-cd /
-mv krita.appdir $APP"-"$VERSION"-x86_64
-tar -czf $APP"-"$VERSION"-x86_64.tgz $APP"-"$VERSION"-x86_64


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic