wok-next diff Qt4-qca-ossl/receipt @ rev 20617

Fix build xchat, xchat-plugin, xget, xine-plugin; xorg-xf86-video-geode isn't compatible with 64-bit arch
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Apr 21 13:54:55 2018 +0300 (2018-04-21)
parents 5195111b1457
children d958fec46c9f
line diff
     1.1 --- a/Qt4-qca-ossl/receipt	Mon Aug 12 16:28:51 2013 +0000
     1.2 +++ b/Qt4-qca-ossl/receipt	Sat Apr 21 13:54:55 2018 +0300
     1.3 @@ -20,51 +20,6 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 -	cd $src
     1.8 -	
     1.9 -	patch -u <<EOP
    1.10 ---- qca-ossl.cpp
    1.11 -+++ qca-ossl.cpp
    1.12 -@@ -330,1 +330,1 @@
    1.13 --	X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, "hash");
    1.14 -+	X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, (char *)"hash");
    1.15 -EOP
    1.16 -	status
    1.17 -	patch -u <<EOP
    1.18 ---- qca-ossl.cpp
    1.19 -+++ qca-ossl.cpp
    1.20 -@@ -6597,9 +6597,11 @@
    1.21 - #ifdef SHA512_DIGEST_LENGTH
    1.22 - 	list += "sha512";
    1.23 - #endif
    1.24 -+ /*
    1.25 - #ifdef OBJ_whirlpool
    1.26 - 	list += "whirlpool";
    1.27 - #endif
    1.28 -+ */
    1.29 - 	return list;
    1.30 - }
    1.31 -EOP
    1.32 -	status
    1.33 -	patch -u <<EOP
    1.34 ---- qca-ossl.cpp
    1.35 -+++ qca-ossl.cpp
    1.36 -@@ -6812,10 +6812,12 @@
    1.37 - 		else if ( type == "sha512" )
    1.38 - 			return new opensslHashContext( EVP_sha512(), this, type);
    1.39 - #endif
    1.40 -+/*
    1.41 - #ifdef OBJ_whirlpool
    1.42 - 		else if ( type == "whirlpool" )
    1.43 - 			return new opensslHashContext( EVP_whirlpool(), this, type);
    1.44 - #endif
    1.45 -+*/
    1.46 - 		else if ( type == "pbkdf1(sha1)" )
    1.47 - 			return new opensslPbkdf1Context( EVP_sha1(), this, type );
    1.48 - 		else if ( type == "pbkdf1(md2)" )
    1.49 -EOP
    1.50 -	status
    1.51 -	
    1.52  	chmod +x configure
    1.53  	./configure \
    1.54  		--qtdir=/usr/lib/qt && \