[arch-commits] Commit in amule/trunk (PKGBUILD amule-cryptopp6.patch)

[Antonio Rojas]

    Date: Wednesday, April 11, 2018 @ 07:12:29
  Author: arojas
Revision: 315696

Update to 10998

Modified:
  amule/trunk/PKGBUILD
Deleted:
  amule/trunk/amule-cryptopp6.patch

-----------------------+
 PKGBUILD              |   13 +++++--------
 amule-cryptopp6.patch |   11 -----------
 2 files changed, 5 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-11 06:52:14 UTC (rev 315695)
+++ PKGBUILD	2018-04-11 07:12:29 UTC (rev 315696)
@@ -7,8 +7,8 @@
 # Contributor: Anatol Pomozov <anatol.pomozov at gmail.com>
 
 pkgname=amule
-pkgver=10990
-pkgrel=7
+pkgver=10998
+pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=(x86_64)
 url="http://www.amule.org"
@@ -16,19 +16,15 @@
 depends=(wxgtk2 gd geoip libupnp crypto++ boost-libs)
 makedepends=(git ccache boost)
 source=("git://repo.or.cz/amule.git#tag=amule-svn-r$pkgver"
-        amuled.systemd amuleweb.systemd amule.sysusers amule.tmpfiles
-        amule-cryptopp6.patch)
+        amuled.systemd amuleweb.systemd amule.sysusers amule.tmpfiles)
 sha256sums=('SKIP'
             '527a2cca6d56b8269722aafc77a89734f59a929f946f342bd0f69b256f9c7522'
             'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2'
             'c4ca658ab4105b3b90e0bb3efcc8121eca1c4d873787db1ed4f637925c16d502'
-            'e9d1b7019c7075b0f8616c6507a767b87de8f899936680e9ff5829d8cbba224d'
-            '84d5e913bf05c1819275f4fd27028856aeb31157debbca89f9b54132efe69575')
+            'e9d1b7019c7075b0f8616c6507a767b87de8f899936680e9ff5829d8cbba224d')
 
 prepare() {
   cd amule
-
-  patch -p1 -i ../amule-cryptopp6.patch # Fix build with crypto++ 6.0
 }
 
 build() {
@@ -49,6 +45,7 @@
               --enable-ccache \
               --enable-geoip \
               --enable-upnp \
+              --enable-fileview \
               --with-boost
   make
 }

Deleted: amule-cryptopp6.patch
===================================================================
--- amule-cryptopp6.patch	2018-04-11 06:52:14 UTC (rev 315695)
+++ amule-cryptopp6.patch	2018-04-11 07:12:29 UTC (rev 315696)
@@ -1,11 +0,0 @@
---- amule/src/ClientCreditsList.cpp.orig	2018-01-30 22:28:29.951863645 +0000
-+++ amule/src/ClientCreditsList.cpp	2018-01-30 22:30:05.725410074 +0000
-@@ -312,7 +312,7 @@
- 		// calculate and store public key
- 		CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey));
- 		CryptoPP::ArraySink asink(m_abyMyPublicKey, 80);
--		pubkey.DEREncode(asink);
-+		pubkey.AccessMaterial().Save(asink);
- 		m_nMyPublicKeyLen = asink.TotalPutLength();
- 		asink.MessageEnd();
- 	} catch (const CryptoPP::Exception& e) {