forked from keepassxreboot/keepassxc
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/yubikey
- Loading branch information
Showing
90 changed files
with
6,216 additions
and
1,434 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,9 @@ | ||
| src/version.h.cmake export-subst | ||
| .gitattributes export-ignore | ||
| .gitignore export-ignore | ||
| .github export-ignore | ||
| .travis.yml export-ignore | ||
| .tx export-ignore | ||
| snapcraft.yaml export-ignore | ||
| make_release.sh export-ignore | ||
| AppImage-Recipe.sh export-ignore |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # KeePassXC AppImage Recipe | ||
| # Copyright (C) 2017 KeePassXC team <https://keepassxc.org/> | ||
| # | ||
| # This program is free software: you can redistribute it and/or modify | ||
| # it under the terms of the GNU General Public License as published by | ||
| # the Free Software Foundation, either version 2 or (at your option) | ||
| # version 3 of the License. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| # GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License | ||
| # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| if [ "$1" == "" ] || [ "$2" == "" ]; then | ||
| echo "Usage: $(basename $0) APP_NAME RELEASE_VERSION" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [ -f CHANGELOG ]; then | ||
| echo "This recipe must not be run from the sources root." >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [ ! -d ../bin-release ]; then | ||
| echo "../bin-release does not exist." >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| APP="$1" | ||
| LOWERAPP="$(echo "$APP" | tr '[:upper:]' '[:lower:]')" | ||
| VERSION="$2" | ||
|
|
||
| mkdir -p $APP.AppDir | ||
| wget -q https://github.com/probonopd/AppImages/raw/master/functions.sh -O ./functions.sh | ||
| . ./functions.sh | ||
|
|
||
| LIB_DIR=./usr/lib | ||
| if [ -d ./usr/lib/x86_64-linux-gnu ]; then | ||
| LIB_DIR=./usr/lib/x86_64-linux-gnu | ||
| fi | ||
|
|
||
| cd $APP.AppDir | ||
| cp -a ../../bin-release/* . | ||
| cp -a ./usr/local/* ./usr | ||
| rm -R ./usr/local | ||
| rmdir ./opt 2> /dev/null | ||
| patch_strings_in_file /usr/local ././ | ||
| patch_strings_in_file /usr ./ | ||
|
|
||
| # bundle Qt platform plugins and themes | ||
| QXCB_PLUGIN="$(find /usr/lib -name 'libqxcb.so' 2> /dev/null)" | ||
| if [ "$QXCB_PLUGIN" == "" ]; then | ||
| QXCB_PLUGIN="$(find /opt/qt*/plugins -name 'libqxcb.so' 2> /dev/null)" | ||
| fi | ||
| QT_PLUGIN_PATH="$(dirname $(dirname $QXCB_PLUGIN))" | ||
| mkdir -p ".${QT_PLUGIN_PATH}/platforms" | ||
| cp "$QXCB_PLUGIN" ".${QT_PLUGIN_PATH}/platforms/" | ||
|
|
||
| get_apprun | ||
| copy_deps | ||
| delete_blacklisted | ||
|
|
||
| # remove dbus and systemd libs as they are not blacklisted | ||
| find . -name libdbus-1.so.3 -exec rm {} \; | ||
| find . -name libsystemd.so.0 -exec rm {} \; | ||
|
|
||
| get_desktop | ||
| get_icon | ||
| cat << EOF > ./usr/bin/keepassxc_env | ||
| #!/usr/bin/env bash | ||
| #export QT_QPA_PLATFORMTHEME=gtk2 | ||
| export LD_LIBRARY_PATH="../opt/qt58/lib:\${LD_LIBRARY_PATH}" | ||
| export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}" | ||
| exec keepassxc "\$@" | ||
| EOF | ||
| chmod +x ./usr/bin/keepassxc_env | ||
| sed -i 's/Exec=keepassxc/Exec=keepassxc_env/' keepassxc.desktop | ||
| get_desktopintegration $LOWERAPP | ||
|
|
||
| GLIBC_NEEDED=$(glibc_needed) | ||
|
|
||
| cd .. | ||
|
|
||
| generate_type2_appimage | ||
|
|
||
| mv ../out/*.AppImage .. | ||
| rmdir ../out > /dev/null 2>&1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -198,3 +198,9 @@ Files: src/zxcvbn/zxcvbn.* | |
| Copyright: 2015, Tony Evans | ||
| 2016, KeePassXC Team | ||
| License: BSD 3-clause | ||
|
|
||
| Files: src/gui/KMessageWidget.h | ||
| src/gui/KMessageWidget.cpp | ||
| Copyright: 2011 Aurélien Gâteau <[email protected]> | ||
| 2014 Dominik Haumann <[email protected]> | ||
| License: LGPL-2.1 | ||
Oops, something went wrong.