gpg4win.git
25 hours agoFix make dist master
Andre Heinecke [Fri, 24 Jun 2016 10:56:51 +0000 (12:56 +0200)]
Fix make dist

* Makefile.am (EXTRA_DIST): Fix path to gpgmepp patch.

25 hours agoMention README-msi.txt in README and for deps
Andre Heinecke [Fri, 24 Jun 2016 10:54:47 +0000 (12:54 +0200)]
Mention README-msi.txt in README and for deps

* README: Mention README-msi.txt
* src/README-msi.txt: Mention uuid-runtime.

--
Thanks to Ángel González <angel@pgp.16bits.net> for noticing
this.

25 hours agoMSI: Fix parsing installer.nsi
Ángel González [Fri, 24 Jun 2016 10:50:38 +0000 (12:50 +0200)]
MSI: Fix parsing installer.nsi

* src/installer.nsi: Move comment to next line.

--
Make MSI appears not to like comments in the same line with
instructions.

Signed-off-by: Andre Heinecke <aheinecke@intevation.de>
25 hours agoMSI: Fix unsupported outh path $TEMP error
Ángel González [Fri, 24 Jun 2016 10:49:13 +0000 (12:49 +0200)]
MSI: Fix unsupported outh path $TEMP error

* src/make-msi.pl (gpg4win_nsis_stubs): Fix $TEMP substitution.

--

Signed-off-by: Andre Heinecke <aheinecke@intevation.de>
25 hours agoRedownload the package if size is zero
Ángel González [Fri, 24 Jun 2016 10:34:07 +0000 (12:34 +0200)]
Redownload the package if size is zero

* packages/download.sh: Redownlad on zero size.

--
This can help if a mirror is temporaryily unavailable
and properly show a download error instead of a checksum
error in case download servers are unavailable.

Signed-off-by: Andre Heinecke <aheinecke@intevation.de>
3 days agoReduce gpgmepp frameworks version dependency
Andre Heinecke [Tue, 21 Jun 2016 13:36:58 +0000 (15:36 +0200)]
Reduce gpgmepp frameworks version dependency

--
This is a quick workaround to fix the build. Frameworks should
be updated.

7 days agoUpdate NEWS and READMES
Andre Heinecke [Fri, 17 Jun 2016 15:54:28 +0000 (17:54 +0200)]
Update NEWS and READMES

--

7 days agoUpdate development packages
Andre Heinecke [Fri, 17 Jun 2016 15:54:07 +0000 (17:54 +0200)]
Update development packages

--

7 days agoUpdate GnuPG and libgpg-error
Andre Heinecke [Fri, 17 Jun 2016 15:53:36 +0000 (17:53 +0200)]
Update GnuPG and libgpg-error

--

7 days agoAdd application/pgp-keys mimetype handling
Andre Heinecke [Fri, 17 Jun 2016 15:31:58 +0000 (17:31 +0200)]
Add application/pgp-keys mimetype handling

* src/installer-finish.nsi: Register application/pgp-keys. Clean
up version and naming.
* src/uninst-gpa.nsi, src/uninst-kleopatra.nsi: Update accordingly.

--
Seems the Version suffix is not something thats usually done on
Windows so we drop it as it complicates things.

9 days agoUpdate file extension icon with gpg4win lock
Andre Heinecke [Wed, 15 Jun 2016 12:32:36 +0000 (14:32 +0200)]
Update file extension icon with gpg4win lock

* src/file-ext.ico: Update based on gpg4win_lock_file.svg.

--
As you can clearly see I'm not an icon designer,..

9 days agoAdd gpg4win lock icon and lock file icon
Andre Heinecke [Wed, 15 Jun 2016 12:31:16 +0000 (14:31 +0200)]
Add gpg4win lock icon and lock file icon

* doc/logo/gpg4win_lock_file.svg, doc/logo/gpg4win_lock_logo.svg: New.
* doc/logo/Makefile.am (EXTRA_DIST): Update accordingly.

2 weeks agoHandle symlinks in ex-build stow command
Andre Heinecke [Wed, 8 Jun 2016 08:27:52 +0000 (10:27 +0200)]
Handle symlinks in ex-build stow command

* gpg4win.mk.in (stamp-$(1)-ex-05-stow): Resolve symlinks before
calling stow.

6 weeks agoUpdate build dependencies in README
Andre Heinecke [Wed, 11 May 2016 10:03:03 +0000 (12:03 +0200)]
Update build dependencies in README

--
The entries are also formatted as a list without comments to
be easier usable for package installation.

