[Gpg4win-commits] [git] Gpg4win - branch, kleo-kf5, updated. gpg4win-2.3.0-41-g787302c
by Andre Heinecke
cvs at cvs.gnupg.org
Thu Jan 21 14:11:23 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 787302ce64c7f43ad5864b39e480a0f1bf1c8ef7 (commit)
via 503c2d8a79acc317a33a81b1b8e9166dd3841aba (commit)
from 5ea86a35994c6d5ba4893ebb7825072309cfb85a (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 787302ce64c7f43ad5864b39e480a0f1bf1c8ef7
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Jan 21 14:09:10 2016 +0100
Add KWidgetsAddons Package
* src/Makefile.am (EXTRA_DIST): Add inst file.
* configure.ac: Declare KDEPKG
* packages/packages.current: Add kwidgetsaddons.
* src/config.nsi.in: Define according macros.
* src/inst-kwidgetsaddons.nsi, src/uninst-kwidgetsaddons.nsi: New.
* src/inst-sections.nsi: Include kwidgetsaddons for kleo.
diff --git a/configure.ac b/configure.ac
index d08b3a3..75f4109 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,6 +346,7 @@ GPG4WIN_BPKG_BINSRC([kleopatra], [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([kwidgetsaddons], [kconfig qtbase])
GPG4WIN_FINALIZE
diff --git a/packages/packages.current b/packages/packages.current
index 09c36f1..886b042 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -337,7 +337,7 @@ name qttools-5.5.1.tar.xz
file 5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz
chk f7815165d0b427346028901a42be5f0f47d05962
-# KDE libraries
+# KDE Frameworks
server http://download.kde.org/stable/frameworks/
@@ -362,6 +362,13 @@ chk 1fd4f512e9802ac2c6bf0eb46d99c1264eed5249
file 5.17/ki18n-5.17.0.tar.xz
chk 270dd1195af0b84f9d6b264ca2df2fe17ac29140
+# 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
+
#
# Qt links DBus and Kleopatra / KDE libs needs it
#
diff --git a/src/Makefile.am b/src/Makefile.am
index a00f62a..e0a7f45 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,6 +63,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
uninst-claws-mail.nsi uninst-claws-mail-cmds.nsi \
inst-qtbase.nsi uninst-qtbase.nsi \
inst-ki18n.nsi uninst-ki18n.nsi \
+ inst-kwidgetsaddons.nsi uninst-kwidgetsaddons.nsi \
inst-qttools.nsi uninst-qttools.nsi \
inst-extra-cmake-modules.nsi uninst-extra-cmake-modules.nsi \
inst-final.nsi
@@ -95,7 +96,7 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
qtbase qttools
# Source packages following the KDE pattern
-gpg4win_kdepkgs = kconfig ki18n extra-cmake-modules
+gpg4win_kdepkgs = kconfig kwidgetsaddons ki18n extra-cmake-modules
# Supported source packages to build in an additional architecture
gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex gpgol \
diff --git a/src/config.nsi.in b/src/config.nsi.in
index 1b3fe65..f0001a4 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -209,6 +209,10 @@
!define gpg4win_pkg_ki18n @gpg4win_pkg_ki18n@
!define gpg4win_pkg_ki18n_version @gpg4win_pkg_ki18n_version@
+ at HAVE_PKG_KWIDGETSADDONS@
+!define gpg4win_pkg_kwidgetsaddons @gpg4win_pkg_kwidgetsaddons@
+!define gpg4win_pkg_kwidgetsaddons_version @gpg4win_pkg_kwidgetsaddons_version@
+
# Internal packages.
@HAVE_PKG_COMPENDIUM@
diff --git a/src/inst-kwidgetsaddons.nsi b/src/inst-kwidgetsaddons.nsi
new file mode 100644
index 0000000..cd2f394
--- /dev/null
+++ b/src/inst-kwidgetsaddons.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}/kwidgetsaddons-${gpg4win_pkg_kwidgetsaddons_version}
+
+!ifdef DEBUG
+Section "kwidgetsaddons" SEC_kwidgetsaddons
+!else
+Section "-kwidgetsaddons" SEC_kwidgetsaddons
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_kwidgetsaddons}"
+!else
+ SetOutPath "$INSTDIR\bin"
+ File ${prefix}/bin/libKF5WidgetsAddons.dll
+!endif
+SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 8706348..18f269b 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -110,6 +110,9 @@
!ifdef HAVE_PKG_KI18N
!include "inst-ki18n.nsi"
!endif
+!ifdef HAVE_PKG_KWIDGETSADDONS
+!include "inst-kwidgetsaddons.nsi"
+!endif
!ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
!include "inst-extra-cmake-modules.nsi"
!endif
@@ -281,6 +284,9 @@
!ifdef HAVE_PKG_KI18N
!include "uninst-ki18n.nsi"
!endif
+!ifdef HAVE_PKG_KWIDGETSADDONS
+!include "uninst-kwidgetsaddons.nsi"
+!endif
!ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
!include "uninst-extra-cmake-modules.nsi"
!endif
@@ -514,6 +520,9 @@ Function CalcDepends
!ifdef HAVE_PKG_KI18N
!insertmacro UnselectSection ${SEC_ki18n}
!endif
+!ifdef HAVE_PKG_KWIDGETSADDONS
+ !insertmacro UnselectSection ${SEC_kwidgetsaddons}
+!endif
# Always install gnupg2. This is also ensured by putting
# these packages in the RO section and enabling them by default, but
@@ -606,6 +615,7 @@ Function CalcDepends
!insertmacro SelectSection ${SEC_oxygen_icons}
!insertmacro SelectSection ${SEC_kconfig}
!insertmacro SelectSection ${SEC_ki18n}
+ !insertmacro SelectSection ${SEC_kwidgetsaddons}
!insertmacro SelectSection ${SEC_qttools}
!insertmacro SelectSection ${SEC_extra-cmake-modules}
skip_kleopatra_libs:
diff --git a/src/uninst-kwidgetsaddons.nsi b/src/uninst-kwidgetsaddons.nsi
new file mode 100644
index 0000000..0ff2d17
--- /dev/null
+++ b/src/uninst-kwidgetsaddons.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}/kwidgetsaddons-${gpg4win_pkg_kwidgetsaddons_version}
+
+; Uninstaller section.
+Section "-un.kwidgetsaddons"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_kwidgetsaddons}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\bin\libKF5WidgetsAddons.dll"
+ RmDir "$INSTDIR\bin"
+
+!endif
+SectionEnd
commit 503c2d8a79acc317a33a81b1b8e9166dd3841aba
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Jan 21 13:58:53 2016 +0100
Add KI18n Package
* Makefile.am (EXTRA_DIST): Add patch.
* configure.ac: Declare KDEPKG
* packages/packages.current: Add ki18n.
* patches/ki18n/no-tests.patch: New. Removes dependency to
QtConcurrent and QML.
* src/config.nsi.in: Define according macros.
* src/inst-ki18n.nsi, src/uninst-ki18n.nsi: New.
* src/inst-sections.nsi: Include ki18n for kleo.
diff --git a/Makefile.am b/Makefile.am
index 666e571..f15d0f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,8 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/qtbase-5.5.1/fix-syssemaphore.patch \
patches/qtbase-5.5.1/fix-zlib-link.patch \
patches/w32pth-2.0.5/workaround-broken-libtool.patch \
- patches/qttools/disable-most-tools.patch
+ patches/qttools/disable-most-tools.patch \
+ patches/ki18n/no-tests.patch
copy-news:
cp NEWS doc/website/NEWS.last
diff --git a/configure.ac b/configure.ac
index 19cd684..d08b3a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -345,6 +345,7 @@ GPG4WIN_SPKG([qttools], [qtbase])
GPG4WIN_BPKG_BINSRC([kleopatra], [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_FINALIZE
diff --git a/packages/packages.current b/packages/packages.current
index fa00bfd..09c36f1 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -355,6 +355,13 @@ chk 8093d72964170246a97e337c259cd4e6f71b627a
file 5.17/kconfig-5.17.0.tar.xz
chk 1fd4f512e9802ac2c6bf0eb46d99c1264eed5249
+# 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
+
#
# Qt links DBus and Kleopatra / KDE libs needs it
#
diff --git a/patches/ki18n/no-tests.patch b/patches/ki18n/no-tests.patch
new file mode 100755
index 0000000..5602850
--- /dev/null
+++ b/patches/ki18n/no-tests.patch
@@ -0,0 +1,17 @@
+#! /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/src/Makefile.am b/src/Makefile.am
index 4c7c207..a00f62a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,7 +62,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-kleopatra.nsi uninst-kleopatra.nsi \
uninst-claws-mail.nsi uninst-claws-mail-cmds.nsi \
inst-qtbase.nsi uninst-qtbase.nsi \
- inst-kconfig.nsi uninst-kconfig.nsi \
+ inst-ki18n.nsi uninst-ki18n.nsi \
inst-qttools.nsi uninst-qttools.nsi \
inst-extra-cmake-modules.nsi uninst-extra-cmake-modules.nsi \
inst-final.nsi
@@ -95,7 +95,7 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
qtbase qttools
# Source packages following the KDE pattern
-gpg4win_kdepkgs = kconfig extra-cmake-modules
+gpg4win_kdepkgs = kconfig ki18n extra-cmake-modules
# Supported source packages to build in an additional architecture
gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex gpgol \
@@ -243,6 +243,10 @@ gpg4win_pkg_gpgex_configure = --silent \
gpg4win_pkg_paperkey_configure = --silent
+gpg4win_pkg_ki18n_configure = -DBUILD_WITH_QTSCRIPT=OFF \
+ -DLibIntl_INCLUDE_DIRS='$(idir)/include' \
+ -DLibIntl_LIBRARIES='$(idir)/lib/libintl.dll.a'
+
gpg4win_pkg_qtbase_configure = -opensource \
-confirm-license \
-xplatform win32-g++ \
diff --git a/src/config.nsi.in b/src/config.nsi.in
index cf48e98..1b3fe65 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -205,6 +205,9 @@
!define gpg4win_pkg_extra_cmake_modules @gpg4win_pkg_extra_cmake_modules@
!define gpg4win_pkg_extra_cmake_modules_version @gpg4win_pkg_extra_cmake_modules_version@
+ at HAVE_PKG_KI18N@
+!define gpg4win_pkg_ki18n @gpg4win_pkg_ki18n@
+!define gpg4win_pkg_ki18n_version @gpg4win_pkg_ki18n_version@
# Internal packages.
@HAVE_PKG_COMPENDIUM@
diff --git a/src/inst-ki18n.nsi b/src/inst-ki18n.nsi
new file mode 100644
index 0000000..65ceae7
--- /dev/null
+++ b/src/inst-ki18n.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}/ki18n-${gpg4win_pkg_ki18n_version}
+
+!ifdef DEBUG
+Section "ki18n" SEC_ki18n
+!else
+Section "-ki18n" SEC_ki18n
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_ki18n}"
+!else
+ SetOutPath "$INSTDIR\bin"
+ File ${prefix}/bin/libKF5I18n.dll
+!endif
+SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index fced63a..8706348 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -107,6 +107,9 @@
!ifdef HAVE_PKG_KCONFIG
!include "inst-kconfig.nsi"
!endif
+!ifdef HAVE_PKG_KI18N
+!include "inst-ki18n.nsi"
+!endif
!ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
!include "inst-extra-cmake-modules.nsi"
!endif
@@ -275,6 +278,9 @@
!ifdef HAVE_PKG_KCONFIG
!include "uninst-kconfig.nsi"
!endif
+!ifdef HAVE_PKG_KI18N
+!include "uninst-ki18n.nsi"
+!endif
!ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
!include "uninst-extra-cmake-modules.nsi"
!endif
@@ -505,6 +511,9 @@ Function CalcDepends
!ifdef HAVE_PKG_KCONFIG
!insertmacro UnselectSection ${SEC_kconfig}
!endif
+!ifdef HAVE_PKG_KI18N
+ !insertmacro UnselectSection ${SEC_ki18n}
+!endif
# Always install gnupg2. This is also ensured by putting
# these packages in the RO section and enabling them by default, but
@@ -596,6 +605,7 @@ Function CalcDepends
!insertmacro SelectSection ${SEC_qtbase}
!insertmacro SelectSection ${SEC_oxygen_icons}
!insertmacro SelectSection ${SEC_kconfig}
+ !insertmacro SelectSection ${SEC_ki18n}
!insertmacro SelectSection ${SEC_qttools}
!insertmacro SelectSection ${SEC_extra-cmake-modules}
skip_kleopatra_libs:
diff --git a/src/uninst-ki18n.nsi b/src/uninst-ki18n.nsi
new file mode 100644
index 0000000..f5f3115
--- /dev/null
+++ b/src/uninst-ki18n.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}/ki18n-${gpg4win_pkg_ki18n_version}
+
+; Uninstaller section.
+Section "-un.ki18n"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_ki18n}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\bin\libKF5I18n.dll"
+ RmDir "$INSTDIR\bin"
+
+!endif
+SectionEnd
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 3 ++-
configure.ac | 2 ++
packages/packages.current | 16 +++++++++++++++-
patches/ki18n/no-tests.patch | 17 +++++++++++++++++
src/Makefile.am | 9 +++++++--
src/config.nsi.in | 7 +++++++
src/{inst-kconfig.nsi => inst-ki18n.nsi} | 10 +++++-----
src/{inst-kconfig.nsi => inst-kwidgetsaddons.nsi} | 10 +++++-----
src/inst-sections.nsi | 20 ++++++++++++++++++++
src/{uninst-kconfig.nsi => uninst-ki18n.nsi} | 8 ++++----
...{uninst-kconfig.nsi => uninst-kwidgetsaddons.nsi} | 8 ++++----
11 files changed, 88 insertions(+), 22 deletions(-)
create mode 100755 patches/ki18n/no-tests.patch
copy src/{inst-kconfig.nsi => inst-ki18n.nsi} (82%)
copy src/{inst-kconfig.nsi => inst-kwidgetsaddons.nsi} (78%)
copy src/{uninst-kconfig.nsi => uninst-ki18n.nsi} (84%)
copy src/{uninst-kconfig.nsi => uninst-kwidgetsaddons.nsi} (82%)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list