From 6a4370f1ba45be5cc78375c2c3b2c2704e9270c1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 31 Mar 2015 01:50:47 +0200 Subject: [PATCH] qca2: Update to new upstream version 2.1.0. This also removes qca2_ossl, because it's now bundled with the main QCA package and we can now drop all those patches and build system fixes, because they have switched from autotools to cmake. Tested against a few builds like PSI and Tomahawk. Signed-off-by: aszlig --- pkgs/applications/audio/tomahawk/default.nix | 3 +- pkgs/applications/misc/kdeconnect/default.nix | 8 ++--- .../instant-messengers/psi/default.nix | 7 ++-- pkgs/development/libraries/qca2/default.nix | 30 +++++------------ pkgs/development/libraries/qca2/gcc47.patch | 12 ------- pkgs/development/libraries/qca2/ossl.nix | 33 ------------------- pkgs/top-level/all-packages.nix | 4 +-- 7 files changed, 14 insertions(+), 83 deletions(-) delete mode 100644 pkgs/development/libraries/qca2/gcc47.patch delete mode 100644 pkgs/development/libraries/qca2/ossl.nix diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index eb26e2b66c4..60e66b9f591 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qca2_ossl, qjson, qt4 +, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4 , qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper , enableXMPP ? true, libjreen ? null @@ -38,7 +38,6 @@ in stdenv.mkDerivation rec { postInstall = let pluginPath = stdenv.lib.concatStringsSep ":" [ "${phonon_backend_vlc}/lib/kde4/plugins" - "${qca2_ossl}/lib/qt4/plugins" ]; in '' for i in "$out"/bin/*; do diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index dcb83d7a79d..51b7b90ca4e 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2, qca2_ossl +{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2 , qjson }: @@ -11,11 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4"; }; - buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qca2_ossl qjson ]; - - postInstall = '' - wrapProgram $out/lib/kde4/libexec/kdeconnectd --prefix QT_PLUGIN_PATH : ${qca2_ossl}/lib/qt4/plugins - ''; + buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qjson ]; meta = with stdenv.lib; { description = "A tool to connect and sync your devices with KDE"; diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 5750476cc5c..784bda5e0cd 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM -, libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib +, libICE, qca2, pkgconfig, liboil, speex, callPackage, which, glib , libXScrnSaver, scrnsaverproto }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ aspell qt4 zlib sox libX11 xproto libSM libICE - qca2 qca2_ossl pkgconfig which glib scrnsaverproto libXScrnSaver + qca2 pkgconfig which glib scrnsaverproto libXScrnSaver ]; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; @@ -32,9 +32,6 @@ stdenv.mkDerivation rec { PSI_PLUGINS="$out/lib/psi/plugins" mkdir -p "$PSI_PLUGINS" ln -s "${psiMedia}"/share/psi/plugins/*.so "$PSI_PLUGINS" - PSI_QT_PLUGINS="$out/share/psi" - mkdir -p "$PSI_QT_PLUGINS"/crypto - ln -s "${qca2_ossl}"/lib/qt4/plugins/crypto/*.so "$PSI_QT_PLUGINS"/crypto ''; meta = { diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 952bdfa29ce..7890017b55b 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,32 +1,18 @@ -{ stdenv, fetchurl, which, qt4 }: +{ stdenv, fetchurl, cmake, pkgconfig, qt }: stdenv.mkDerivation rec { - name = "qca-2.0.3"; - + name = "qca-2.1.0"; + src = fetchurl { - url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.bz2"; - sha256 = "0pw9fkjga8vxj465wswxmssxs4wj6zpxxi6kzkf4z5chyf4hr8ld"; + url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.gz"; + sha256 = "114jg97fmg1rb4llfg7x7r68lxdkjrx60qsqq76khdwc2dvcsv92"; }; - - buildInputs = [ qt4 ]; - - nativeBuildInputs = [ which ]; - preBuild = - '' - sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\ - EMSA3_SHA224, ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ - EMSA3_SHA256, ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ - EMSA3_SHA384, ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ - EMSA3_SHA512 ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding' - ''; - - patches = [ ./gcc47.patch ]; - - configureFlags = "--no-separate-debug-info"; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ qt ]; enableParallelBuilding = true; - + meta = with stdenv.lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; diff --git a/pkgs/development/libraries/qca2/gcc47.patch b/pkgs/development/libraries/qca2/gcc47.patch deleted file mode 100644 index 08711884a57..00000000000 --- a/pkgs/development/libraries/qca2/gcc47.patch +++ /dev/null @@ -1,12 +0,0 @@ -# Thanks to http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20120917/347917.html ---- qca-2.0.3/src/botantools/botan/botan/secmem.h.orig 2007-04-19 23:26:13.000000000 +0200 -+++ qca-2.0.3/src/botantools/botan/botan/secmem.h 2012-09-16 23:28:43.767480490 +0200 -@@ -214,7 +214,7 @@ - - SecureVector(u32bit n = 0) { MemoryRegion::init(true, n); } - SecureVector(const T in[], u32bit n) -- { MemoryRegion::init(true); set(in, n); } -+ { MemoryRegion::init(true); this->set(in, n); } - SecureVector(const MemoryRegion& in) - { MemoryRegion::init(true); set(in); } - SecureVector(const MemoryRegion& in1, const MemoryRegion& in2) diff --git a/pkgs/development/libraries/qca2/ossl.nix b/pkgs/development/libraries/qca2/ossl.nix deleted file mode 100644 index d2b8778aa14..00000000000 --- a/pkgs/development/libraries/qca2/ossl.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchurl, fetchgit, qt4, qca2, openssl, which}: - -stdenv.mkDerivation rec { - version = "2.0.0-beta3"; - name = "qca-ossl-${version}"; - src = fetchurl { - url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2"; - sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08"; - }; - # SVN version has stabilized and has a lot of fixes for fresh OpenSSL - # Take the main source from there - git_src = fetchgit { - url = git://anongit.kde.org/qca; - rev = "0a8b9db6613f2282fe492ff454412f502a6be410"; - sha256 = "1ebb97092f21b9152c6dda56cb33795bea4e83c82800848e800ddaaaf23a31e1"; - }; - buildInputs = [ qt4 qca2 openssl ]; - nativeBuildInputs = [ which ]; - dontAddPrefix = true; - configureFlags="--no-separate-debug-info --with-qca=${qca2} - --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib"; - preConfigure='' - cp ${git_src}/plugins/qca-ossl/qca-ossl.cpp . - - configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins" - ''; - meta = with stdenv.lib; { - description = "Qt Cryptographic Architecture OpenSSL plugin"; - license = "LGPL"; - homepage = http://delta.affinix.com/qca; - maintainers = [ maintainers.urkud ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 224d2ca013d..8b7a59cf378 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7252,9 +7252,7 @@ let re2 = callPackage ../development/libraries/re2 { }; - qca2 = callPackage ../development/libraries/qca2 {}; - - qca2_ossl = callPackage ../development/libraries/qca2/ossl.nix {}; + qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; qimageblitz = callPackage ../development/libraries/qimageblitz {};