3
0
Fork 0
forked from mirrors/nixpkgs

Add akunambol

svn path=/nixpkgs/trunk/; revision=26337
This commit is contained in:
Yury G. Kudryashov 2011-03-15 23:09:33 +00:00
parent 6923a32b33
commit a8901903b0
3 changed files with 35 additions and 0 deletions

View file

@ -0,0 +1,16 @@
{ stdenv, fetchgit, cmake, kdelibs, kdepimlibs, automoc4, funambol,liblikeback }:
stdenv.mkDerivation rec {
name = "akunambol-20110304";
src = fetchgit {
url = git://anongit.kde.org/akunambol.git;
rev = "1d832bbbce84f474e3f1e5d2f9fa8a4079b0c8e5";
sha256 = "1d2x42lbw32qyawri7z0mrbafz36r035w5bxjpq51awyqjwkbb2d";
};
buildInputs = [ cmake automoc4 kdelibs kdepimlibs funambol liblikeback ];
KDEDIRS = liblikeback;
patches = [ ./non-latin.diff ];
}

View file

@ -0,0 +1,17 @@
diff --git a/qtgui/standardsourcesettings.cpp b/qtgui/standardsourcesettings.cpp
index a14a737..5d4712e 100644
--- a/qtgui/standardsourcesettings.cpp
+++ b/qtgui/standardsourcesettings.cpp
@@ -83,9 +83,9 @@ void StandardSourceSettings::populateCollections()
foreach( const Collection &collection, colls ) {
if (collection.contentMimeTypes().contains(source->getAkonadiMimeType())) {
i++;
- const char* dn = collection.name().toUtf8();
- LOG.debug("Adding collection id %lld named %s", collection.id(), dn);
- collections->addItem(dn);
+ LOG.debug("Adding collection id %lld named %s", collection.id(),
+ collection.name().toLocal8Bit().data());
+ collections->addItem(collection.name());
idList.append(collection.id());
}
}

View file

@ -5572,6 +5572,8 @@ let
inherit (pkgsi686Linux.gtkLibs) glib pango atk gtk;
};
akunambol = newScope pkgs.kde4 ../applications/networking/sync/akunambol { };
amarok = newScope pkgs.kde4 ../applications/audio/amarok { };
amsn = callPackage ../applications/networking/instant-messengers/amsn {