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

freecad: small cleanup

Browse Source 
* FreeCAD v0.14 switched from pyqt4 to pyside, remove unneeded pyqt4 dependency
* cmake.patch is not used anymore, remove it
* License is now only LGPLv2+ (since v0.14)
* Homepage moved to http://www.freecadweb.org/

Ref. http://www.freecadweb.org/wiki/index.php?title=Release_notes_014
This commit is contained in:
Bjørn Forsman 2014-08-03 12:02:27 +02:00
parent 335575a51e
commit 5fc4ab1dfe
2 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/applications/graphics/freecad/cmake.patch
View File

@ -1,32 +0,0 @@
diff -urN freecad-0.13.1830.old/cMake/FreeCadMacros.cmake freecad-0.13.1830/cMake/FreeCadMacros.cmake
--- freecad-0.13.1830.old/cMake/FreeCadMacros.cmake 2013-02-02 18:09:17.000000000 +0100
+++ freecad-0.13.1830/cMake/FreeCadMacros.cmake 2014-04-20 10:52:17.293599913 +0200
@@ -201,7 +201,7 @@
#endmacro(fc_add_resources)
MACRO (fc_add_resources outfiles )
- QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
+ QT4_EXTRACT_OPTIONS(rcc_files rcc_options rcc_target ${ARGN})
FOREACH (it ${rcc_files})
GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
diff -urN freecad-0.13.1830.old/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt
--- freecad-0.13.1830.old/CMakeLists.txt 2013-02-02 18:09:17.000000000 +0100
+++ freecad-0.13.1830/CMakeLists.txt 2014-04-20 10:28:41.782536753 +0200
@@ -314,14 +314,14 @@
macro(fc_wrap_cpp outfiles )
# get include dirs
QT4_GET_MOC_FLAGS(moc_flags)
- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
+ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN})
# fixes bug 0000585: bug with boost 1.48
SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
foreach(it ${moc_files})
get_filename_component(it ${it} ABSOLUTE)
QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile)
- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
+ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "")
set(${outfiles} ${${outfiles}} ${outfile})
add_file_dependencies(${it} ${outfile})
endforeach(it)

14
pkgs/applications/graphics/freecad/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
, boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper , boost, zlib, python, swig, gfortran, soqt, libf2c, makeWrapper
, matplotlib, pycollada, pyside, pysideShiboken }: , matplotlib, pycollada, pyside, pysideShiboken }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib zlib python swig gfortran soqt libf2c makeWrapper matplotlib
pycollada pyside pysideShiboken pycollada pyside pysideShiboken
]; ];
@ -30,11 +30,11 @@ stdenv.mkDerivation rec {
patches = [ ./pythonpath.patch ]; patches = [ ./pythonpath.patch ];
meta = { meta = with stdenv.lib; {
homepage = http://free-cad.sourceforge.net/;
license = [ "GPLv2+" "LGPLv2+" ];
description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
maintainers = with stdenv.lib.maintainers; [viric]; homepage = http://www.freecadweb.org/;
platforms = with stdenv.lib.platforms; linux; license = licenses.lgpl2Plus;
maintainers = [ maintainers.viric ];
platforms = platforms.linux;
}; };
} }