gpg4win.git
3 years 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 years 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 years 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 years 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 years 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 years 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 years 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 years 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 years 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 years 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 years 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 years 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.

3 years 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.

3 years 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.

3 years 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.

3 years 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.

3 years 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.

3 years 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.

3 years 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

3 years 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.

3 years 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

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

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

3 years 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

3 years 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.

3 years 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.

3 years agoUpdate GnuPG to 2.1.11
Andre Heinecke [Fri, 19 Feb 2016 14:15:06 +0000 (15:15 +0100)]
Update GnuPG to 2.1.11

* packages/packages.current (gnupg-w32): Update.

3 years agoAdd kde-l10n package
Andre Heinecke [Fri, 19 Feb 2016 14:13:43 +0000 (15:13 +0100)]
Add kde-l10n package

* configure.ac, packages/packages.current,
  src/Makefile.am, src/config.nsi.in, src/inst-sections.nsi:
 Add KDE-l10n package.
* src/inst-kde-l10n.nsi, src/uninst-kde-l10n.nsi: Add files generated
 by kde-l10n.sh

3 years agoDo not install translations as part of xmlgui
Andre Heinecke [Fri, 19 Feb 2016 14:11:59 +0000 (15:11 +0100)]
Do not install translations as part of xmlgui

* src/inst-kxmlgui.nsi, src/uninst-kxmlgui.nsi: Do not install l10n
--

This will be done with a new kde-l10n package

3 years agoAdd script to generate KDE translations.
Andre Heinecke [Fri, 19 Feb 2016 14:04:47 +0000 (15:04 +0100)]
Add script to generate KDE translations.

* src/kde-l10n.sh: New.
* README: Add note about this.

--
The script generates installation scripts for all the KDE packages,
as it only makes sense to ship localizations that are also
available for kleopatra.

3 years agoInstall logging conf for Kleo and config desktops
Andre Heinecke [Thu, 18 Feb 2016 15:15:43 +0000 (16:15 +0100)]
Install logging conf for Kleo and config desktops

* src/inst-kleopatra.nsi: Install qt logging conf.
  Install config desktop files.
* src/uninst-kleopatra.nsi: Uninstall this.

--
While we don't use KService and real desktop file parsing
anymore we still use them to get a localized name of the config
module and the icon name.

3 years agoAdd missing qt patch for relative paths
Andre Heinecke [Wed, 17 Feb 2016 15:33:18 +0000 (16:33 +0100)]
Add missing qt patch for relative paths

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

3 years agoExplicitly configure gpgex-ex to use -ex libs
Andre Heinecke [Wed, 17 Feb 2016 10:30:04 +0000 (11:30 +0100)]
Explicitly configure gpgex-ex to use -ex libs

* src/Makefile.am (gpg4win_pkg_gpgex_configure): New. Use -ex libs.

--
Without this the x86 variant of the libaries were picked up on another
build system.

3 years agoRemove kleopatra dirs in share on uninstall
Andre Heinecke [Wed, 17 Feb 2016 10:23:22 +0000 (11:23 +0100)]
Remove kleopatra dirs in share on uninstall

* src/uninst-kleopatra: Remove additional dirs.

3 years agoInclude glib dir when building gpgme
Andre Heinecke [Wed, 17 Feb 2016 10:20:43 +0000 (11:20 +0100)]
Include glib dir when building gpgme

* src/Makefile.am (gpg4win_pkg_gpgme_configure): Include glib dir.

--
Don't  really understand why this was not necessary before.

3 years agoFix Kleopatra and Breeze-Icons source installation
Andre Heinecke [Wed, 17 Feb 2016 09:59:22 +0000 (10:59 +0100)]
Fix Kleopatra and Breeze-Icons source installation

* src/config.nsi.in: Remove unused defines.
* src/inst-breeze-icons.nsi: Install source package.
* src/uninst-breeze-icons.nsi, src/uninst-kleopatra.nsi:
 Uninstall source package.

3 years agoBuild kleopatra from KDE Master with patches
Andre Heinecke [Wed, 17 Feb 2016 09:57:26 +0000 (10:57 +0100)]
Build kleopatra from KDE Master with patches

* Makefile.am (EXTRA_DIST): Add patches.
* packages/packages.current: Use unmodified git master tarball.
* patches/kleopatra: Add patches not yet upstream.
* src/Makefile.am: Add necessary build defines.

--
The Tarball used before contained uncommited changes. Now
the changes are cleaned up into functional patches.

