diff --git a/Makefile.am b/Makefile.am
index b836d805..7ef1a17d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,92 +1,91 @@
# 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/glib-2.41.5/01-socket.patch \
patches/glib-2.41.5/02-formatsec.patch \
patches/qtbase/relative-paths.patch \
patches/qtbase/qtbase-mingw-fixes.patch \
patches/qtbase/config-standardpaths.patch \
patches/qtwinextras/support-xp.patch \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
patches/qttools/disable-most-tools.patch \
- patches/ki18n/no-tests.patch \
patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch \
patches/kxmlgui/0003-Make-KTextWidgets-optional.patch \
patches/kxmlgui/0004-Cruedly-disable-KSendbugmail.patch \
patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch \
patches/kiconthemes/0001-Make-DBus-optional.patch \
patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch \
patches/kleopatra/0005-Hack-generated-conf-files-for-Crosscompiling.patch \
patches/kleopatra/fix-qt5.6-build.patch \
patches/libgpg-error-1.21/0001-Add-FD_ISSET-replacement-for-Windows.patch \
patches/gpgex-1.0.4/0001-Prefer-kleowrapped-gpgwrapped-binaries.patch \
patches/gpgex-1.0.4/0002-Fix-loop-logic-error-in-new-server-name-detection.patch \
patches/extra-cmake-modules/0001-Use-BIN_INSTALL_DIR-data-for-DATAROOTDIR-on-Windows.patch \
patches/gpa-0.9.10/0001-w32-Make-location-of-locale-dir-more-flexible.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/packages/packages.current b/packages/packages.current
index c05f33ce..3088e684 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -1,559 +1,565 @@
# packages.current - list of current packages for use with gpg4win -*- sh -*-
#
# The download script processes the statements here to
# actually download the packages. The syntax is trivial:
#
# If the first non whitespace character of a line is #, the line is
# considered a comment. If the first word of a line is "server", the
# rest of the line will be taken as the base URL for following file
# commands. If the first word of a line is "file" the rest of the
# line will be appended to the current base URL (with a / as
# delimiter). The statement "chk" is followed by the SHA1 checksum of
# the last file.
#
# zlib
#
server http://zlib.net
# last-changed: 2017-01-23
# by: ah
# verified: Sig 5ED4 6A67 21D3 6558 7791 E2AA 783F CD8E 58BC AFBA
file zlib-1.2.11.tar.gz
chk c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
#
# GNU
#
server ftp://ftp.gnu.org/pub/gnu
# last-changed: 2017-02-15
# by: ah
# verified: Sig 68D9 4D8A AEEA D48A E7DC 5B90 4F49 4A94 2E46 16C2
file libiconv/libiconv-1.15.tar.gz
chk ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178
# last-changed: 2017-02-15
# by: ah
# verified: Sig 4622 25C3 B46F 3487 9FC8 496C D605 848E D7E6 9871
file gettext/gettext-0.19.8.tar.xz
chk 9c1781328238caa1685d7bc7a2e1dcf1c6c134e86b42ed554066734b621bd12f
#
# GLIB
#
# The GTK boyz seem to think that sha256sum files on the server
# magically get them a lot of additional security karma.
#
# And it's plain to see
# You were meant for me
# Yeah I'm your .sig
# Your 21th Century sig
# 21th Century sig, I wanna be your file
#
server http://ftp.gnome.org/pub/gnome/sources/glib/2.41
# last-changed: 2015-06-05
# Latest minor release is 2.45 but 2.41 works for us.
# by: ah
# compared checksum with debian experimental version.
# https://lists.debian.org/debian-experimental-changes/2014/09/msg00182.html
# verified: Sig 3D0E FB95 E7B5 237F 16E8 2258 E352 D5C5 1C50 41D4
file glib-2.41.5.tar.xz
chk e76a6bd1456749bdd05db19a8f0f174e787e612ed443d30cc9cf02237dd58e16
#
# GDK-PIXBUF
#
server http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.30/
# checked: 2015-06-05
# by: ah
# There is a 2.31 series but afaik no security problems with 2.30
# verified: with linuxfromscratch and frugalware checksums
file gdk-pixbuf-2.30.8.tar.xz
chk 4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be
#
# ATK
#
server http://ftp.gnome.org/pub/gnome/sources/atk/1.32
# checked: 2013-04-29 wk (1.32.0 still the latest in 1.32)
file atk-1.32.0.tar.bz2
chk e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e
server http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.32
# checked: 2013-04-29 wk
name atk-1.32.0.zip
file atk_1.32.0-2_win32.zip
chk cadc6d52f2af21996a6dcba7b1fac27ce66721e14d1c4ab21fde7bc9965f5037
# checked: 2013-04-29 wk
name atk-dev-1.32.0.zip
file atk-dev_1.32.0-2_win32.zip
chk 5021d64043d270350d6a8d50b91db691a7421a68ca0bfa4eeb0c8804a176ac44
#
# PANGO
#
server http://ftp.gnome.org/pub/gnome/sources/pango/1.29
# fixme: 2013-04-29 wk - There is a 1.29.5 but no 1.29.5 binaries
# What shall we do: Update to 1.32? There are no
# 1.32 binaries either.
file pango-1.29.4.tar.bz2
chk f15deecaecf1e9dcb7db0e4947d12b5bcff112586434f8d30a5afd750747ff2b
server http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.29
name pango-1.29.4.zip
file pango_1.29.4-1_win32.zip
chk e1b865ae2e4054388c598f92b34593b3d24d7fd15e6308c8926ee634717c21ce
name pango-dev-1.29.4.zip
file pango-dev_1.29.4-1_win32.zip
chk 0d7fb255e65ed4bd43acedab4405986e4877b87ba8227d5fa22b38330485e3cb
#
# CAIRO
#
server http://cairographics.org/releases
# checked: 2013-04-29 wk - 1.10.2 is the latest in the 1.10 series.
file cairo-1.10.2.tar.gz
chk 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41
server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
# checked: 2013-07-16 ah most recent package on that server is from
# 2012-09-27 TODO -> Move to another source / source build of those
# dependencies
# checked: 2013-04-29 wk
name cairo-1.10.2.zip
file cairo_1.10.2-2_win32.zip
chk e6c361ec1df4ccb23edbe5b68db16329d563a19eeee7fa70d583dda3d2358f4e
name cairo-dev-1.10.2.zip
file cairo-dev_1.10.2-2_win32.zip
chk b86f875bf776bbf578e3fa8c46866b84c93200b962b30d03cf795f82157e3167
# checked: 2013-04-29 wk
file freetype-2.4.2.tar.bz2
chk 9a987aef8c50d9bcfdfdc9f012f8bd0de6095cc1a5524e62c1a037deb8dacbfe
name freetype-2.4.2.zip
file freetype_2.4.2-1_win32.zip
chk bdf67e6573363fd2256a58295931cc1186382fd0ad1fe420059d6ffdb5fba7c0
name freetype-dev-2.4.2.zip
file freetype-dev_2.4.2-1_win32.zip
chk eed58c2807b65d5e0ec78031e89f1628577ad76bf47f02eaecde432c0b99eae9
server http://www.fontconfig.org/release
# checked: 2013-04-29 wk - 2.8.0 still the latest in 2.8
file fontconfig-2.8.0.tar.gz
chk fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335
server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
# checked: 2013-04-29 wk
name fontconfig-2.8.0.zip
file fontconfig_2.8.0-2_win32.zip
chk 9d6bcaeed0eced43a649953132d9f2b3e15b98c7bb9e4a207872dfeade818204
name fontconfig-dev-2.8.0.zip
file fontconfig-dev_2.8.0-2_win32.zip
chk 2f15af3d27ca507dad2a208e58409f484aa7e7c7eac10b49edca079b31ae7073
server ftp://ftp.g10code.com/g10code/misc
# checked: 2013-04-29 wk - 2.0.1 still the latest in 2.0
file expat-2.0.1.tar.gz
chk 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93
server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
# checked: 2013-04-29 wk
name expat-2.0.1.zip
file expat_2.0.1-1_win32.zip
chk 77b88ab780e698d6590426b26a877878584b9f8b6357909699674fb5045737bd
name expat-dev-2.0.1.zip
file expat-dev_2.0.1-1_win32.zip
chk 67b92b7f3441fee077bdc0094bf4dd673870acdf51899e32e199246801538162
#
# GTK+
#
server http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24
# last-changed: 2015-06-05
# by: ah
# verified: chk from https://download.gnome.org/core/3.17/3.17.2/sources/SHA256SUMS-for-xz
file gtk+-2.24.28.tar.xz
chk b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656
#
# GIMP stuff for W32
#
server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
# checked: 2012-03-28 wk - Not updated - not a security problem
name pkgconfig-0.23.tar.gz
file pkg-config-0.23.tar.gz
chk 08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53
name pkgconfig-0.23.zip
file pkg-config_0.23-3_win32.zip
chk 677d6055494e24cad6c49eab33eee618ddc6ed65da827c8b5b7da761b4063278
# PNG
# last changed: 2017-08-28
# by: js
# verified: Sig 8048 643B A2C8 40F4 F92A 195F F549 84BF A16C 640F
server ftp://ftp.simplesystems.org/pub/png/src
file libpng14/libpng-1.4.22.tar.xz
chk 8d419a8b2a5edddda5cbcb897ded92205344a3249fa7a00d6384ea23ac3ccbd8
#
# LibFFI
#
server ftp://sourceware.org/pub/libffi
# checked: 2013-04-29 wk - updated from 3.0.10.
# checked: 2014-07-16 ah - only rc availble from 3.0.14
file libffi-3.0.13.tar.gz
chk 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c
#
# GpgOL
#
server http://files.gpg4win.org/src
# last-changed: 2018-01-12
# by: ah
# verified: Sig 5B80 C575 4298 F0CB 55D8 ED6A BCEF 7E29 4B09 2E28
file gpgol/gpgol-2.0.6.tar.bz2
chk 6cb06f7c79f40d94c4b9da7123971e62767180a2f8d1ec99e7eacc3f241238a5
# for beta
#server http://files.gpg4win.org/Beta/gpgol
#file 2.0.6-beta9/gpgol-2.0.6-beta9.tar.bz2
#chk 1e956632633a708da46bdd932d34f76350c001d3b857efd75ccc55a0b7a28fb7
#
# GpgEX
#
# last-changed: 2017-09-12
# by: ah
# verified: Sig 5B80 C575 4298 F0CB 55D8 ED6A BCEF 7E29 4B09 2E28
file gpgex/gpgex-1.0.5.tar.bz2
chk f2696a34f77f4afb4e9bef82ea73ebbed59e07c534c68b5c5afd976dddd86feb
#
# Pth emulation
#
server ftp://ftp.g10code.com/g10code/w32pth
# checked: 2014-07-16 ah
file w32pth-2.0.5.tar.bz2
chk 5e462d06ed50e9e961546ab5264258e606b101860a74c1e410d086432ec27a06
#
# Stripped down version of BZIP2
# (full source at http://bzip.org)
#
server ftp://ftp.g10code.com/g10code/bzip2
# checked: 2014-07-16 ah
file bzip2-1.0.6-g10.tar.gz
chk c2a9b3aec1a38d34b66106116a39f64b01d84f475fef75c40ea0bda0ea67ed07
#
# GnuPG et al.
#
# All tarballs from this server are verified with an openpgp
# signature made by "Werner Koch (dist sig)".
# D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
server ftp://ftp.gnupg.org/gcrypt
# last-changed: 2016-11-14
# by: ah
file libgpg-error/libgpg-error-1.27.tar.bz2
chk 4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
# last-changed: 2017-12-07
# by: ah
file libassuan/libassuan-2.5.1.tar.bz2
chk 47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449
# last changed: 2018-01-11
# by: ah
name gnupg-w32-2.2.4-20171220-bin.exe
file binary/gnupg-w32-2.2.4_20171220.exe
chk 2030f00548ec175cac4996a8128ed71393c156429d95f3e6c2f53194b2f4d885
name gnupg-w32-2.2.4-20171220-src.tar.xz
file binary/gnupg-w32-2.2.4_20171220.tar.xz
chk b9707e1c761b6bfef9d9062f188e0c9fc41c1f98da67c71cb75984d46d019d72
# last changed: 2017-12-05
# by: ah
file pinentry/pinentry-1.1.0.tar.bz2
chk 68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570
# last changed: 2018-01-11
# by: ah
file gpgme/gpgme-1.10.0.tar.bz2
chk 1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693
# last changed: 2017-01-04
# by: ah
file gpa/gpa-0.9.10.tar.bz2
chk c3b9cc36fd9916e83524930f99df13b1d5f601f4c0168cb9f5d81422e282b727
#
# GnuPG utilities
#
server http://www.jabberwocky.com/software/paperkey
# last-changed: 2017-12-05
# by: ah
# verified: SIG 7D92 FD31 3AB6 F373 4CC5 9CA1 DB69 8D71 9924 2560
file paperkey-1.5.tar.gz
chk c4737943083ce92e41faf13c27a9d608105b6285c0840dfb684a7ee294142ddf
#
# Kleopatra and dependencies
#
# Boost
# last changes: 2016-01-21
# by: ah
# verified: Second source https://github.com/mxe/mxe/commit/fdd5b9f7aa8bf0e40c1f1f8119701af96e51457e
server http://downloads.sourceforge.net/project/boost/boost/
name boost-1.60.0.tar.bz2
file 1.60.0/boost_1_60_0.tar.bz2
chk 686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b
# Qt base
# last changed: 2018-02-27
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz.sha256
server http://download.qt.io/official_releases/qt/
name qtbase-5.10.1.tar.xz
file 5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz
chk d8660e189caa5da5142d5894d328b61a4d3ee9750b76d61ad74e4eee8765a969
# Qt Tools
# last changed: 2018-02-27
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz.sha256
name qttools-5.10.1.tar.xz
file 5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz
chk f1ea441e5fe138756e6de3b60ab7d8d3051799eabe85a9408c995dfd4d048a53
# Qt Winextras
# last changed: 2018-02-27
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtwinextras-everywhere-src-5.10.1.tar.xz.sha256
name qtwinextras-5.10.1.tar.xz
file 5.10/5.10.1/submodules/qtwinextras-everywhere-src-5.10.1.tar.xz
chk 12401eea9abe87307b9aeba9d539ad403858ea43a99248421caf069f27b28917
# Qt svg
# last changed: 2018-02-27
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz.sha256
name qtsvg-5.10.1.tar.xz
file 5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz
chk 00e00c04abcc8363cf7d94ca8b16af61840995a4af23685d49fa4ccafa1c7f5a
# Qt translations
# last changed: 2018-02-27
# by: ah
# verified: HTTPS https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qttranslations-everywhere-src-5.10.1.tar.xz.sha256
name qttranslations-5.10.1.tar.xz
file 5.10/5.10.1/submodules/qttranslations-everywhere-src-5.10.1.tar.xz
chk 1f6d840e3d04b00b976bc1a86ea2be9d61051b7c3455dc2b891fae61772643fd
# KDE Frameworks generated by gen-frameworks.sh
-server http://ftp.iij.ad.jp/pub/X11/KDE/Attic/frameworks
+server https://download.kde.org/stable/frameworks/
##### Paste Here #####
+#
+# Don't forget to update gpg4win.mk.in with new version numbers
+#
# extra-cmake-modules
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/extra-cmake-modules-5.30.0.tar.xz
-chk 7da9647514e134db5054ab4848d4bfa6054537593a95720a7a9361f8cc71a96c
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/extra-cmake-modules-5.43.0.tar.xz
+chk 5757a5ddceede5321b58345a8dbf953c2282487bf9c24ae477efde800b94fffd
# kconfig
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kconfig-5.30.0.tar.xz
-chk a29a3ccb6c9e8124eca488417d602e689dc7240f9b10510f4152e739fdc143dc
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kconfig-5.43.0.tar.xz
+chk 22ebe055ae6545e01653b2e7d678145261cc5073202561735a894aa59b5841d9
# ki18n
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/ki18n-5.30.0.tar.xz
-chk 2dd2d0835570c5e9fcdabd124613131cb4042a4deb3a38e68ed05daf6fcd72f3
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/ki18n-5.43.0.tar.xz
+chk 8a802507ba6a5a91470d09c649e842843d70f37968d86473567928f2cdee57ff
# kwidgetsaddons
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kwidgetsaddons-5.30.0.tar.xz
-chk 34c322aa53a33ed883d8082e2435cd9464fb9d3f63e50c4a81d87166088fc24a
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kwidgetsaddons-5.43.0.tar.xz
+chk 59a7329e8a4a3b22677dc09648de9c0a042b9ae284af2556c5db48394a9aa797
# kcompletion
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kcompletion-5.30.0.tar.xz
-chk a667bd28575ba4462ed365ce3ea7d35e3f86b20e6fc034365914949205ee0588
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kcompletion-5.43.0.tar.xz
+chk 2999af185dea2164b6943c9cabf2330e4cae4bea46863a1c3d66e86b04ffb618
# kwindowsystem
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kwindowsystem-5.30.0.tar.xz
-chk 20ac7025f998f85e83f72609038b4bf7051f3c373dc039faf30340c595e7e16b
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kwindowsystem-5.43.0.tar.xz
+chk 4df6da4f313f8c52a5d202caa5cc90791b4a07f0d91d5b7252e2da5487a6997d
# kcoreaddons
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kcoreaddons-5.30.0.tar.xz
-chk f62bcef0aa391362e8797eb03135ad9d9b9fd5f3741298241ffb59eb182da040
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kcoreaddons-5.43.0.tar.xz
+chk c67f008b79365913cbb8c62d2b1b48353c1302f6a351a9bc34b874b18392ef82
# kcodecs
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kcodecs-5.30.0.tar.xz
-chk 6eb6935512e01a70d730938c28cb84852e73d4c023deebb5f2946b4c760f2aee
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kcodecs-5.43.0.tar.xz
+chk 5bc09761bf3a3e5fcbea76b1b41c2f07e372fd8449c14fb7276250e177ff9959
# kconfigwidgets
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kconfigwidgets-5.30.0.tar.xz
-chk 021d85537faf01b9a88a9614edf9011a7e2dac752330f4928a287f4832263996
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kconfigwidgets-5.43.0.tar.xz
+chk 7c9016f2c98452d912359def78185f4bf3c6f8c45833fe0e321278124c45bbe3
# kxmlgui
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kxmlgui-5.30.0.tar.xz
-chk da3f6f59aed6d7970f78a040e387fcec6509a2bac3e6efaa965b6600c9b1ac00
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kxmlgui-5.43.0.tar.xz
+chk a3fd16055c5c37130edc80cc331356dea0be78ad227ed4bf00d45bb59dbfccca
# kguiaddons
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kguiaddons-5.30.0.tar.xz
-chk f55f5b5ffe0e330ae3ee5971cf8d206040d82bd52d677a8478d6a9c88c8ac04e
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kguiaddons-5.43.0.tar.xz
+chk 19b32ef071dd51271b5999f22968864cf8409cb8caf9c9daa7707a922f71da7c
# kitemviews
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kitemviews-5.30.0.tar.xz
-chk 5e8466caa4d27cd78e37c3814e495590158a5a57cbb61e8d07505cea72d3a43b
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kitemviews-5.43.0.tar.xz
+chk 304cbdd832b12c9e2b08f29efc5d876a9de60076d444c3d502849fdc21ec86a7
# kitemmodels
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kitemmodels-5.30.0.tar.xz
-chk aeb94534470bb581196a3e2eef158694c5b5727a7e9db8ca2d873fdcbf5bc2f9
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kitemmodels-5.43.0.tar.xz
+chk ad617dc843297c2c4d5db97ea528c44c886d52c89125a77f9494da09de8187fb
# kiconthemes
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/kiconthemes-5.30.0.tar.xz
-chk e969d2180f0d5b0802e7c57d63ff78314562cad4b50dbb3a0935d5edc4c33d6a
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/kiconthemes-5.43.0.tar.xz
+chk 5ce7918311b89e30a4715f3ebeeb7263c550c9e9c59556a1a6e45ad24442ac80
# breeze-icons
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/breeze-icons-5.30.0.tar.xz
-chk 53e533d006e0289b969ee37534a71f02b2708cee28cfa829b95a144f75010759
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/breeze-icons-5.43.0.tar.xz
+chk 3eda58a4c7c9369fe9b246500d88a964d3411f83e1113727ed723989d935dea7
# karchive
-# last changed: 2017-02-02
+# last changed: 2018-02-27
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.30.0.php (created by gen-frameworks.sh)
-file 5.30/karchive-5.30.0.tar.xz
-chk 18b35d437e7cbf6f00983d0f66372cbd6a0daedaa58e6c092838c20845571f38
+# verified: https://www.kde.org/info/kde-frameworks-5.43.0.php (created by gen-frameworks.sh)
+file 5.43/karchive-5.43.0.tar.xz
+chk 0e639a2818700220bf20aea83a00697b385d67f39eba5840b400d8d72ec477b8
##### End Paste #####
# KDE Applications
-server https://download.kde.org/Attic/applications
+# For older releases check here:
+# server https://download.kde.org/Attic/applications
+
+server http://download.kde.org/stable/applications/
# kmime
-# last changed: 2017-02-02
+# last changed: 2018-02-02
# by: ah
-# verified: https://download.kde.org/Attic/applications/16.12.3/src/kmime-16.12.3.tar.xz.mirrorlist
-file 16.12.3/src/kmime-16.12.3.tar.xz
-chk 40c874c98c0eb0c76e9a5015aab5d5ed791c1e0bed138f412fb496031e80eb3f
+# verified: https://download.kde.org/stable/applications/17.12.2/src/kmime-17.12.2.tar.xz.mirrorlist
+file 17.12.2/src/kmime-17.12.2.tar.xz
+chk 29f11eafeb13c0045069a250bdcd57fda4bdd3423e7e1b7e0ca0517a9afefd24
# Devel versions are needed until Kleopatra can be based on
# a stable branch.
server http://files.intevation.de/projects/gpg4all
# by: ah
#file gpgme/gpgme-1.10.0-beta90.tar.bz2
#chk d7b8f5456192349df14287f5e5222f1e44102b36a7558c98fa09a9251957e808
# Libkleo
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
file libkleo/libkleo-201802071408.tar.gz
chk e74fbccf7ac8766dd7bca29c43ce3f21be5f85e83903a9a6790c792f037fd547
# KDE-L10n
# last changed: see package date.
# by: ah
# verified: Tarball created by ah with script kde-l10n.sh
file kde-l10n/kde-l10n-201712080943-bin.tar.xz
chk 9c3da7c8b99c9f3eff5b0bd57fc5d100ebfcc3717516a5e2e7261481503943b8
file kde-l10n/kde-l10n-201712080943-src.tar.xz
chk 4e6993d5a28de4f4338d96de0edb5d7cb9243976d647162d0539b021a853bafb
# Gpg4win-tools package (experimental)
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
file gpg4win-tools/gpg4win-tools-201802271506.tar.gz
chk f98bc97cf9fbbdcda1bcbcc5eab6f4ad2e4478ceaa6505f9b132c2f706bac0dc
# Kleopatra
# last changed: see package date.
# by: ah
# verified: Tarball created by ah.
file kleopatra/kleopatra-201801121054.tar.gz
chk 5b82c0bbb87b558e6d66a729eca8a5170af2c9787a528fe187a64cacd1d180b1
diff --git a/patches/kconfigwidgets/0001-Make-QDbus-optional.patch b/patches/kconfigwidgets/0001-Make-QDbus-optional.patch
index 94374fc3..893dde74 100755
--- a/patches/kconfigwidgets/0001-Make-QDbus-optional.patch
+++ b/patches/kconfigwidgets/0001-Make-QDbus-optional.patch
@@ -1,129 +1,130 @@
#! /bin/sh
patch -p1 -l -f $* < $0
exit $?
From 438f98aed2dd8857c6ea73b3b93b9cd0abaf6993 Mon Sep 17 00:00:00 2001
From: Andre Heinecke
Date: Thu, 28 Jan 2016 15:27:54 +0100
Subject: [PATCH 1/2] Make QDbus optional
This removes the Klipper integration of KPasteAction if QDBus
is not available.
---
CMakeLists.txt | 11 ++++++++++-
src/CMakeLists.txt | 7 ++++++-
src/config-kconfigwidgets.h.cmake | 2 ++
src/kpastetextaction.cpp | 14 ++++++++++++--
4 files changed, 30 insertions(+), 4 deletions(-)
create mode 100644 src/config-kconfigwidgets.h.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bed53d1..87f976c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,7 +10,16 @@
+--- CMakeLists.txt.orig 2018-02-28 08:33:32.052419561 +0100
++++ CMakeLists.txt 2018-02-28 08:35:44.523986191 +0100
+@@ -12,7 +12,17 @@
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
- set(REQUIRED_QT_VERSION 5.5.0)
+ set(REQUIRED_QT_VERSION 5.7.0)
-find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Widgets DBus)
++find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Widgets)
+if (UNIX)
-+ find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Widgets DBus)
++ find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED DBus)
+#else()
+# find_package(Qt5DBus "${REQUIRED_QT_VERSION}" CONFIG)
+# set_package_properties(Qt5DBus PROPERTIES DESCRIPTION "Qt DBus Library"
+# PURPOSE "KPasteAction klipper integration."
+# URL "https://doc.qt.io/qt-5/qdbus.html"
+# TYPE OPTIONAL)
+endif()
+set (HAVE_QDBUS ${Qt5DBus_FOUND})
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 97837b3..104b118 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,8 @@
+if (HAVE_QDBUS)
+ set (KCONFIGWIDGETS_QDBUS_LIBS Qt5::DBus)
+endif ()
+configure_file(config-kconfigwidgets.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kconfigwidgets.h )
+
set(kconfigwidgets_SRCS
kcodecaction.cpp
kcolorscheme.cpp
@@ -29,7 +34,7 @@ target_link_libraries(KF5ConfigWidgets
KF5::ConfigGui # KStandardAction uses KStandardShortcut
KF5::Auth # KCModule uses KAuth::Action
PRIVATE
- Qt5::DBus # KPasteTextAction talks to Klipper via DBus
+ ${KCONFIGWIDGETS_QDBUS_LIBS} # KPasteTextAction talks to Klipper via DBus
KF5::CoreAddons # KCModule uses KAboutData, KTipDialog uses KRandom
KF5::GuiAddons # KColorScheme uses KColorUtils
KF5::I18n # For action and widget texts
diff --git a/src/config-kconfigwidgets.h.cmake b/src/config-kconfigwidgets.h.cmake
new file mode 100644
index 0000000..4a933fa
--- /dev/null
+++ b/src/config-kconfigwidgets.h.cmake
@@ -0,0 +1,2 @@
+/* Qt5DBus available */
+#cmakedefine01 HAVE_QDBUS
diff --git a/src/kpastetextaction.cpp b/src/kpastetextaction.cpp
index a38aa0c..3c5a614 100644
--- a/src/kpastetextaction.cpp
+++ b/src/kpastetextaction.cpp
@@ -27,11 +27,15 @@
#include "kpastetextaction.h"
+#include "config-kconfigwidgets.h"
+
#include
#include
#include
-#include
-#include
+#if HAVE_QDBUS
+# include
+# include
+#endif
class KPasteTextActionPrivate
{
@@ -97,6 +101,7 @@ void KPasteTextActionPrivate::_k_menuAboutToShow()
{
m_popup->clear();
QStringList list;
+#if HAVE_QDBUS
QDBusInterface klipper(QStringLiteral("org.kde.klipper"), QStringLiteral("/klipper"), QStringLiteral("org.kde.klipper.klipper"));
if (klipper.isValid()) {
QDBusReply reply = klipper.call(QStringLiteral("getClipboardHistoryMenu"));
@@ -104,6 +109,7 @@ void KPasteTextActionPrivate::_k_menuAboutToShow()
list = reply;
}
}
+#endif
QString clipboardText = qApp->clipboard()->text(QClipboard::Clipboard);
if (list.isEmpty()) {
list << clipboardText;
@@ -123,6 +129,7 @@ void KPasteTextActionPrivate::_k_menuAboutToShow()
void KPasteTextActionPrivate::_k_slotTriggered(QAction *action)
{
+#if HAVE_QDBUS
QDBusInterface klipper(QStringLiteral("org.kde.klipper"), QStringLiteral("/klipper"), QStringLiteral("org.kde.klipper.klipper"));
if (klipper.isValid()) {
QDBusReply reply = klipper.call(QStringLiteral("getClipboardHistoryItem"),
@@ -135,6 +142,9 @@ void KPasteTextActionPrivate::_k_slotTriggered(QAction *action)
//if (reply.isValid())
// qDebug() << "Clipboard: " << qApp->clipboard()->text(QClipboard::Clipboard);
}
+#else
+ Q_UNUSED(action);
+#endif
}
#include "moc_kpastetextaction.cpp"
--
2.1.4
diff --git a/patches/ki18n/no-tests.patch b/patches/ki18n/no-tests.patch
deleted file mode 100755
index 56028500..00000000
--- a/patches/ki18n/no-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-patch -p0 -R -f $* < $0
-exit $?
-
---- CMakeLists.txt 2016-01-21 13:38:48.962678469 +0100
-+++ CMakeLists.txt.orig 2016-01-21 13:40:08.468110980 +0100
-@@ -58,9 +58,7 @@
- ki18n_install(po)
- endif()
- add_subdirectory(src)
--if (BUILD_TESTING)
-- add_subdirectory(autotests)
--endif()
-+add_subdirectory(autotests)
-
- # create a Config.cmake and a ConfigVersion.cmake file and install them
- set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5I18n")
diff --git a/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch b/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
index a6826f9b..ebf6f07a 100755
--- a/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
+++ b/patches/kxmlgui/0002-Make-QDBus-dependency-optional.patch
@@ -1,426 +1,421 @@
#! /bin/sh
patch -p1 -l -f $* < $0
exit $?
From 6f2ed92f19bcfa4d8d03a98ace3232082ddbab18 Mon Sep 17 00:00:00 2001
From: Andre Heinecke
Date: Thu, 2 Feb 2017 11:36:48 +0100
Subject: [PATCH] Make QDBus dependency optional
If an application is "standalone" DBus IPC may not be neccessary.
This main use case for this are platforms like Windows where DBus
is foreign.
Features lost without DBus are the handling of global style changes
in KToolBar and the general KDE DBus integration of KMainWindow.
So this should not be done and is guarded as a FORCE option
---
CMakeLists.txt | 15 ++++++++++++---
KF5XmlGuiConfig.cmake.in | 2 +-
autotests/kmainwindow_unittest.cpp | 2 ++
autotests/ktoolbar_unittest.cpp | 20 +++++++++++++++++++-
src/CMakeLists.txt | 15 ++++++++++++---
src/config-xmlgui.h.cmake | 3 +++
src/kmainwindow.cpp | 10 ++++++++--
src/kmainwindowiface.cpp | 2 +-
src/ktoolbar.cpp | 13 +++++++++++--
src/kxmlguiwindow.cpp | 13 +++++++++++--
10 files changed, 80 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9728db..7d8cd00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -29,12 +29,14 @@ ecm_setup_version(PROJECT
+@@ -30,13 +30,16 @@
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5XmlGuiConfigVersion.cmake"
SOVERSION 5)
-option(FORCE_DISABLE_KGLOBALACCEL "Force building KXmlGui without KGlobalAccel. Doing this will break global shortcut support. [default=OFF]" OFF)
+# Optional packages that usually should not be disabled as this might
+# break behavior users (or other developers) of this library rely on.
+option(FORCE_DISABLE_KGLOBALACCEL "Force building KXmlGui without KGlobalAccel. This will break global shortcut support. [default=OFF]" OFF)
+option(FORCE_DISABLE_DBUS "Force building KXmlGui without a dependency to QDbus. This will break KMainWindow integration and style change notifications. [default=OFF]" OFF)
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
# Dependencies
- set(REQUIRED_QT_VERSION 5.5.0)
+ set(REQUIRED_QT_VERSION 5.7.0)
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Xml Network PrintSupport)
--
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets Xml Network PrintSupport)
+
find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
-@@ -44,6 +46,7 @@ find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5TextWidgets ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
-+
- find_package(KF5Attica ${KF5_DEP_VERSION})
- set_package_properties(KF5Attica PROPERTIES DESCRIPTION "A Qt library that implements the Open Collaboration Services API"
- PURPOSE "Support for Get Hot New Stuff in KXMLGUI"
-@@ -57,6 +60,12 @@ if (NOT FORCE_DISABLE_KGLOBALACCEL)
+@@ -60,6 +64,12 @@
endif()
set (HAVE_GLOBALACCEL ${KF5GlobalAccel_FOUND})
+if (NOT FORCE_DISABLE_DBUS)
+ find_package(Qt5DBus ${REQUIRED_QT_VERSION} CONFIG REQUIRED)
+ set(QT5DBUS_FIND_DEPENDENCY "find_dependency(Qt5DBus ${REQUIRED_QT_VERSION})")
+endif()
+set (HAVE_QDBUS ${Qt5DBus_FOUND})
+
# Subdirectories
add_definitions(-DTRANSLATION_DOMAIN=\"kxmlgui5\")
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
diff --git a/KF5XmlGuiConfig.cmake.in b/KF5XmlGuiConfig.cmake.in
index 6f8d8ce..550e667 100644
--- a/KF5XmlGuiConfig.cmake.in
+++ b/KF5XmlGuiConfig.cmake.in
@@ -3,7 +3,7 @@
set(XMLGUI_DBUS_INTERFACES_DIR "@PACKAGE_KDE_INSTALL_DBUSINTERFACEDIR@")
include(CMakeFindDependencyMacro)
-find_dependency(Qt5DBus @REQUIRED_QT_VERSION@)
+@QT5DBUS_FIND_DEPENDENCY@
find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
find_dependency(Qt5Xml @REQUIRED_QT_VERSION@)
diff --git a/autotests/kmainwindow_unittest.cpp b/autotests/kmainwindow_unittest.cpp
index ec73f7f..4776453 100644
--- a/autotests/kmainwindow_unittest.cpp
+++ b/autotests/kmainwindow_unittest.cpp
@@ -17,6 +17,8 @@
Boston, MA 02110-1301, USA.
*/
+#include "config-xmlgui.h"
+
#include
#include "kmainwindow_unittest.h"
#include
diff --git a/autotests/ktoolbar_unittest.cpp b/autotests/ktoolbar_unittest.cpp
index 09b96dc..241f7f0 100644
--- a/autotests/ktoolbar_unittest.cpp
+++ b/autotests/ktoolbar_unittest.cpp
@@ -18,10 +18,14 @@
Boston, MA 02110-1301, USA.
*/
+#include "config-xmlgui.h"
+
#include "testxmlguiwindow.h"
#include "testguiclient.h"
-#include
+#if HAVE_QDBUS
+# include
+#endif
#include
#include
#include
@@ -80,7 +84,9 @@ protected:
private:
void changeGlobalIconSizeSetting(int, int);
void deleteGlobalIconSizeSetting();
+#if HAVE_QDBUS
void changeGlobalToolButtonStyleSetting(const QString &, const QString &);
+#endif
void deleteGlobalToolButtonStyleSetting();
QByteArray m_xml;
bool m_showWasCalled;
@@ -427,6 +433,7 @@ void tst_KToolBar::testToolButtonStyleNoXmlGui()
QCOMPARE((int)mainToolBar->toolButtonStyle(), (int)toolButtonStyle);
QCOMPARE((int)otherToolBar->toolButtonStyle(), (int)toolButtonStyle);
+#if HAVE_QDBUS
// Now change KDE-global setting
changeGlobalToolButtonStyleSetting(QStringLiteral("IconOnly"), QStringLiteral("TextOnly"));
@@ -441,6 +448,9 @@ void tst_KToolBar::testToolButtonStyleNoXmlGui()
} else {
QCOMPARE((int)otherToolBar->toolButtonStyle(), (int)toolButtonStyle);
}
+#else
+ Q_UNUSED(selectedDefaultForOtherToolbar);
+#endif
}
}
@@ -490,16 +500,23 @@ void tst_KToolBar::testToolButtonStyleXmlGui()
// Save settings
kmw.saveMainWindowSettings(group);
+#if HAVE_QDBUS
// Now change KDE-global setting
changeGlobalToolButtonStyleSetting(QStringLiteral("IconOnly"), QStringLiteral("TextOnly"));
QCOMPARE((int)mainToolBar->toolButtonStyle(), (int)expectedStyleMainToolbar);
QCOMPARE((int)otherToolBar->toolButtonStyle(), (int)expectedStyleOtherToolbar);
QCOMPARE((int)cleanToolBar->toolButtonStyle(), (int)expectedStyleCleanToolbar);
+#else
+ Q_UNUSED(expectedStyleMainToolbar);
+ Q_UNUSED(expectedStyleOtherToolbar);
+ Q_UNUSED(expectedStyleCleanToolbar);
+#endif
}
}
+#if HAVE_QDBUS
void tst_KToolBar::changeGlobalToolButtonStyleSetting(const QString &mainToolBar, const QString &otherToolBars)
{
KConfigGroup group(KSharedConfig::openConfig(), "Toolbar style");
@@ -517,6 +534,7 @@ void tst_KToolBar::changeGlobalToolButtonStyleSetting(const QString &mainToolBar
KToolBar::emitToolbarStyleChanged();
spy.wait(2000);
}
+#endif
void tst_KToolBar::deleteGlobalToolButtonStyleSetting()
{
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8126b5e..e849ab7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,10 @@ endif ()
if (HAVE_GLOBALACCEL)
set (XMLGUI_EXTRA_LIBS ${XMLGUI_EXTRA_LIBS} KF5::GlobalAccel)
endif ()
+if (HAVE_QDBUS)
+ set (XMLGUI_QDBUS_LIBS Qt5::DBus)
+ set (XMLGUI_DBUS_PRI_NAME "dbus")
+endif ()
if(WIN32)
set (XMLGUI_EXTRA_LIBS ${XMLGUI_EXTRA_LIBS} secur32) # GetUserNameEx()
endif()
@@ -33,7 +37,6 @@ set(kxmlgui_SRCS
khelpmenu.cpp
kkeysequencewidget.cpp
kmainwindow.cpp
- kmainwindowiface.cpp
kmenumenuhandler_p.cpp
kshortcuteditwidget.cpp
kshortcutschemeseditor.cpp
@@ -56,6 +59,12 @@ set(kxmlgui_SRCS
kundoactions.cpp
kcheckaccelerators.cpp
)
+if (HAVE_QDBUS)
+ set(kxmlgui_SRCS
+ ${kxmlgui_SRCS}
+ kmainwindowiface.cpp
+ )
+endif()
# add the resource file
qt5_add_resources(kxmlgui_SRCS kxmlgui.qrc)
@@ -77,7 +86,7 @@ target_include_directories(KF5XmlGui INTERFACE "$
#include
#include
-#include
#include
#include
@@ -58,6 +57,11 @@
#include
#include
+#if HAVE_QDBUS
+# include "kmainwindowiface_p.h"
+# include
+#endif
+
//#include
static const char WINDOW_PROPERTIES[]="WindowProperties";
@@ -340,6 +344,7 @@ void KMainWindowPrivate::polish(KMainWindow *q)
q->winId(); // workaround for setWindowRole() crashing, and set also window role, just in case TT
q->setWindowRole(s); // will keep insisting that object name suddenly should not be used for window role
+#if HAVE_QDBUS
dbusName = QLatin1Char('/') + QCoreApplication::applicationName() + QLatin1Char('/');
dbusName += q->objectName().replace(QLatin1Char('/'), QLatin1Char('_'));
// Clean up for dbus usage: any non-alphanumeric char should be turned into '_'
@@ -355,6 +360,7 @@ void KMainWindowPrivate::polish(KMainWindow *q)
QDBusConnection::ExportNonScriptableSlots |
QDBusConnection::ExportNonScriptableProperties |
QDBusConnection::ExportAdaptors);
+#endif
}
void KMainWindowPrivate::setSettingsDirty(CallCompression callCompression)
diff --git a/src/kmainwindowiface.cpp b/src/kmainwindowiface.cpp
index c194bec..25439b3 100644
--- a/src/kmainwindowiface.cpp
+++ b/src/kmainwindowiface.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include "kmainwindowiface_p.h"
+#include "kmainwindowiface_p.h"
#include "kactioncollection.h"
#include "kxmlguiwindow.h"
diff --git a/src/ktoolbar.cpp b/src/ktoolbar.cpp
index 4569524..f77d965 100644
--- a/src/ktoolbar.cpp
+++ b/src/ktoolbar.cpp
@@ -24,6 +24,8 @@
Boston, MA 02110-1301, USA.
*/
+#include "config-xmlgui.h"
+
#include "ktoolbar.h"
#include
@@ -38,10 +40,13 @@
#include
#include
#include
-#include
-#include
#include
+#if HAVE_QDBUS
+# include
+# include
+#endif
+
#include
#include
#include
@@ -275,8 +280,10 @@ void KToolBar::Private::init(bool readConfig, bool _isMainToolBar)
q->setAcceptDrops(true);
+#if HAVE_QDBUS
QDBusConnection::sessionBus().connect(QString(), QStringLiteral("/KToolBar"), QStringLiteral("org.kde.KToolBar"),
QStringLiteral("styleChanged"), q, SLOT(slotAppearanceChanged()));
+#endif
connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()),
q, SLOT(slotAppearanceChanged()));
}
@@ -1467,8 +1474,10 @@ bool KToolBar::toolBarsLocked()
void KToolBar::emitToolbarStyleChanged()
{
+#if HAVE_QDBUS
QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KToolBar"), QStringLiteral("org.kde.KToolBar"), QStringLiteral("styleChanged"));
QDBusConnection::sessionBus().send(message);
+#endif
}
#include "moc_ktoolbar.cpp"
diff --git a/src/kxmlguiwindow.cpp b/src/kxmlguiwindow.cpp
index 24d48f1..5b9fac7 100644
--- a/src/kxmlguiwindow.cpp
+++ b/src/kxmlguiwindow.cpp
-@@ -23,12 +23,13 @@
+@@ -23,13 +23,14 @@
Boston, MA 02110-1301, USA.
*/
+#include "config-xmlgui.h"
+
#include "kxmlguiwindow.h"
+ #include "debug.h"
#include "kmainwindow_p.h"
#include "kmessagebox.h"
#include "kactioncollection.h"
-#include "kmainwindowiface_p.h"
#include "ktoolbarhandler_p.h"
#include "kxmlguifactory.h"
#include "kedittoolbar.h"
-@@ -36,7 +37,6 @@
+@@ -37,7 +38,6 @@
#include "ktoolbar.h"
#include
-#include
#include
#include
- #include
+ #include
@@ -47,6 +47,11 @@
#include
#include
+#if HAVE_QDBUS
+# include "kmainwindowiface_p.h"
+# include
+#endif
+
#include
#include
#include
-@@ -87,7 +92,9 @@ KXmlGuiWindow::KXmlGuiWindow(QWidget *parent, Qt::WindowFlags f)
- d->toolBarHandler = 0;
- d->showStatusBarAction = 0;
- d->factory = 0;
+@@ -87,7 +92,9 @@
+ d->toolBarHandler = nullptr;
+ d->showStatusBarAction = nullptr;
+ d->factory = nullptr;
+- new KMainWindowInterface(this);
+#if HAVE_QDBUS
- new KMainWindowInterface(this);
++ new KMainWindowInterface(this);
+#endif
}
QAction *KXmlGuiWindow::toolBarMenuAction()
-@@ -117,6 +124,7 @@ KXmlGuiWindow::~KXmlGuiWindow()
+@@ -117,6 +124,7 @@
bool KXmlGuiWindow::event(QEvent *ev)
{
bool ret = KMainWindow::event(ev);
+#if HAVE_QDBUS
if (ev->type() == QEvent::Polish) {
QDBusConnection::sessionBus().registerObject(dbusName() + QStringLiteral("/actions"), actionCollection(),
QDBusConnection::ExportScriptableSlots |
-@@ -125,6 +133,7 @@ bool KXmlGuiWindow::event(QEvent *ev)
+@@ -125,6 +133,7 @@
QDBusConnection::ExportNonScriptableProperties |
QDBusConnection::ExportChildObjects);
}
+#endif
return ret;
}
--
2.1.4
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index c8c71e74..68b4f01e 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -1,763 +1,763 @@
# gpg4win.m4.in - Installer for GnuPG 4 Windows Makefile. -*- makefile -*-
# Copyright (C) 2005, 2009 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, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
# No servicable parts below this line :)
# These paths must be absolute, as we switch directories pretty often.
root := $(shell pwd)/playground
bdir := $(root)/build
idir := $(root)/install
ipdir := $(root)/install/pkgs
tsdir := $(shell pwd)/${top_srcdir}
pdir := $(shell pwd)/${top_srcdir}/patches
ex_idir := $(root)/install-ex
ex_ipdir := $(root)/install-ex/pkgs
# We collect the names of all pkg files used.
pkg_files =
# The playground area is our scratch area, where we unpack, build and
# install the packages.
stamps/stamp-directories:
$(MKDIR) stamps
$(MKDIR) playground
$(MKDIR) -p installers
$(MKDIR) $(bdir)
$(MKDIR) $(idir)
$(MKDIR) $(ipdir)
$(if $GPGEX_ADD_HOST, $(MKDIR) $(ex_idir))
$(if $GPGEX_ADD_HOST, $(MKDIR) $(ex_ipdir))
touch $(bdir)/versioninfo.txt
touch stamps/stamp-directories
# Frob the name $1 by converting all '-' and '+' characters to '_'.
define FROB_macro
$(subst +,_,$(subst -,_,$(1)))
endef
# Get the variable $(1) (which may contain '-' and '+' characters).
define GETVAR
$($(call FROB_macro,$(1)))
endef
# Set a couple of common variables.
define SETVARS
set -e; \
pkg="$(call GETVAR,gpg4win_pkg_$(1))"; \
pkg_version="$(1)-$(call GETVAR,gpg4win_pkg_$(1)_version)"; \
pkgsdir="$(bdir)/$$$${pkg_version}"; \
pkgbdir="$(bdir)/$$$${pkg_version}-build"; \
pkgpdir="$(pdir)/$$$${pkg_version}"; \
pkgpbdir="$(pdir)/$(1)"; \
pkgidir="$(ipdir)/$$$${pkg_version}"; \
pkg_dev="$(call GETVAR,gpg4win_pkg_$(1)_dev)"; \
pkg_version_dev="$(1)-dev-$(call GETVAR,gpg4win_pkg_$(1)_version)"; \
pkgidir_dev="$(ipdir)/$$$${pkg_version_dev}"; \
pkgcfg="$(call GETVAR,gpg4win_pkg_$(1)_configure)"; \
pkgextracflags="$(call GETVAR,gpg4win_pkg_$(1)_extracflags)"; \
pkgmkargs="$(call GETVAR,gpg4win_pkg_$(1)_make_args)"; \
pkgmkargs_inst="$(call GETVAR,gpg4win_pkg_$(1)_make_args_inst)";\
pkgmkdir="$(call GETVAR,gpg4win_pkg_$(1)_make_dir)"; \
pkgmkdir_inst="$(call GETVAR,gpg4win_pkg_$(1)_make_dir)"; \
export PKG_CONFIG="$(tsdir)/src/pkg-config"; \
export PKG_CONFIG_PATH="$(idir)/lib/pkgconfig"; \
export PKG_CONFIG_LIBDIR=""; \
export PATH="$(idir)/bin:$${PATH}"; \
export SYSROOT="$(idir)"; \
export CONFIG_SITE="$(tsdir)/src/config.site"
endef
# Set variables for building in an additional architecture
define SETVARS_EX
set -e; \
pkg="$(call GETVAR,gpg4win_pkg_$(1))"; \
pkg_version="$(1)-$(call GETVAR,gpg4win_pkg_$(1)_version)"; \
pkgsdir="$(bdir)/$$$${pkg_version}"; \
pkgbdir="$(bdir)/$$$${pkg_version}-ex-build"; \
pkgpdir="$(pdir)/$$$${pkg_version}"; \
pkgpbdir="$(pdir)/$(1)"; \
pkgidir="$(ex_ipdir)/$$$${pkg_version}"; \
pkgidir_dev="$(ex_ipdir)/$$$${pkg_version_dev}"; \
pkgcfg="$(call GETVAR,gpg4win_pkg_$(1)_ex_configure)"; \
pkgextracflags="$(call GETVAR,gpg4win_pkg_$(1)_ex_extracflags)"; \
pkgmkargs="$(call GETVAR,gpg4win_pkg_$(1)_ex_make_args)"; \
pkgmkargs_inst="$(call GETVAR,gpg4win_pkg_$(1)_ex_make_args_inst)"; \
pkgmkdir="$(call GETVAR,gpg4win_pkg_$(1)_ex_make_dir)"; \
pkgmkdir_inst="$(call GETVAR,gpg4win_pkg_$(1)_ex_make_dir)"; \
export PKG_CONFIG="$(tsdir)/src/pkg-config"; \
export PKG_CONFIG_PATH="$(ex_idir)/lib/pkgconfig"; \
export PKG_CONFIG_LIBDIR=""; \
export PATH="$(ex_idir)/bin:$${PATH}"; \
export SYSROOT="$(ex_idir)"
endef
# Support macro. Unpack the archive $(1).
define DEFLATE_macro
rm -rf $$$${pkgsdir}; \
case "$(1)" in \
*/qtbase*.*.tar.xz) \
- $(TAR) -xJ --transform='s,^qtbase-opensource-src,qtbase,' -f "$(1)" ;; \
+ $(TAR) -xJ --transform='s,^qtbase-everywhere-src,qtbase,' -f "$(1)" ;; \
*/qttools*.*.tar.xz) \
- $(TAR) -xJ --transform='s,^qttools-opensource-src,qttools,' -f "$(1)" ;; \
+ $(TAR) -xJ --transform='s,^qttools-everywhere-src,qttools,' -f "$(1)" ;; \
*/qtwinextras*.*.tar.xz) \
- $(TAR) -xJ --transform='s,^qtwinextras-opensource-src,qtwinextras,' -f "$(1)" ;; \
+ $(TAR) -xJ --transform='s,^qtwinextras-everywhere-src,qtwinextras,' -f "$(1)" ;; \
*/qtsvg*.*.tar.xz) \
- $(TAR) -xJ --transform='s,^qtsvg-opensource-src,qtsvg,' -f "$(1)" ;; \
+ $(TAR) -xJ --transform='s,^qtsvg-everywhere-src,qtsvg,' -f "$(1)" ;; \
*/qttranslations*.*.tar.xz) \
- $(TAR) -xJ --transform='s,^qttranslations-opensource-src,qttranslations,' -f "$(1)" ;; \
+ $(TAR) -xJ --transform='s,^qttranslations-everywhere-src,qttranslations,' -f "$(1)" ;; \
*/boost*.*.tar.bz2) \
$(TAR) -xj --transform='s,^boost_1_60_0,boost-1.60.0,' -f "$(1)" ;; \
*.tar.gz | *.tgz) \
$(TAR) xzf "$(1)" ;; \
*.tar.bz2 | *.tbz2 | *.tbz) \
$(TAR) xjf "$(1)" ;; \
*.tar.xz ) \
$(TAR) xJf "$(1)" ;; \
*.exe ) \
cp "$(1)" . ;; \
*.zip) \
$(UNZIP) -o "$(1)" ;; \
esac
endef
# Support macro. Strip all exe files below $(1).
define STRIP_macro
if test -z '$(DEBUG)'; then \
(cd $(1); \
for f in `find . -name \*.exe -o -name \*.dll`; do \
echo Calling $(STRIP) "$$$${pkg_version}/$$$${f}"; \
$(STRIP) "$$$${f}"; done); \
fi
endef
# Support macro. Strip all exe files below $(1) using STRIP_EX.
define STRIP_EX_macro
if test -z '$(DEBUG)'; then \
(cd $(1); \
for f in `find . -name \*.exe -o -name \*.dll`; do \
echo Calling $(STRIP_EX) "$$$${pkg_version}/$$$${f}"; \
$(STRIP_EX) "$$$${f}"; done); \
fi
endef
define GETDEPS
$(addprefix stamps/stamp-final-, $(call GETVAR,gpg4win_pkg_$(1)_deps))
endef
define GETDEPS_EX
$(addprefix stamps/stamp-final-ex-, $(call GETVAR,gpg4win_pkg_$(1)_deps))
endef
# Template for source packages to build for an additional host
define EXPKG_template_
pkg_files += $(call GETVAR,gpg4win_pkg_$(1))
stamps/stamp-$(1)-ex-00-unpack: stamps/stamp-$(1)-00-unpack
touch stamps/stamp-$(1)-ex-00-unpack
stamps/stamp-$(1)-ex-01-patch: stamps/stamp-$(1)-ex-00-unpack stamps/stamp-$(1)-01-patch
touch stamps/stamp-$(1)-ex-01-patch
stamps/stamp-$(1)-ex-02-configure: stamps/stamp-$(1)-ex-01-patch
($(call SETVARS_EX,$(1)); \
mkdir "$$$${pkgbdir}"; \
cd "$$$${pkgbdir}"; \
eval "../$$$${pkg_version}/configure" \
--prefix="$$$${pkgidir}" \
--host=$(GPGEX_ADD_HOST) \
--build=$(build) \
$$$${pkgcfg} CFLAGS=\"-mms-bitfields $$$${pkgextracflags}\";\
shopt -s nullglob; \
for pfile in "$$$${pkgpbdir}"/*.postcfg \
"$$$${pkgpdir}"/*.postcfg ; do \
(cd "$$$${pkgsdir}"; "$$$${pfile}") \
done; \
for pfile in "$$$${pkgpbdir}"/*.postcfg-build \
"$$$${pkgpdir}"/*.postcfg-build ; do \
(cd "$$$${pkgbdir}"; "$$$${pfile}") \
done)
touch stamps/stamp-$(1)-ex-02-configure
stamps/stamp-$(1)-ex-03-make: stamps/stamp-$(1)-ex-02-configure
($(call SETVARS_EX,$(1)); \
cd "$$$${pkgbdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs} \
)
touch stamps/stamp-$(1)-ex-03-make
# Note that post_install must come last because it may be empty and
# "; ;" is a syntax error.
stamps/stamp-$(1)-ex-04-install: stamps/stamp-$(1)-ex-03-make
($(call SETVARS_EX,$(1)); \
cd "$$$${pkgbdir}"; \
$(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs_inst} install; \
$(call STRIP_EX_macro,"$$$${pkgidir}"); \
rm -f "$$$${pkgidir}/share/info/dir"; \
$(call gpg4win_pkg_$(call FROB_macro,$(1))_ex_post_install))
touch stamps/stamp-$(1)-ex-04-install
stamps/stamp-$(1)-ex-05-stow: stamps/stamp-$(1)-ex-04-install
($(call SETVARS_EX,$(1)); \
cd $(ex_ipdir); \
$(STOW) -t `readlink -f $(ex_idir)` "$$$${pkg_version}")
touch stamps/stamp-$(1)-ex-05-stow
stamps/stamp-final-ex-$(1): stamps/stamp-$(1)-ex-05-stow
touch stamps/stamp-final-ex-$(1)
.PHONY : clean-ex-$(1)
clean-ex-$(1):
($(call SETVARS_EX,$(1)); \
(cd $(ex_ipdir) && \
($(STOW) -D "$$$${pkg_version}"; \
rm -fR "$$$${pkg_version}")); \
rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}")
rm -f stamps/stamp-final-ex-$(1) stamps/stamp-$(1)-ex-*
endef
define EXPKG_template
$(if $(filter-out no, $(call GETVAR,gpg4win_pkg_$(1))),
$(call EXPKG_template_,$1))
endef
# Template for source packages.
define SPKG_template_
pkg_files += $(call GETVAR,gpg4win_pkg_$(1))
stamps/stamp-$(1)-00-unpack: stamps/stamp-directories $(call GETDEPS,$(1))
(cd $(bdir); \
$(call SETVARS,$(1)); \
$(call DEFLATE_macro,$$$${pkg}))
touch stamps/stamp-$(1)-00-unpack
stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
(shopt -s nullglob; \
$(call SETVARS,$(1)); \
for pfile in "$$$${pkgpbdir}"/*.patch "$$$${pkgpdir}"/*.patch ; do \
(cd "$$$${pkgsdir}"; "$$$${pfile}") \
done)
touch stamps/stamp-$(1)-01-patch
stamps/stamp-$(1)-02-configure: stamps/stamp-$(1)-01-patch
($(call SETVARS,$(1)); \
mkdir "$$$${pkgbdir}"; \
cd "$$$${pkgbdir}"; \
eval "../$$$${pkg_version}/configure" \
--prefix="$$$${pkgidir}" \
--host=$(host) \
--build=$(build) \
$$$${pkgcfg} CFLAGS=\"-mms-bitfields $$$${pkgextracflags}\";\
shopt -s nullglob; \
for pfile in "$$$${pkgpbdir}"/*.postcfg \
"$$$${pkgpdir}"/*.postcfg ; do \
(cd "$$$${pkgsdir}"; "$$$${pfile}") \
done; \
for pfile in "$$$${pkgpbdir}"/*.postcfg-build \
"$$$${pkgpdir}"/*.postcfg-build ; do \
(cd "$$$${pkgbdir}"; "$$$${pfile}") \
done;) && \
touch stamps/stamp-$(1)-02-configure
stamps/stamp-$(1)-03-make: stamps/stamp-$(1)-02-configure
($(call SETVARS,$(1)); \
cd "$$$${pkgbdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs})
touch stamps/stamp-$(1)-03-make
# Note that post_install must come last because it may be empty and
# "; ;" is a syntax error.
stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
($(call SETVARS,$(1)); \
cd "$$$${pkgbdir}"; \
cd "$$$${pkgmkdir_inst}"; \
$(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs_inst} install; \
$(call STRIP_macro,"$$$${pkgidir}"); \
rm -f "$$$${pkgidir}/share/info/dir"; \
$(call gpg4win_pkg_$(call FROB_macro,$(1))_post_install))
touch stamps/stamp-$(1)-04-install
stamps/stamp-$(1)-05-stow: stamps/stamp-$(1)-04-install
($(call SETVARS,$(1)); \
cd $(ipdir); \
$(STOW) "$$$${pkg_version}")
touch stamps/stamp-$(1)-05-stow
stamps/stamp-final-$(1): stamps/stamp-$(1)-05-stow
touch stamps/stamp-final-$(1)
.PHONY : clean-$(1)
clean-$(1):
($(call SETVARS,$(1)); \
(cd $(ipdir) && \
($(STOW) -D "$$$${pkg_version}"; \
rm -fR "$$$${pkg_version}")); \
rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}")
rm -f stamps/stamp-final-$(1) stamps/stamp-$(1)-*
endef
define SPKG_template
$(if $(filter-out no, $(call GETVAR,gpg4win_pkg_$(1))),
$(call SPKG_template_,$1))
endef
# Template for source packages using only make and no build
# directory.
define MPKG_template_
pkg_files += $(call GETVAR,gpg4win_pkg_$(1))
stamps/stamp-$(1)-00-unpack: stamps/stamp-directories $(call GETDEPS,$(1))
(cd $(bdir); \
$(call SETVARS,$(1)); \
$(call DEFLATE_macro,$$$${pkg}))
touch stamps/stamp-$(1)-00-unpack
stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
(shopt -s nullglob; \
$(call SETVARS,$(1)); \
for pfile in "$$$${pkgpbdir}"/*.patch "$$$${pkgpdir}"/*.patch ; do \
(cd "$$$${pkgsdir}"; "$$$${pfile}") \
done)
touch stamps/stamp-$(1)-01-patch
stamps/stamp-$(1)-03-make: stamps/stamp-$(1)-01-patch
($(call SETVARS,$(1)); \
cd "$$$${pkgsdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs})
touch stamps/stamp-$(1)-03-make
stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
($(call SETVARS,$(1)); \
cd "$$$${pkgsdir}"; \
$(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs_inst} install; \
$(call STRIP_macro,"$$$${pkgidir}"); \
$(call gpg4win_pkg_$(call FROB_macro,$(1))_post_install))
touch stamps/stamp-$(1)-04-install
stamps/stamp-$(1)-05-stow: stamps/stamp-$(1)-04-install
($(call SETVARS,$(1)); \
cd $(ipdir); \
$(STOW) "$$$${pkg_version}")
touch stamps/stamp-$(1)-05-stow
stamps/stamp-final-$(1): stamps/stamp-$(1)-05-stow
touch stamps/stamp-final-$(1)
.PHONY : clean-$(1)
clean-$(1):
($(call SETVARS,$(1)); \
(cd $(ipdir) && \
($(STOW) -D "$$$${pkg_version}"; \
rm -fR "$$$${pkg_version}")); \
rm -fR "$$$${pkgsdir}")
rm -f stamps/stamp-final-$(1) stamps/stamp-$(1)-*
endef
define MPKG_template
$(if $(filter-out no, $(call GETVAR,gpg4win_pkg_$(1))),
$(call MPKG_template_,$1))
endef
# Template for binary packages.
define BPKG_template_
pkg_files += $(call GETVAR,gpg4win_pkg_$(1))
pkg_files += $(call GETVAR,gpg4win_pkg_$(1)_dev)
stamps/stamp-$(1)-00-install: stamps/stamp-directories $(call GETDEPS,$(1))
($(call SETVARS,$(1)); \
$(MKDIR) "$$$${pkgidir}"; \
cd $$$${pkgidir}; \
$(call DEFLATE_macro,$$$${pkg}))
touch stamps/stamp-$(1)-00-install
# Note that post_install must come last because it may be empty and
# "; ;" is a syntax error.
stamps/stamp-$(1)-01-install-dev: stamps/stamp-$(1)-00-install
($(call SETVARS,$(1)); \
$(MKDIR) "$$$${pkgidir_dev}"; \
(cd $$$${pkgidir_dev}; \
$(call DEFLATE_macro,$$$${pkg_dev})); \
$(call gpg4win_pkg_$(call FROB_macro,$(1))_post_install))
touch stamps/stamp-$(1)-01-install-dev
stamps/stamp-$(1)-02-stow: stamps/stamp-$(1)-01-install-dev
($(call SETVARS,$(1)); \
cd $(ipdir); \
$(STOW) "$$$${pkg_version}")
touch stamps/stamp-$(1)-02-stow
stamps/stamp-$(1)-03-stow-dev: stamps/stamp-$(1)-02-stow
($(call SETVARS,$(1)); \
cd $(ipdir); \
$(STOW) "$$$${pkg_version_dev}")
touch stamps/stamp-$(1)-03-stow-dev
stamps/stamp-final-$(1): stamps/stamp-$(1)-03-stow-dev
touch stamps/stamp-final-$(1)
.PHONY : clean-$(1)
clean-$(1):
($(call SETVARS,$(1)); \
cd $(ipdir) && \
($(STOW) -D "$$$${pkg_version}"; \
$(STOW) -D "$$$${pkg_version_dev}"; \
rm -fR "$$$${pkg_version}" "$$$${pkg_version_dev}"))
rm -f stamps/stamp-final-$(1) stamps/stamp-$(1)-*
endef
define BPKG_template
$(if $(filter-out no, $(call GETVAR,gpg4win_pkg_$(1))),
$(call BPKG_template_,$1))
endef
# Template for qt packages.
define QTPKG_template_
pkg_files += $(call GETVAR,gpg4win_pkg_$(1))
stamps/stamp-$(1)-00-unpack: stamps/stamp-directories $(call GETDEPS,$(1))
(cd $(bdir); \
$(call SETVARS,$(1)); \
$(call DEFLATE_macro,$$$${pkg}))
touch stamps/stamp-$(1)-00-unpack
stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
(shopt -s nullglob; \
$(call SETVARS,$(1)); \
for pfile in "$$$${pkgpbdir}"/*.patch "$$$${pkgpdir}"/*.patch ; do \
(cd "$$$${pkgsdir}"; "$$$${pfile}") \
done)
touch stamps/stamp-$(1)-01-patch
stamps/stamp-$(1)-02-configure: stamps/stamp-$(1)-01-patch
($(call SETVARS,$(1)); \
mkdir "$$$${pkgbdir}"; \
cd "$$$${pkgbdir}"; \
$$$${pkgcfg}) && \
touch stamps/stamp-$(1)-02-configure
stamps/stamp-$(1)-03-make: stamps/stamp-$(1)-02-configure
($(call SETVARS,$(1)); \
cd "$$$${pkgbdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs})
touch stamps/stamp-$(1)-03-make
# Note that post_install must come last because it may be empty and
# "; ;" is a syntax error.
stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
($(call SETVARS,$(1)); \
$(call gpg4win_pkg_$(call FROB_macro,$(1))_post_install))
touch stamps/stamp-$(1)-04-install
stamps/stamp-$(1)-05-stow: stamps/stamp-$(1)-04-install
($(call SETVARS,$(1)); \
cd $(ipdir); \
$(STOW) "$$$${pkg_version}")
touch stamps/stamp-$(1)-05-stow
stamps/stamp-final-$(1): stamps/stamp-$(1)-05-stow
touch stamps/stamp-final-$(1)
.PHONY : clean-$(1)
clean-$(1):
($(call SETVARS,$(1)); \
(cd $(ipdir) && \
($(STOW) -D "$$$${pkg_version}"; \
rm -fR "$$$${pkg_version}")); \
rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}")
rm -f stamps/stamp-final-$(1) stamps/stamp-$(1)-*
endef
define QTPKG_template
$(if $(filter-out no, $(call GETVAR,gpg4win_pkg_$(1))),
$(call QTPKG_template_,$1))
endef
# Template for internal packages.
define IPKG_template
stamps/stamp-final-$(1): stamps/stamp-directories $(call GETDEPS,$(1))
touch stamps/stamp-final-$(1)
endef
# Template for README files
# (The final awk command converts the file endings).
define README_template
README.$(1).txt : versioninfo.txt NEWS.tmp $(top_srcdir)/doc/README.$(1).txt \
COMPONENTS-list.tmp $(top_srcdir)/doc/beta-warning.txt
sed -e '/^;.*/d;/!VERSIONINFO!/{r versioninfo.txt' -e 'd;}' \
-e '/!NEWSFILE!/{r NEWS.tmp' -e 'd;}' \
-e '/!NEWSFILE!/{r NEWS.tmp' -e 'd;}' \
-e '/!COMPONENTS!/{r COMPONENTS-list.tmp' -e 'd;}' \
-e '/!PKG-COPYRIGHT!/{r $(top_srcdir)/doc/pkg-copyright.txt' -e 'd;}' \
-e 's,!VERSION!,$(VERSION),g' \
-e 's,!BUILD_ISODATE!,$(BUILD_ISODATE),g' \
< $(top_srcdir)/doc/README.$(1).txt \
| (if echo "$(VERSION)" | egrep 'svn|rc|beta|git' >/dev/null; then \
sed -e '/!BETA-WARNING!/{r $(top_srcdir)/doc/beta-warning.txt' \
-e 'd;}'; else sed -e 's,!BETA-WARNING!,,g'; fi) \
| awk '{printf "%s\r\n", $$$$0}' >README.$(1).txt
endef
define HOWTO_template
HOWTO-$(1).$(2).txt : $(top_srcdir)/doc/HOWTO-$(1).$(2).txt
sed -e '/^;.*/d' \
-e 's,!VERSION!,$(VERSION),g' \
-e 's,!BUILD_ISODATE!,$(BUILD_ISODATE),g' \
< $(top_srcdir)/doc/HOWTO-$(1).$(2).txt \
| awk '{printf "%s\r\n", $$$$0}' > HOWTO-$(1).$(2).txt
endef
# Special Template for boost.
define BOOST_template_
pkg_files += $(call GETVAR,gpg4win_pkg_$(1))
stamps/stamp-$(1)-00-unpack: stamps/stamp-directories $(call GETDEPS,$(1))
(cd $(bdir); \
$(call SETVARS,$(1)); \
$(call DEFLATE_macro,$$$${pkg}))
touch stamps/stamp-$(1)-00-unpack
stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
(shopt -s nullglob; \
$(call SETVARS,$(1)); \
for pfile in "$$$${pkgpbdir}"/*.patch "$$$${pkgpdir}"/*.patch ; do \
(cd "$$$${pkgsdir}"; "$$$${pfile}") \
done)
touch stamps/stamp-$(1)-01-patch
stamps/stamp-$(1)-02-build: stamps/stamp-$(1)-01-patch
($(call SETVARS,$(1)); \
cd $$$${pkgsdir}/tools/build/; \
./bootstrap.sh; \
cd $$$${pkgsdir}; \
echo "using gcc : mxe : $(host)-g++ : $(host)-windres $(host)-ar $(host)-ranlib ;" > "user-config.jam"; \
./tools/build/b2 \
-a \
-q \
'$(GPG4WIN_PARALLEL)' \
--ignore-site-config \
--user-config=user-config.jam \
abi=ms \
address-model=32 \
architecture=x86 \
binary-format=pe \
link=shared \
target-os=windows \
threadapi=win32 \
threading=multi \
variant=release \
toolset=gcc-mxe \
cxxflags=-std=gnu++98 \
--layout=tagged \
--disable-icu \
--without-mpi \
--without-python \
--prefix=$$$${pkgidir} \
--exec-prefix=$$$${pkgidir}/bin \
--libdir=$$$${pkgidir}/lib \
--includedir=$$$${pkgidir}/include \
-sEXPAT_INCLUDE='$(idir)/include' \
-sEXPAT_LIBPATH='$(idir)/lib' \
-sBZIP2_INCLUDE='$(idir)/include' \
-sBZIP2_LIBPATH='$(idir)/lib' \
install) && \
touch stamps/stamp-$(1)-02-build
stamps/stamp-$(1)-03-stow: stamps/stamp-$(1)-02-build
($(call SETVARS,$(1)); \
cd $(ipdir); \
$(STOW) "$$$${pkg_version}")
touch stamps/stamp-$(1)-03-stow
stamps/stamp-final-$(1): stamps/stamp-$(1)-03-stow
touch stamps/stamp-final-$(1)
.PHONY : clean-$(1)
clean-$(1):
($(call SETVARS,$(1)); \
(cd $(ipdir) && \
($(STOW) -D "$$$${pkg_version}"; \
rm -fR "$$$${pkg_version}")); \
rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}")
rm -f stamps/stamp-final-$(1) stamps/stamp-$(1)-*
endef
# Template for source packages of KDE software
define KDEPKG_template_
pkg_files += $(call GETVAR,gpg4win_pkg_$(1))
stamps/stamp-$(1)-00-unpack: stamps/stamp-directories $(call GETDEPS,$(1))
(cd $(bdir); \
$(call SETVARS,$(1)); \
$(call DEFLATE_macro,$$$${pkg}))
touch stamps/stamp-$(1)-00-unpack
stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
(shopt -s nullglob; \
$(call SETVARS,$(1)); \
cd "$$$${pkgsdir}"; \
- sed -i 's/set(KF5_VERSION.*)/set(KF5_VERSION "5.30.0")/' CMakeLists.txt; \
+ sed -i 's/set(KF5_VERSION.*)/set(KF5_VERSION "5.43.0")/' CMakeLists.txt; \
sed -i 's/set(KMIME_VERSION.*)/set(KMIME_VERSION "5.2.40")/' CMakeLists.txt; \
sed -i 's/set(LIBKLEO_VERSION.*)/set(LIBKLEO_VERSION "5.4.40")/' CMakeLists.txt; \
- sed -i 's/set(QT_REQUIRED_VERSION.*)/set(QT_REQUIRED_VERSION "5.7.0")/' CMakeLists.txt; \
- sed -i 's/set(GPGME_REQUIRED_VERSION.*)/set(GPGME_REQUIRED_VERSION "1.8.0")/' CMakeLists.txt; \
+ sed -i 's/set(QT_REQUIRED_VERSION.*)/set(QT_REQUIRED_VERSION "5.10.0")/' CMakeLists.txt; \
+ sed -i 's/set(GPGME_REQUIRED_VERSION.*)/set(GPGME_REQUIRED_VERSION "1.10.0")/' CMakeLists.txt; \
for pfile in "$$$${pkgpbdir}"/*.patch "$$$${pkgpdir}"/*.patch ; do \
(cd "$$$${pkgsdir}"; "$$$${pfile}") \
done)
touch stamps/stamp-$(1)-01-patch
stamps/stamp-$(1)-02-configure: stamps/stamp-$(1)-01-patch
($(call SETVARS,$(1)); \
mkdir "$$$${pkgbdir}"; \
cd "$$$${pkgbdir}"; \
cmake \
-DCMAKE_INSTALL_PREFIX="$$$${pkgidir}" \
-DCMAKE_PREFIX_PATH="$$$${pkgidir}" \
-DCMAKE_TOOLCHAIN_FILE=$(abs_top_srcdir)/src/toolchain.cmake \
-DKDE_INSTALL_DATADIR="$$$${pkgidir}/share" \
-DBUILD_TESTING=False \
$$$${pkgcfg} $$$${pkgextracflags} "../$$$${pkg_version}") && \
touch stamps/stamp-$(1)-02-configure
stamps/stamp-$(1)-03-make: stamps/stamp-$(1)-02-configure
($(call SETVARS,$(1)); \
cd "$$$${pkgbdir}"; \
test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs})
touch stamps/stamp-$(1)-03-make
# Note that post_install must come last because it may be empty and
# "; ;" is a syntax error.
stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
($(call SETVARS,$(1)); \
cd "$$$${pkgbdir}"; \
cd "$$$${pkgmkdir_inst}"; \
$(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs_inst} install; \
$(call STRIP_macro,"$$$${pkgidir}"); \
$(call gpg4win_pkg_$(call FROB_macro,$(1))_post_install))
touch stamps/stamp-$(1)-04-install
stamps/stamp-$(1)-05-stow: stamps/stamp-$(1)-04-install
($(call SETVARS,$(1)); \
cd $(ipdir); \
$(STOW) "$$$${pkg_version}")
touch stamps/stamp-$(1)-05-stow
stamps/stamp-final-$(1): stamps/stamp-$(1)-05-stow
touch stamps/stamp-final-$(1)
.PHONY : clean-$(1)
clean-$(1):
($(call SETVARS,$(1)); \
(cd $(ipdir) && \
($(STOW) -D "$$$${pkg_version}"; \
rm -fR "$$$${pkg_version}")); \
rm -fR "$$$${pkgsdir}" "$$$${pkgbdir}")
rm -f stamps/stamp-final-$(1) stamps/stamp-$(1)-*
endef
define KDEPKG_template
$(if $(filter-out no, $(call GETVAR,gpg4win_pkg_$(1))),
$(call KDEPKG_template_,$1))
endef
# Insert the template for each source package.
$(foreach spkg, $(gpg4win_spkgs), $(eval $(call SPKG_template,$(spkg))))
# Insert the template for each gpgEx architecture package.
$(foreach expkg, $(gpg4win_expkgs), $(eval $(call EXPKG_template,$(expkg))))
# Insert the template for each make only source package.
$(foreach mpkg, $(gpg4win_mpkgs), $(eval $(call MPKG_template,$(mpkg))))
# Insert the template for each binary package.
$(foreach bpkg, $(gpg4win_bpkgs), $(eval $(call BPKG_template,$(bpkg))))
# Insert the template for each internal package.
$(foreach ipkg, $(gpg4win_ipkgs), $(eval $(call IPKG_template,$(ipkg))))
# Insert the template for the README and HOWTO files.
$(foreach rll, $(gpg4win_readme_ll), $(eval $(call README_template,$(rll))))
# Insert the template for KDE packages.
$(foreach kdepkg, $(gpg4win_kdepkgs), $(eval $(call KDEPKG_template,$(kdepkg))))
# Insert the template for qt packages.
$(foreach qtpkg, $(gpg4win_qtpkgs), $(eval $(call QTPKG_template,$(qtpkg))))
$(foreach rll, $(gpg4win_howto_smime_ll), \
$(eval $(call HOWTO_template,SMIME,$(rll))))
$(eval $(call BOOST_template_,boost))
stamps/stamp-final: stamps/stamp-directories
stamps/stamp-final: $(addprefix stamps/stamp-final-,$(gpg4win_build_list)) \
$(addprefix stamps/stamp-final-ex-,$(gpg4win_build_ex_list))
touch stamps/stamp-final
$(bdir)/versioninfo.txt: stamps/stamp-final
touch $(bdir)/versioninfo.txt
all-gpg4win: stamps/stamp-final
# Just to check if we catched all stamps.
clean-stamps:
$(RM) -fR $(stamps)
clean-gpg4win:
$(RM) -fR playground stamps
.PHONY : all-gpg4win clean-stamps clean-gpg4win
# @emacs_local_vars_begin@
# @emacs_local_vars_read_only@
# @emacs_local_vars_end@
diff --git a/src/inst-breeze-icons.nsi b/src/inst-breeze-icons.nsi
index 1bc5ec28..0e964708 100644
--- a/src/inst-breeze-icons.nsi
+++ b/src/inst-breeze-icons.nsi
@@ -1,309 +1,309 @@
# inst-breeze-icons.nsi - Snippet for breeze-icons. -*- coding: latin-1; -*-
# Copyright (C) 2005, 2007, 2008 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, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
!ifdef prefix
!undef prefix
!endif
!define prefix ${ipdir}/breeze-icons-${gpg4win_pkg_breeze_icons_version}
!ifdef DEBUG
Section "breeze-icons" SEC_breeze_icons
!else
Section "-breeze-icons" SEC_breeze_icons
!endif
SetOutPath "$INSTDIR"
!ifdef SOURCES
File "${gpg4win_pkg_breeze_icons}"
!else
#
# Note: You may want to use the pkg-to-nsi.pl script to create the
# list of icons.
#
SetOutPath "$INSTDIR\share\icons\breeze\actions\16"
File ${prefix}/share/icons/breeze/actions/16/application-exit.svg
File ${prefix}/share/icons/breeze/actions/16/arrow-down.svg
File ${prefix}/share/icons/breeze/actions/16/arrow-up.svg
File ${prefix}/share/icons/breeze/actions/16/configure-shortcuts.svg
File ${prefix}/share/icons/breeze/actions/16/configure-toolbars.svg
File ${prefix}/share/icons/breeze/actions/16/configure.svg
File ${prefix}/share/icons/breeze/actions/16/cell_edit.svg
File ${prefix}/share/icons/breeze/actions/16/dialog-cancel.svg
File ${prefix}/share/icons/breeze/actions/16/dialog-close.svg
File ${prefix}/share/icons/breeze/actions/16/dialog-ok-apply.svg
File ${prefix}/share/icons/breeze/actions/16/dialog-ok.svg
File ${prefix}/share/icons/breeze/actions/16/document-edit-decrypt-verify.svg
File ${prefix}/share/icons/breeze/actions/16/document-edit-decrypt.svg
File ${prefix}/share/icons/breeze/actions/16/document-edit-encrypt.svg
File ${prefix}/share/icons/breeze/actions/16/document-edit-sign-encrypt.svg
File ${prefix}/share/icons/breeze/actions/16/document-edit-sign.svg
File ${prefix}/share/icons/breeze/actions/16/document-edit-verify.svg
File ${prefix}/share/icons/breeze/actions/16/document-encrypt.svg
File ${prefix}/share/icons/breeze/actions/16/document-sign.svg
File ${prefix}/share/icons/breeze/actions/16/document-open.svg
File ${prefix}/share/icons/breeze/actions/16/document-print.svg
File ${prefix}/share/icons/breeze/actions/16/document-revert.svg
File ${prefix}/share/icons/breeze/actions/16/draw-arrow-down.svg
File ${prefix}/share/icons/breeze/actions/16/draw-arrow-up.svg
File ${prefix}/share/icons/breeze/actions/16/edit-clear-locationbar-rtl.svg
File ${prefix}/share/icons/breeze/actions/16/edit-delete.svg
File ${prefix}/share/icons/breeze/actions/16/edit-find.svg
File ${prefix}/share/icons/breeze/actions/16/edit-paste.svg
File ${prefix}/share/icons/breeze/actions/16/edit-redo.svg
File ${prefix}/share/icons/breeze/actions/16/edit-rename.svg
File ${prefix}/share/icons/breeze/actions/16/edit-undo.svg
File ${prefix}/share/icons/breeze/actions/16/editor.svg
File ${prefix}/share/icons/breeze/actions/16/go-bottom.svg
File ${prefix}/share/icons/breeze/actions/16/go-down.svg
File ${prefix}/share/icons/breeze/actions/16/go-first.svg
File ${prefix}/share/icons/breeze/actions/16/go-last.svg
File ${prefix}/share/icons/breeze/actions/16/go-next.svg
File ${prefix}/share/icons/breeze/actions/16/go-previous.svg
File ${prefix}/share/icons/breeze/actions/16/go-top.svg
File ${prefix}/share/icons/breeze/actions/16/go-up.svg
File ${prefix}/share/icons/breeze/actions/16/help-contents.svg
File ${prefix}/share/icons/breeze/actions/16/help-contextual.svg
File ${prefix}/share/icons/breeze/actions/16/list-add.svg
File ${prefix}/share/icons/breeze/actions/16/list-remove.svg
File ${prefix}/share/icons/breeze/actions/16/process-stop.svg
File ${prefix}/share/icons/breeze/actions/16/run-build-configure.svg
File ${prefix}/share/icons/breeze/actions/16/settings-configure.svg
File ${prefix}/share/icons/breeze/actions/16/tab-close.svg
File ${prefix}/share/icons/breeze/actions/16/tab-duplicate.svg
File ${prefix}/share/icons/breeze/actions/16/tab-new-background.svg
File ${prefix}/share/icons/breeze/actions/16/tools-report-bug.svg
File ${prefix}/share/icons/breeze/actions/16/view-refresh.svg
File ${prefix}/share/icons/breeze/actions/16/window-close.svg
File ${prefix}/share/icons/breeze/actions/16/visibility.svg
File ${prefix}/share/icons/breeze/actions/16/hint.svg
SetOutPath "$INSTDIR\share\icons\breeze\actions\22"
File ${prefix}/share/icons/breeze/actions/22/application-exit.svg
File ${prefix}/share/icons/breeze/actions/22/arrow-down.svg
File ${prefix}/share/icons/breeze/actions/22/arrow-up.svg
File ${prefix}/share/icons/breeze/actions/22/cell_edit.svg
File ${prefix}/share/icons/breeze/actions/22/configure-shortcuts.svg
File ${prefix}/share/icons/breeze/actions/22/configure-toolbars.svg
File ${prefix}/share/icons/breeze/actions/22/configure.svg
File ${prefix}/share/icons/breeze/actions/22/dialog-cancel.svg
File ${prefix}/share/icons/breeze/actions/22/dialog-close.svg
File ${prefix}/share/icons/breeze/actions/22/dialog-ok-apply.svg
File ${prefix}/share/icons/breeze/actions/22/dialog-ok.svg
File ${prefix}/share/icons/breeze/actions/22/document-edit-decrypt-verify.svg
File ${prefix}/share/icons/breeze/actions/22/document-edit-decrypt.svg
File ${prefix}/share/icons/breeze/actions/22/document-edit-encrypt.svg
File ${prefix}/share/icons/breeze/actions/22/document-edit-sign-encrypt.svg
File ${prefix}/share/icons/breeze/actions/22/document-edit-sign.svg
File ${prefix}/share/icons/breeze/actions/22/document-edit-verify.svg
File ${prefix}/share/icons/breeze/actions/22/document-encrypt.svg
File ${prefix}/share/icons/breeze/actions/22/document-sign.svg
File ${prefix}/share/icons/breeze/actions/22/document-open.svg
File ${prefix}/share/icons/breeze/actions/22/document-print.svg
File ${prefix}/share/icons/breeze/actions/22/document-revert.svg
File ${prefix}/share/icons/breeze/actions/22/draw-arrow-down.svg
File ${prefix}/share/icons/breeze/actions/22/draw-arrow-up.svg
File ${prefix}/share/icons/breeze/actions/22/edit-clear-locationbar-rtl.svg
File ${prefix}/share/icons/breeze/actions/22/edit-delete.svg
File ${prefix}/share/icons/breeze/actions/22/edit-find.svg
File ${prefix}/share/icons/breeze/actions/22/edit-paste.svg
File ${prefix}/share/icons/breeze/actions/22/edit-redo.svg
File ${prefix}/share/icons/breeze/actions/22/edit-rename.svg
File ${prefix}/share/icons/breeze/actions/22/edit-undo.svg
File ${prefix}/share/icons/breeze/actions/22/editor.svg
File ${prefix}/share/icons/breeze/actions/22/go-bottom.svg
File ${prefix}/share/icons/breeze/actions/22/go-down.svg
File ${prefix}/share/icons/breeze/actions/22/go-first.svg
File ${prefix}/share/icons/breeze/actions/22/go-last.svg
File ${prefix}/share/icons/breeze/actions/22/go-next.svg
File ${prefix}/share/icons/breeze/actions/22/go-previous.svg
File ${prefix}/share/icons/breeze/actions/22/go-top.svg
File ${prefix}/share/icons/breeze/actions/22/go-up.svg
File ${prefix}/share/icons/breeze/actions/22/help-contents.svg
File ${prefix}/share/icons/breeze/actions/22/help-contextual.svg
File ${prefix}/share/icons/breeze/actions/22/list-add.svg
File ${prefix}/share/icons/breeze/actions/22/list-remove.svg
File ${prefix}/share/icons/breeze/actions/22/process-stop.svg
File ${prefix}/share/icons/breeze/actions/22/run-build-configure.svg
File ${prefix}/share/icons/breeze/actions/22/settings-configure.svg
File ${prefix}/share/icons/breeze/actions/22/tab-close.svg
File ${prefix}/share/icons/breeze/actions/22/tab-duplicate.svg
File ${prefix}/share/icons/breeze/actions/22/tab-new-background.svg
File ${prefix}/share/icons/breeze/actions/22/tools-report-bug.svg
File ${prefix}/share/icons/breeze/actions/22/view-certificate-add.svg
File ${prefix}/share/icons/breeze/actions/22/view-certificate-export-secret.svg
File ${prefix}/share/icons/breeze/actions/22/view-certificate-export-server.svg
File ${prefix}/share/icons/breeze/actions/22/view-certificate-export.svg
File ${prefix}/share/icons/breeze/actions/22/view-certificate-import.svg
File ${prefix}/share/icons/breeze/actions/22/view-certificate-server-configure.svg
File ${prefix}/share/icons/breeze/actions/22/view-certificate-sign.svg
File ${prefix}/share/icons/breeze/actions/22/view-refresh.svg
File ${prefix}/share/icons/breeze/actions/22/window-close.svg
File ${prefix}/share/icons/breeze/actions/22/question.svg
SetOutPath "$INSTDIR\share\icons\breeze\actions\24"
File ${prefix}/share/icons/breeze/actions/24/application-exit.svg
File ${prefix}/share/icons/breeze/actions/24/arrow-down.svg
File ${prefix}/share/icons/breeze/actions/24/arrow-up.svg
File ${prefix}/share/icons/breeze/actions/24/configure-toolbars.svg
File ${prefix}/share/icons/breeze/actions/24/configure.svg
File ${prefix}/share/icons/breeze/actions/24/dialog-cancel.svg
File ${prefix}/share/icons/breeze/actions/24/dialog-close.svg
File ${prefix}/share/icons/breeze/actions/24/dialog-ok-apply.svg
File ${prefix}/share/icons/breeze/actions/24/dialog-ok.svg
File ${prefix}/share/icons/breeze/actions/24/document-edit-decrypt-verify.svg
File ${prefix}/share/icons/breeze/actions/24/document-edit-decrypt.svg
File ${prefix}/share/icons/breeze/actions/24/document-edit-encrypt.svg
File ${prefix}/share/icons/breeze/actions/24/document-edit-sign-encrypt.svg
File ${prefix}/share/icons/breeze/actions/24/document-edit-sign.svg
File ${prefix}/share/icons/breeze/actions/24/document-edit-verify.svg
File ${prefix}/share/icons/breeze/actions/24/document-encrypt.svg
File ${prefix}/share/icons/breeze/actions/24/document-sign.svg
File ${prefix}/share/icons/breeze/actions/24/document-open.svg
File ${prefix}/share/icons/breeze/actions/24/document-print.svg
File ${prefix}/share/icons/breeze/actions/24/document-revert.svg
File ${prefix}/share/icons/breeze/actions/24/draw-arrow-down.svg
File ${prefix}/share/icons/breeze/actions/24/draw-arrow-up.svg
File ${prefix}/share/icons/breeze/actions/24/edit-clear-locationbar-rtl.svg
File ${prefix}/share/icons/breeze/actions/24/edit-delete.svg
File ${prefix}/share/icons/breeze/actions/24/edit-find.svg
File ${prefix}/share/icons/breeze/actions/24/edit-paste.svg
File ${prefix}/share/icons/breeze/actions/24/edit-redo.svg
File ${prefix}/share/icons/breeze/actions/24/edit-rename.svg
File ${prefix}/share/icons/breeze/actions/24/edit-undo.svg
File ${prefix}/share/icons/breeze/actions/24/go-bottom.svg
File ${prefix}/share/icons/breeze/actions/24/go-down.svg
File ${prefix}/share/icons/breeze/actions/24/go-first.svg
File ${prefix}/share/icons/breeze/actions/24/go-last.svg
File ${prefix}/share/icons/breeze/actions/24/go-next.svg
File ${prefix}/share/icons/breeze/actions/24/go-previous.svg
File ${prefix}/share/icons/breeze/actions/24/go-top.svg
File ${prefix}/share/icons/breeze/actions/24/go-up.svg
File ${prefix}/share/icons/breeze/actions/24/gtk-tab-duplicate.svg
File ${prefix}/share/icons/breeze/actions/24/help-contextual.svg
File ${prefix}/share/icons/breeze/actions/24/list-add.svg
File ${prefix}/share/icons/breeze/actions/24/list-remove.svg
File ${prefix}/share/icons/breeze/actions/24/process-stop.svg
File ${prefix}/share/icons/breeze/actions/24/run-build-configure.svg
File ${prefix}/share/icons/breeze/actions/24/tab-close.svg
File ${prefix}/share/icons/breeze/actions/24/tab-duplicate.svg
File ${prefix}/share/icons/breeze/actions/24/tab-new-background.svg
File ${prefix}/share/icons/breeze/actions/24/tools-report-bug.svg
File ${prefix}/share/icons/breeze/actions/24/view-refresh.svg
File ${prefix}/share/icons/breeze/actions/24/window-close.svg
File ${prefix}/share/icons/breeze/actions/24/visibility.svg
File ${prefix}/share/icons/breeze/actions/24/hint.svg
SetOutPath "$INSTDIR\share\icons\breeze\actions\32"
File ${prefix}/share/icons/breeze/actions/32/application-exit.svg
File ${prefix}/share/icons/breeze/actions/32/configure.svg
File ${prefix}/share/icons/breeze/actions/32/dialog-cancel.svg
File ${prefix}/share/icons/breeze/actions/32/dialog-ok-apply.svg
File ${prefix}/share/icons/breeze/actions/32/document-edit-decrypt-verify.svg
File ${prefix}/share/icons/breeze/actions/32/document-edit-decrypt.svg
File ${prefix}/share/icons/breeze/actions/32/document-edit-encrypt.svg
File ${prefix}/share/icons/breeze/actions/32/document-edit-sign-encrypt.svg
File ${prefix}/share/icons/breeze/actions/32/document-edit-sign.svg
File ${prefix}/share/icons/breeze/actions/32/document-open.svg
File ${prefix}/share/icons/breeze/actions/32/document-print.svg
File ${prefix}/share/icons/breeze/actions/32/document-revert.svg
File ${prefix}/share/icons/breeze/actions/32/edit-delete.svg
File ${prefix}/share/icons/breeze/actions/32/edit-redo.svg
File ${prefix}/share/icons/breeze/actions/32/edit-undo.svg
File ${prefix}/share/icons/breeze/actions/32/editor.svg
File ${prefix}/share/icons/breeze/actions/32/view-refresh.svg
File ${prefix}/share/icons/breeze/actions/32/window-close.svg
SetOutPath "$INSTDIR\share\icons\breeze\apps\22"
File ${prefix}/share/icons/breeze/apps/22/kde.svg
- SetOutPath "$INSTDIR\share\icons\breeze\apps\32"
+ SetOutPath "$INSTDIR\share\icons\breeze\preferences\32"
- File ${prefix}/share/icons/breeze/apps/32/preferences-desktop-locale.svg
- File ${prefix}/share/icons/breeze/apps/32/preferences-system-network.svg
+ File ${prefix}/share/icons/breeze/preferences/32/preferences-desktop-locale.svg
+ File ${prefix}/share/icons/breeze/preferences/32/preferences-system-network.svg
SetOutPath "$INSTDIR\share\icons\breeze\apps\48"
File ${prefix}/share/icons/breeze/apps/48/internet-mail.svg
File ${prefix}/share/icons/breeze/apps/48/telepathy-kde.svg
File ${prefix}/share/icons/breeze/apps/48/usb-creator-kde.svg
SetOutPath "$INSTDIR\share\icons\breeze\categories\32"
File ${prefix}/share/icons/breeze/categories/32/applications-graphics.svg
SetOutPath "$INSTDIR\share\icons\breeze"
File ${prefix}/share/icons/breeze/index.theme
File ${prefix}/share/icons/breeze/icon-theme.cache
SetOutPath "$INSTDIR\share\icons\breeze\places\16"
File ${prefix}/share/icons/breeze/places/16/start-here-kde.svg
SetOutPath "$INSTDIR\share\icons\breeze\places\22"
File ${prefix}/share/icons/breeze/places/22/start-here-kde.svg
SetOutPath "$INSTDIR\share\icons\breeze\places\64"
File ${prefix}/share/icons/breeze/places/64/start-here-kde.svg
SetOutPath "$INSTDIR\share\icons\breeze\status\16"
File ${prefix}/share/icons/breeze/status/16/dialog-information.svg
SetOutPath "$INSTDIR\share\icons\breeze\status\22"
File ${prefix}/share/icons/breeze/status/22/dialog-information.svg
File ${prefix}/share/icons/breeze/status/22/security-high.svg
File ${prefix}/share/icons/breeze/status/22/security-low.svg
File ${prefix}/share/icons/breeze/status/22/security-medium.svg
SetOutPath "$INSTDIR\share\icons\breeze\status\24"
File ${prefix}/share/icons/breeze/status/24/dialog-information.svg
SetOutPath "$INSTDIR\share\icons\breeze\status\64"
File ${prefix}/share/icons/breeze/status/64/dialog-error.svg
File ${prefix}/share/icons/breeze/status/64/dialog-information.svg
File ${prefix}/share/icons/breeze/status/64/dialog-password.svg
File ${prefix}/share/icons/breeze/status/64/dialog-warning.svg
File ${prefix}/share/icons/breeze/status/64/security-high.svg
File ${prefix}/share/icons/breeze/status/64/security-low.svg
File ${prefix}/share/icons/breeze/status/64/security-medium.svg
SetOutPath "$INSTDIR\share\icons\breeze\emblems\8"
File ${prefix}/share/icons/breeze/emblems/8/emblem-information.svg
File ${prefix}/share/icons/breeze/emblems/8/emblem-warning.svg
File ${prefix}/share/icons/breeze/emblems/8/emblem-success.svg
File ${prefix}/share/icons/breeze/emblems/8/emblem-error.svg
File ${prefix}/share/icons/breeze/emblems/8/emblem-question.svg
SetOutPath "$INSTDIR\share\icons\breeze\actions\symbolic"
File ${prefix}/share/icons/breeze/actions/symbolic/send-to-symbolic.svg
!endif
SectionEnd
diff --git a/src/uninst-breeze-icons.nsi b/src/uninst-breeze-icons.nsi
index 62555746..9d7506d6 100644
--- a/src/uninst-breeze-icons.nsi
+++ b/src/uninst-breeze-icons.nsi
@@ -1,278 +1,280 @@
# uninst-breeze-icons.nsi - Snippet for breeze-icons. -*- coding: latin-1; -*-
# Copyright (C) 2005, 2007, 2008 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, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
!ifdef prefix
!undef prefix
!endif
!define prefix ${ipdir}/breeze-icons-${gpg4win_pkg_breeze_icons_version}
; Uninstaller section.
Section "-un.breeze-icons"
!ifdef SOURCES
Push "${gpg4win_pkg_breeze_icons}"
Call un.SourceDelete
!else
Delete "$INSTDIR\share\icons\breeze\status\64\security-medium.svg"
Delete "$INSTDIR\share\icons\breeze\status\64\security-low.svg"
Delete "$INSTDIR\share\icons\breeze\status\64\security-high.svg"
Delete "$INSTDIR\share\icons\breeze\status\64\dialog-warning.svg"
Delete "$INSTDIR\share\icons\breeze\status\64\dialog-password.svg"
Delete "$INSTDIR\share\icons\breeze\status\64\dialog-information.svg"
Delete "$INSTDIR\share\icons\breeze\status\64\dialog-error.svg"
Delete "$INSTDIR\share\icons\breeze\status\24\dialog-information.svg"
Delete "$INSTDIR\share\icons\breeze\status\22\security-medium.svg"
Delete "$INSTDIR\share\icons\breeze\status\22\security-low.svg"
Delete "$INSTDIR\share\icons\breeze\status\22\security-high.svg"
Delete "$INSTDIR\share\icons\breeze\status\22\dialog-information.svg"
Delete "$INSTDIR\share\icons\breeze\status\16\dialog-information.svg"
Delete "$INSTDIR\share\icons\breeze\places\64\start-here-kde.svg"
Delete "$INSTDIR\share\icons\breeze\places\22\start-here-kde.svg"
Delete "$INSTDIR\share\icons\breeze\places\16\start-here-kde.svg"
Delete "$INSTDIR\share\icons\breeze\index.theme"
Delete "$INSTDIR\share\icons\breeze\icon-theme.cache"
Delete "$INSTDIR\share\icons\breeze\categories\32\applications-graphics.svg"
Delete "$INSTDIR\share\icons\breeze\apps\48\usb-creator-kde.svg"
Delete "$INSTDIR\share\icons\breeze\apps\48\telepathy-kde.svg"
Delete "$INSTDIR\share\icons\breeze\apps\48\internet-mail.svg"
- Delete "$INSTDIR\share\icons\breeze\apps\32\preferences-system-network.svg"
- Delete "$INSTDIR\share\icons\breeze\apps\32\preferences-desktop-locale.svg"
+ Delete "$INSTDIR\share\icons\breeze\preferences\32\preferences-system-network.svg"
+ Delete "$INSTDIR\share\icons\breeze\preferences\32\preferences-desktop-locale.svg"
Delete "$INSTDIR\share\icons\breeze\apps\22\kde.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\window-close.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\view-refresh.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\edit-undo.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\edit-redo.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\edit-delete.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\editor.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\document-revert.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\document-print.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\document-open.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\document-edit-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\document-edit-sign-encrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\document-edit-encrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\document-edit-decrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\document-edit-decrypt-verify.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\dialog-ok-apply.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\dialog-cancel.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\configure.svg"
Delete "$INSTDIR\share\icons\breeze\actions\32\application-exit.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\window-close.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\view-refresh.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\tools-report-bug.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\tab-new-background.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\tab-duplicate.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\tab-close.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\run-build-configure.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\process-stop.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\list-remove.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\list-add.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\help-contextual.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\gtk-tab-duplicate.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\go-up.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\go-top.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\go-previous.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\go-next.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\go-last.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\go-first.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\go-down.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\go-bottom.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\edit-undo.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\edit-rename.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\edit-redo.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\edit-paste.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\edit-find.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\edit-delete.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\edit-clear-locationbar-rtl.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\draw-arrow-up.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\draw-arrow-down.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-revert.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-print.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-open.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-encrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-verify.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-sign-encrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-encrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-decrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-decrypt-verify.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\dialog-ok.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\dialog-ok-apply.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\dialog-close.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\dialog-cancel.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\configure.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\configure-toolbars.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\arrow-up.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\arrow-down.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\application-exit.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\visibility.svg"
Delete "$INSTDIR\share\icons\breeze\actions\24\hint.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\cell_edit.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\editor.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\window-close.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\view-refresh.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-server-configure.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-import.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-export.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-export-server.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-export-secret.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-add.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\tools-report-bug.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\tab-new-background.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\tab-duplicate.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\tab-close.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\settings-configure.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\run-build-configure.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\process-stop.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\list-remove.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\list-add.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\help-contextual.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\help-contents.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\go-up.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\go-top.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\go-previous.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\go-next.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\go-last.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\go-first.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\go-down.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\go-bottom.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\edit-undo.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\edit-rename.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\edit-redo.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\edit-paste.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\edit-find.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\edit-delete.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\edit-clear-locationbar-rtl.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\draw-arrow-up.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\draw-arrow-down.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-revert.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-print.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-open.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-encrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-verify.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-sign-encrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-encrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-decrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-decrypt-verify.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\dialog-ok.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\dialog-ok-apply.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\dialog-close.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\dialog-cancel.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\configure.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\configure-toolbars.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\configure-shortcuts.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\arrow-up.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\arrow-down.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\application-exit.svg"
Delete "$INSTDIR\share\icons\breeze\actions\22\question.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\cell_edit.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\window-close.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\view-refresh.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\tools-report-bug.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\tab-new-background.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\tab-duplicate.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\tab-close.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\settings-configure.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\run-build-configure.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\process-stop.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\list-remove.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\list-add.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\help-contextual.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\help-contents.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\editor.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\go-up.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\go-top.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\go-previous.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\go-next.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\go-last.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\go-first.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\go-down.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\go-bottom.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\edit-undo.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\edit-rename.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\edit-redo.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\edit-paste.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\edit-find.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\edit-delete.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\edit-clear-locationbar-rtl.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\draw-arrow-up.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\draw-arrow-down.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-revert.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-print.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-open.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-encrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-verify.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-sign.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-sign-encrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-encrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-decrypt.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-decrypt-verify.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\dialog-ok.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\dialog-ok-apply.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\dialog-close.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\dialog-cancel.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\configure.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\configure-toolbars.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\configure-shortcuts.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\arrow-up.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\arrow-down.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\application-exit.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\visibility.svg"
Delete "$INSTDIR\share\icons\breeze\actions\16\hint.svg"
Delete "$INSTDIR\share\icons\breeze\actions\symbolic\send-to-symbolic.svg"
Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-information.svg"
Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-warning.svg"
Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-success.svg"
Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-error.svg"
Delete "$INSTDIR\share\icons\breeze\emblems\8\emblem-question.svg"
+ RMDir "$INSTDIR\share\icons\breeze\preferences\32"
+ RMDir "$INSTDIR\share\icons\breeze\preferences"
RMDir "$INSTDIR\share\icons\breeze\emblems\8"
RMDir "$INSTDIR\share\icons\breeze\emblems"
RMDir "$INSTDIR\share\icons\breeze\status\64"
RMDir "$INSTDIR\share\icons\breeze\status\24"
RMDir "$INSTDIR\share\icons\breeze\status\22"
RMDir "$INSTDIR\share\icons\breeze\status\16"
RMDir "$INSTDIR\share\icons\breeze\status"
RMDir "$INSTDIR\share\icons\breeze\places\64"
RMDir "$INSTDIR\share\icons\breeze\places\22"
RMDir "$INSTDIR\share\icons\breeze\places\16"
RMDir "$INSTDIR\share\icons\breeze\places"
RMDir "$INSTDIR\share\icons\breeze\categories\32"
RMDir "$INSTDIR\share\icons\breeze\categories"
RMDir "$INSTDIR\share\icons\breeze\apps\48"
RMDir "$INSTDIR\share\icons\breeze\apps\32"
RMDir "$INSTDIR\share\icons\breeze\apps\22"
RMDir "$INSTDIR\share\icons\breeze\apps"
RMDir "$INSTDIR\share\icons\breeze\actions\symbolic"
RMDir "$INSTDIR\share\icons\breeze\actions\32"
RMDir "$INSTDIR\share\icons\breeze\actions\24"
RMDir "$INSTDIR\share\icons\breeze\actions\22"
RMDir "$INSTDIR\share\icons\breeze\actions\16"
RMDir "$INSTDIR\share\icons\breeze\actions"
RMDir "$INSTDIR\share\icons\breeze"
RMDir "$INSTDIR\share\icons"
RMDir "$INSTDIR\share"
RMDir "$INSTDIR"
!endif
SectionEnd