[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.1-9-g5d191be

[by Andre Heinecke]

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  5d191bea02c2075e3a169e4375511a88911858d9 (commit)
       via  530af9733880838c569f8c30450d9fddcfed787b (commit)
      from  02d1abb80cd9e6f42a06d2c5a07c0321ac045351 (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 5d191bea02c2075e3a169e4375511a88911858d9
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Jul 28 10:29:59 2014 +0200

    Add repacked kleopatra.
    
        The old package was missing kdebugdialog.
    
        * src/packages.current (kleopatra): Update package.

diff --git a/packages/packages.current b/packages/packages.current
index adc1477..c33f40d 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -514,8 +514,9 @@ chk  c48227c5f3b475c7792abc36c415479d3233468c
 #
 server http://files.kolab.org/local/gpg4win
 
-file kleopatra-20140721-bin.tar.xz
-chk  7513343e0370dc9a88bdaedb44c3be90583cc986
+# Repackacked. Source is the same als 20140721
+file kleopatra-20140728-bin.tar.xz
+chk  0f034698806fe7a2451c4e5f3b5489e052d33d19
 
 file kleopatra-20140721-src.tar.xz
 chk  cf8e6d9af34fe95ac28f7dfd23bcb0445fb4f48c

commit 530af9733880838c569f8c30450d9fddcfed787b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Jul 28 10:26:32 2014 +0200

    Install accessible plugin under bin
    
        This fixes on demand loading of the accessible plugin
        when a screen reader is attached.
    
        * src/inst-qt.nsi: Install plugin under bin
        * src/uninst-qt.nsi: Uninstall accordingly.
    
    --
        For some reason (BUG?) Accessibilty plugins are looked
        for in bin and not under plugins when they are loaded
        on demand later. The problem is probably that the Kleopatra
        module at runtime has a different module path then the qt
        libaries.

diff --git a/src/inst-qt.nsi b/src/inst-qt.nsi
index 93e1397..5307cbe 100644
--- a/src/inst-qt.nsi
+++ b/src/inst-qt.nsi
@@ -51,6 +51,12 @@ Section "-qt" SEC_qt
   File ${prefix}/plugins/imageformats/qsvg4.dll
   File ${prefix}/plugins/imageformats/qtiff4.dll
 
+  # For some reason (BUG?) Accessibilty plugins are looked
+  # for in bin and not under plugins when they are loaded
+  # on demand later.
+  SetOutPath "$INSTDIR\bin\accessible"
+  File ${prefix}/plugins/accessible/qtaccessiblewidgets4.dll
+
   # For what is this needed? Scripting?
   SetOutPath "$INSTDIR"
   File ${prefix}/bin/qdbus.exe
diff --git a/src/uninst-qt.nsi b/src/uninst-qt.nsi
index cdd4533..ae93c8c 100644
--- a/src/uninst-qt.nsi
+++ b/src/uninst-qt.nsi
@@ -62,10 +62,9 @@ Section "-un.qt"
   Delete "$INSTDIR\translations\qt_de.qm"
   Delete "$INSTDIR\translations\qt_help_de.qm"
 
-  Delete "$INSTDIR\plugins\accessible\qtaccessiblecompatwidgets4.dll"
-  Delete "$INSTDIR\plugins\accessible\qtaccessiblewidgets4.dll"
+  Delete "$INSTDIR\bin\accessible\qtaccessiblewidgets4.dll"
 
-  RMDir "$INSTDIR\plugins\accessible"
+  RMDir "$INSTDIR\bin\accessible"
 
   Delete "$INSTDIR\plugins\codecs\qcncodecs4.dll"
   Delete "$INSTDIR\plugins\codecs\qjpcodecs4.dll"

-----------------------------------------------------------------------

Summary of changes:
 packages/packages.current |    5 +++--
 src/inst-qt.nsi           |    6 ++++++
 src/uninst-qt.nsi         |    5 ++---
 3 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org