[arch-commits] Commit in xmlsec/trunk (PKGBUILD no_extern_c_scope.patch)
Date: Monday, April 22, 2019 @ 15:36:03 Author: andyrtr Revision: 351914 upgpkg: xmlsec 1.2.28-1 upstream update 1.2.28 Modified: xmlsec/trunk/PKGBUILD Deleted: xmlsec/trunk/no_extern_c_scope.patch -+ PKGBUILD| 15 no_extern_c_scope.patch | 1610 -- 2 files changed, 4 insertions(+), 1621 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-04-22 15:18:14 UTC (rev 351913) +++ PKGBUILD2019-04-22 15:36:03 UTC (rev 351914) @@ -3,8 +3,8 @@ # Contributor: Hussam Al-Tayeb pkgname=xmlsec -pkgver=1.2.27 -pkgrel=2 +pkgver=1.2.28 +pkgrel=1 pkgdesc="XML Security Library is a C library based on LibXML2" license=('custom') arch=('x86_64') @@ -11,17 +11,10 @@ url="https://www.aleksey.com/xmlsec/index.html; depends=('libxslt' 'openssl' 'gnutls' 'nss' 'libltdl') source=(https://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz # signature file not compatible -no_extern_c_scope.patch) -sha256sums=('97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6' -'2c43c0c31da6b8c12944626598c9f067bb61ad87a58220897e0bf7f4dfffb95a') +) +sha256sums=('13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4') #validpgpkeys=('') # -prepare() { - cd ${pkgname}1-${pkgver} - # https://github.com/lsh123/xmlsec/commit/0a14f52e9a5976c104d0fc2d1f739508042aa752 - needed to build with icu >=64.1 - patch -Np1 -i ../no_extern_c_scope.patch -} - build() { cd ${pkgname}1-${pkgver} ./configure --prefix=/usr --disable-static Deleted: no_extern_c_scope.patch === --- no_extern_c_scope.patch 2019-04-22 15:18:14 UTC (rev 351913) +++ no_extern_c_scope.patch 2019-04-22 15:36:03 UTC (rev 351914) @@ -1,1610 +0,0 @@ -From 0a14f52e9a5976c104d0fc2d1f739508042aa752 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Sat, 30 Mar 2019 17:36:58 +0300 -Subject: [PATCH] build: do not extern "C" scope for include files (#249) - -C++ include files such as icu do not expect the scope to be in C, as include directive is expected to be performed at global scope. Not clear why C++ include files are included from C include files though. - apps/cmdline.h | 4 ++-- - apps/crypto.h | 8 - include/xmlsec/app.h| 8 - include/xmlsec/base64.h | 8 - include/xmlsec/bn.h | 8 - include/xmlsec/buffer.h | 6 +++--- - include/xmlsec/crypto.h | 8 - include/xmlsec/dl.h | 22 +- - include/xmlsec/gcrypt/app.h | 8 - include/xmlsec/gcrypt/crypto.h | 8 - include/xmlsec/gnutls/app.h | 8 - include/xmlsec/gnutls/crypto.h | 22 -- - include/xmlsec/gnutls/x509.h| 11 +-- - include/xmlsec/io.h | 8 - include/xmlsec/keyinfo.h| 8 - include/xmlsec/keys.h | 7 +++ - include/xmlsec/keysdata.h | 8 - include/xmlsec/keysmngr.h | 8 - include/xmlsec/list.h | 6 +++--- - include/xmlsec/membuf.h | 8 - include/xmlsec/mscng/app.h | 8 - include/xmlsec/mscng/certkeys.h | 8 - include/xmlsec/mscng/crypto.h | 8 - include/xmlsec/mscng/keysstore.h| 4 ++-- - include/xmlsec/mscng/x509.h | 12 ++-- - include/xmlsec/mscrypto/app.h | 8 - include/xmlsec/mscrypto/certkeys.h | 7 +++ - include/xmlsec/mscrypto/crypto.h| 8 - include/xmlsec/mscrypto/keysstore.h | 4 ++-- - include/xmlsec/mscrypto/x509.h | 12 ++-- - include/xmlsec/nodeset.h| 8 - include/xmlsec/nss/app.h| 8 - include/xmlsec/nss/bignum.h | 8 - include/xmlsec/nss/crypto.h | 8 - include/xmlsec/nss/keysstore.h | 4 ++-- - include/xmlsec/nss/pkikeys.h| 7 +++ - include/xmlsec/nss/x509.h | 12 ++-- - include/xmlsec/openssl/app.h| 8 - include/xmlsec/openssl/bn.h | 8 - include/xmlsec/openssl/crypto.h | 29 +++-- - include/xmlsec/openssl/evp.h| 7 +++ - include/xmlsec/openssl/x509.h | 12 ++-- - include/xmlsec/parser.h | 7 +++ - include/xmlsec/private.h| 23 +-- - include/xmlsec/skeleton/app.h | 8 - include/xmlsec/skeleton/crypto.h| 8 - include/xmlsec/soap.h | 7 +++ - include/xmlsec/strings.h| 8 - include/xmlsec/templates.h | 8 - include/xmlsec/transforms.h | 13 - -
[arch-commits] Commit in xmlsec/trunk (PKGBUILD no_extern_c_scope.patch)
Date: Thursday, April 4, 2019 @ 19:57:01 Author: andyrtr Revision: 349838 upgpkg: xmlsec 1.2.27-2 apply upstream fix to solve compilation issues with recent icu 64 changes Added: xmlsec/trunk/no_extern_c_scope.patch Modified: xmlsec/trunk/PKGBUILD -+ PKGBUILD| 14 no_extern_c_scope.patch | 1610 ++ 2 files changed, 1621 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-04-04 19:33:51 UTC (rev 349837) +++ PKGBUILD2019-04-04 19:57:01 UTC (rev 349838) @@ -4,16 +4,24 @@ pkgname=xmlsec pkgver=1.2.27 -pkgrel=1 +pkgrel=2 pkgdesc="XML Security Library is a C library based on LibXML2" license=('custom') arch=('x86_64') url="https://www.aleksey.com/xmlsec/index.html; depends=('libxslt' 'openssl' 'gnutls' 'nss' 'libltdl') -source=(https://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz) # signature file not compatible -sha256sums=('97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6') +source=(https://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz # signature file not compatible +no_extern_c_scope.patch) +sha256sums=('97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6' +'2c43c0c31da6b8c12944626598c9f067bb61ad87a58220897e0bf7f4dfffb95a') #validpgpkeys=('') # +prepare() { + cd ${pkgname}1-${pkgver} + # https://github.com/lsh123/xmlsec/commit/0a14f52e9a5976c104d0fc2d1f739508042aa752 - needed to build with icu >=64.1 + patch -Np1 -i ../no_extern_c_scope.patch +} + build() { cd ${pkgname}1-${pkgver} ./configure --prefix=/usr --disable-static Added: no_extern_c_scope.patch === --- no_extern_c_scope.patch (rev 0) +++ no_extern_c_scope.patch 2019-04-04 19:57:01 UTC (rev 349838) @@ -0,0 +1,1610 @@ +From 0a14f52e9a5976c104d0fc2d1f739508042aa752 Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev +Date: Sat, 30 Mar 2019 17:36:58 +0300 +Subject: [PATCH] build: do not extern "C" scope for include files (#249) + +C++ include files such as icu do not expect the scope to be in C, as include directive is expected to be performed at global scope. Not clear why C++ include files are included from C include files though. +--- + apps/cmdline.h | 4 ++-- + apps/crypto.h | 8 + include/xmlsec/app.h| 8 + include/xmlsec/base64.h | 8 + include/xmlsec/bn.h | 8 + include/xmlsec/buffer.h | 6 +++--- + include/xmlsec/crypto.h | 8 + include/xmlsec/dl.h | 22 +- + include/xmlsec/gcrypt/app.h | 8 + include/xmlsec/gcrypt/crypto.h | 8 + include/xmlsec/gnutls/app.h | 8 + include/xmlsec/gnutls/crypto.h | 22 -- + include/xmlsec/gnutls/x509.h| 11 +-- + include/xmlsec/io.h | 8 + include/xmlsec/keyinfo.h| 8 + include/xmlsec/keys.h | 7 +++ + include/xmlsec/keysdata.h | 8 + include/xmlsec/keysmngr.h | 8 + include/xmlsec/list.h | 6 +++--- + include/xmlsec/membuf.h | 8 + include/xmlsec/mscng/app.h | 8 + include/xmlsec/mscng/certkeys.h | 8 + include/xmlsec/mscng/crypto.h | 8 + include/xmlsec/mscng/keysstore.h| 4 ++-- + include/xmlsec/mscng/x509.h | 12 ++-- + include/xmlsec/mscrypto/app.h | 8 + include/xmlsec/mscrypto/certkeys.h | 7 +++ + include/xmlsec/mscrypto/crypto.h| 8 + include/xmlsec/mscrypto/keysstore.h | 4 ++-- + include/xmlsec/mscrypto/x509.h | 12 ++-- + include/xmlsec/nodeset.h| 8 + include/xmlsec/nss/app.h| 8 + include/xmlsec/nss/bignum.h | 8 + include/xmlsec/nss/crypto.h | 8 + include/xmlsec/nss/keysstore.h | 4 ++-- + include/xmlsec/nss/pkikeys.h| 7 +++ + include/xmlsec/nss/x509.h | 12 ++-- + include/xmlsec/openssl/app.h| 8 + include/xmlsec/openssl/bn.h | 8 + include/xmlsec/openssl/crypto.h | 29 +++-- + include/xmlsec/openssl/evp.h| 7 +++ + include/xmlsec/openssl/x509.h | 12 ++-- + include/xmlsec/parser.h | 7 +++ + include/xmlsec/private.h| 23 +-- + include/xmlsec/skeleton/app.h | 8 + include/xmlsec/skeleton/crypto.h| 8 + include/xmlsec/soap.h | 7 +++ + include/xmlsec/strings.h| 8 +