From 0d132ab6e3df0bb8102b9e60a85805ddc9d32b86 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 17 Sep 2019 11:43:06 +0200 Subject: [PATCH 1/3] Make create appimage script working on other system than debian/ubuntu. Not all distro use `lib/x86_64-linux-gnu` --- scripts/create_kiwix-desktop_appImage.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/create_kiwix-desktop_appImage.sh b/scripts/create_kiwix-desktop_appImage.sh index 7738fe5..fc773e6 100755 --- a/scripts/create_kiwix-desktop_appImage.sh +++ b/scripts/create_kiwix-desktop_appImage.sh @@ -6,6 +6,10 @@ INSTALLDIR=${1:-$PWD/BUILD_native_dyn/INSTALL} SOURCEDIR=${2:-$PWD/SOURCE/kiwix-desktop} APPDIR=${3:-$PWD/AppDir} +SYSTEMLIBDIR=lib/x86_64-linux-gnu +# Uncoment if needed +SYSTEMLIBDIR=lib64 + #TODO We should have our icon ICONFILE=$SOURCEDIR/resources/icons/kiwix/app_icon.svg DESKTOPFILE=$SOURCEDIR/resources/org.kiwix.desktop.desktop @@ -14,14 +18,14 @@ DESKTOPFILE=$SOURCEDIR/resources/org.kiwix.desktop.desktop mkdir -p $APPDIR/usr/{bin,lib,share} $APPDIR/usr/share/applications $APPDIR/usr/share/icons/hicolor/48x48/apps # Copy our files cp $INSTALLDIR/bin/kiwix-desktop $APPDIR/usr/bin/ -cp $INSTALLDIR/lib/x86_64-linux-gnu/*.so* $APPDIR/usr/lib +cp $INSTALLDIR/$SYSTEMLIBDIR/*.so* $APPDIR/usr/lib # Remove it as it break with linuxdeployqt (should we compile without it) ? rm $APPDIR/usr/lib/libmagic.so* # Copy nss lib (to not conflict with host's ones) -cp -a /usr/lib/x86_64-linux-gnu/nss $APPDIR/usr/lib -cp -a /usr/lib/x86_64-linux-gnu/libstdc++.so* $APPDIR/usr/lib -cp -a /usr/lib/x86_64-linux-gnu/libc.so* $APPDIR/usr/lib -cp -a /usr/lib/x86_64-linux-gnu/libz.so* $APPDIR/usr/lib +cp -a /usr/$SYSTEMLIBDIR/nss $APPDIR/usr/lib +cp -a /usr/$SYSTEMLIBDIR/libstdc++.so* $APPDIR/usr/lib +cp -a /usr/$SYSTEMLIBDIR/libc.so* $APPDIR/usr/lib +cp -a /usr/$SYSTEMLIBDIR/libz.so* $APPDIR/usr/lib cp $ICONFILE $APPDIR/usr/share/icons/hicolor/48x48/apps/kiwix-desktop.svg mkdir -p $APPDIR/usr/share/applications cp $DESKTOPFILE $APPDIR/usr/share/applications/kiwix-desktop.desktop From 813c6f80386155452fab89bc2ad411f88db3f365 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 17 Sep 2019 11:43:22 +0200 Subject: [PATCH 2/3] Fix rpath of kiwix-serve. --- scripts/create_kiwix-desktop_appImage.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/create_kiwix-desktop_appImage.sh b/scripts/create_kiwix-desktop_appImage.sh index fc773e6..769838c 100755 --- a/scripts/create_kiwix-desktop_appImage.sh +++ b/scripts/create_kiwix-desktop_appImage.sh @@ -46,5 +46,6 @@ chmod a+x linuxdeployqt-continuous-x86_64.AppImage ./linuxdeployqt-continuous-x86_64.AppImage $APPDIR/usr/bin/kiwix-desktop -unsupported-allow-new-glibc -bundle-non-qt-libs -extra-plugins=imageformats,iconengines # Fix the RPATH of QtWebEngineProcess [TODO] Fill a issue ? patchelf --set-rpath '$ORIGIN/../lib' $APPDIR/usr/libexec/QtWebEngineProcess +patchelf --set-rpath '$ORIGIN/../lib' $APPDIR/usr/bin/kiwix-serve # Build the image. ./linuxdeployqt-continuous-x86_64.AppImage $APPDIR/usr/share/applications/kiwix-desktop.desktop -unsupported-allow-new-glibc -bundle-non-qt-libs -extra-plugins=imageformats,iconengines -appimage From fe3e147d08ca0762a156f3bab240415ba280a36d Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 17 Sep 2019 11:49:38 +0200 Subject: [PATCH 3/3] New release of kiwix-lib --- appveyor.yml | 2 +- kiwixbuild/versions.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2b28900..f08cf80 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ environment: MSYS2_ARG_CONV_EXCL: '-Tp' MINGW64_RUN: 'C:\msys64\usr\bin\bash.exe --login -c' MSYSTEM: 'MINGW64' - KIWIX_DESKTOP_VERSION: '2.0-rc2' + KIWIX_DESKTOP_VERSION: '2.0-rc2-1' KIWIX_DESKTOP_RELEASE: 1 init: diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index 933c3fd..893f7a9 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -1,7 +1,7 @@ # This file reference all the versions of the depedencies we use in kiwix-build. main_project_versions = { - 'kiwix-lib': '7.0.0', + 'kiwix-lib': '8.0.0', 'kiwix-tools': '3.0.1', # Also need to change this in appveyor/install_kiwix-tools.cmd 'libzim': '6.0.1', 'zim-tools': '1.0.5', @@ -33,10 +33,10 @@ main_project_versions = { release_versions = { 'libzim': None, # Depends of base deps (was 0) 'kiwix-lib': 0, # Depends of libzim (was 0) - 'kiwix-tools': 4, # Depends of kiwix-lib and libzim (was 3) + 'kiwix-tools': 5, # Depends of kiwix-lib and libzim (was 4) 'zim-tools': None, # Depends of libzim (was 1) 'zimwriterfs': None, # Depends of libzim (was 1) - 'kiwix-desktop': 0 # Depends of kiwix-lib and libzim (was 3) + 'kiwix-desktop': 1 # Depends of kiwix-lib and libzim (was 0) }