Skip to content

Commit

Permalink
Add gpgpass prison and qrencode to gpg4win
Browse files Browse the repository at this point in the history
* configure.ac: Add packages.
* doc/pkg-copyright.txt: Add license and copyright for new pkgs.
* packages/gen-frameworks.sh: Add prison.
* packages/gen-tarball.sh: Add gpgpass.
* packages/packages.common (gpgpass, qrencode, prison): New.
* po/POTFILES.in: Add inst-gpgpass.nsi
* src/Makefile.am: Add new packages and install files.
* src/appimage/Makefile.am: Add new packages.
* src/inst-gpgpass.nsi, src/uninst-gpgpass.nsi,
src/inst-prison.nsi, src/uninst-prison.nsi,
src/inst-qrencode.nsi, src/uninst-qrencode.nsi: New.
* src/inst-sections.nsi: Set up new section. Move some
dependencies to qtbase.
* src/config.nsi.in: Add new defines.
* src/included-icons.txt: Add gpgpass specific icons.
* src/findicons.sh: Add gpgpass.
* src/installer.nsi: Set up new section description.
* src/po: Auto update.

--
This sets up gpgpass as new a optional package for Gpg4win
and includes it with the Appimage.

GnuPG-Bug-Id: T6611
  • Loading branch information
AndreHeinecke committed Feb 2, 2024
1 parent 26f9a94 commit 0a968c1
Show file tree
Hide file tree
Showing 31 changed files with 466 additions and 53 deletions.
7 changes: 7 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ if test "$build_gpg4win" = yes ; then
GPG4WIN_SPKG([gettext], [libiconv])
GPG4WIN_SPKG([libpng], [zlib])
GPG4WIN_SPKG([jpeg])
GPG4WIN_SPKG([qrencode], [libpng libiconv])

# Packages needed for gpgex
GPG4WIN_SPKGEX([libgpg-error])
Expand Down Expand Up @@ -343,6 +344,8 @@ if test "$build_gpg4win" = yes ; then
GPG4WIN_KDEPKG([libical])
GPG4WIN_KDEPKG([kcalendarcore], [qtbase libical extra-cmake-modules])
GPG4WIN_KDEPKG([mimetreeparser], [libkleo kwidgetsaddons ki18n kmbox kmime kcodecs kcalendarcore])
GPG4WIN_KDEPKG([prison], [qtbase extra-cmake-modules qrencode])
GPG4WIN_KDEPKG([gpgpass], [prison kconfigwidgets kiconthemes ki18n gpgme])

GPG4WIN_FINALIZE
fi
Expand Down Expand Up @@ -426,6 +429,10 @@ if test "$build_appimage" = yes ; then
APPIMAGE_KDEPKG([poppler], [gpgme kio qtbase freetype])
APPIMAGE_KDEPKG([okular], [kparts gpgme kio poppler threadweaver qtsvg kactivities])

# Gpgpass
APPIMAGE_SPKG([qrencode], [libpng libiconv])
APPIMAGE_KDEPKG([prison], [qtbase extra-cmake-modules qrencode])
APPIMAGE_KDEPKG([gpgpass], [prison kconfigwidgets kiconthemes ki18n gpgme])
APPIMAGE_FINALIZE
fi

Expand Down
36 changes: 36 additions & 0 deletions doc/pkg-copyright.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1168,6 +1168,23 @@ libiconv
License along with the GNU LIBICONV Library; see the file COPYING.LIB.


qrencode

Copyright (C) 2006-2018 Kentaro Fukuchi

This library is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free
Software Foundation; either version 2.1 of the License, or any later version.

This library 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 Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public License along
with this library; if not, write to the Free Software Foundation, Inc., 51
Franklin St, Fifth Floor, Boston, MA 02110-1301 USA


Poppler, Libkleo, Gpg4win-tools, pkg-config

This program is licensed under the GNU General Pubic License, either
Expand Down Expand Up @@ -1208,6 +1225,25 @@ KDE-Frameworks
License along with this library. If not, see <http://www.gnu.org/licenses/>.


gpgpass

Copyright (C) 2014-2023 Anne Jan Brouwer <[email protected]>
Copyright (C) 2023 g10 Code GmbH

