[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.1-142-g9146982
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Apr 29 11:12:26 CEST 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, master has been updated
via 9146982f74b436d993d7d567cf9081695f1230f5 (commit)
via 4fb8608e16081a5e3285cf05387d927bd08664a4 (commit)
from 4775fc5148a4fe0d1a40e3e30ef6e90c2dd3bcb6 (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 9146982f74b436d993d7d567cf9081695f1230f5
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 29 11:11:58 2016 +0200
Update Kleopatra development version
* packages/packages.current (kleopatra): Update
diff --git a/packages/packages.current b/packages/packages.current
index cd8a588..28089d9 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -547,6 +547,6 @@ chk d07988acf4398583580f0f55aae73c3082687fba19d2aa8048979d53a82cf592
# Kleopatra
# last changed: see package date.
# by: ah
-# verified: Tarball created by ah.
-file kleopatra/kleopatra-201604271827.tar.gz
-chk 131d6baece998ea22f64c1492e98f0c32eaf23592dfc47e7eecd7026f4f1d66d
+# verified: Tarball created by ah. (branch signencfiles-3)
+file kleopatra/kleopatra-201604291038.tar.gz
+chk 1c43f38756b063a27984c6e20b4ea4200fbee097d32bb12ae828b735fd005a86
commit 4fb8608e16081a5e3285cf05387d927bd08664a4
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Apr 29 11:09:44 2016 +0200
Add kittemmodels as new dependency of Kleopatra
* configure.ac, packages/packages.current, src/Makefile.am: Add
new package.
* src/inst-kitemmodels.nsi, src/uninst-kitemmodels.nsi: New.
* src/inst-sections.nsi: Install it for Kleopatra.
--
As Tier1 Kitemmodels is a lightweight dependency and contains
a Proxymodel with improved column handling that we will use in
Kleopatra
diff --git a/configure.ac b/configure.ac
index 5394cef..2a6f35e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -347,7 +347,7 @@ GPG4WIN_SPKG([qtwinextras], [qtbase])
GPG4WIN_SPKG([qtsvg], [qtbase])
GPG4WIN_SPKG([boost], [expat zlib bzip2])
GPG4WIN_KDEPKG([breeze-icons], [extra-cmake-modules qtbase])
-GPG4WIN_KDEPKG([kleopatra], [breeze-icons kxmlgui libkleo kde-l10n])
+GPG4WIN_KDEPKG([kleopatra], [breeze-icons kxmlgui libkleo kde-l10n kitemmodels])
GPG4WIN_KDEPKG([extra-cmake-modules])
GPG4WIN_KDEPKG([kconfig], [qtbase qttools extra-cmake-modules])
GPG4WIN_KDEPKG([ki18n], [qtbase gettext qttools extra-cmake-modules])
@@ -361,6 +361,7 @@ GPG4WIN_KDEPKG([kguiaddons], [qtbase qttools])
GPG4WIN_KDEPKG([kmime], [kcodecs])
GPG4WIN_KDEPKG([kconfigwidgets], [kwidgetsaddons kguiaddons ki18n kcodecs kconfig])
GPG4WIN_KDEPKG([kitemviews], [qtbase qttools])
+GPG4WIN_KDEPKG([kitemmodels], [qtbase qttools])
GPG4WIN_KDEPKG([kiconthemes], [qtsvg kconfigwidgets])
GPG4WIN_KDEPKG([kxmlgui], [kiconthemes kconfigwidgets kitemviews])
GPG4WIN_KDEPKG([libkleo], [gpgmepp kmime kwidgetsaddons kwindowsystem kcompletion kconfig gpgme])
diff --git a/packages/packages.current b/packages/packages.current
index ace5ddc..cd8a588 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -462,6 +462,13 @@ chk be0e6a2f1a1c0d670a8333325b0a65334a2aff62dda9c8e32347a480f9e62407
file 5.20/kitemviews-5.20.0.tar.xz
chk 3d71897950535b3180966917997320bd7227c503cb9e47356fe01df687d7e596
+# KItemModels
+# last changed: 2016-04-29
+# by: ah
+# verified: https://www.kde.org/info/kde-frameworks-5.20.0.php
+file 5.20/kitemmodels-5.20.0.tar.xz
+chk 2fce8fe2294ec26a1943c44a547cfd1a2b3e7044e5b571bebd0aef5c7812da79
+
# KIconThemes
# last changed: 2016-04-19
# by: ah
diff --git a/src/Makefile.am b/src/Makefile.am
index caec2d2..50c9445 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,6 +75,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
inst-kiconthemes.nsi uninst-kiconthemes.nsi \
inst-breeze-icons.nsi uninst-breeze-icons.nsi \
inst-kitemviews.nsi uninst-kitemviews.nsi \
+ inst-kitemmodels.nsi uninst-kitemmodels.nsi \
inst-kguiaddons.nsi uninst-kguiaddons.nsi \
inst-kmime.nsi uninst-kmime.nsi \
inst-kde-l10n.nsi uninst-kde-l10n.nsi \
@@ -116,7 +117,7 @@ gpg4win_qtpkgs = qtbase qttools qtwinextras qtsvg
gpg4win_kdepkgs = kconfig kwidgetsaddons gpgmepp ki18n extra-cmake-modules \
kcompletion kwindowsystem kcoreaddons libkleo kcodecs \
kmime kconfigwidgets kxmlgui kguiaddons kitemviews \
- kiconthemes kleopatra breeze-icons
+ kiconthemes kleopatra breeze-icons kitemmodels
# Supported source packages to build in an additional architecture
gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex gpgol \
diff --git a/src/inst-kitemmodels.nsi b/src/inst-kitemmodels.nsi
new file mode 100644
index 0000000..3e9f028
--- /dev/null
+++ b/src/inst-kitemmodels.nsi
@@ -0,0 +1,35 @@
+# Copyright (C) 2016 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}/kitemmodels-${gpg4win_pkg_kitemmodels_version}
+
+!ifdef DEBUG
+Section "kitemmodels" SEC_kitemmodels
+!else
+Section "-kitemmodels" SEC_kitemmodels
+!endif
+ SetOutPath "$INSTDIR"
+!ifdef SOURCES
+ File "${gpg4win_pkg_kitemmodels}"
+!else
+ SetOutPath "$INSTDIR\bin"
+ File ${prefix}/bin/libKF5ItemModels.dll
+!endif
+SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 9fee78d..d2eaf2d 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -152,6 +152,9 @@
!ifdef HAVE_PKG_KITEMVIEWS
!include "inst-kitemviews.nsi"
!endif
+!ifdef HAVE_PKG_KITEMMODELS
+!include "inst-kitemmodels.nsi"
+!endif
!ifdef HAVE_PKG_LIBKLEO
!include "inst-libkleo.nsi"
!endif
@@ -365,6 +368,9 @@
!ifdef HAVE_PKG_KITEMVIEWS
!include "uninst-kitemviews.nsi"
!endif
+!ifdef HAVE_PKG_KITEMMODELS
+!include "uninst-kitemmodels.nsi"
+!endif
!ifdef HAVE_PKG_KMIME
!include "uninst-kmime.nsi"
!endif
@@ -630,6 +636,9 @@ Function CalcDepends
!ifdef HAVE_PKG_KITEMVIEWS
!insertmacro UnselectSection ${SEC_kitemviews}
!endif
+!ifdef HAVE_PKG_KITEMMODELS
+ !insertmacro UnselectSection ${SEC_kitemmodels}
+!endif
!ifdef HAVE_PKG_KGUIADDONS
!insertmacro UnselectSection ${SEC_kguiaddons}
!endif
@@ -746,6 +755,7 @@ Function CalcDepends
!insertmacro SelectSection ${SEC_kconfigwidgets}
!insertmacro SelectSection ${SEC_kxmlgui}
!insertmacro SelectSection ${SEC_kitemviews}
+ !insertmacro SelectSection ${SEC_kitemmodels}
!insertmacro SelectSection ${SEC_kiconthemes}
!insertmacro SelectSection ${SEC_kguiaddons}
!insertmacro SelectSection ${SEC_qtsvg}
diff --git a/src/uninst-kitemmodels.nsi b/src/uninst-kitemmodels.nsi
new file mode 100644
index 0000000..89fb6dd
--- /dev/null
+++ b/src/uninst-kitemmodels.nsi
@@ -0,0 +1,33 @@
+# Copyright (C) 2016 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}/kitemmodels-${gpg4win_pkg_kitemmodels_version}
+
+; Uninstaller section.
+Section "-un.kitemmodels"
+!ifdef SOURCES
+ Push "${gpg4win_pkg_kitemmodels}"
+ Call un.SourceDelete
+!else
+ Delete "$INSTDIR\bin\libKF5ItemModels.dll"
+ RmDir "$INSTDIR\bin"
+
+!endif
+SectionEnd
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 3 ++-
packages/packages.current | 13 ++++++++++---
src/Makefile.am | 3 ++-
src/{inst-kcoreaddons.nsi => inst-kitemmodels.nsi} | 12 ++++++------
src/inst-sections.nsi | 10 ++++++++++
src/{uninst-kiconthemes.nsi => uninst-kitemmodels.nsi} | 10 +++++-----
6 files changed, 35 insertions(+), 16 deletions(-)
copy src/{inst-kcoreaddons.nsi => inst-kitemmodels.nsi} (77%)
copy src/{uninst-kiconthemes.nsi => uninst-kitemmodels.nsi} (80%)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list