3 years agoFix qt plugin install path
Andre Heinecke [Tue, 16 Feb 2016 14:36:41 +0000 (15:36 +0100)]
Fix qt plugin install path

* src/inst-qtbase.nsi, src/inst-qtsvg.nsi: Install plugins in bin.
* src/uninst-qtbase.nsi, src/uninst-qtsvg.nsi: Update accordingly.

3 years agoRemove source directory before unpack
Andre Heinecke [Tue, 16 Feb 2016 14:35:23 +0000 (15:35 +0100)]
Remove source directory before unpack

* src/gpg4win.mk.in (DEFLATE_macro): Remove source dir.

--
If a patch creates a new file unpack / patch will fail otherwise
on nonclean builds.

3 years agoUpdate KXmlGui GlobalAccel patch to match upstream
Andre Heinecke [Tue, 9 Feb 2016 11:42:43 +0000 (12:42 +0100)]
Update KXmlGui GlobalAccel patch to match upstream

* patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch:
 Update patch to upstream version.

3 years agoFix dependencies for KDE Frameworks packages
Andre Heinecke [Tue, 9 Feb 2016 11:22:25 +0000 (12:22 +0100)]
Fix dependencies for KDE Frameworks packages

* configure.ac: Fix dependencies of KDE Frameworks.

--
Nearly all Tier 1 Frameworks depend on qttools for linguist.
Breeze Icons depends on Qt.

3 years agoUpdate XMLGui DBus optional patch
Andre Heinecke [Tue, 9 Feb 2016 11:19:57 +0000 (12:19 +0100)]
Update XMLGui DBus optional patch

* patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch: Update.
* src/Makefile.am (gpg4win_pkg_kxmlgui_configure): Add new options.

--
The updated patch fixes the installed cmake config and adds the
optional stuff as an option which has more chance to go upstream.

3 years agoUse respun tarball for Kleopatra
Andre Heinecke [Tue, 9 Feb 2016 11:19:11 +0000 (12:19 +0100)]
Use respun tarball for Kleopatra

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

--
The old one extracted into a wrong subdirectory.

3 years agoAdd missing nsi files for kguiaddons & kitemviews
Andre Heinecke [Thu, 4 Feb 2016 15:23:13 +0000 (16:23 +0100)]
Add missing nsi files for kguiaddons & kitemviews

* src/inst-kguiaddons.nsi, src/inst-kitemviews.nsi
 src/uninst-kguiaddons.nsi, src/uninst-kitemviews.nsi: New.

--
Accidentally left out in the according commits.

3 years agoMerge branch 'master' into kleo-kf5
Andre Heinecke [Thu, 4 Feb 2016 15:16:40 +0000 (16:16 +0100)]
Merge branch 'master' into kleo-kf5

3 years agoMerge branch 'gpg4win-2'
Andre Heinecke [Thu, 4 Feb 2016 15:16:27 +0000 (16:16 +0100)]
Merge branch 'gpg4win-2'

3 years agoUpdate libpng to 1.4.19
Andre Heinecke [Thu, 4 Feb 2016 15:15:48 +0000 (16:15 +0100)]
Update libpng to 1.4.19

* packages/packages.current (libpng): Update

3 years agoBuild Kleopatra from source. Switch to breeze.
Andre Heinecke [Thu, 4 Feb 2016 14:56:34 +0000 (15:56 +0100)]
Build Kleopatra from source. Switch to breeze.

* configure.ac: Change kleo to KDEPKG add breeze icons.
* packages/packages.current (kleopatra): New.
* src/Makefile.am(EXTRA_DIST): Update. Add index.theme.
  (gpg4win_kdepkgs): Declare new packages
  (gpg4win_bpkgs): Remove kleo and oxygen-icons.
  (gpg4win_bpkgs): Remove bsfilter as its not packaged.
  (gpg4win_pkg_kleopatra_post_install): Disable for now.
* src/config.in.nsi: Update defines.
* src/inst-sections.nsi: Update. Fix kiconthemes include.
* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Update.
* src/inst-breeze-icons.nsi, src/uninst-breeze-icons.nsi:
 New. Generated with help from pkg2nsi.
* src/inst-oxygen-icons.nsi, src/uninst-oxygen-icons.nsi: Removed.
* src/index.theme: Index for hicolor theme is neccessary for QTheme
 support.

--
Phew. For now this installs breeze and breeze-dark themes. Removing
one later will be quick.
Localization is not yet done and Kleopatra itself has some regressions
that need to be fixed.

