commit 9a88c1c4db5eb9faa68cf8f8ff5e6f6cb987cad4
Author: Jakub Bogusz <[email protected]>
Date: Mon Dec 31 14:28:29 2018 +0100
- enhanced cryptopp patch to cover cryptopp 8; release 3
cdcat.spec | 14 +++++++-------
cryptopp.patch | 9 +++++++++
2 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/cdcat.spec b/cdcat.spec
index 7c86759..f81b002 100644
--- a/cdcat.spec
+++ b/cdcat.spec
@@ -3,7 +3,7 @@ Summary(hu.UTF-8): Hyper CD Katalógusa
Summary(pl.UTF-8): Katalog CDków Hypera
Name: cdcat
Version: 2.3.1
-Release: 2
+Release: 3
Epoch: 1
License: GPL v2
Group: X11/Applications
@@ -12,18 +12,18 @@ Source0:
http://downloads.sourceforge.net/cdcat/%{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Patch0: cryptopp.patch
URL: http://cdcat.sourceforge.net/
-BuildRequires: Qt3Support-devel
-BuildRequires: QtGui-devel
-BuildRequires: QtXml-devel
+BuildRequires: Qt3Support-devel >= 4
+BuildRequires: QtGui-devel >= 4
+BuildRequires: QtXml-devel >= 4
BuildRequires: expat-devel >= 1.95.2
BuildRequires: cryptopp-devel
BuildRequires: libmediainfo-devel
BuildRequires: libtar-devel
BuildRequires: lib7zip-devel >= 1.6.5-2
BuildRequires: pcre-devel >= 1.1.4
-BuildRequires: qt4-build
-BuildRequires: qt4-linguist
-BuildRequires: qt4-qmake
+BuildRequires: qt4-build >= 4
+BuildRequires: qt4-linguist >= 4
+BuildRequires: qt4-qmake >= 4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
diff --git a/cryptopp.patch b/cryptopp.patch
index 41e6651..4249b25 100644
--- a/cryptopp.patch
+++ b/cryptopp.patch
@@ -30,6 +30,15 @@
#endif
#ifdef CATALOG_ENCRYPTION
+@@ -31,7 +31,7 @@
+
+ static CryptoPP::SecByteBlock crypto_key(CryptoPP::Blowfish::BLOCKSIZE);
+
+-static byte iv[CryptoPP::Blowfish::BLOCKSIZE];
++static CryptoPP::byte iv[CryptoPP::Blowfish::BLOCKSIZE];
+
+
+ int generate_cryptokey(QString password);
--- cdcat-2.3.1/src/cdcat.pro~ 2013-09-29 10:44:34.000000000 +0200
+++ cdcat-2.3.1/src/cdcat.pro 2013-12-08 17:13:09.755273206 +0100
@@ -226,7 +226,7 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cdcat.git/commitdiff/9a88c1c4db5eb9faa68cf8f8ff5e6f6cb987cad4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
