[Libreoffice-commits] core.git: Branch 'private/thb/gpg4libre-win32' - 3 commits - external/gpgmepp RepositoryExternal.mk xmlsecurity/inc xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/source

[Thorsten Behrens]

Rebased ref, commits from common ancestor:
commit 1fa0705c2caf70626d0a947bf1f1648e48e19bd8
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Wed Nov 22 12:53:25 2017 +0100

    fixup
    
    Change-Id: Id6a915604791e0e3aa0b4629527b00faa5242629

diff --git a/external/gpgmepp/Library_gpgmepp.mk b/external/gpgmepp/Library_gpgmepp.mk
index ead5a16a835f..7649753fe748 100644
--- a/external/gpgmepp/Library_gpgmepp.mk
+++ b/external/gpgmepp/Library_gpgmepp.mk
@@ -16,9 +16,8 @@ $(eval $(call gb_Library_use_externals,gpgmepp,\
 	libassuan \
 ))
 
-$(eval $(call \
-      gb_LinkTarget_use_external_project,$(call \
-             gb_Library_get_linktarget,gpgmepp),gpgmepp,full))
+$(eval $(call gb_LinkTarget_use_external_project,\
+	$(call gb_Library_get_linktarget,gpgmepp),gpgmepp,full))
 
 $(eval $(call gb_Library_set_warnings_not_errors,gpgmepp))
 
commit 053baebb1c3f787aaadf21280bdf2d3964adc9b6
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Wed Nov 22 12:51:42 2017 +0100

    fixup xmlsec linker probs
    
    Change-Id: I9394907f143d862f40c95672f4e3398b65b7bd2c

diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 5f3649dc5ab9..5bb1828f61ea 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,xsec_xmlsec))
 $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 	-DXMLSEC_NO_XSLT \
 	-DXSECXMLSEC_DLLIMPLEMENTATION \
+	-DXSECGPG_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_set_precompiled_header,xsec_xmlsec,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xsec_xmlsec))
diff --git a/xmlsecurity/inc/certificate.hxx b/xmlsecurity/inc/certificate.hxx
index 0698e91f422f..494dc6e30d40 100644
--- a/xmlsecurity/inc/certificate.hxx
+++ b/xmlsecurity/inc/certificate.hxx
@@ -25,7 +25,7 @@ public:
     /// Returns the SHA-256 thumbprint.
     ///
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() = 0;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getSHA256Thumbprint() = 0;
 
 protected:
     ~Certificate() noexcept = default;
diff --git a/xmlsecurity/source/gpg/CertificateImpl.hxx b/xmlsecurity/source/gpg/CertificateImpl.hxx
index 9db3ab85de14..63cddc6dc7b9 100644
--- a/xmlsecurity/source/gpg/CertificateImpl.hxx
+++ b/xmlsecurity/source/gpg/CertificateImpl.hxx
@@ -78,8 +78,8 @@ public:
     static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
     /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
-    virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() override;
-    virtual css::security::CertificateKind getCertificateKind() override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getSHA256Thumbprint() override;
+    virtual css::security::CertificateKind SAL_CALL getCertificateKind() override;
 
     // Helper methods
     void setCertificate(GpgME::Context* ctx, const GpgME::Key& key);
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
index b36b1c3c5d8f..94d53529bf21 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
@@ -80,7 +80,7 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper<
         virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
         /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
-        virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getSHA256Thumbprint() override;
 
         static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
         static X509Certificate_MSCryptImpl* getImplementation( const css::uno::Reference< css::uno::XInterface >& rObj ) ;
commit eb850588c27956d805782cbaa0534bb27ce79ef0
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Wed Nov 22 12:13:13 2017 +0100

    remove remaining gpgme mentions, fix library_gpgmepp deps
    
    Change-Id: I12f07d50c70f8a56ac519570b127ab45ddde485c

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 58bdfaadc450..995a490214ec 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3514,8 +3514,8 @@ endef
 
 define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
-	-I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
+	-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
+	-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
 	$$(GPG_ERROR_CFLAGS) \
 	$$(INCLUDE) \
 )
@@ -3542,16 +3542,16 @@ define gb_LinkTarget__use_gpgmepp
 $(call gb_LinkTarget_use_package,$(1),gpgmepp)
 
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src \
-	-I$(call gb_UnpackedTarball_get_dir,gpgme)/src \
+	-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src \
+	-I$(call gb_UnpackedTarball_get_dir,gpgmepp)/src \
 	$$(GPG_ERROR_CFLAGS) \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,gpgme)/lang/cpp/src/.libs/ -lgpgmepp \
+	-L$(call gb_UnpackedTarball_get_dir,gpgmepp)/lang/cpp/src/.libs/ -lgpgmepp \
 )
 
-endif
+endef
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	gpgmepp \
@@ -3561,6 +3561,8 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 
 endif
 
+endif
+
 define gb_LinkTarget__use_dconf
 $(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS))
 $(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS))
diff --git a/external/gpgmepp/Library_gpgmepp.mk b/external/gpgmepp/Library_gpgmepp.mk
index 08f1ec003be6..ead5a16a835f 100644
--- a/external/gpgmepp/Library_gpgmepp.mk
+++ b/external/gpgmepp/Library_gpgmepp.mk
@@ -16,7 +16,9 @@ $(eval $(call gb_Library_use_externals,gpgmepp,\
 	libassuan \
 ))
 
-$(eval $(call gb_Library_use_external_project,gpgmepp,gpgmepp))
+$(eval $(call \
+      gb_LinkTarget_use_external_project,$(call \
+             gb_Library_get_linktarget,gpgmepp),gpgmepp,full))
 
 $(eval $(call gb_Library_set_warnings_not_errors,gpgmepp))