[Gpg4win-commits] [git] Gpg4win - branch, kleo-kf5, updated. gpg4win-2.3.0-45-g4afd89e
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Jan 22 11:07:14 CET 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, kleo-kf5 has been updated
via 4afd89e0e311372b7cee17b9834ded4b757f9d70 (commit)
via 05a54cc15cd5367f5c767de4c2aca8a9d3911e9c (commit)
from a4abe7454844a5a7d7e85a5fe7257aa256097079 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4afd89e0e311372b7cee17b9834ded4b757f9d70
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jan 22 11:06:02 2016 +0100
Fix gpgmepp patch filename
* Makefile.am (EXTRA_DIST): Fix filename for second gpgmepp patch.
diff --git a/Makefile.am b/Makefile.am
index 4abcb50..1716213 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/qttools/disable-most-tools.patch \
patches/ki18n/no-tests.patch \
patches/gpgmepp/0001-Remove-uneccessary-dependency-to-KDEWIN.patch \
- patches/gpgmepp/0001-disable-variants.patch
+ patches/gpgmepp/0002-disable-variants.patch
copy-news:
cp NEWS doc/website/NEWS.last
commit 05a54cc15cd5367f5c767de4c2aca8a9d3911e9c
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jan 22 11:02:00 2016 +0100
Update frameworks and add KCompletion
* configure.ac: Add Kcompletion as KDEPKG
* packages/packages.current: Update KDE Frameworks. Add KCompletion.
* src/config.nsi.in: Add KCompletion defines.
* src/inst-kcompletion.nsi, src/uninst-kcompletion.nsi: New.
* src/inst-sections.nsi: Add sections for KCompletion.
diff --git a/configure.ac b/configure.ac
index df97d6c..fd868cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -344,12 +344,13 @@ GPG4WIN_BPKG_BINSRC([oxygen-icons])
GPG4WIN_SPKG([qtbase], [dbus libpng])
GPG4WIN_SPKG([qttools], [qtbase])
GPG4WIN_SPKG([boost], [expat zlib bzip2])
-GPG4WIN_BPKG_BINSRC([kleopatra], [kconfig gpgme qtbase oxygen-icons])
+GPG4WIN_BPKG_BINSRC([kleopatra], [kwidgetsaddons kcompletion kconfig gpgme qtbase oxygen-icons])
GPG4WIN_KDEPKG([extra-cmake-modules])
GPG4WIN_KDEPKG([kconfig], [qtbase qttools extra-cmake-modules])
GPG4WIN_KDEPKG([ki18n], [qtbase gettext qttools extra-cmake-modules])
GPG4WIN_KDEPKG([gpgmepp], [boost qtbase gpgme extra-cmake-modules])
GPG4WIN_KDEPKG([kwidgetsaddons], [kconfig qttools qtbase])
+GPG4WIN_KDEPKG([kcompletion], [kwidgetsaddons])
GPG4WIN_FINALIZE
diff --git a/packages/packages.current b/packages/packages.current
index 8b5f4cf..043ac4c 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -363,32 +363,40 @@ chk f7815165d0b427346028901a42be5f0f47d05962
server http://download.kde.org/stable/frameworks/
# ECM
-# last changed: 2016-01-08
+# last changed: 2016-01-22
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.17.0.php
-file 5.17/extra-cmake-modules-5.17.0.tar.xz
-chk 8093d72964170246a97e337c259cd4e6f71b627a
+# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
+file 5.18/extra-cmake-modules-5.18.0.tar.xz
+chk ce741f28486f616564aec7d56cedf88eccab9a25
# KConfig
-# last changed: 2016-01-08
+# last changed: 2016-01-22
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.17.0.php
-file 5.17/kconfig-5.17.0.tar.xz
-chk 1fd4f512e9802ac2c6bf0eb46d99c1264eed5249
+# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
+file 5.18/kconfig-5.18.0.tar.xz
+chk d23e28f8b8651970cb12c6485639165340006811
# KI18n
# last changed: 2016-01-21
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.17.0.php
-file 5.17/ki18n-5.17.0.tar.xz
-chk 270dd1195af0b84f9d6b264ca2df2fe17ac29140
+# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
+file 5.18/ki18n-5.18.0.tar.xz
+chk c2b3b02f3776f579151a2423acd67b844440ee8f
# KWidgetsAddons
# last changed: 2016-01-21
# by: ah
-# verified: https://www.kde.org/info/kde-frameworks-5.17.0.php
-file 5.17/kwidgetsaddons-5.17.0.tar.xz
-chk a9923ececfcc7d270c654f43797fa88c774337d3
+# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
+file 5.18/kwidgetsaddons-5.18.0.tar.xz
+chk b6120dd7ca1ffe52d4fecaf396ac64ad3dfe5e94
+
+# KCompletion
+# last changed: 2016-01-22
+# by: ah
+# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
+file 5.18/kcompletion-5.18.0.tar.xz
+chk 6e4e095711c073056d1bd101d24e7ba1c4c214cc
+
# KDE Applications
diff --git a/src/Makefile.am b/src/Makefile.am
index 6341bd7..cc56c5f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,6 +66,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-ki18n.nsi uninst-ki18n.nsi \
inst-gpgmepp.nsi uninst-gpgmepp.nsi \
inst-kwidgetsaddons.nsi uninst-kwidgetsaddons.nsi \
+ inst-kcompletion.nsi uninst-kcompletion.nsi \
inst-qttools.nsi uninst-qttools.nsi \
inst-boost.nsi uninst-boost.nsi \
inst-extra-cmake-modules.nsi uninst-extra-cmake-modules.nsi \
@@ -99,7 +100,8 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
qtbase qttools boost
# Source packages following the KDE pattern
-gpg4win_kdepkgs = kconfig kwidgetsaddons gpgmepp ki18n extra-cmake-modules
+gpg4win_kdepkgs = kconfig kwidgetsaddons gpgmepp ki18n extra-cmake-modules \
+ kcompletion
# Supported source packages to build in an additional architecture
gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex gpgol \
@@ -247,6 +249,8 @@ gpg4win_pkg_gpgex_configure = --silent \
gpg4win_pkg_paperkey_configure = --silent
+gpg4win_pkg_ki18n_configure = -DBUILD_WITH_QTSCRIPT=OFF
+
gpg4win_pkg_qtbase_configure = -opensource \
-confirm-license \
-xplatform win32-g++ \
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 29ffcfd..3be13fb 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -225,6 +225,10 @@
!define gpg4win_pkg_boost @gpg4win_pkg_boost@
!define gpg4win_pkg_boost_version @gpg4win_pkg_boost_version@
+ at HAVE_PKG_KCOMPLETION@
+!define gpg4win_pkg_kcompletion @gpg4win_pkg_kcompletion@
+!define gpg4win_pkg_kcompletion_version @gpg4win_pkg_kcompletion_version@
+
# Internal packages.
@HAVE_PKG_COMPENDIUM@
diff --git a/src/inst-kcompletion.nsi b/src/inst-kcompletion.nsi
new file mode 100644
index 0000000..8ab4a5b
--- /dev/null
+++ b/src/inst-kcompletion.nsi
@@ -0,0 +1,35 @@
+# Copyright (C) 2015 Intevation 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}/kcompletion-${gpg4win_pkg_kcompletion_version}
+
+!ifdef DEBUG
+Section "kcompletion" SEC_kcompletion
+!else
+Section "-kcompletion" SEC_kcompletion
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_kcompletion}"
+!else
+ SetOutPath "$INSTDIR\bin"
+ File ${prefix}/bin/libKF5Completion.dll
+!endif
+SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index a4dc3aa..6629752 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -122,6 +122,9 @@
!ifdef HAVE_PKG_KWIDGETSADDONS
!include "inst-kwidgetsaddons.nsi"
!endif
+!ifdef HAVE_PKG_KCOMPLETION
+!include "inst-kcompletion.nsi"
+!endif
!ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
!include "inst-extra-cmake-modules.nsi"
!endif
@@ -302,6 +305,9 @@
!ifdef HAVE_PKG_KWIDGETSADDONS
!include "uninst-kwidgetsaddons.nsi"
!endif
+!ifdef HAVE_PKG_KCOMPLETION
+!include "uninst-kcompletion.nsi"
+!endif
!ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
!include "uninst-extra-cmake-modules.nsi"
!endif
@@ -547,6 +553,9 @@ Function CalcDepends
!ifdef HAVE_PKG_KWIDGETSADDONS
!insertmacro UnselectSection ${SEC_kwidgetsaddons}
!endif
+!ifdef HAVE_PKG_KCOMPLETION
+ !insertmacro UnselectSection ${SEC_kcompletion}
+!endif
# Always install gnupg2. This is also ensured by putting
# these packages in the RO section and enabling them by default, but
@@ -641,6 +650,7 @@ Function CalcDepends
!insertmacro SelectSection ${SEC_ki18n}
!insertmacro SelectSection ${SEC_gpgmepp}
!insertmacro SelectSection ${SEC_kwidgetsaddons}
+ !insertmacro SelectSection ${SEC_kcompletion}
!insertmacro SelectSection ${SEC_qttools}
!insertmacro SelectSection ${SEC_boost}
!insertmacro SelectSection ${SEC_extra-cmake-modules}
diff --git a/src/uninst-kcompletion.nsi b/src/uninst-kcompletion.nsi
new file mode 100644
index 0000000..b5b0e20
--- /dev/null
+++ b/src/uninst-kcompletion.nsi
@@ -0,0 +1,33 @@
+# Copyright (C) 2015 Intevation 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}/kcompletion-${gpg4win_pkg_kcompletion_version}
+
+; Uninstaller section.
+Section "-un.kcompletion"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_kcompletion}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\bin\libKF5Completion.dll"
+ RmDir "$INSTDIR\bin"
+
+!endif
+SectionEnd
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +-
configure.ac | 3 +-
packages/packages.current | 36 +++++++++++++++---------
src/Makefile.am | 6 +++-
src/config.nsi.in | 4 +++
src/{inst-gpgmepp.nsi => inst-kcompletion.nsi} | 10 +++----
src/inst-sections.nsi | 10 +++++++
src/{uninst-boost.nsi => uninst-kcompletion.nsi} | 8 +++---
8 files changed, 53 insertions(+), 26 deletions(-)
copy src/{inst-gpgmepp.nsi => inst-kcompletion.nsi} (80%)
copy src/{uninst-boost.nsi => uninst-kcompletion.nsi} (83%)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list