mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 05:43:50 +03:00
kdesvn: upgrade to 1.6.0
This commit is contained in:
parent
c5d05a5652
commit
e966ebd5e1
@ -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 ];
|
||||
|
@ -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 -->
|
@ -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:
|
Loading…
Reference in New Issue
Block a user