3 years agoInstall qtsvg iconengine and imageformat
Andre Heinecke [Thu, 4 Feb 2016 14:52:44 +0000 (15:52 +0100)]
Install qtsvg iconengine and imageformat

* src/inst-qtsvg.nsi, src/uninst-qtsvg.nsi: Add files.

--
Needed for breeze icons which are svg only

3 years agoAdd tar.xz support to pkg-to-nsi.pl
Andre Heinecke [Thu, 4 Feb 2016 14:50:41 +0000 (15:50 +0100)]
Add tar.xz support to pkg-to-nsi.pl

* src/pkg-to-nsi.pl: Add tar.xz support

3 years agoAdd patch to use convert to generate icon
Andre Heinecke [Thu, 4 Feb 2016 10:40:26 +0000 (11:40 +0100)]
Add patch to use convert to generate icon

* Makefile.am (EXTRA_DIST): Add patch.
* patches/extra-cmake-modules/
 0001-Add-convert-utility-support-for-Windows-icons.patch: New.

--
Convert is more readily available in most distributions
then png2ico. Convert also does not have the 128px size restriction.

3 years agoInstall various additional files
Andre Heinecke [Wed, 3 Feb 2016 17:51:13 +0000 (18:51 +0100)]
Install various additional files

* inst-gpgmepp.nsi: Install QGpgme.
* inst-kconfig.nsi: Install gui parts.
* inst-kxmgui.nsi: Install translations for generic KDE Strings.
* inst-qtbase.nsi: Install qtnetwork, qtxml and printsupport.
* inst-gpgmepp.nsi,
 inst-kconfig.nsi,
 inst-kxmgui.nsi,
 inst-qtbase.nsi: Update accordingly.

3 years agoAlso build KCModule from configwidgets
Andre Heinecke [Wed, 3 Feb 2016 17:48:38 +0000 (18:48 +0100)]
Also build KCModule from configwidgets

* patches/kconfigwidgets/
 0002-Crudely-remove-KF5Auth-depedency.patch: Updated.

--
They will still be used in Kleopatra but without
the KAuth dependency.

This patch is not ready for upstream and is more
of a hack.

3 years agoRemove DBus
Andre Heinecke [Thu, 28 Jan 2016 18:00:10 +0000 (19:00 +0100)]
Remove DBus

* src/inst-dbus.nsi, src/uninst-dbus.nsi: Removed.
* configure.ac, src/config.nsi.in, src/Makefile.am,
 packages/packages.current, src/inst-sections.nsi: Update accordingly.

--
I am nearly certain now that we can provide Kleopatra for Windows
without dbus.

3 years agoAdd KXmlGui and it's dependencies
Andre Heinecke [Thu, 28 Jan 2016 17:38:19 +0000 (18:38 +0100)]
Add KXmlGui and it's dependencies

Dependencies are: QtSvg, KIconThemes, KItemViews and KConfigWidgets

* patches/kconfigwidgets/0001-Make-QDbus-optional.patch
 patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch
 patches/kiconthemes/0001-Make-DBus-optional.patand
 patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch
 patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
 patches/kxmlgui/0003-Make-KTextWidgets-optional.patch
 patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch
 patches/qtsvg/qtsvg-link-zlib.patch
 src/inst-kconfigwidgets.nsi
 src/inst-kiconthemes.nsi
 src/inst-kxmlgui.nsi
 src/inst-qtsvg.nsi
 src/uninst-kconfigwidgets.nsi
 src/uninst-kiconthemes.nsi
 src/uninst-kxmlgui.nsi
 src/uninst-qtsvg.nsi: New.
* Makefile.am (EXTRA_DIST): Add new Patches.
* configure.ac: Declare new packages.
* pacakges/packages.current: Add new Packages.
* src/Makefile.am: Add new things.
* src/config.nsi.in, src/inst-sections.nsi: Update accordingly.
* src/gpg4win.mk.in: Add Qt hacks for QtSvg.

--
The patches to make some dependencies optional are partly under
review and might make it upstream.

3 years agoAdd KMime
Andre Heinecke [Tue, 26 Jan 2016 09:55:39 +0000 (10:55 +0100)]
Add KMime

* Makefile.am (EXTRA_DIST): Add patches.
* configure.ac: Add KMime.
* packages/packages.current: Add KMime.
* patches/kmime/0001-Check-for-and-replace-strcasestr.patch,
 patches/kmime/0002-Fix-Windows-build.patch: New.
* src/Makefile.am, src/config.nsi.in: Update accordingly.
* src/inst-sections.nsi: Update and fix duplicated kcodecs entry.
* src/inst-kmime.nsi, src/uninst-kmime.nsi: New.

