From 5e35fef0eb7f303f2589f1dc48f297ea2c2767fd Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Fri, 1 Aug 2014 13:50:09 +0200 Subject: freecad: updating to 0.14 I had to update all the pyside programs, or freecad failed to build. I picked the versions advertised in http://qt-project.org/wiki/PySideDownloads . The rest I took for github latest releases. --- pkgs/applications/graphics/freecad/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/applications/graphics/freecad/default.nix') diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 770a7ee8212b..2f20291e2703 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts , boost, zlib, python, swig, gfortran, soqt, libf2c , pyqt4, makeWrapper -, matplotlib, pycollada }: +, matplotlib, pycollada, pyside, pysideShiboken }: stdenv.mkDerivation rec { name = "freecad-${version}"; - version = "0.13.1830"; + version = "0.14.3702"; src = fetchurl { url = "mirror://sourceforge/free-cad/${name}.tar.gz"; - sha256 = "04rgww5y32asn4sx5j4wh79ggvb479pq56xfcfj6gkg44mid23jm"; + sha256 = "1jcx7d3mp2wxkd20qdvr4vlf7h5wb0jgab9dl63sicdz88swy97f"; }; buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost zlib python swig gfortran soqt libf2c pyqt4 makeWrapper matplotlib - pycollada + pycollada pyside pysideShiboken ]; enableParallelBuilding = true; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1 ''; - patches = [ ./pythonpath.patch ./cmake.patch ]; + patches = [ ./pythonpath.patch ]; meta = { homepage = http://free-cad.sourceforge.net/; -- cgit 1.4.1 From 5fc4ab1dfe9bb6fa7cc7d4728fe14aaa06431fc3 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sun, 3 Aug 2014 12:02:27 +0200 Subject: freecad: small cleanup * 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 --- pkgs/applications/graphics/freecad/cmake.patch | 32 -------------------------- pkgs/applications/graphics/freecad/default.nix | 14 +++++------ 2 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 pkgs/applications/graphics/freecad/cmake.patch (limited to 'pkgs/applications/graphics/freecad/default.nix') diff --git a/pkgs/applications/graphics/freecad/cmake.patch b/pkgs/applications/graphics/freecad/cmake.patch deleted file mode 100644 index 62efaf1e29dc..000000000000 --- a/pkgs/applications/graphics/freecad/cmake.patch +++ /dev/null @@ -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) diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 2f20291e2703..a7665177046b 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,5 +1,5 @@ { 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 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; 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 ]; @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { patches = [ ./pythonpath.patch ]; - meta = { - homepage = http://free-cad.sourceforge.net/; - license = [ "GPLv2+" "LGPLv2+" ]; + meta = with stdenv.lib; { description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + homepage = http://www.freecadweb.org/; + license = licenses.lgpl2Plus; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; }; } -- cgit 1.4.1