gpgpass 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 3 of the License, or
(at your option) any later version.

gpgpass 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/>.


Okular

Copyright (C) 2002 Wilco Greven, Christophe Devriese
Expand Down
3 changes: 2 additions & 1 deletion packages/gen-frameworks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ FRAMEWORKS="extra-cmake-modules
kparts
ktextwidgets
sonnet
kcalendarcore"
kcalendarcore
prison"

fullversion=$1
case ${fullversion} in
Expand Down
2 changes: 1 addition & 1 deletion packages/gen-tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ case ${package} in
is_gpg="yes"
is_w32="yes"
;;
gpg4win-tools)
gpg4win-tools | gpgpass)
repo=git://git.gnupg.org/${package}.git
;;
mimetreeparser)
Expand Down
21 changes: 21 additions & 0 deletions packages/packages.common
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ chk b44705dd71ca4538c86fb16248483ab4b48978524fb1da5097bd76aa2e0f0c33
file PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2
chk 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840

# qrencode for prison
# last-changed: 2023-11-30
# by ah
# verified: verification of checksum from multiple sources
server https://fukuchi.org/works/qrencode/
file qrencode-4.1.1.tar.gz
chk da448ed4f52aba6bcb0cd48cac0dd51b8692bccc4cd127431402fca6f8171e8e

#
# GIMP stuff for W32
#
Expand Down Expand Up @@ -497,6 +505,12 @@ chk 593ba654a8b5f61af95fec3fd0b269a8f5e89dbed54d62aafb41a0ce0146eeba
file 5.109/kcalendarcore-5.109.0.tar.xz
chk 8581e0e2ac540ce4c8ea76fb61c61234c85c3c908e70b8b5afd0b8ca244edad4

# prison
# last changed: 2023-11-30
# by: ah
# verified: PGP Signed by ./kde-release-keys.gpg (created by gen-frameworks.sh)
file 5.109/prison-5.109.0.tar.xz
chk 8109d7daada25735e4aa9c0f0b51640f34386aa51a9d03bb49b84a0359e8bcde

### END PASTE ###

Expand Down Expand Up @@ -534,6 +548,13 @@ server https://gnupg.org/ftp/gcrypt/snapshots
file gpg4win-tools/gpg4win-tools-202311210840.tar.xz
chk 312e90d9073e6409426db7d603e67b1430256131d9d652da15ac2a27ca5658d3

# gpgpass
# last changed: 2023-12-12
# by: aheinecke
# verified: Tarball created by aheinecke.
file gpgpass/gpgpass-202312121150.tar.xz
chk 6cc3eec7bec7ebe32860c86e97d541e8b53836d50150a392270ba2e05d30201a

# mimetreeparser
# last changed: 2023-12-03
# by: aheinecke
Expand Down
1 change: 1 addition & 0 deletions po/POTFILES.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ src/inst-gpgol.nsi
src/inst-gpgme-browser.nsi
src/inst-kleopatra.nsi
src/inst-okular.nsi
src/inst-gpgpass.nsi
src/inst-compendium.nsi
src/installer-finish.nsi
14 changes: 10 additions & 4 deletions po/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,16 @@ msgctxt "DESC_Menu_okular"
msgid "Run the Okular PDF viewer to sign and verify documents with GnuPG."
msgstr ""

msgctxt "DESC_SEC_gpgpass"
msgid ""
"A password manager which uses GnuPG to decrypt and encrypt your passwords."
msgstr ""

#, fuzzy
msgctxt "DESC_Menu_gpgpass"
msgid "Run the GnuPG Password Manager"
msgstr "شغّل مدير المفاتيح"

#~ msgctxt "T_ShowReadme"
#~ msgid "Show the README file"
#~ msgstr "طالع ملف README"
Expand Down Expand Up @@ -482,10 +492,6 @@ msgstr ""
#~ "Warning: Administrator permissions required for a successful installation"
#~ msgstr "تحذير: تحتاج إلى صلاحيات المدير لإتمام التثبيت"

#~ msgctxt "T_RunKeyManager"
#~ msgid "Run the key manager"
#~ msgstr "شغّل مدير المفاتيح"

