Commit graph

22 commits

Author SHA1 Message Date
Lluís Batlle i Rossell f16353b6f2 Updated from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Peter Simons b42dfe40ec Fix akonadi startup failure.
Patch akonadiserver so as to correct the datadir parameter passed to
mysql. Without this patch akonadiserver in KDE 4.4.5 would not start and
consequently kmail would crash during start up.

svn path=/nixpkgs/trunk/; revision=23154
2010-08-12 14:58:02 +00:00
Yury G. Kudryashov 05da3db77f Copy qca from kde-4.5 to make qca2_ossl build
svn path=/nixpkgs/trunk/; revision=23137
2010-08-12 10:39:29 +00:00
Lluís Batlle i Rossell 5417c720fd Merging from trunk.
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
2010-08-02 15:48:19 +00:00
Sander van der Burg aaff5b7a46 Bumped eigen library to version 2.0.15
svn path=/nixpkgs/trunk/; revision=22808
2010-07-29 13:14:51 +00:00
Yury G. Kudryashov 04225887fa Upgrade attica and soprano
svn path=/nixpkgs/trunk/; revision=22445
2010-07-03 09:18:55 +00:00
Yury G. Kudryashov 1bd76098fe Upgrade akonadi to 1.3.85
svn path=/nixpkgs/trunk/; revision=22431
2010-06-30 15:52:24 +00:00
Yury G. Kudryashov 74d75bdd6c phonon-4.4.2
svn path=/nixpkgs/trunk/; revision=22363
2010-06-21 19:25:20 +00:00
Yury G. Kudryashov ab6031464a Upgrade phonon to 4.4.1
svn path=/nixpkgs/trunk/; revision=21660
2010-05-08 17:03:07 +00:00
Yury G. Kudryashov b2ed8f1aa0 Propagate policykit
svn path=/nixpkgs/trunk/; revision=21607
2010-05-05 18:17:35 +00:00
Yury G. Kudryashov a44db4e52d Adjust plugin install dir to changes in qt
svn path=/nixpkgs/trunk/; revision=21606
2010-05-05 18:17:30 +00:00
Yury G. Kudryashov 7a3f602580 Get rid of decibel and tapioca-qt
It never worked, and nothing use it.

svn path=/nixpkgs/trunk/; revision=21185
2010-04-20 17:06:19 +00:00
Yury G. Kudryashov cafe94f42d Add qca openssl plug-in
svn path=/nixpkgs/trunk/; revision=21044
2010-04-13 06:53:51 +00:00
Lluís Batlle i Rossell 3fd062e933 Fixing kde44 qimageblitz. I remove the patch about FindQt4.cmake; let's trust
its version better.

svn path=/nixpkgs/trunk/; revision=20997
2010-04-09 18:43:56 +00:00
Yury G. Kudryashov 39c24a4801 Bump soprano to 2.4.1
Add virtuoso backend. Another full KDE rebuild.

svn path=/nixpkgs/trunk/; revision=20933
2010-04-03 17:34:26 +00:00
Lluís Batlle i Rossell 4a6cfd435e Removing a part of the cmake setup-hook that broke at least the findqt4 cmake module.
That way, we don't need the patch anymore to fix what that part broke.

Also kde stops needing the findqt4 patch (for its own copy of the findqt4 cmake module).

I tested a nixos-rebuild with kde4, and it builds as far as hydra built with this configuration.

svn path=/nixpkgs/trunk/; revision=20921
2010-04-01 18:19:44 +00:00
Sander van der Burg a928ee6ea0 Upgraded soprano to 2.4.0.1 hotfix release
svn path=/nixpkgs/trunk/; revision=20022
2010-02-15 18:05:47 +00:00
Lluís Batlle i Rossell ce46e7ff63 Found a new phonon (in 'unstable'), and I think kde-4.4 should be able to link with it.
I updated gstreamer too, because this phonon was not finding a header file. As that
did not fix much the phonon build, I helped the generic builder with NIX_CFLAGS_COMPILER for
phonon to find the proper header files. Either the phonon cmake scripts don't find properly
the gstreamer plugins header file, or we install gstreamer in a strange way.

svn path=/nixpkgs/trunk/; revision=19974
2010-02-13 14:03:07 +00:00
Lluís Batlle i Rossell e0ff817c40 Big kde-related update.
I updated cmake to use CMAKE_PREFIX_PATH instead of CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH.
There were some expressions in kde that required CMAKE_PREFIX_PATH, and now they are not anymore
a special case.
I updated most kde-4.4 files to point to kde-4.4.0 sources instead of 4.3.4 .

svn path=/nixpkgs/trunk/; revision=19965
2010-02-12 21:58:27 +00:00
Lluís Batlle i Rossell 333dfb869e More on kde44 builds. More findqt4.cmake copies around fixed, and
set shared_desktop_ontologies to be propagated in kdelibs.
(Maybe only kdegraphics wants it? I think more will want it, so I set it
in propagatedBuildInputs)

svn path=/nixpkgs/trunk/; revision=19962
2010-02-12 17:53:51 +00:00
Lluís Batlle i Rossell ffcac187e8 Trying to get kde-4.4 build *normally*. That is, without the hack "includeAllQtDirs".
I patched properly their own copy of cmake findqt4 module, the same way as we had to
do in the cmake expression.
The findqt4 patch we have is already filled in the cmake buglist, but it seems it is
still not solved in in cmake 2.8.0

svn path=/nixpkgs/trunk/; revision=19960
2010-02-12 17:02:45 +00:00
Sander van der Burg bcb6e407ea Added my initial KDE 4.4 expression
svn path=/nixpkgs/trunk/; revision=19906
2010-02-10 15:06:50 +00:00