7 weeks agoRegister PGP Content-Types
Andre Heinecke [Wed, 4 May 2016 15:24:28 +0000 (17:24 +0200)]
Register PGP Content-Types

* src/installer-finish.nsi (SetupExtRegKeys): Add MimeAssociation for
pgp-keys
(Section): Add PGP Content Types.
(Uninstall): Remove keys again.

8 weeks agoInstall additional icons
Andre Heinecke [Fri, 29 Apr 2016 12:27:58 +0000 (14:27 +0200)]
Install additional icons

--
The icons are needed for new features in Kleopatra and for
pinentry visibility.

8 weeks agoFix gpgol_ex configure command
Andre Heinecke [Fri, 29 Apr 2016 12:27:07 +0000 (14:27 +0200)]
Fix gpgol_ex configure command

* src/Makefile.am (pkg_gpgol_ex_configure): Remove duplicated conf.

--
A merge error from merging the 2.x branch into master.

8 weeks agorepairing the installer logo
Jochen Saalfeld [Fri, 29 Apr 2016 10:37:41 +0000 (12:37 +0200)]
repairing the installer logo

8 weeks agoFix kittemmodels section declaration
Andre Heinecke [Fri, 29 Apr 2016 09:37:29 +0000 (11:37 +0200)]
Fix kittemmodels section declaration

* src/config.nsi.in: Add KItemModels definies.

8 weeks agoUpdate Kleopatra development version
Andre Heinecke [Fri, 29 Apr 2016 09:11:58 +0000 (11:11 +0200)]
Update Kleopatra development version

* packages/packages.current (kleopatra): Update

8 weeks agoAdd kittemmodels as new dependency of Kleopatra
Andre Heinecke [Fri, 29 Apr 2016 09:09:44 +0000 (11:09 +0200)]
Add kittemmodels as new dependency of Kleopatra

* configure.ac, packages/packages.current, src/Makefile.am: Add
new package.
* src/inst-kitemmodels.nsi, src/uninst-kitemmodels.nsi: New.
* src/inst-sections.nsi: Install it for Kleopatra.

--
As Tier1 Kitemmodels is a lightweight dependency and contains
a Proxymodel with improved column handling that we will use in
Kleopatra

8 weeks agoUpdate Kleopatra and remove applied patches
Andre Heinecke [Wed, 27 Apr 2016 16:28:45 +0000 (18:28 +0200)]
Update Kleopatra and remove applied patches

* Makefile.am (EXTRA_DIST): Remove patches.
* packages/packages.current (kleopatra): Update.
* patches/kleopatra: Remove all but one very ugly patch.

--
I finally got around to cleaning the patches up enough to commit them
properly.

2 months agoUpdate KDE Packages and pinentry
Andre Heinecke [Tue, 19 Apr 2016 14:37:51 +0000 (16:37 +0200)]
Update KDE Packages and pinentry

* Makefile.am (EXTRA_DIST): Remove patches applied upstream.
* packages/packages.current: Update
* patches/kcoreaddons/
0001-Fix-Kdelibs4-config-migration-for-Windows.patch,
patches/kleopatra/0003-Add-option-to-disable-KWatchGnuPG.patch,
patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch,
patches/kxmlgui/0005-Use-non-native-Language-name-as-fallback.patch,
patches/pinentry-0.9.7/
Qt-Fix-Windows-foreground-window-hacks-for-Qt5.patch: Removed.
* patches/kleopatra/0003-Add-option-to-disable-KWatchGnuPG: Updated.

2 months agoFix Unreg of File extensions
Andre Heinecke [Wed, 13 Apr 2016 15:33:38 +0000 (17:33 +0200)]
Fix Unreg of File extensions

* src/uninst-gpa.nsi, src/uninst-kleopatra.nsi: Unregister more
CMS Extensions.

2 months agoRegister file extensions and AppIDs in Windows
Andre Heinecke [Wed, 13 Apr 2016 14:46:07 +0000 (16:46 +0200)]
Register file extensions and AppIDs in Windows

* src/inst-gpa.nsi, src/inst-kleopatra.nsi: Set up AppIDs.
* src/installer-finish.nsi: Register mime types and extensions for
Kleopatra and or GPA.
* src/uninst-gpa.nsi, src/uninst-kleopatra.nsi: Clean up afterwards.
* src/file-ext.ico: New. Icon for file extensions.

--
This might take over .pgp, .sig, .asc, .gpg, .p7m, .p7s,
.arl, .crl by default.

For the certificate types .cer, crt, .der, .p10, .p12, .p7c .pfx
GPA and Kleopatra are only listed as supported applications
in the OpenWith menu.