--
Patches were neccessary for Windows build and are already submitted
to upstream for review / inclusion.

3 years agoAdd KCodecs
Andre Heinecke [Mon, 25 Jan 2016 15:40:52 +0000 (16:40 +0100)]
Add KCodecs

* configure.ac: Add packages.
* src/inst-kcodecs.nsi,
 src/uninst-kcodecs.nsi: New:
* src/Makefile.am, src/inst-sections.nsi,
 packages/packages.current, src/config.nsi.in: Update accordingly.

3 years agoAdd libkleo and update gpgmepp
Andre Heinecke [Fri, 22 Jan 2016 14:10:22 +0000 (15:10 +0100)]
Add libkleo and update gpgmepp

* configure.ac: Add package.
* src/inst-libkleo.nsi,
 src/uninst-libkleo.nsi: New:
* src/Makefile.am, src/inst-sections.nsi,
 packages/packages.current, src/config.nsi.in: Update accordingly.
* patches/gpgmepp/0001-Remove-uneccessary-dependency-to-KDEWIN.patch:
 Removed. Applied upstream.
* Makefile.am (EXTRA_DIST): Update accordingly.

3 years agoAdd KCoreAddons
Andre Heinecke [Fri, 22 Jan 2016 10:38:56 +0000 (11:38 +0100)]
Add KCoreAddons

* configure.ac: Add packages.
* src/inst-kcoreaddons.nsi,
 src/uninst-kcoreaddons.nsi: New:
* src/Makefile.am, src/inst-sections.nsi,
 packages/packages.current, src/config.nsi.in: Update accordingly.

3 years agoAdd KWindowsystem and QtWinExtras
Andre Heinecke [Fri, 22 Jan 2016 10:23:43 +0000 (11:23 +0100)]
Add KWindowsystem and QtWinExtras

* configure.ac: Add packages.
* src/inst-kwindowsystem.nsi,
 src/inst-qtwinextras.nsi,
 src/uninst-kwindowsystem.nsi,
 src/uninst-qtwinextras.nsi: New.
* src/Makefile.am, src/inst-sections.nsi,
 packages/packages.current, src/config.nsi.in,
 src/gpg4win.mk.in: Update accordingly.

3 years agoFix gpgmepp patch filename
Andre Heinecke [Fri, 22 Jan 2016 10:06:02 +0000 (11:06 +0100)]
Fix gpgmepp patch filename

* Makefile.am (EXTRA_DIST): Fix filename for second gpgmepp patch.

3 years agoUpdate frameworks and add KCompletion
Andre Heinecke [Fri, 22 Jan 2016 10:02:00 +0000 (11:02 +0100)]
Update frameworks and add KCompletion

* configure.ac: Add Kcompletion as KDEPKG
* packages/packages.current: Update KDE Frameworks. Add KCompletion.
* src/config.nsi.in: Add KCompletion defines.
* src/inst-kcompletion.nsi, src/uninst-kcompletion.nsi: New.
* src/inst-sections.nsi: Add sections for KCompletion.

3 years agoAdd boost, gpgmepp and build qt uitools
Andre Heinecke [Thu, 21 Jan 2016 17:00:59 +0000 (18:00 +0100)]
Add boost, gpgmepp and build qt uitools

* patches/boost/boost-1-fixes.patch,
 patches/gpgmepp/0001-Remove-uneccessary-dependency-to-KDEWIN.patch,
 patches/gpgmepp/0002-disable-variants.patch,
 src/inst-boost.nsi,
 src/inst-gpgmepp.nsi,
 src/uninst-boost.nsi,
 src/uninst-gpgmepp.nsi: New.
* Makefile.am (EXTRA_DIST): Add patches.
* configure.ac: Add gpgmepp, boost. Fix kwidgetsaddon dependencies.
* packages/packages.current: Add boost and gpgmepp.
* patches/qttools/disable-most-tools: Renable qt uitools.
* src/config.nsi.in: Updat for new packages.
* src/gpg4win.mk.in: Add configure override for boost.
* src/toolchain.cmake.in: Fix Root path location.

3 years agoRevert "Remove bzip2"
Andre Heinecke [Thu, 21 Jan 2016 15:26:18 +0000 (16:26 +0100)]
Revert "Remove bzip2"

This reverts commit a07c319c55af5c7eaa082d31faed076d793be542.

Conflicts:
src/inst-sections.nsi

