Author: urkud
Date: Sat Jul 17 22:14:54 2010
New Revision: 22622
URL: https://svn.nixos.org/websvn/nix/?rev=22622&sc=1
Log:
kdesupport for kde-4.5
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/attica/
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/attica/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/automoc4/
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/automoc4/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/eigen/
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/eigen/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/phonon/
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/phonon/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/ossl-remove-whirlpool.patch
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/ossl.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/soprano/
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/soprano/default.nix
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/default.nix Sat Jul
17 22:14:54 2010 (r22622)
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql,
automoc4, soprano}:
+
+stdenv.mkDerivation rec {
+ name = "akonadi-1.3.85";
+ src = fetchurl {
+ url = "http://download.akonadi-project.org/${name}.tar.bz2";;
+ sha256 = "1d2ancspavp4qg717hj56j1likb0ifdr65q1awbc2ghqqgd9znck";
+ };
+ buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4
soprano ];
+ meta = with stdenv.lib; {
+ description = "KDE PIM Storage Service";
+ license = "LGPL";
+ homepage = http://pim.kde.org/akonadi;
+ maintainers = [ maintainers.sander maintainers.urkud ];
+ platforms = platforms.linux;
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/attica/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/attica/default.nix Sat Jul
17 22:14:54 2010 (r22622)
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, cmake, qt4}:
+
+stdenv.mkDerivation rec {
+ name = "attica-0.1.4";
+ src = fetchurl {
+ url = "mirror://kde/stable/attica/${name}.tar.bz2";
+ sha256 = "0frarnrnbli3f5ji90swgw05g88w1f5777ais345wc8lkvqg9ix1";
+ };
+ buildInputs = [ cmake qt4 ];
+ meta = with stdenv.lib; {
+ description = "A library to access Open Collaboration Service providers";
+ license = "LGPL";
+ maintainers = [ maintainers.sander maintainers.urkud ];
+ platforms = qt4.meta.platforms;
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/automoc4/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/automoc4/default.nix Sat Jul
17 22:14:54 2010 (r22622)
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, lib, cmake, qt4}:
+
+stdenv.mkDerivation {
+ name = "automoc4-0.9.88";
+ src = fetchurl {
+ url = mirror://kde/stable/automoc4/0.9.88/automoc4-0.9.88.tar.bz2;
+ md5 = "91bf517cb940109180ecd07bc90c69ec";
+ };
+ buildInputs = [ cmake qt4 ];
+ meta = {
+ description = "KDE Meta Object Compiler";
+ license = "BSD";
+ maintainers = [ lib.maintainers.sander ];
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/eigen/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/eigen/default.nix Sat Jul
17 22:14:54 2010 (r22622)
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, lib, cmake}:
+
+let
+ v = "2.0.14";
+in
+stdenv.mkDerivation {
+ name = "eigen-${v}";
+ src = fetchurl {
+ url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";;
+ name = "eigen-${v}.tar.bz2";
+ sha256 = "01xkdqs6hqkwcq5yzpdz79da0i512s818pbg8fl9w3m2vvndzs6p";
+ };
+ buildInputs = [ cmake ];
+ meta = {
+ description = "C++ template library for linear algebra: vectors, matrices,
and related algorithms";
+ license = "LGPL";
+ homepage = http://eigen.tuxfamily.org ;
+ maintainers = [ lib.maintainers.sander ];
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/phonon/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/phonon/default.nix Sat Jul
17 22:14:54 2010 (r22622)
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, cmake, qt4, automoc4, pkgconfig
+, libXau, libXdmcp, libpthreadstubs
+, gstreamer, gstPluginsBase, xineLib, pulseaudio}:
+
+let
+ v = "4.4.2";
+ stable = true;
+in
+
+stdenv.mkDerivation rec {
+ name = "phonon-${v}";
+ src = fetchurl {
+ url = "mirror://kde/${if stable then "" else
"un"}stable/phonon/${v}/${name}.tar.bz2";
+ sha256 = "11ilv692yqzvk93y3n2zp9qvqc2xi0npz8vbqa1b60b268zlqh7i";
+ };
+ buildInputs = [ cmake qt4 libXau libXdmcp libpthreadstubs gstreamer
+ gstPluginsBase xineLib automoc4 pulseaudio pkgconfig ];
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ description = "KDE Multimedia API";
+ longDescription = "KDE Multimedia API which abstracts over various
backends such as GStreamer and Xine";
+ license = "LGPL";
+ homepage = http://phonon.kde.org;
+ maintainers = [ maintainers.sander maintainers.urkud ];
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/default.nix Sat Jul
17 22:14:54 2010 (r22622)
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, lib, which, qt4}:
+
+stdenv.mkDerivation {
+ name = "qca-2.0.2";
+ src = fetchurl {
+ url = http://delta.affinix.com/download/qca/2.0/qca-2.0.2.tar.bz2;
+ sha256 =
"49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8";
+ };
+ buildInputs = [ which qt4 ];
+ meta = {
+ description = "Qt Cryptographic Architecture";
+ license = "LGPL";
+ homepage = http://delta.affinix.com/qca;
+ maintainers = [ lib.maintainers.sander ];
+ };
+}
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/ossl-remove-whirlpool.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/ossl-remove-whirlpool.patch
Sat Jul 17 22:14:54 2010 (r22622)
@@ -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 <infin...@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/q...@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 <infin...@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/q...@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
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/ossl.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/ossl.nix Sat Jul 17
22:14:54 2010 (r22622)
@@ -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/lib/qt4/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 ];
+ };
+}
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/soprano/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/soprano/default.nix Sat Jul
17 22:14:54 2010 (r22622)
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, lib, cmake, qt4, cluceneCore, redland, libiodbc}:
+
+stdenv.mkDerivation rec {
+ name = "soprano-2.4.63";
+
+ src = fetchurl {
+ url = "mirror://sf/soprano/${name}.tar.bz2";
+ sha256 = "0iqs0dy5d0pgf2x3vpigwvs8vp7mvfvzimkdw7dvqlqbbld05qbf";
+ };
+
+ # We disable the Java backend, since we do not need them and they make the
closure size much bigger
+ 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 = with lib.maintainers; [ sander urkud ];
+ platforms = qt4.meta.platforms;
+ };
+}
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