2 months agoupdating installer logo
Jochen Saalfeld [Wed, 13 Apr 2016 10:32:20 +0000 (12:32 +0200)]
updating installer logo

2 months agoAdding fix for libgpg-error-1.21
Jochen Saalfeld [Wed, 6 Apr 2016 06:09:10 +0000 (08:09 +0200)]
Adding fix for libgpg-error-1.21

* Makefile.am: Adding the Patchfile
* patches/libgpg-error-1.21/0001-Add-FD_ISSET-replacement-for
-Windows.patch: the Patch itself
* po/pt.po: removing obsolete content to supress compilation errors

--
libgpg-error fails to compile for windows without optimization because
it uses the FD_ISSET macro and does not link against ws2_32.
thi patch provides a simple replacement function for FD_ISSET to be
used on Windows.

2 months agoMerge branch 'gpg4win-2'
Andre Heinecke [Tue, 5 Apr 2016 09:53:39 +0000 (11:53 +0200)]
Merge branch 'gpg4win-2'

Conflicts:
NEWS
packages/packages.current

2 months agoMerge branch 'gpg4win-2'
Andre Heinecke [Tue, 5 Apr 2016 09:48:48 +0000 (11:48 +0200)]
Merge branch 'gpg4win-2'

Conflicts:
NEWS
doc/README.de.txt
doc/README.en.txt
packages/packages.current
po/pt.po
src/Makefile.am
src/inst-gpgol.nsi
src/uninst-gpgol.nsi

2 months agoChanged the server for gettext and libiconv gpg4win-2
Jochen Saalfeld [Tue, 5 Apr 2016 09:27:14 +0000 (11:27 +0200)]
Changed the server for gettext and libiconv

* packages/packages.current: Changed the server from tu.berlin to
gnu.org

--

The server ftp.cs.tu-berlin.de is down and doesn't seem to come
back to life, so we switched to another server.

2 months agoThis is release 2.3.1 gpg4win-2.3.1
Jochen Saalfeld [Tue, 5 Apr 2016 08:48:24 +0000 (10:48 +0200)]
This is release 2.3.1

* NEWS: added the release date

2 months agodowngraded libgpg-error to 1.20
Jochen Saalfeld [Thu, 31 Mar 2016 14:09:53 +0000 (16:09 +0200)]
downgraded libgpg-error to 1.20

* packages/packages.current (gnupg): added meta infos
* packages/packages.current (libgpg-error): downgraded version

--
I checked the sha256sum locally. I downloaded the file, checked the
sah1sum and generated the sha256 after verifing.

2 months agoAdded 2.0.30 as new stable version of gnupg
Jochen Saalfeld [Thu, 31 Mar 2016 12:06:42 +0000 (14:06 +0200)]
Added 2.0.30 as new stable version of gnupg

* NEWS: Update Version.
* packages/packages.current (gnupg): Update package.

--
The conversion of the sha1sum was done locally. I downloaded the file checked
the sha1sum and after verifing it was correct, i generated the sha256sum

2 months agoUse sha256 for package checksums
Andre Heinecke [Wed, 30 Mar 2016 15:33:34 +0000 (17:33 +0200)]
Use sha256 for package checksums

* packages/download.sh: Use sha256sum
* packages/packages.current: Converted to sha256 checksums.

--
Conversion was done on a valid download folder where all sha1sums
matched by the command:

for file in $(ls *.tar* *.zip); do
    SHA1=$(sha1sum $file | awk '{print $1}')
    SHA2=$(sha256sum $file | awk '{print $1}')
    sed -i "s/$SHA1/$SHA2/" packages.current
done

GnuPG-Bug-Id: 2299

2 months agoUse sha256 for package checksums
Andre Heinecke [Wed, 30 Mar 2016 15:27:39 +0000 (17:27 +0200)]
Use sha256 for package checksums

* packages/download.sh: Use sha256sum
* packages/packages.current: Converted to sha256 checksums.

--
Conversion was done on a valid download folder where all sha1sums
matched by the command:

for file in $(ls *.tar* *.zip); do
    SHA1=$(sha1sum $file | awk '{print $1}')
    SHA2=$(sha256sum $file | awk '{print $1}')
    sed -i "s/$SHA1/$SHA2/" packages.current
done

2 months agoUpdating the Readme with the latest news
jochen@intevation.de [Wed, 30 Mar 2016 13:07:46 +0000 (15:07 +0200)]
Updating the Readme with the latest news

