JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Kdesvn fixed. At the end it was a wrong docbook type only in one of the docbook

Browse Source 
files there. The other was fine, and kept me confused for long.

svn path=/nixpkgs/trunk/; revision=24571
This commit is contained in:
Lluís Batlle i Rossell 2010-11-02 13:35:28 +00:00
parent 448b75b87b
commit 9ff0622848
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/version-management/kdesvn/default.nix
View File

@ -8,11 +8,12 @@ stdenv.mkDerivation {
sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7";
};
patchPhase = ''
prePatch = ''
sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake
'';
makeFlags = [ "VERBOSE=1" ];
patches = [ ./docbook.patch ];
buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ];

13
pkgs/applications/version-management/kdesvn/docbook.patch Normal file
View File

@ -0,0 +1,13 @@
The name of the dtd changed in kdelibs 4.5, so we need to increase it.
diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook
index 8747869..a9676aa 100644
--- a/doc/nl/index.docbook
+++ b/doc/nl/index.docbook
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kdesvn "<application>kdesvn</application>">
<!ENTITY kappname "&kdesvn;"><!-- Do *not* replace kappname-->
<!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->