Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix libgcrypt and libgpg-errror paths in AppImage, resolves #1522

Browse Source
This commit is contained in:
Janek Bevendorff 2018-02-24 23:20:53 +01:00
parent daaa3c5b41
commit 8dad78194f
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AppImage-Recipe.sh
View File

@ -66,14 +66,18 @@ cp "$QXCB_PLUGIN" ".${QT_PLUGIN_PATH}/platforms/"
get_apprun get_apprun
copy_deps copy_deps
# protect our libgpg-error from being deleted
mv ./opt/gpg-error-127/lib/x86_64-linux-gnu/libgpg-error.so.0 ./protected.so
delete_blacklisted delete_blacklisted
mv ./protected.so ./opt/gpg-error-127/lib/x86_64-linux-gnu/libgpg-error.so.0
get_desktop get_desktop
get_icon get_icon
cat << EOF > ./usr/bin/keepassxc_env cat << EOF > ./usr/bin/keepassxc_env
#!/usr/bin/env bash #!/usr/bin/env bash
export LD_LIBRARY_PATH="/opt/libgcrypt20-18/lib/x86_64-linux-gnu:\${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH="../opt/libgcrypt20-18/lib/x86_64-linux-gnu:\${LD_LIBRARY_PATH}"
export LD_LIBRARY_PATH="/opt/gpg-error-127/lib/x86_64-linux-gnu:\${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH="../opt/gpg-error-127/lib/x86_64-linux-gnu:\${LD_LIBRARY_PATH}"
export LD_LIBRARY_PATH="..$(dirname ${QT_PLUGIN_PATH})/lib:\${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH="..$(dirname ${QT_PLUGIN_PATH})/lib:\${LD_LIBRARY_PATH}"
export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}:\${KPXC_QT_PLUGIN_PATH}" export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}:\${KPXC_QT_PLUGIN_PATH}"

16
release-tool
View File

@ -619,17 +619,19 @@ build() {
git archive --format=tar "$TAG_NAME" --prefix="${prefix}/" --output="${OUTPUT_DIR}/${tarball_name}" git archive --format=tar "$TAG_NAME" --prefix="${prefix}/" --output="${OUTPUT_DIR}/${tarball_name}"
# add .version file to tar if ! ${BUILD_SNAPSHOT}; then
mkdir "${prefix}" # add .version file to tar
echo -n ${RELEASE_NAME} > "${prefix}/.version" mkdir "${prefix}"
tar --append --file="${OUTPUT_DIR}/${tarball_name}" "${prefix}/.version" echo -n ${RELEASE_NAME} > "${prefix}/.version"
rm "${prefix}/.version" tar --append --file="${OUTPUT_DIR}/${tarball_name}" "${prefix}/.version"
rmdir "${prefix}" 2> /dev/null rm "${prefix}/.version"
rmdir "${prefix}" 2> /dev/null
fi
xz -6 "${OUTPUT_DIR}/${tarball_name}" xz -6 "${OUTPUT_DIR}/${tarball_name}"
fi fi
if [ -e "${OUTPUT_DIR}/build-release" ]; then if ! ${BUILD_SNAPSHOT} && [ -e "${OUTPUT_DIR}/build-release" ]; then
logInfo "Cleaning existing build directory..." logInfo "Cleaning existing build directory..."
rm -r "${OUTPUT_DIR}/build-release" 2> /dev/null rm -r "${OUTPUT_DIR}/build-release" 2> /dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then