diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-12-16 14:27:59 +0100 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-12-23 10:25:16 +0100 |
| commit | e966ebd5e148e83d7fddac483a9c5501883669c4 (patch) | |
| tree | ff6b4db080abea34a009364b2a78b701ff7bd8e6 | |
| parent | c5d05a5652c54009c318fa451e525dacc28a48ba (diff) | |
kdesvn: upgrade to 1.6.0
3 files changed, 6 insertions, 31 deletions
diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 59fb1f5a867f1..6373eb9f7f971 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }: +# the homepage mentions this is the final release. +# from now on, kdesvn will be part of the official kde software distribution stdenv.mkDerivation rec { - name = "kdesvn-1.5.5"; + name = "kdesvn-1.6.0"; - src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.bz2"; - sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7"; + src = fetchurl rec { + url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/${md5}/${name}.tar.bz2"; + md5 = "7e6adc98ff4777a06d5752d3f2b58fa3"; }; prePatch = '' sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake ''; - patches = [ ./docbook.patch ./virtual_inheritance.patch ]; - - buildInputs = [ apr aprutil subversion db4 kdelibs expat ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/version-management/kdesvn/docbook.patch b/pkgs/applications/version-management/kdesvn/docbook.patch deleted file mode 100644 index 54f43c7795806..0000000000000 --- a/pkgs/applications/version-management/kdesvn/docbook.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 --> diff --git a/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch b/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch deleted file mode 100644 index faaf6afcd6ba3..0000000000000 --- a/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h -+++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h -@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil - /** - @author Rajko Albrecht <ral@alwins-world.de> - */ --class RevGraphView : virtual public QGraphicsView -+class RevGraphView : public QGraphicsView - { - Q_OBJECT - public: |