smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Appimage fix (#371) 

Appimage fix
This commit is contained in:
Matthieu Gautier 2019-09-17 12:18:41 +02:00 committed by GitHub
parent c3cb4ab0c0 fe3e147d08
commit 97b6b8f792
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -9,7 +9,7 @@ environment:
MSYS2_ARG_CONV_EXCL: '-Tp' MSYS2_ARG_CONV_EXCL: '-Tp'
MINGW64_RUN: 'C:\msys64\usr\bin\bash.exe --login -c' MINGW64_RUN: 'C:\msys64\usr\bin\bash.exe --login -c'
MSYSTEM: 'MINGW64' MSYSTEM: 'MINGW64'
KIWIX_DESKTOP_VERSION: '2.0-rc2' KIWIX_DESKTOP_VERSION: '2.0-rc2-1'
KIWIX_DESKTOP_RELEASE: 1 KIWIX_DESKTOP_RELEASE: 1
init: init:

6
kiwixbuild/versions.py
View File

@ -1,7 +1,7 @@
# This file reference all the versions of the depedencies we use in kiwix-build. # This file reference all the versions of the depedencies we use in kiwix-build.
main_project_versions = { 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 'kiwix-tools': '3.0.1', # Also need to change this in appveyor/install_kiwix-tools.cmd
'libzim': '6.0.1', 'libzim': '6.0.1',
'zim-tools': '1.0.5', 'zim-tools': '1.0.5',
@ -33,10 +33,10 @@ main_project_versions = {
release_versions = { release_versions = {
'libzim': None, # Depends of base deps (was 0) 'libzim': None, # Depends of base deps (was 0)
'kiwix-lib': 0, # Depends of libzim (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) 'zim-tools': None, # Depends of libzim (was 1)
'zimwriterfs': 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)
} }

15
scripts/create_kiwix-desktop_appImage.sh
View File

@ -6,6 +6,10 @@ INSTALLDIR=${1:-$PWD/BUILD_native_dyn/INSTALL}
SOURCEDIR=${2:-$PWD/SOURCE/kiwix-desktop} SOURCEDIR=${2:-$PWD/SOURCE/kiwix-desktop}
APPDIR=${3:-$PWD/AppDir} APPDIR=${3:-$PWD/AppDir}
SYSTEMLIBDIR=lib/x86_64-linux-gnu
# Uncoment if needed
SYSTEMLIBDIR=lib64
#TODO We should have our icon #TODO We should have our icon
ICONFILE=$SOURCEDIR/resources/icons/kiwix/app_icon.svg ICONFILE=$SOURCEDIR/resources/icons/kiwix/app_icon.svg
DESKTOPFILE=$SOURCEDIR/resources/org.kiwix.desktop.desktop 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 mkdir -p $APPDIR/usr/{bin,lib,share} $APPDIR/usr/share/applications $APPDIR/usr/share/icons/hicolor/48x48/apps
# Copy our files # Copy our files
cp $INSTALLDIR/bin/kiwix-desktop $APPDIR/usr/bin/ 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) ? # Remove it as it break with linuxdeployqt (should we compile without it) ?
rm $APPDIR/usr/lib/libmagic.so* rm $APPDIR/usr/lib/libmagic.so*
# Copy nss lib (to not conflict with host's ones) # 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/$SYSTEMLIBDIR/nss $APPDIR/usr/lib
cp -a /usr/lib/x86_64-linux-gnu/libstdc++.so* $APPDIR/usr/lib cp -a /usr/$SYSTEMLIBDIR/libstdc++.so* $APPDIR/usr/lib
cp -a /usr/lib/x86_64-linux-gnu/libc.so* $APPDIR/usr/lib cp -a /usr/$SYSTEMLIBDIR/libc.so* $APPDIR/usr/lib
cp -a /usr/lib/x86_64-linux-gnu/libz.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 cp $ICONFILE $APPDIR/usr/share/icons/hicolor/48x48/apps/kiwix-desktop.svg
mkdir -p $APPDIR/usr/share/applications mkdir -p $APPDIR/usr/share/applications
cp $DESKTOPFILE $APPDIR/usr/share/applications/kiwix-desktop.desktop cp $DESKTOPFILE $APPDIR/usr/share/applications/kiwix-desktop.desktop
@ -42,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 ./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 ? # 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/libexec/QtWebEngineProcess
patchelf --set-rpath '$ORIGIN/../lib' $APPDIR/usr/bin/kiwix-serve
# Build the image. # 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 ./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