#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
#~ "A version of Gpg4Win has already been installed on the system. There will "
Expand Down
14 changes: 10 additions & 4 deletions po/cz.po
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,16 @@ msgctxt "DESC_Menu_okular"
msgid "Run the Okular PDF viewer to sign and verify documents with GnuPG."
msgstr ""

msgctxt "DESC_SEC_gpgpass"
msgid ""
"A password manager which uses GnuPG to decrypt and encrypt your passwords."
msgstr ""

#, fuzzy
msgctxt "DESC_Menu_gpgpass"
msgid "Run the GnuPG Password Manager"
msgstr "Spustit manažer klíèù"

#~ msgctxt "T_ShowReadme"
#~ msgid "Show the README file"
#~ msgstr "Ukázat README"
Expand Down Expand Up @@ -485,10 +495,6 @@ msgstr ""
#~ msgstr ""
#~ "Upozornìní: Pro úspìšnou instalaci jsou vyžadována práva Administrátora."

#~ msgctxt "T_RunKeyManager"
#~ msgid "Run the key manager"
#~ msgstr "Spustit manažer klíèù"

#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
#~ "A version of Gpg4Win has already been installed on the system. There will "
Expand Down
14 changes: 10 additions & 4 deletions po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,16 @@ msgstr ""
"Starte das PDF Anzeigeprogramm Okular um Dokumente mit GnuPG zu signieren "
"und zu verifizieren."

msgctxt "DESC_SEC_gpgpass"
msgid ""
"A password manager which uses GnuPG to decrypt and encrypt your passwords."
msgstr ""

#, fuzzy
msgctxt "DESC_Menu_gpgpass"
msgid "Run the GnuPG Password Manager"
msgstr "Die Schlüsselverwaltung aufrufen"

#~ msgctxt "T_ShowReadme"
#~ msgid "Show the README file"
#~ msgstr "Die README Datei anzeigen"
Expand Down Expand Up @@ -569,10 +579,6 @@ msgstr ""
#~ "Achtung: Für eine erfolgreiche Installation werden Administratorrechte "
#~ "benötigt."

#~ msgctxt "T_RunKeyManager"
#~ msgid "Run the key manager"
#~ msgstr "Die Schlüsselverwaltung aufrufen"

#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
#~ "A version of Gpg4Win has already been installed on the system. There will "
Expand Down
14 changes: 10 additions & 4 deletions po/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,16 @@ msgctxt "DESC_Menu_okular"
msgid "Run the Okular PDF viewer to sign and verify documents with GnuPG."
msgstr ""

msgctxt "DESC_SEC_gpgpass"
msgid ""
"A password manager which uses GnuPG to decrypt and encrypt your passwords."
msgstr ""

#, fuzzy
msgctxt "DESC_Menu_gpgpass"
msgid "Run the GnuPG Password Manager"
msgstr "Ejecutar el gestor de llaves"

#~ msgctxt "T_ShowReadme"
#~ msgid "Show the README file"
#~ msgstr "Ver el archivo README"
Expand Down Expand Up @@ -455,10 +465,6 @@ msgstr ""
#~ "Advertencia: Necesita permisos de administrador para una instalación "
#~ "exitosa."

#~ msgctxt "T_RunKeyManager"
#~ msgid "Run the key manager"
#~ msgstr "Ejecutar el gestor de llaves"

#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
#~ "A version of Gpg4Win has already been installed on the system. There will "
Expand Down
14 changes: 10 additions & 4 deletions po/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,16 @@ msgctxt "DESC_Menu_okular"
msgid "Run the Okular PDF viewer to sign and verify documents with GnuPG."
msgstr ""

msgctxt "DESC_SEC_gpgpass"
msgid ""
"A password manager which uses GnuPG to decrypt and encrypt your passwords."
msgstr ""

#, fuzzy
msgctxt "DESC_Menu_gpgpass"
msgid "Run the GnuPG Password Manager"
msgstr "Lancer le gestionnaire de clés"