3 years agoAdd KWidgetsAddons Package
Andre Heinecke [Thu, 21 Jan 2016 13:09:10 +0000 (14:09 +0100)]
Add KWidgetsAddons Package

* src/Makefile.am (EXTRA_DIST): Add inst file.
* configure.ac: Declare KDEPKG
* packages/packages.current: Add kwidgetsaddons.
* src/config.nsi.in: Define according macros.
* src/inst-kwidgetsaddons.nsi, src/uninst-kwidgetsaddons.nsi: New.
* src/inst-sections.nsi: Include kwidgetsaddons for kleo.

3 years agoAdd KI18n Package
Andre Heinecke [Thu, 21 Jan 2016 12:58:53 +0000 (13:58 +0100)]
Add KI18n Package

* Makefile.am (EXTRA_DIST): Add patch.
* configure.ac: Declare KDEPKG
* packages/packages.current: Add ki18n.
* patches/ki18n/no-tests.patch: New. Removes dependency to
  QtConcurrent and QML.
* src/config.nsi.in: Define according macros.
* src/inst-ki18n.nsi, src/uninst-ki18n.nsi: New.
* src/inst-sections.nsi: Include ki18n for kleo.

3 years agoAdd first KDE Framework and infrastructure for it
Andre Heinecke [Mon, 11 Jan 2016 13:39:21 +0000 (14:39 +0100)]
Add first KDE Framework and infrastructure for it

This also adds qttools and extra-cmake-modules

* patches/qttools/disable-most-tools.patch: New.
* Makefile.am (EXTRA_DIST): Add qttools patch.
* configure.ac: Add new packages.
* src/toolchain.cmake.in: New. CMake toolchain file.
* m4/gpg4win.m4 (GPG4WIN_KDEPKG): Add KDE style package support.
* packages/packages.current: Add qttools, ecm and kconfig.
* src/Makefile.am (EXTRA_DIST): Add new install files.
 (gpg4win_kdepkgs): New list of kde style packages.
 (gpg4win_pkg_qtbase_post_install): Fix qt post install hack.
 (gpg4win_pkg_qttools_post_install): Hack for qmake brokenness.
* src/config.nsi.in: Add new package definitions.
* src/gpg4win.mk.in (DEFLATE_macro): Extract qttools.
 (KDEPKG_template_): New template for CMake / KDE projects.
 (OVERRIDE_QTTOOLS_CONF_TEMPLATE): Hack to avoid qmake templates.
* src/inst-sections.nsi: Add new sections.
* src/inst-extra-cmake-modules.nsi,
 src/inst-qttools.nsi,
 src/uninst-extra-cmake-modules.nsi,
 src/uninst-qttools.nsi: New. Only install sources.
* src/inst-kconfig.nsi,
 src/uninst-kconfig.nsi: New. Install KF5ConfigCore

3 years agoRemove Kleowrap and Gpgwrap
Andre Heinecke [Fri, 8 Jan 2016 13:50:42 +0000 (14:50 +0100)]
Remove Kleowrap and Gpgwrap

* src/gpgwrap.c, src/kleowrap.c: Begone.
* src/Makefile.am: Remove gpgwrap / kleowrap stuff.

3 years agoInstall binaries into bin subfolder
Andre Heinecke [Fri, 8 Jan 2016 13:43:21 +0000 (14:43 +0100)]
Install binaries into bin subfolder

