[Gpg4win-commits] [git] Gpg4win - branch, kleo-kf5, updated. gpg4win-2.3.0-69-g2298f35
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Feb 16 15:37:59 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 2298f35977df5205f83c2bb71ce60d3517d90db0 (commit)
via 67dde191b7b819ac40dd7d9c213f0cb09b22d958 (commit)
via 855200eef9b00befa8f3992e91048bddd3d2661d (commit)
from 7f867e27e05f221fb38afef21085f4968e916235 (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 2298f35977df5205f83c2bb71ce60d3517d90db0
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 16 15:36:41 2016 +0100
Fix qt plugin install path
* src/inst-qtbase.nsi, src/inst-qtsvg.nsi: Install plugins in bin.
* src/uninst-qtbase.nsi, src/uninst-qtsvg.nsi: Update accordingly.
diff --git a/src/inst-qtbase.nsi b/src/inst-qtbase.nsi
index 301a638..debd4c9 100644
--- a/src/inst-qtbase.nsi
+++ b/src/inst-qtbase.nsi
@@ -41,7 +41,7 @@ Section "-qtbase" SEC_qtbase
File ${prefix}/bin/Qt5PrintSupport.dll
File ${prefix}/bin/Qt5Xml.dll
- SetOutPath "$INSTDIR\platforms"
+ SetOutPath "$INSTDIR\bin\platforms"
File ${prefix}/plugins/platforms/qwindows.dll
diff --git a/src/inst-qtsvg.nsi b/src/inst-qtsvg.nsi
index 45e6aa8..6ba14a2 100644
--- a/src/inst-qtsvg.nsi
+++ b/src/inst-qtsvg.nsi
@@ -31,9 +31,9 @@ Section "-qtsvg" SEC_qtsvg
!else
SetOutPath "$INSTDIR\bin"
File ${prefix}/bin/Qt5Svg.dll
- SetOutPath "$INSTDIR\iconengines"
- File ${prefix}/plugins/iconengines/qtsvgicon.dll
- SetOutPath "$INSTDIR\imageformats"
- File ${prefix}/plugins/imageformats/qtsvg.dll
+ SetOutPath "$INSTDIR\bin\iconengines"
+ File ${prefix}/plugins/iconengines/qsvgicon.dll
+ SetOutPath "$INSTDIR\bin\imageformats"
+ File ${prefix}/plugins/imageformats/qsvg.dll
!endif
SectionEnd
diff --git a/src/uninst-qtbase.nsi b/src/uninst-qtbase.nsi
index eab906f..2a26743 100644
--- a/src/uninst-qtbase.nsi
+++ b/src/uninst-qtbase.nsi
@@ -38,9 +38,10 @@ Section "-un.qtbase"
Delete "$INSTDIR\bin\Qt5Xml.dll"
Delete "$INSTDIR\bin\Qt5PrintSupport.dll"
- Delete "$INSTDIR\platforms\qwindows.dll"
+ Delete "$INSTDIR\bin\platforms\qwindows.dll"
- RMDir "$INSTDIR\platforms"
+ RMDir "$INSTDIR\bin\platforms"
+ RMDir "$INSTDIR\bin"
RMDir "$INSTDIR"
!endif
diff --git a/src/uninst-qtsvg.nsi b/src/uninst-qtsvg.nsi
index b9326c1..2765db8 100644
--- a/src/uninst-qtsvg.nsi
+++ b/src/uninst-qtsvg.nsi
@@ -27,8 +27,8 @@ Section "-un.qtsvg"
Call un.SourceDelete
!else
Delete "$INSTDIR\bin\Qt5Svg.dll"
- Delete "$INSTDIR\bin\iconengines\qtsvgicon.dll"
- Delete "$INSTDIR\bin\imageformats\qtsvg.dll"
+ Delete "$INSTDIR\bin\iconengines\qsvgicon.dll"
+ Delete "$INSTDIR\bin\imageformats\qsvg.dll"
RmDir "$INSTDIR\bin\imageformats"
RmDir "$INSTDIR\bin\iconengines"
RmDir "$INSTDIR\bin"
commit 67dde191b7b819ac40dd7d9c213f0cb09b22d958
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 16 15:35:23 2016 +0100
Remove source directory before unpack
* src/gpg4win.mk.in (DEFLATE_macro): Remove source dir.
--
If a patch creates a new file unpack / patch will fail otherwise
on nonclean builds.
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index fe8793b..3b9eb82 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -109,6 +109,7 @@ 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)" ;; \
commit 855200eef9b00befa8f3992e91048bddd3d2661d
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Feb 9 12:42:43 2016 +0100
Update KXmlGui GlobalAccel patch to match upstream
* patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch:
Update patch to upstream version.
diff --git a/patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch b/patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch
index eb58a4b..eee7e85 100755
--- a/patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch
+++ b/patches/kxmlgui/0001-Make-KGlobalAccel-dependency-optional.patch
@@ -2,17 +2,19 @@
patch -p1 -l -f $* < $0
exit $?
-From 915904a70894eb33c3451106b05816966489ad2c Mon Sep 17 00:00:00 2001
+From cca106313c9ec77f5dc409bd1b104f4e93da3cf1 Mon Sep 17 00:00:00 2001
From: Andre Heinecke <aheinecke at intevation.de>
Date: Tue, 26 Jan 2016 17:20:18 +0100
-Subject: [PATCH] Make KGlobalAccel dependency optional
+Subject: [PATCH 1/2] Add option to disable KGlobalAccel
-Global shortcuts are a nice optional feature to have. They
-are not strictly neccessary for the core functionality of KXmlGui.
-As they pull in an extra dependency to DBus and need runtime support
-on the target platform they should be optional.
+KGlobalAccel integration is a core feature of KXmlGui in
+an integrated KDE enviornment. For other platforms, with different
+global shortcut concepts support for it might not be required
+in XMLGui. So there is now an option to disable it.
+
+REVIEW: 126895
---
- CMakeLists.txt | 10 ++++++++--
+ CMakeLists.txt | 9 +++++++--
src/CMakeLists.txt | 4 +++-
src/config-xmlgui.h.cmake | 3 +++
src/kactioncollection.cpp | 26 ++++++++++++++++++++++++--
@@ -21,13 +23,22 @@ on the target platform they should be optional.
src/kshortcutseditor.cpp | 15 +++++++++++++--
src/kshortcutseditoritem.cpp | 32 +++++++++++++++++++++++++++++---
src/kxmlguifactory.cpp | 7 ++++++-
- 9 files changed, 104 insertions(+), 13 deletions(-)
+ 9 files changed, 103 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9d79619..448ae76 100644
+index e2de5b0..74afa01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -37,7 +37,6 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Xml Network
+@@ -30,6 +30,8 @@ ecm_setup_version(${KF5_VERSION}
+ 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)
++
+ # Dependencies
+ set(REQUIRED_QT_VERSION 5.3.0)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Xml Network PrintSupport)
+@@ -37,7 +39,6 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Xml Network
find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
@@ -35,7 +46,7 @@ index 9d79619..448ae76 100644
find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
-@@ -45,7 +44,6 @@ find_package(KF5TextWidgets ${KF5_DEP_VERSION} REQUIRED)
+@@ -45,7 +46,6 @@ 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})
@@ -43,16 +54,13 @@ index 9d79619..448ae76 100644
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"
URL "https://projects.kde.org/attica"
-@@ -53,6 +51,14 @@ set_package_properties(KF5Attica PROPERTIES DESCRIPTION "A Qt library that imple
+@@ -53,6 +53,11 @@ set_package_properties(KF5Attica PROPERTIES DESCRIPTION "A Qt library that imple
)
set (HAVE_ATTICA ${KF5Attica_FOUND})
-+find_package(KF5GlobalAccel ${KF5_DEP_VERSION})
-+set_package_properties(KF5GlobalAccel PROPERTIES DESCRIPTION "A KDE Frameworks Library for global workspace shortcuts"
-+ PURPOSE "Support for global shortcuts"
-+ URL "https://projects.kde.org/projects/frameworks/kglobalaccel"
-+ TYPE RECOMMENDED
-+ )
++if (NOT FORCE_DISABLE_KGLOBALACCEL)
++ find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED)
++endif()
+set (HAVE_GLOBALACCEL ${KF5GlobalAccel_FOUND})
+
# Subdirectories
@@ -498,7 +506,7 @@ index 461a90c..8442f10 100644
#if 0
if (m_oldShapeGesture) {
diff --git a/src/kxmlguifactory.cpp b/src/kxmlguifactory.cpp
-index 2767e69..4fcfeca 100644
+index 6848610..f42bc41 100644
--- a/src/kxmlguifactory.cpp
+++ b/src/kxmlguifactory.cpp
@@ -17,6 +17,7 @@
-----------------------------------------------------------------------
Summary of changes:
...001-Make-KGlobalAccel-dependency-optional.patch | 46 +++++++++++++---------
src/gpg4win.mk.in | 1 +
src/inst-qtbase.nsi | 2 +-
src/inst-qtsvg.nsi | 8 ++--
src/uninst-qtbase.nsi | 5 ++-
src/uninst-qtsvg.nsi | 4 +-
6 files changed, 38 insertions(+), 28 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list