diff --git a/Makefile.am b/Makefile.am
index 9e1f3dc3..3b1e085c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,87 +1,86 @@
# Makefile.am - Installer for GnuPG 4 Windows Makefile.
# Copyright (C) 2005, 2008, 2012 g10 Code GmbH
#
# This file is part of GPG4Win.
#
# GPG4Win 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 of the License, or
# (at your option) any later version.
#
# GPG4Win 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 .
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
DISTCHECK_CONFIGURE_FLAGS = --host=i686-w64-mingw32
SUBDIRS = po packages doc src
# find patches -type f | sort | sed 's/$/ \\/' | sed 's/^/ /'
EXTRA_DIST = autogen.sh README.GIT ONEWS \
doc/license-page doc/GPLv3 \
build-aux/git-log-footer build-aux/git-log-fix \
patches/boost/boost-1-fixes.patch \
- patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch \
patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
patches/glib-2.41.5/01-socket.patch \
patches/glib-2.41.5/02-formatsec.patch \
patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
patches/kiconthemes/0001-Make-DBus-optional.patch \
patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
patches/kleopatra/fix-qt5.6-build.patch \
patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
patches/libgpg-error-1.29/0001-doc-Fix-yat2m-build-for-cross-compilation.patch \
patches/qtbase/config-standardpaths.patch \
patches/qtbase/qtbase-mingw-fixes.patch \
patches/qtbase/relative-paths.patch \
patches/qttools/disable-most-tools.patch \
patches/qtwinextras/support-xp.patch \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches/breeze-icons/0001-Make-binary-icons-cross-compilable.patch
copy-news:
cp NEWS doc/website/NEWS.last
copy-release: gpg4win-$(VERSION).tar.bz2 installers/gpg4win-$(VERSION).exe \
installers/gpg4win-light-$(VERSION).exe \
installers/gpg4win-vanilla-$(VERSION).exe
@echo Copying $(VERSION) to $(RELEASEHOST) >&2
@set -e;\
if ssh "$$(echo $(RELEASEHOST)|cut -d: -f -1)" \
test -f "$$(echo $(RELEASEHOST)/gpg4win-$(VERSION).exe|cut -d: -f2-)";\
then echo "This release has already been copied to the server" >&2 ;\
else scp gpg4win-$(VERSION).tar.bz2 \
installers/gpg4win-$(VERSION).exe \
installers/gpg4win-light-$(VERSION).exe \
installers/gpg4win-vanilla-$(VERSION).exe \
installers/gpg4win-src-$(VERSION).exe $(RELEASEHOST)/ ;\
for f in en de ; do \
scp src/README.$$f.txt \
$(RELEASEHOST)/README-$(VERSION).$$f.txt; \
done;\
fi
dist-hook: gen-ChangeLog
gen_start_date = 2012-03-26T00:00:00
.PHONY: gen-ChangeLog
gen-ChangeLog:
set -e; \
if test -d $(top_srcdir)/.git; then \
(cd $(top_srcdir) && \
$(GITLOG_TO_CHANGELOG) --append-dot --tear-off \
--amend=build-aux/git-log-fix \
--since=$(gen_start_date) ) > $(distdir)/cl-t; \
cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\
rm -f $(distdir)/ChangeLog; \
mv $(distdir)/cl-t $(distdir)/ChangeLog; \
fi
diff --git a/README b/README
index 2770fb7b..74f22ca6 100644
--- a/README
+++ b/README
@@ -1,181 +1,181 @@
This is gpg4win - the GUI Installer Builder for W32.
See also the file doc/README.en.txt.
For MSI Package instructions see src/README-msi.txt.
Instructions:
=============
1. Download the source and binary packages that are required to build
the installer:
$ cd packages
$ sh download.sh
[...]
$ cd ..
1.5 (Only necessary when building from Git)
$ ./autogen.sh
2. Configure the source tree for cross compilation:
$ ./autogen.sh --build-w32
3. Build the installer:
$ make
The installer will be made available in two files:
src/installers/gpg4win-X.Y.Z.exe
src/installers/gpg4win-src-X.Y.Z.exe
Basic requirements
==================
A decent POSIX system is required for building this software as well
as GNU make. We are using Debian GNU/Linux 10 (buster), any other
POSIX system should work as well but you may run into problems due to
different toolchain versions. For MSI Packages you will additionally
need the dependencies mentioned in src/README-msi.txt
To satisfy all needs of configure at least the following packages need
to be installed:
build-essential autoconf automake mingw-w64 mingw-w64-i686-dev \
- mingw-w64-x86-64-dev nsis stow unzip imagemagick texlive \
+ mingw-w64-x86-64-dev nsis stow unzip icoutils texlive \
libglib2.0-dev gettext docbook-utils ghostscript \
texinfo libgdk-pixbuf2.0-dev texlive-latex-extra libqt4-dev-bin \
wget mingw-w64 texlive-lang-german cmake libgtk2.0-bin libxml2-utils \
gperf libgettextpo-dev automake-1.15
Building the Webpages
=====================
The website is in the dedicated branch "website" in the git reposity.
Checkout that branch and read the instructions:
git checkout website
Development Branches
====================
The old version of gpg4win (version < 1.2) is since 1.1.3 tracked by
the GIT branch: gpg4win-1-branch. Only important fixes will go into
this version. The current version in the GIT master starts as version
1.9.
Adding new packages to the installer:
=====================================
This requires editing a couple of files; we might eventually automate
some of these tasks. Here is a short run up:
1. Add constants for the package FOO into src/config.nsi.in .
2. Create 2 new installer scripts, named src/inst-foo.nsi and
uninst-foo.nsi and add them to EXTRA_DIST in src/Makefile.am.
3. Add foo to one the variables gpg4win_bpgks (if foo should not be
build be the gpg4win) or gpg4win_spkgs (if foo should be build by
gpg4win) in src/Makefile.am . Also add any required configure
flags etc.
4. Add FOO to src/inst-sections.nsi.
5. Add detection of packages to configure.ac. Check out the available
macros in m4/gpg4win.m4. Depending on the way an upstream package
is packaged, you might need to write a new macro.
6. Add download information to packages/download.sh.
7. If the package ships pkg-config (*.pc) support files, you need add
post install instructions to Makefile.am. Note that *.pc files may
be in the "runtime" directory ${pkgidir} if the package is built
within gpg4win (or peculiarly shipped), or in the development
package ${pkgidir_dev}.
8. Add the installed files to the mkportable headers.
Then run the usual "./autogen.sh" to create the actual configure file
and run configure as described above.
Kleopatra Locatization
======================
The kde-l10n package is generated with the script src/kde-l10n.sh
execute it after a build to generate an updated l10n package which
you can then upload and add to packages.current.
The tarballs and the nsis scripts are located in the temp directory
kde-l10n prints as output.
Installer Slideshow
===================
During installation we are showing a slide show. If you want to
change the contents shown add / modify files in the src/slideshow
subfolder. Install them in inst-gpg4win.nsi (Add them to the list
of files before g4wihelp::slide_show) and modify
src/slideshow/slides.dat accordingly.
Version numbers
===============
We use a specific order of version numbers. This is best shown by an
example:
2.1.1 - The final 2.1.1 release.
2.1.1-beta88 - A snapshot before the 2.1.1 release.
(The 88 in this example is the number of
commits since the last release).
The important point is that we bump up the version number before we do
an release and append a suffix to mark it as a development version.
This allows other software to use a configure check for the next to be
released version of gpg4win.
Copyright
=========
The entire Gpg4win package is
Copyright (C) 2005, 2006, 2007, 2008, 2009, 2012, 2013 g10 Code GmbH
GPG4Win 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 of the License, or
(at your option) any later version.
GPG4Win 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, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA
This file
=========
Copyright 2005, 2006, 2008 g10 Code GmbH
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
modifications, as long as this notice is preserved.
This file is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE.
diff --git a/patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch b/patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch
deleted file mode 100755
index 24cf44c4..00000000
--- a/patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-#! /bin/sh
-patch -p1 -l -f $* < $0
-exit $?
-
-From 9032d5c41ada1c50eddf6ea5562887af7a941aa9 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke
-Date: Thu, 4 Feb 2016 11:00:31 +0100
-Subject: [PATCH] Add convert utility support for Windows icons
-
----
- find-modules/FindConvert.cmake | 66 ++++++++++++++++++++++++++++++++++++++++++
- modules/ECMAddAppIcon.cmake | 27 +++++++++++++----
- 2 files changed, 88 insertions(+), 5 deletions(-)
- create mode 100644 find-modules/FindConvert.cmake
-
-diff --git a/find-modules/FindConvert.cmake b/find-modules/FindConvert.cmake
-new file mode 100644
-index 0000000..a723c37
---- /dev/null
-+++ b/find-modules/FindConvert.cmake
-@@ -0,0 +1,66 @@
-+#.rst:
-+# FindConvert
-+# -----------
-+#
-+# Try to find convert.
-+#
-+# If the convert executable is not in your PATH, you can provide
-+# an alternative name or full path location with the ``Convert_EXECUTABLE``
-+# variable.
-+#
-+#=============================================================================
-+# Copyright 2016 Intevation GmbH
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# 1. Redistributions of source code must retain the copyright
-+# notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+# notice, this list of conditions and the following disclaimer in the
-+# documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+# derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
-+
-+ecm_find_package_version_check(Convert)
-+
-+find_program(Convert_EXECUTABLE NAMES convert)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Convert
-+ FOUND_VAR
-+ Convert_FOUND
-+ REQUIRED_VARS
-+ Convert_EXECUTABLE
-+)
-+
-+mark_as_advanced(Convert_EXECUTABLE)
-+
-+if (Convert_FOUND)
-+ if (NOT TARGET Convert::Convert)
-+ add_executable(Convert::Convert IMPORTED)
-+ set_target_properties(Convert::Convert PROPERTIES
-+ IMPORTED_LOCATION "${Convert_EXECUTABLE}"
-+ )
-+ endif()
-+endif()
-+
-+include(FeatureSummary)
-+set_package_properties(Convert PROPERTIES
-+ URL "http://www.imagemagick.org/"
-+ DESCRIPTION "Generic image format conversion tool from imagemagick."
-+)
-diff --git a/modules/ECMAddAppIcon.cmake b/modules/ECMAddAppIcon.cmake
-index 5233a5f..2b5dca1 100644
---- a/modules/ECMAddAppIcon.cmake
-+++ b/modules/ECMAddAppIcon.cmake
-@@ -192,8 +192,11 @@
- if (WIN32 AND (windows_icons_modern OR windows_icons_classic))
- set(saved_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}")
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_FIND_MODULE_DIR})
-- find_package(Png2Ico)
-- find_package(IcoTool)
-+ find_package(Convert)
-+ if (NOT Convert_FOUND)
-+ find_package(IcoTool)
-+ find_package(Png2Ico)
-+ endif()
- set(CMAKE_MODULE_PATH "${saved_CMAKE_MODULE_PATH}")
-
- function(create_windows_icon_and_rc command args deps)
-@@ -204,6 +207,10 @@
- DEPENDS ${deps}
- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
- )
-+
-+ if (Convert_FOUND OR Png2Ico_FOUND)
-+ set(${appsources} "${${appsources}};${_outfilename}.rc" PARENT_SCOPE)
-+ if (NOT Png2Ico_HAS_RCFILE_ARGUMENT)
- # this bit's a little hacky to make the dependency stuff work
- file(WRITE "${_outfilename}.rc.in" "IDI_ICON1 ICON DISCARDABLE \"${_outfilename}.ico\"\n")
- add_custom_command(
-@@ -220,6 +220,8 @@
- DEPENDS "${_outfilename}.ico"
- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
- )
-+ endif()
-+ endif()
- endfunction()
-
- if (IcoTool_FOUND)
-@@ -270,8 +281,6 @@
-
- set(${appsources} "${${appsources}};${_outfilename}.rc" PARENT_SCOPE)
- # else none of the supported tools was found
-- else()
-- message(WARNING "Unable to find the png2ico or icotool utilities or icons in matching sizes - application will not have an application icon!")
- endif()
- elseif (APPLE AND (mac_icons OR mac_sidebar_icons))
- # first generate .iconset directory structure, then convert to .icns format using the Mac OS X "iconutil" utility,
---
-2.1.4