* src/gpgol.nsi, src/gpgex.nsi: Install x64 binaries in bin_64
* src/gpa.nsi: Do not install into pub.
* src/inst-atk.nsi
  src/inst-cairo.nsi
  src/inst-dbus.nsi,
  src/inst-expat.nsi,
  src/inst-fontconfig.nsi,
  src/inst-freetype.nsi,
  src/inst-gdk-pixbuf.nsi,
  src/inst-gettext.nsi,
  src/inst-glib.nsi,
  src/inst-gpa.nsi,
  src/inst-gpg4win.nsi,
  src/inst-gpgex.nsi,
  src/inst-gpgme.nsi,
  src/inst-gpgol.nsi,
  src/inst-gtk+.nsi,
  src/inst-kleopatra.nsi,
  src/inst-libassuan.nsi,
  src/inst-libffi.nsi,
  src/inst-libgpg-error.nsi,
  src/inst-libiconv.nsi,
  src/inst-libpng.nsi,
  src/inst-pango.nsi,
  src/inst-paperkey.nsi,
  src/inst-pinentry.nsi,
  src/inst-qtbase.nsi,
  src/inst-sections.nsi,
  src/inst-w32pth.nsi,
  src/inst-zlib.nsi,
  src/uninst-atk.nsi,
  src/uninst-cairo.nsi,
  src/uninst-claws-mail-cmds.nsi,
  src/uninst-dbus.nsi,
  src/uninst-expat.nsi,
  src/uninst-fontconfig.nsi,
  src/uninst-freetype.nsi,
  src/uninst-gdk-pixbuf.nsi,
  src/uninst-gettext.nsi,
  src/uninst-glib.nsi,
  src/uninst-gpa.nsi,
  src/uninst-gpg4win.nsi,
  src/uninst-gpgex.nsi,
  src/uninst-gpgme.nsi,
  src/uninst-gpgol.nsi,
  src/uninst-gtk+.nsi,
  src/uninst-kleopatra.nsi,
  src/uninst-libassuan.nsi,
  src/uninst-libffi.nsi,
  src/uninst-libgpg-error.nsi,
  src/uninst-libiconv.nsi,
  src/uninst-libpng.nsi,
  src/uninst-pango.nsi,
  src/uninst-paperkey.nsi,
  src/uninst-pinentry.nsi,
  src/uninst-qtbase.nsi,
  src/uninst-w32pth.nsi,
  src/uninst-zlib.nsi: Install binaries into bin.

--
This removes the need for Kleowrap. This will also fix
"Pinned to taskbar" Kleopatra instances where the shortcut
would not be to Kleowrap otherwise.

Basically this should fix most of the reports where
Kleopatra fails to start because DLL's can't be found.

3 years agoFix Qt5 installation
Andre Heinecke [Fri, 8 Jan 2016 12:05:23 +0000 (13:05 +0100)]
Fix Qt5 installation

* src/Makefile.am (EXTRA_DIST): Remove qt.conf
* src/inst-pinentry.nsi: Fix check for qt section.
* src/qt.conf: Removed. Not neccessary anmyore.
* src/inst-qtbase.nsi: Install Qt5Widgets. Remove image plugins.
  Fix platform plugin path.
* src/uninst-qtbase.nsi: Update accordingly.

--
Imageformat plugins should be readded if we are sure that
we need them.

3 years agoUpdate GpgOL to latest development snapshot
Andre Heinecke [Thu, 7 Jan 2016 11:43:51 +0000 (12:43 +0100)]
Update GpgOL to latest development snapshot

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

3 years agoBuild Qt5 from source
Andre Heinecke [Thu, 7 Jan 2016 11:27:36 +0000 (12:27 +0100)]
Build Qt5 from source

* Makefile.am (EXTRA_DIST): Add patches
* configure.ac: Add qtbase as SPKG
* packages/packages.current: Add qtbase remove qt binary pacakge.
* patches/qtbase-5.5.1/fix-freetype-link.patch,
  patches/qtbase-5.5.1/fix-oci-detect.patch,
  patches/qtbase-5.5.1/fix-syssemaphore.patch,
  patches/qtbase-5.5.1/fix-zlib-link.patch: New. Mainly from MXE.
* src/Makefile.am (EXTRA_DIST): Add / Remove files.
  (gpg4win_pkg_qtbase_configure): New.
  (gpg4win_pkg_qtbase_make_args),
  (gpg4win_pkg_qtbase_post_install): Workaround QTBUG-30898
  (gpg4win_bpkgs): Remove qt.
* src/config.nsi.in: Change QT to QTBASE
* src/gpg4win.mk.in (DEFLAGE_macro): Transform Qtbase dir name.
  (OVERRIDE_CONF_TEMPLATE): New. Override configure step of SPKGs.
  Call it for Qtbase.
* src/gpg4win.nsi: Change QT to QTBASE
* src/inst-qt.nsi, src/uninst-qt.nsi: Removed.
* src/inst-qtbase.nsi, src/uninst-qtbase: New. Minimal install for
  pinentry.
* src/inst-sections.nsi: Update section name.

--
First step to build Kleopatra and dependencies from source.
For now the Qt installation is only used by Pinentry and Kleopatra
installation is broken.

The name was changed to qtbase as we might want to add additionall
qt modules if neccessary in the future.

3 years agoDefault to parallel make
Andre Heinecke [Thu, 7 Jan 2016 11:23:57 +0000 (12:23 +0100)]
Default to parallel make

* configure.ac (GPG4WIN_PARALLEL): Set to nproc count if unset.

--
This drastically speeds up build times on multi core systems.
Building package tragets in parallel jobs might also help.

