Enable cpp and qt bindings for gpgme
authorAndre Heinecke <aheinecke@intevation.de>
Tue, 15 Nov 2016 14:26:04 +0000 (15:26 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Tue, 15 Nov 2016 14:26:04 +0000 (15:26 +0100)
* src/Makefile.am: Update configuration variables.
* src/inst-gpgme.nsi: Install them.
* src/uninst-gpgme.nsi: Uninstall.

src/Makefile.am
src/inst-gpgme.nsi
src/uninst-gpgme.nsi

index 8c29d5a..1bbd1fa 100644 (file)
@@ -120,7 +120,7 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
 gpg4win_qtpkgs = qtbase qttools qtwinextras qtsvg
 
 # Source packages following the KDE pattern
-gpg4win_kdepkgs = kconfig kwidgetsaddons gpgmepp ki18n extra-cmake-modules \
+gpg4win_kdepkgs = kconfig gpgmepp kwidgetsaddons ki18n extra-cmake-modules \
                   kcompletion kwindowsystem kcoreaddons libkleo kcodecs \
                   kmime kconfigwidgets kxmlgui kguiaddons kitemviews \
                   kiconthemes kleopatra breeze-icons kitemmodels karchive
@@ -245,13 +245,13 @@ gpg4win_pkg_gpgme_configure = --silent \
   `test -n "@HAVE_PKG_GLIB@" && echo "--enable-w32-glib"` \
   CFLAGS=-I$(idir)/include/glib-2.0/ \
   LDFLAGS=-L$(idir)/lib \
-  --enable-languages=no
+  --enable-languages=qt,cpp
 
 gpg4win_pkg_gpgme_ex_configure = --silent \
   --with-gpg-error-prefix=$(ex_idir) --enable-static \
   --with-libassuan-prefix=$(ex_idir) \
   LDFLAGS=-L$(ex_idir)/lib \
-  --enable-languages=no
+  --enable-languages=cpp
 
 gpg4win_pkg_gpa_configure = --silent \
   --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \
index 9233e5c..b0f72e0 100644 (file)
@@ -36,6 +36,7 @@ Section "-gpgme" SEC_gpgme
   ClearErrors
   SetOverwrite try
   File "${prefix}/bin/libgpgme-11.dll"
+  File "${prefix}/bin/libgpgme-11.dll"
 
   SetOverwrite lastused
   ifErrors 0 +3
@@ -50,6 +51,8 @@ Section "-gpgme" SEC_gpgme
       File /oname=libgpgme-glib-11.dll.tmp "${prefix}/bin/libgpgme-glib-11.dll"
       Rename /REBOOTOK libgpgme-glib-11.dll.tmp libgpgme-glib-11.dll
 
+  File "${prefix}/bin/libqgpgme-7.dll"
+  File "${prefix}/bin/libgpgmepp-6.dll"
   File "${prefix}/libexec/gpgme-w32spawn.exe"
 
   SetOutPath "$INSTDIR\lib"
index fabcf9c..76bbaa4 100644 (file)
@@ -32,7 +32,8 @@ Section "-un.gpgme"
 !else
   Delete /REBOOTOK "$INSTDIR\bin\libgpgme-11.dll"
   Delete /REBOOTOK "$INSTDIR\bin\libgpgme-glib-11.dll"
-  Delete /REBOOTOK "$INSTDIR\bin\libgpgme-qt-11.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libqgpgme-7.dll"
+  Delete /REBOOTOK "$INSTDIR\bin\libgpgmepp-6.dll"
   Delete "$INSTDIR\bin\gpgme-w32spawn.exe"
   Delete "$INSTDIR\lib\libgpgme.imp"
   Delete "$INSTDIR\lib\libgpgme-glib.imp"