mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 03:12:51 +00:00
qcad: removing it. it didn't build since long and librecad replaces it.
I think librecad is a good replacement for the super-outdated qcad community edition. And afaik, librecad started by taking the qcad code and putting it more up to date.
This commit is contained in:
Lluís Batlle i Rossell
parent
66e980ba31
commit
2671e32c20
@ -1,55 +0,0 @@
|
||||
# translations still misssing
|
||||
|
||||
{ stdenv, fetchurl, qt3, libpng, libXext, libX11 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "qcad-2.0.5.0-1-community";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.ribbonsoft.com/archives/qcad/qcad-2.0.5.0-1-community.src.tar.gz;
|
||||
sha256 = "07aiw7zjf1fc04dhgwwp29adwb2qs165n7v04lh09zy0k2aplcl3";
|
||||
};
|
||||
|
||||
# TODO: add translations
|
||||
buildPhase = ''
|
||||
cd scripts
|
||||
sh build_qcad.sh notrans
|
||||
cd ..
|
||||
'';
|
||||
|
||||
buildInputs = [ qt3 libpng libXext libX11 ];
|
||||
|
||||
prePatch = ''
|
||||
sed -i 's/-pedantic//' mkspecs/defs.pro
|
||||
# patch -p1 < ${ ./qcad-2.0.4.0-1.src-intptr.patch }
|
||||
'';
|
||||
patches = [
|
||||
/* taken from gentoo, fixes amd64 compilation issue */
|
||||
./qcad-2.0.4.0-1.src-intptr.patch
|
||||
/* taken from gentoo, fixes gcc 4.3 or above compilation issue */
|
||||
./qcad-2.0.4.0-gcc43.patch
|
||||
];
|
||||
|
||||
# probably there is more to be done. But this seems to work for now (eg see gentoo ebuild)
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,share}
|
||||
cp -r qcad $out/share
|
||||
|
||||
# The compilation does not fail with error code. But qcad will not exist
|
||||
# if it failed.
|
||||
test -f $out/share/qcad/qcad
|
||||
|
||||
cat >> $out/bin/qcad << EOF
|
||||
#!/bin/sh
|
||||
cd $out/share/qcad
|
||||
./qcad "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/qcad
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A 2D CAD package based upon Qt";
|
||||
homepage = http://www.ribbonsoft.de/qcad.html;
|
||||
license = "GPLv2"; # community edition
|
||||
};
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp
|
||||
--- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp 2004-09-14 15:13:02.000000000 -0500
|
||||
+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp 2006-06-23 14:21:40.000000000 -0500
|
||||
@@ -849,7 +849,7 @@
|
||||
os << " layer: NULL ";
|
||||
} else {
|
||||
os << " layer: " << e.layer->getName().latin1() << " ";
|
||||
- os << " layer address: " << (int)(e.layer) << " ";
|
||||
+ os << " layer address: " << (intptr_t)(e.layer) << " ";
|
||||
}
|
||||
|
||||
os << e.pen << "\n";
|
||||
diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp
|
||||
--- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp 2004-09-14 15:13:02.000000000 -0500
|
||||
+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp 2006-06-23 14:21:23.000000000 -0500
|
||||
@@ -57,7 +57,7 @@
|
||||
os << " name: " << l.getName().latin1()
|
||||
<< " pen: " << l.getPen()
|
||||
<< " frozen: " << (int)l.isFrozen()
|
||||
- << " address: " << (int)(&l)
|
||||
+ << " address: " << (intptr_t)(&l)
|
||||
<< std::endl;
|
||||
return os;
|
||||
}
|
||||
@ -1,45 +0,0 @@
|
||||
diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp
|
||||
--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer_ascii.cpp 2004-09-14 16:13:01.000000000 -0400
|
||||
+++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer_ascii.cpp 2008-04-27 08:35:47.000000000 -0400
|
||||
@@ -30,6 +30,7 @@
|
||||
#endif // _MSC_VER > 1000
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <cstring>
|
||||
|
||||
#include "dl_writer_ascii.h"
|
||||
#include "dl_exception.h"
|
||||
diff -Naur qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h
|
||||
--- qcad-2.0.4.0-1.src/dxflib/src/dl_writer.h 2004-09-14 16:13:01.000000000 -0400
|
||||
+++ qcad-2.0.4.0-1.src.new/dxflib/src/dl_writer.h 2008-04-27 08:35:48.000000000 -0400
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
|
||||
#include <iostream>
|
||||
+#include <cstring>
|
||||
|
||||
#include "dl_attributes.h"
|
||||
|
||||
diff -Naur qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp
|
||||
--- qcad-2.0.4.0-1.src/qcadactions/src/rs_actionzoompan.cpp 2004-09-14 16:13:03.000000000 -0400
|
||||
+++ qcad-2.0.4.0-1.src.new/qcadactions/src/rs_actionzoompan.cpp 2008-04-27 08:35:48.000000000 -0400
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "rs_snapper.h"
|
||||
#include "rs_point.h"
|
||||
|
||||
+#include <cstdlib>
|
||||
|
||||
RS_ActionZoomPan::RS_ActionZoomPan(RS_EntityContainer& container,
|
||||
RS_GraphicView& graphicView)
|
||||
diff -Naur qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h
|
||||
--- qcad-2.0.4.0-1.src/qcadlib/src/information/rs_information.h 2004-09-14 16:13:02.000000000 -0400
|
||||
+++ qcad-2.0.4.0-1.src.new/qcadlib/src/information/rs_information.h 2008-04-27 08:35:48.000000000 -0400
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "rs_line.h"
|
||||
#include "rs_arc.h"
|
||||
|
||||
-
|
||||
+#include <cstdlib>
|
||||
|
||||
/**
|
||||
* Class for getting information about entities. This includes
|
||||
@ -7108,8 +7108,6 @@ let
|
||||
slibGuile = slibGuile.override { scheme = guile_1_8; };
|
||||
};
|
||||
|
||||
qcad = callPackage ../applications/misc/qcad { };
|
||||
|
||||
libquvi = callPackage ../applications/video/quvi/library.nix { };
|
||||
|
||||
praat = callPackage ../applications/audio/praat { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user