2 months agoUpdate gpgol to 1.4.0
Andre Heinecke [Wed, 30 Mar 2016 12:49:46 +0000 (14:49 +0200)]
Update gpgol to 1.4.0

--

(cherry picked from commit f00782716c86d6e135c8dba417ad79d1fd2b2ec1)

2 months agoUpdate gpgol to 1.4.0
Andre Heinecke [Wed, 30 Mar 2016 12:49:46 +0000 (14:49 +0200)]
Update gpgol to 1.4.0

--

2 months agoRemove gpgex 1.0.3 patches
Andre Heinecke [Wed, 30 Mar 2016 12:46:42 +0000 (14:46 +0200)]
Remove gpgex 1.0.3 patches

* Makefile.am (EXTRA_DIST): Update.
* patches/gpgex-1.0.3: Remove patches. Applied upstream.

2 months agoUpdate gpgex to 1.0.4
Andre Heinecke [Wed, 30 Mar 2016 12:44:56 +0000 (14:44 +0200)]
Update gpgex to 1.0.4

--

(cherry picked from commit 6adb4901c99b9af655b55a368f5cc6da6c05a897)

2 months agoUpdate gpgex to 1.0.4
Andre Heinecke [Wed, 30 Mar 2016 12:44:56 +0000 (14:44 +0200)]
Update gpgex to 1.0.4

--

2 months agoUpdate GpgOL package
Andre Heinecke [Fri, 4 Mar 2016 13:40:15 +0000 (14:40 +0100)]
Update GpgOL package

* packages.current (gpgol): Update gpgol package.

(cherry picked from commit 10e088b6bd670029409a80431fc5a34f870828a2)

Conflicts:
packages/packages.current

2 months agoUpdate NEWS
Andre Heinecke [Wed, 30 Mar 2016 10:13:54 +0000 (12:13 +0200)]
Update NEWS

--

2 months agoUpdate Portuguese translation
Andre Heinecke [Wed, 30 Mar 2016 08:50:15 +0000 (10:50 +0200)]
Update Portuguese translation

* po/pt.po: Update.

--
Updated translation provided by Marco A.G. Pinto. Thanks.
Encoding changed from UTF-8 to windows-1252 by Andre Heinecke.

(cherry picked from commit ef443a5954bc04984480f1141e2ce30cf3be4ba3)

Conflicts:
po/pt.po

2 months agoUpdate libgpg-error to 1.21
Andre Heinecke [Wed, 30 Mar 2016 09:13:11 +0000 (11:13 +0200)]
Update libgpg-error to 1.21

--

(cherry picked from commit 6a01ff06da69f7cfd4cbd2d05ac2346ad2bf3e01)

2 months agoUpdate libgpg-error to 1.21
Andre Heinecke [Wed, 30 Mar 2016 09:13:11 +0000 (11:13 +0200)]
Update libgpg-error to 1.21

--

2 months agoUpdate libgcrypt to 1.6.5
Andre Heinecke [Wed, 30 Mar 2016 09:11:59 +0000 (11:11 +0200)]
Update libgcrypt to 1.6.5

--

2 months agoUpdate libassuan
Andre Heinecke [Wed, 30 Mar 2016 09:07:47 +0000 (11:07 +0200)]
Update libassuan

--

2 months agoUpdate gettext
Andre Heinecke [Wed, 26 Aug 2015 14:19:04 +0000 (16:19 +0200)]
Update gettext

* packages/packages.current(gettext): Update.

--
The old version does not compile with jessie default autotools.

(cherry picked from commit b5b8449f45c2debf30138cce950c9bb03c9fce1f)

2 months agoUpdate Portuguese translation
Andre Heinecke [Wed, 30 Mar 2016 08:50:15 +0000 (10:50 +0200)]
Update Portuguese translation

* po/pt.po: Update.

--
Updated translation provided by Marco A.G. Pinto. Thanks.
Encoding changed from UTF-8 to windows-1252 by Andre Heinecke.

2 months agoAdd 64bit version of GpgOL
Andre Heinecke [Mon, 30 Nov 2015 14:32:36 +0000 (15:32 +0100)]
Add 64bit version of GpgOL

* configure.ac: Mark gpgme and gpgol als SPKGEX. Clarify output.
* doc/README.de.txt, doc/README.en.txt: Note 64 support.
* packages/packages.current (gpgol): Update to beta for testing.
* src/Makefile.am: Mark gpgme and gpgol as expkgs. Add config opts.
* src/inst-gpgex.nsi: Undefine exprefix if necessary.
* src/inst-gpgol.nsi: Install 64 bit variant.
* src/uninst-gpgol.nsi: Uninstall 64 bit variant.