3 years agoUpdate GpgOL to latest development snapshot
Andre Heinecke [Fri, 11 Dec 2015 17:16:32 +0000 (18:16 +0100)]
Update GpgOL to latest development snapshot

--

3 years agoAdd some NEWS and update READMES
Andre Heinecke [Fri, 11 Dec 2015 17:14:35 +0000 (18:14 +0100)]
Add some NEWS and update READMES

--

3 years agoMark called uninstallers rebootok
Andre Heinecke [Fri, 11 Dec 2015 17:12:25 +0000 (18:12 +0100)]
Mark called uninstallers rebootok

* src/inst-gpg4win.nsi, src/uninst-gnupg-w32.nsi: Mark as rebootok.

--
This is a very very bad workaround the fact that I can't seem
to delete the uninstallers after execution. Have to figure out
why. We also need better killing code as currently rebootok is
triggered nearly always.

3 years agoWrite instdir reg key correctly. Don't add path.
Andre Heinecke [Fri, 11 Dec 2015 17:10:50 +0000 (18:10 +0100)]
Write instdir reg key correctly. Don't add path.

* src/inst-gpg4win.nsi: Write the registry key correctly,
  don't add pub dir to path.

--
The pub dir will be removed in future versions. For now
it only contains GPA.

3 years agoUpdate gnupg-w32, pinentry, libassuan
Andre Heinecke [Fri, 11 Dec 2015 10:11:29 +0000 (11:11 +0100)]
Update gnupg-w32, pinentry, libassuan

* packages/packages.current: Update.

3 years agoUpdate gpgol and enable mime send
Andre Heinecke [Wed, 9 Dec 2015 11:05:06 +0000 (12:05 +0100)]
Update gpgol and enable mime send

* packages/packages.current (gpgol): Update to latest dev. version.
* src/Makefile.am: Configure gpgol to use mime-send and new reg keys.

3 years agoUninstall old version on update
Andre Heinecke [Tue, 8 Dec 2015 16:28:32 +0000 (17:28 +0100)]
Uninstall old version on update

* src/inst-gpg4win.nsi (CheckExistingVersion): Remove message boxes.
* src/installer.nsi: Call uninstaller of old version if neccessary.
* src/uninst-gnupg-w32.nsi: Fix waiting for the uninstaller.

--
The messages provided no real information or choices. Uninstalling
is also cleaner then the usual case of overwriting.

3 years agoUpdate mkportable
Sean Engelhardt [Tue, 8 Dec 2015 10:02:23 +0000 (11:02 +0100)]
Update mkportable

* src/mkportable-full.h: remove references to non existing files,
  link existing files to their new file-path
* src/mkportable-light.h: remove references to non existing files,
  link existing files to their new file-path
* src/mkportable-vanilla.h: remove references to non existing files,
  link existing files to their new file-path
* src/mkportable.c: adjust the new path of gpgconf.exe

3 years agoAsk to uninstall old versions on upgrade
Sean Engelhardt [Tue, 8 Dec 2015 14:12:01 +0000 (15:12 +0100)]
Ask to uninstall old versions on upgrade

* src/installer.nsi (CheckExistingVersion): Ask to uninstall
 old version.

--
If an other version was detected, the user will receive an
accordingly information. If the user chooses to proceed the
installation, the uninstaller of the old version will be executed.

Commit message amended by Andre Heinecke <aheinecke@intevation.de>

3 years agoRemove obsolete patches from 2.x merge
Andre Heinecke [Mon, 30 Nov 2015 14:40:24 +0000 (15:40 +0100)]
Remove obsolete patches from 2.x merge

* patches/gnupg2-2.0.29: Removed.

3 years 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.

3 years agoMerge branch 'gpg4win-2'
Andre Heinecke [Thu, 26 Nov 2015 08:32:11 +0000 (19:02 +1030)]
Merge branch 'gpg4win-2'

Conflicts:
Makefile.am
NEWS
configure.ac
packages/packages.current
src/Makefile.am

3 years agoRemove claws license from pkg-copyright
Andre Heinecke [Wed, 25 Nov 2015 13:15:44 +0000 (14:15 +0100)]
Remove claws license from pkg-copyright

* doc/pkg-copyright.txt: Remove claws copyright.

--
Since 2.2.6 we don't include claws anymore.

3 years agoUpdate gpgex and install new translations
Andre Heinecke [Mon, 23 Nov 2015 11:47:12 +0000 (12:47 +0100)]
Update gpgex and install new translations

* packages/packages.current(gpgol): update
* src/inst-gpgex.nsi, src/uninst-gpgex.nsi: Inst / uninst new files.

