diff options
Diffstat (limited to 'pkgs/desktops/kde-4.4/support')
5 files changed, 104 insertions, 27 deletions
diff --git a/pkgs/desktops/kde-4.4/support/decibel/default.nix b/pkgs/desktops/kde-4.4/support/decibel/default.nix deleted file mode 100644 index ad6eaa98fe9..00000000000 --- a/pkgs/desktops/kde-4.4/support/decibel/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, lib, cmake, qt4, tapioca_qt, telepathy_qt}: - -stdenv.mkDerivation { - name = "decibel-0.5.0"; - src = fetchurl { - url = http://decibel.kde.org/fileadmin/downloads/decibel/releases/decibel-0.5.0.tar.gz; - md5 = "7de299ace568c87a746388ad765228e5"; - }; - buildInputs = [ cmake qt4 tapioca_qt telepathy_qt ]; - meta = { - description = "Realtime communications framework for KDE"; - license = "LGPL"; - homepage = http://decibel.kde.org; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.4/support/qca2/ossl-remove-whirlpool.patch b/pkgs/desktops/kde-4.4/support/qca2/ossl-remove-whirlpool.patch new file mode 100644 index 00000000000..fa4eb401622 --- /dev/null +++ b/pkgs/desktops/kde-4.4/support/qca2/ossl-remove-whirlpool.patch @@ -0,0 +1,74 @@ +Source: Upstream, SVN r864423 +Upstream: Yes +Reason: Fix compilation w/ >=dev-libs/openssl-0.9.8g + + +From 883f1057b31387e7cbfe66f6b3cf5781a6ca49fb Mon Sep 17 00:00:00 2001 +From: infiniti <infiniti@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> +Date: Wed, 24 Sep 2008 19:22:26 +0000 +Subject: [PATCH] remove whirlpool usage. the algorithm is missing on at least 0.9.8g and + 0.9.8i, even though there's an OBJ_whirlpool definition in 0.9.8i. + +git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca@864423 283d02a7-25f6-0310-bc7c-ecb5cbfe19da +--- + plugins/qca-ossl/qca-ossl.cpp | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/qca-ossl.cpp b/qca-ossl.cpp +index 746a863..f9efd84 100644 +--- a/qca-ossl.cpp ++++ b/qca-ossl.cpp +@@ -6616,9 +6616,11 @@ static QStringList all_hash_types() + #ifdef SHA512_DIGEST_LENGTH + list += "sha512"; + #endif ++/* + #ifdef OBJ_whirlpool + list += "whirlpool"; + #endif ++*/ + return list; + } + +@@ -6863,10 +6865,12 @@ public: + else if ( type == "sha512" ) + return new opensslHashContext( EVP_sha512(), this, type); + #endif ++/* + #ifdef OBJ_whirlpool + else if ( type == "whirlpool" ) + return new opensslHashContext( EVP_whirlpool(), this, type); + #endif ++*/ + else if ( type == "pbkdf1(sha1)" ) + return new opensslPbkdf1Context( EVP_sha1(), this, type ); + else if ( type == "pbkdf1(md2)" ) +-- +1.6.0.4 + + +From 70730a58fe6d9ba5b50b8971424663ba52947e4c Mon Sep 17 00:00:00 2001 +From: infiniti <infiniti@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> +Date: Wed, 24 Sep 2008 19:23:30 +0000 +Subject: [PATCH] fix warning + +git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca@864425 283d02a7-25f6-0310-bc7c-ecb5cbfe19da +--- + plugins/qca-ossl/qca-ossl.cpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/qca-ossl.cpp b/qca-ossl.cpp +index f9efd84..1790364 100644 +--- a/qca-ossl.cpp ++++ b/qca-ossl.cpp +@@ -327,7 +327,7 @@ static X509_EXTENSION *new_subject_key_id(X509 *cert) + X509V3_CTX ctx; + X509V3_set_ctx_nodb(&ctx); + X509V3_set_ctx(&ctx, NULL, cert, NULL, NULL, 0); +- X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, "hash"); ++ X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, (char *)"hash"); + return ex; + } + +-- +1.6.0.4 diff --git a/pkgs/desktops/kde-4.4/support/qca2/ossl.nix b/pkgs/desktops/kde-4.4/support/qca2/ossl.nix new file mode 100644 index 00000000000..6385919305d --- /dev/null +++ b/pkgs/desktops/kde-4.4/support/qca2/ossl.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, lib, qt4, qca2, openssl}: + +stdenv.mkDerivation rec { + name = "qca-ossl-2.0.0-beta3"; + src = fetchurl { + url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2"; + sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08"; + }; + buildInputs = [ qt4 qca2 openssl ]; + dontAddPrefix = true; + configureFlags="--no-separate-debug-info --with-qca=${qca2} + --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib"; + preConfigure='' + configureFlags="$configureFlags --plugins-path=$out/plugins" + ''; + patches = [ ./ossl-remove-whirlpool.patch ]; + meta = { + description = "Qt Cryptographic Architecture OpenSSL plugin"; + license = "LGPL"; + homepage = http://delta.affinix.com/qca; + maintainers = [ lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix index 3e352b1f027..34cbe36b5da 100644 --- a/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix +++ b/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix @@ -6,10 +6,6 @@ stdenv.mkDerivation { url = mirror://sourceforge/qimageblitz/qimageblitz-0.0.4.tar.bz2; md5 = "cb87c7f1c0455e8984ee4830f1e749cf"; }; - patchPhase = '' - cp ${cmake}/share/cmake-${cmake.majorVersion}/Modules/FindQt4.cmake cmake/modules - ''; - patches = [ ../../libs/findqt4.patch ]; buildInputs = [ cmake qt4 ]; meta = { description = "Graphical effect and filter library for KDE4"; diff --git a/pkgs/desktops/kde-4.4/support/soprano/default.nix b/pkgs/desktops/kde-4.4/support/soprano/default.nix index 28c9af52d52..f8610093f2c 100644 --- a/pkgs/desktops/kde-4.4/support/soprano/default.nix +++ b/pkgs/desktops/kde-4.4/support/soprano/default.nix @@ -1,20 +1,20 @@ -{stdenv, fetchurl, lib, cmake, qt4, cluceneCore, redland}: +{stdenv, fetchurl, lib, cmake, qt4, cluceneCore, redland, libiodbc}: -stdenv.mkDerivation { - name = "soprano-2.4.0.1"; +stdenv.mkDerivation rec { + name = "soprano-2.4.1"; src = fetchurl { - url = mirror://sourceforge/soprano/soprano-2.4.0.1.tar.bz2; - sha256 = "0124i92g3vky9wm8ripy3x4gnf1c4pz2hklisds9vld6ylj8gsa6"; + url = "mirror://sf/soprano/${name}.tar.bz2"; + sha256 = "1ghwjbcrbwhq0in61a47iaxcja50r9axsg9cv97x2myprrqa43bj"; }; # We disable the Java backends, since we do not need them and they make the closure size much bigger - buildInputs = [ cmake qt4 cluceneCore redland ]; + buildInputs = [ cmake qt4 cluceneCore redland libiodbc ]; meta = { homepage = http://soprano.sourceforge.net/; description = "An object-oriented C++/Qt4 framework for RDF data"; license = "LGPL"; - maintainers = [ lib.maintainers.sander ]; + maintainers = with lib.maintainers; [ sander urkud ]; }; } |