(cherry picked from commit edb5ba81a7cb4523d02ed8619f1ad157c09ff443)

3 months agoUpdate README and NEWS
Andre Heinecke [Fri, 11 Mar 2016 14:33:02 +0000 (15:33 +0100)]
Update README and NEWS

* NEWS: Update.
* doc/README.de.txt, doc/README.en.txt: Update accordingly.

3 months agoUpdate kleopatra to latest master
Andre Heinecke [Thu, 10 Mar 2016 18:34:19 +0000 (19:34 +0100)]
Update kleopatra to latest master

* packages/packages.current(kleopatra): Update.

3 months agoUpdate extra-cmake-modules
Andre Heinecke [Thu, 10 Mar 2016 11:51:40 +0000 (12:51 +0100)]
Update extra-cmake-modules

* packages/packages.current (extra-cmake-modules): Update.

3 months agoAdd patches for gpgex Kleopatra-kf5 compatibility
Andre Heinecke [Thu, 10 Mar 2016 10:44:33 +0000 (11:44 +0100)]
Add patches for gpgex Kleopatra-kf5 compatibility

* Makefile.am (EXTRA_DIST): Add patches
* patches/gpgex-1.0.3/
 0001-Support-gpg4win-registry-keys-and-install-location.patch,
 patches/gpgex-1.0.3/
 0002-Place-assuan-calls-in-a-different-thread.patch: New.

3 months agoSwitch to standalone repo kleopatra
Andre Heinecke [Wed, 9 Mar 2016 14:02:21 +0000 (15:02 +0100)]
Switch to standalone repo kleopatra