#~ msgctxt "T_ShowReadme"
#~ msgid "Show the README file"
#~ msgstr "Afficher le fichier README"
Expand Down Expand Up @@ -485,10 +495,6 @@ msgstr ""
#~ "Warning: Administrator permissions required for a successful installation"
#~ msgstr "Avertissement : l'installation requiert des droits d'administrateur"

#~ msgctxt "T_RunKeyManager"
#~ msgid "Run the key manager"
#~ msgstr "Lancer le gestionnaire de clés"

#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
#~ "A version of Gpg4Win has already been installed on the system. There will "
Expand Down
14 changes: 10 additions & 4 deletions po/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,16 @@ msgctxt "DESC_Menu_okular"
msgid "Run the Okular PDF viewer to sign and verify documents with GnuPG."
msgstr ""

msgctxt "DESC_SEC_gpgpass"
msgid ""
"A password manager which uses GnuPG to decrypt and encrypt your passwords."
msgstr ""

#, fuzzy
msgctxt "DESC_Menu_gpgpass"
msgid "Run the GnuPG Password Manager"
msgstr "Esegui l'amministratore delle chiavi"

#~ msgctxt "T_ShowReadme"
#~ msgid "Show the README file"
#~ msgstr "Mostra il file README"
Expand Down Expand Up @@ -515,10 +525,6 @@ msgstr ""
#~ "Avvertenza: Sono necessari i permessi di amministratore per la riuscita "
#~ "dell'installazione"

#~ msgctxt "T_RunKeyManager"
#~ msgid "Run the key manager"
#~ msgstr "Esegui l'amministratore delle chiavi"

#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
#~ "A version of Gpg4Win has already been installed on the system. There will "
Expand Down
9 changes: 9 additions & 0 deletions po/nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,15 @@ msgctxt "DESC_Menu_okular"
msgid "Run the Okular PDF viewer to sign and verify documents with GnuPG."
msgstr ""

msgctxt "DESC_SEC_gpgpass"
msgid ""
"A password manager which uses GnuPG to decrypt and encrypt your passwords."
msgstr ""

msgctxt "DESC_Menu_gpgpass"
msgid "Run the GnuPG Password Manager"
msgstr ""

#~ msgctxt "T_ShowReadme"
#~ msgid "Show the README file"
#~ msgstr "Het README-bestand weergeven"
Expand Down
15 changes: 10 additions & 5 deletions po/no.po
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,16 @@ msgctxt "DESC_Menu_okular"
msgid "Run the Okular PDF viewer to sign and verify documents with GnuPG."
msgstr ""

msgctxt "DESC_SEC_gpgpass"
msgid ""
"A password manager which uses GnuPG to decrypt and encrypt your passwords."
msgstr ""

#, fuzzy
msgctxt "DESC_Menu_gpgpass"
msgid "Run the GnuPG Password Manager"
msgstr "Kjør Kleopatra nøkkelhåndteringsverktøy."

#~ msgctxt "T_ShowReadme"
#~ msgid "Show the README file"
#~ msgstr "Vis README filen"
Expand Down Expand Up @@ -489,11 +499,6 @@ msgstr ""
#~ msgstr ""
#~ "Advarsel: Administratorrettigheter kreves for å fullføre installasjonen"

#, fuzzy
#~ msgctxt "T_RunKeyManager"
#~ msgid "Run the key manager"
#~ msgstr "Kjør Kleopatra nøkkelhåndteringsverktøy."

#, fuzzy
#~ msgctxt "T_FoundExistingVersionB"
#~ msgid ""
Expand Down
9 changes: 9 additions & 0 deletions po/pt.po
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,15 @@ msgctxt "DESC_Menu_okular"
msgid "Run the Okular PDF viewer to sign and verify documents with GnuPG."
msgstr ""

msgctxt "DESC_SEC_gpgpass"
msgid ""
"A password manager which uses GnuPG to decrypt and encrypt your passwords."
msgstr ""

msgctxt "DESC_Menu_gpgpass"
msgid "Run the GnuPG Password Manager"
msgstr ""

#~ msgctxt "T_ShowReadme"
#~ msgid "Show the README file"
#~ msgstr "Mostrar o ficheiro README"
Expand Down
Loading

0 comments on commit 0a968c1

Please sign in to comment.