(cherry picked from commit cfa1a2d031fd72fb2c354a714df50521ca0e5fd0)

3 years agoPost release updates. For 2.x branch.
Andre Heinecke [Tue, 24 Nov 2015 17:53:13 +0000 (18:53 +0100)]
Post release updates. For 2.x branch.

* configure.ac, NEWS: Bump version.

3 years agoUpdate NEWS and Readme's for 2.3.0 gpg4win-2.3.0
Andre Heinecke [Tue, 24 Nov 2015 17:43:13 +0000 (18:43 +0100)]
Update NEWS and Readme's for 2.3.0

* NEWS: Mention security advisory. Fix kleo version.
* doc/README.de.txt, doc/README.en.txt: Update with news.

3 years agoUpdate gpgol to 1.3.0
Andre Heinecke [Tue, 24 Nov 2015 09:16:21 +0000 (10:16 +0100)]
Update gpgol to 1.3.0

* NEWS: Update versions. Also for gpgex.
* packages/packages.current (gpgol): Update to 1.3.0

3 years agoAdd branding text to show version and variant
Andre Heinecke [Tue, 24 Nov 2015 09:15:00 +0000 (10:15 +0100)]
Add branding text to show version and variant

* src/installer.nsi: Add branding text.
--
This is useful information to show down there and avoids
the problem that ugly NSIS version strings are rendered into
the branding text.

3 years agoUpdate gpgol and install new translations
Andre Heinecke [Mon, 23 Nov 2015 11:47:12 +0000 (12:47 +0100)]
Update gpgol and install new translations

* packages/packages.current(gpgol): update
* src/inst-gpgex.nsi, src/uninst-gpgex.nsi: Inst / uninst new files.

3 years agoUpdate GpgOL
Andre Heinecke [Mon, 23 Nov 2015 10:42:34 +0000 (11:42 +0100)]
Update GpgOL

* NEWS: Mention changes
* packages/packages.current (gpgol): Update to beta116

3 years agoUse fixed kleopatra package
Andre Heinecke [Mon, 23 Nov 2015 10:27:34 +0000 (11:27 +0100)]
Use fixed kleopatra package

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

--
Due to a build error the old package contained binaries that
were not build from current git but from an uncommited development
version.

3 years agoAdded 'Outlook 2016' support to README.
Emanuel Schuetze [Mon, 16 Nov 2015 14:04:17 +0000 (15:04 +0100)]
Added 'Outlook 2016' support to README.

* doc/README.en.txt, doc/README.de.txt: Updated platform support.

3 years agoFixed typos in NEWS for 2.3.0.
Emanuel Schuetze [Mon, 16 Nov 2015 13:50:44 +0000 (14:50 +0100)]
Fixed typos in NEWS for 2.3.0.

3 years agoAnother fix for nsis-msgfmt mapping
Andre Heinecke [Fri, 13 Nov 2015 15:55:47 +0000 (16:55 +0100)]
Another fix for nsis-msgfmt mapping

* po/nsis-msgfmt.c: Map Chinese simplified and Traditional differently.

--
Still not sure what I am doing here but wihtout this I get warnings
that zh_CN and zh_TW is not used and the strings are mapped to
language 0. With this mapping it appears to work. I've taken
nsis.sourceforge.net/Examples/languages.nsi as an example.

3 years agoUpdate gpgol to -beta104
Andre Heinecke [Fri, 13 Nov 2015 15:03:49 +0000 (16:03 +0100)]
Update gpgol to -beta104

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

--
The libmapi removal contained in beta103 led to a runtime problem.

3 years agoMap zh_TW and zh_CN to their NSIS names.
Andre Heinecke [Fri, 13 Nov 2015 15:01:54 +0000 (16:01 +0100)]
Map zh_TW and zh_CN to their NSIS names.

* po/nsis-msgfmt.c: Fix mapping of zh_TW and zh_CN

3 years agoFix typo in language installation
Andre Heinecke [Fri, 13 Nov 2015 15:01:29 +0000 (16:01 +0100)]
Fix typo in language installation

* src/inst-gpgol.nsi: Fix typo.

3 years agoAdd patch to make libassuan-2.4.0 compile
Andre Heinecke [Fri, 13 Nov 2015 14:59:47 +0000 (15:59 +0100)]
Add patch to make libassuan-2.4.0 compile

* patches/libassuan-2.4.0/
0001-Fix-windows-build-with-mingw-w64-2.0.x.patch: New.
* Makefile.am (EXTRA_DIST): Add this.

--
Not needed on jessie