* packages/packages.current (kleopatra): Update.
* patches/kleopatra/*: Rebase patches to new src layout.

3 months agoAdd patch for unreleased pubkey_algo_string
Andre Heinecke [Wed, 9 Mar 2016 14:01:16 +0000 (15:01 +0100)]
Add patch for unreleased pubkey_algo_string

* Makefile.am (EXTRA_DIST): Add patch.
* patches/gpgme-1.6.0/0001-Add-gpgme_pubkey_algo_string.patch: New.

--
Gpgmepp and kleo use this now.

3 months agoUpdate gpgmepp
Andre Heinecke [Wed, 9 Mar 2016 13:02:19 +0000 (14:02 +0100)]
Update gpgmepp

* packages/packages.current (gpgmepp): Update.

--
Kleo master needs support for a new symbol in there.

3 months agoFix removal of installer-options.nsi
Andre Heinecke [Tue, 8 Mar 2016 10:17:52 +0000 (11:17 +0100)]
Fix removal of installer-options.nsi

* src/Makefile.am (EXTRA_DIST): Remove installer-options.
* src/installer.nsi: Don't Reserve file anymore

3 months agoNote down ./autogen.sh in general readme
Andre Heinecke [Mon, 7 Mar 2016 13:35:26 +0000 (14:35 +0100)]
Note down ./autogen.sh in general readme

* README: Add autogen step when building from git.

--
README.GIT is apprently too hidden ;-)

3 months agoAdd Patch for pinentry-qt foreground window
Andre Heinecke [Fri, 4 Mar 2016 14:50:53 +0000 (15:50 +0100)]
Add Patch for pinentry-qt foreground window

* Makefile.am (EXTRA_DIST): Add patch.
* patches/pinentry-0.9.7/
Qt-Fix-Windows-foreground-window-hacks-for-Qt5.patch: New.

--
Patch is already commited to pinentry master.

3 months agoUpdate GpgOL package
Andre Heinecke [Fri, 4 Mar 2016 13:40:15 +0000 (14:40 +0100)]
Update GpgOL package

* packages.current (gpgol): Update gpgol package.

3 months agoFix kleopatra language detection
Andre Heinecke [Fri, 4 Mar 2016 10:47:00 +0000 (11:47 +0100)]
Fix kleopatra language detection

* Makefile.am (EXTRA_DIST): Add patch.
* patches/ki18n/0001-Use-QLocale-system-uiLanguages-as-fallback.patch:
 New.
* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Remove
 klanguageoverrides handling.

--
The language overrides did not work as they were not read from the
global folder. This new patch is better. (KDE review 127275)

3 months agoTranslate run after install strings (german)
Andre Heinecke [Fri, 4 Mar 2016 08:32:41 +0000 (09:32 +0100)]
Translate run after install strings (german)

* po/de.po: Translate run after install.

3 months agoRemove parameter handling in Destkopshellrun
Andre Heinecke [Thu, 3 Mar 2016 16:10:39 +0000 (17:10 +0100)]
Remove parameter handling in Destkopshellrun

* src/desktopshellrun.cpp (DesktopShellRun): Don't handle parameters.

--
Using the stack for additional parameters is too ticklish as we
don't really know what else is on the stack in such a complex project.

So we remove the param handlign altogether as this are not neccessary
for gpg4win.

3 months agoAuto update of translations
Andre Heinecke [Thu, 3 Mar 2016 08:50:52 +0000 (09:50 +0100)]
Auto update of translations

* po: Updated

3 months agoDo not fail if installers subdirectory exists
Andre Heinecke [Wed, 2 Mar 2016 11:39:40 +0000 (12:39 +0100)]
Do not fail if installers subdirectory exists

* src/gpg4win.mk.in (stamp-directories): Add -p for installers.
--

The installers are not removed by make clean so its normal
if the directory may exist.

3 months agoUpdate Kleopatra package to latest master
Andre Heinecke [Wed, 2 Mar 2016 10:29:43 +0000 (11:29 +0100)]
Update Kleopatra package to latest master

* packages/packages.current (kleopatra): Update.

3 months agoAdd patch for gpgme gpgconf fallback search
Andre Heinecke [Wed, 2 Mar 2016 10:27:08 +0000 (11:27 +0100)]
Add patch for gpgme gpgconf fallback search

* patches/gpgme-1.6.0/
 0001-w32-Fallback-to-2.1-reg-key-for-gpgconf-search.patch: New.

3 months agoCreate qt.conf for Config / Data locations
Andre Heinecke [Tue, 1 Mar 2016 16:54:51 +0000 (17:54 +0100)]
Create qt.conf for Config / Data locations

* src/inst-qtbase.nsi: Create qt.conf
* src/unist-qtbase.nsi: Uninstall it.

3 months agoAdd patch for KDE4 to KF5 config migration
Andre Heinecke [Tue, 1 Mar 2016 16:51:51 +0000 (17:51 +0100)]
Add patch for KDE4 to KF5 config migration

* Makefile.am (EXTRA_DIST): Add patch.
* patches/kcoreaddons/
 0001-Fix-Kdelibs4-config-migration-for-Windows.patch: New.

--
This is KDE Review Request 127245

3 months agoFix dependency selection for assuan and zlib
Andre Heinecke [Tue, 1 Mar 2016 14:43:58 +0000 (15:43 +0100)]
Fix dependency selection for assuan and zlib

* src/inst-sections.nsi: Select zlib for qt. Select assuan for gpgme.

3 months agoAdd Patch to make qtstandardpaths configurable
Andre Heinecke [Tue, 1 Mar 2016 14:02:51 +0000 (15:02 +0100)]
Add Patch to make qtstandardpaths configurable

* Makefile.am (EXTRA_DIST): Add patch.
* patches/qtbase-5.5.1/config-standardpaths.patch: New.

--
QStandardPaths is in a bad state by default. It writes config
data into %LOCALAPPDATA% (without subdir) which does not make
sense at all.

This patch makes it possible to change this with a qt.conf file

3 months agoFix GnuPG-w32 installation path
Andre Heinecke [Tue, 1 Mar 2016 10:31:28 +0000 (11:31 +0100)]
Fix GnuPG-w32 installation path

* src/inst-gnupg-w32.nsi: Fix installation path.

--
The /D argument MUST not contain any quotes but must be the last
argument on the command line.

3 months agoRemove kcm_kleopatra.dll properly
Andre Heinecke [Tue, 1 Mar 2016 10:31:04 +0000 (11:31 +0100)]
Remove kcm_kleopatra.dll properly

* src/uninst-kleopatra.nsi: Fix path for kcm_kleopatra.dll

3 months agoFix source installer build
Andre Heinecke [Tue, 1 Mar 2016 10:23:02 +0000 (11:23 +0100)]
Fix source installer build

* src/installer.nsi: Fix ifndef SOURCES guard.

--
The customfunction post was now in context of the sources
uninstaller welcome page.

3 months agoInstall gpg4win-compact icon in theme dir
Andre Heinecke [Mon, 29 Feb 2016 17:04:57 +0000 (18:04 +0100)]
Install gpg4win-compact icon in theme dir

* src/inst-kleopatra.nsi (gpg4win_compact.png): Install into hicolor
 theme dir.
* src/uninst-kleopatra.nsi (gpg4win_compact.png): Remove it.

--
This fixes the about gpg4win menu entry icon.

3 months agoFix installation of Desktop icons
Andre Heinecke [Mon, 29 Feb 2016 15:26:44 +0000 (16:26 +0100)]
Fix installation of Desktop icons

* src/inst-sections.nsi: Remove wrong IntCmp jump.

3 months agoKill Kleo and GPA on uninstall / install
Andre Heinecke [Mon, 29 Feb 2016 14:55:03 +0000 (15:55 +0100)]
Kill Kleo and GPA on uninstall / install

* src/installer.nsi (PrintCloseOtherApps): Just kill them.
 (un.CloseApps): New.
* MUI_UNPAGE_INSTFILES: Call CloseApps in pre function.

3 months agoAdd simple KillProc function
Andre Heinecke [Mon, 29 Feb 2016 14:50:21 +0000 (15:50 +0100)]
Add simple KillProc function

* src/desktopshellrun.cpp, src/exdll.h (ERRORPRINTF),
 (acp_to_wchar): Move from destkopshellrun to exdll.h
* src/g4wihelp.c (KillProc): New. Kill processes.

3 months agoSwitch to MUI2 and add Run after Install
Andre Heinecke [Mon, 29 Feb 2016 13:52:11 +0000 (14:52 +0100)]
Switch to MUI2 and add Run after Install

MUI2 gives more flexibility in customizing pages.

* src/installer-options.ini.in: Removed.
* src/Makefile.am (installer-options.ini.in): Remove mentions.
 (g4wihelp.dll): Link with desktopshellrun.cpp
* src/g4wihelp.c: Fix implicit stdio usages.
* src/gpg4win-src.nsi, src/gpg4win.nsi (ABOUT_STR): MUI2 needs
  $\r$\n everywere.
  (Sections): Include Sections and Memento header.
  (installer.nsi): Include after sections.
* src/inst-sections.nsi, src/installer.nsi: Move generic functions
 into installer.nsi
* src/installer.nsi (FinishFunction): New. Conditional show run with
 correct Cert Manager. If not source installer.
  (RunAsUser): New. Use DesktopShellRun.
  (LICENSE_PAGE): Commented out.
  (MUI_UNIFINISHPAGE): Commented out.

--

The finish page now shows a Run GPA or Run Kleopatra depending
on wether or not they are selected. If none is selected nothing
is offered.

License and finish page for uninstaller and source installer removed.

3 months agoAdd RunAsUser implementation.
Andre Heinecke [Mon, 29 Feb 2016 13:47:06 +0000 (14:47 +0100)]
Add RunAsUser implementation.

* src/desktopshellrun.cpp: New.

--
As it is impossible to fully drop privileges from an elevated
token in UAC the approach is to look up the users shell and
send a COM signal to spawn a process with the shell's access rights.

3 months agoSimplify start menu entries
Andre Heinecke [Mon, 29 Feb 2016 10:09:56 +0000 (11:09 +0100)]
Simplify start menu entries

* src/inst-sections.nsi: Remove old removal code. Remove Manual
 links. Install Kleopatra/GPA entries in top level.
* src/installer-finish.nsi: Remove start menu entry removal.
* src/installer.nsi: Remove start menu page.

--
We might want to add a custom installation option that will allow
to select startmenu again. But installing many start menu entries in
a subfolder is no longer state of the art for Windows.

3 months agoSet Kleopatra language according to installer lang
Andre Heinecke [Mon, 29 Feb 2016 10:07:46 +0000 (11:07 +0100)]
Set Kleopatra language according to installer lang

* src/inst-kleopatra.nsi: Write klanguageoverridesrc.
* src/uninst-kleopatra.nsi: Remove it.

--
Probably better to use system locale, but for now make the old
code that set it according to installer work again.

3 months agoFix extra-cmake-modules section name.
Andre Heinecke [Mon, 29 Feb 2016 10:06:37 +0000 (11:06 +0100)]
Fix extra-cmake-modules section name.

* src/inst-extra-cmake-modules.nsi: Fix section name.

3 months agoDisable light and vanilla installer by default
Andre Heinecke [Mon, 29 Feb 2016 10:05:58 +0000 (11:05 +0100)]
Disable light and vanilla installer by default

* configure.ac: Disable light and vanilla by default.

--
They might be dropped altogether in the future. For now just
disable them.

3 months agoDo not create uninstaller shortcut
Andre Heinecke [Thu, 25 Feb 2016 14:26:50 +0000 (15:26 +0100)]
Do not create uninstaller shortcut

* installer-finish.nsi: Do not create uninstaller shortcut.

--
Shortcuts to uninstallers are not something thats done nowadays.
You have the "Apps" or Software settings to uninstall software.

4 months agoRemove qt as a build dependency
Andre Heinecke [Wed, 24 Feb 2016 15:36:30 +0000 (16:36 +0100)]
Remove qt as a build dependency

* README: Remove qt as build dependency.

--
With qt5 we are building moc ourself.

4 months agoMove installers into subdir and print success
Andre Heinecke [Wed, 24 Feb 2016 13:54:48 +0000 (14:54 +0100)]
Move installers into subdir and print success

* Makefile.am (copy-release): Update path of installers
* src/Makefile.am: Move installers into subdir.
* src/gpg4win.mk.in: Add installers subdir to directories target.

4 months agoImprove error messages for dup packages
Andre Heinecke [Wed, 24 Feb 2016 10:00:22 +0000 (11:00 +0100)]
Improve error messages for dup packages

* configure.ac: Print removal hint for duplicate packages.
* m4/gpg4win.m4 (GPG4WIN_FIND): Store potentially dup file names.

4 months agoRemove override template hacks
Andre Heinecke [Tue, 23 Feb 2016 13:36:11 +0000 (14:36 +0100)]
Remove override template hacks

* src/Makefile.am: Use qtpkg template. Update qt package defines.
* src/gpg4win.mk.in: Add boost template and qt package template.

--
The override of targets was a hack and led to warnings and it
also did not simplify things much. Now we have a bit more template
duplication but things are simpler.
Especially boost build was extremly fragile with the configure
target creating the make stamps.

4 months agoDo not call make three times
Andre Heinecke [Tue, 23 Feb 2016 13:34:52 +0000 (14:34 +0100)]
Do not call make three times

* src/gpg4win.mk.in (SPKG_template, SPKG_EX_template): Do not
 call make three times. Reindent SPKG configure.

4 months agoBuild with -e
Andre Heinecke [Tue, 23 Feb 2016 13:32:13 +0000 (14:32 +0100)]
Build with -e

* src/Makefile.am: Fix errors.
* src/gpg4win.mk.in: Inject -e through variable setters.

--
Undetected build errors can lead to horrible horrible follow up
errors especially if something like mkdir / change dir fails
and commands get executed in wrong directories.

4 months agoFix circular dependency typo for kiconthemes
Andre Heinecke [Tue, 23 Feb 2016 13:29:27 +0000 (14:29 +0100)]
Fix circular dependency typo for kiconthemes

* configure.ac: Fix kiconthemes dependency

4 months agoHack patches to avoid picking up build sys libs
Andre Heinecke [Tue, 23 Feb 2016 13:28:16 +0000 (14:28 +0100)]
Hack patches to avoid picking up build sys libs

* patches/kconfigwidgets/0001-Make-QDbus-optional.patch,
 kiconthemes/0001-Make-DBus-optional.patch: Don't make dbus optional
 for Windows.

--
This can lead to the dependency beeing picked up from the build
system and not for the target system.

4 months agoFix last kxmlgui patch permissions
Andre Heinecke [Mon, 22 Feb 2016 16:21:14 +0000 (17:21 +0100)]
Fix last kxmlgui patch permissions

* patches/kxmlgui/0005-Use-non-native-Language-name-as-fallback.patch:
  Make executable

4 months agoUpdate kleo snapshot
Andre Heinecke [Mon, 22 Feb 2016 15:02:53 +0000 (16:02 +0100)]
Update kleo snapshot

* packages/packages.current(kleopatra): Update.

4 months agoAdd patch for language name fallback in xmlgui
Andre Heinecke [Mon, 22 Feb 2016 09:52:33 +0000 (10:52 +0100)]
Add patch for language name fallback in xmlgui

* Makefile.am (EXTRA_DIST): Add patch.
* patches/kxmlgui/0005-Use-non-native-Language-name-as-fallback.patch:
 New.

--
This is upstream review request: 127136

4 months agoUninstall additional files
Andre Heinecke [Fri, 19 Feb 2016 14:16:31 +0000 (15:16 +0100)]
Uninstall additional files

* src/uninst-gpgmepp.nsi: Fix QGpgme file name.
* src/uninst-kleopatra.nsi: Uninst kcm and desktop files.

4 months agoWrite breeze icon theme into kdeglobals
Andre Heinecke [Fri, 19 Feb 2016 14:15:47 +0000 (15:15 +0100)]
Write breeze icon theme into kdeglobals

* src/inst-kleopatra.nsi: Write breeze theme.
--
Without this entry KDE tries to find oxygen and fails in
strange ways if this can't be found.