From afb1fa99e115b827305455bb5b3e18e90cb9d94e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Sun, 17 Apr 2016 15:30:43 +0300 Subject: [PATCH] Updated to 0.16 --- .abf.yml | 5 +- freecad-0.13-qt4_cmake.patch | 130 ----------------------------------- freecad.spec | 16 +---- 3 files changed, 4 insertions(+), 147 deletions(-) delete mode 100644 freecad-0.13-qt4_cmake.patch diff --git a/.abf.yml b/.abf.yml index dbbbfd0..124c27c 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,5 +1,2 @@ -removed_sources: - freecad-0.10.3247.tar.gz: c4f37b76256562452bde096ab8498e5758861fe9 - freecad-0.13.1830.tar.gz: 82d58b91a28a4cd5d138666d2ed0f36bf18c0255 sources: - freecad-0.14.3702.tar.gz: 048f2aa9cabc71fa4e2b6e10c9a61d8e728faa36 + FreeCAD-0.16.tar.gz: 5e8956588e87b18c8c4140cbdcaa1229c04907bb diff --git a/freecad-0.13-qt4_cmake.patch b/freecad-0.13-qt4_cmake.patch deleted file mode 100644 index 0b0f139..0000000 --- a/freecad-0.13-qt4_cmake.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Naur freecad-0.13.1830.orig/cMake/FreeCadMacros.cmake freecad-0.13.1830.qt4/cMake/FreeCadMacros.cmake ---- freecad-0.13.1830.orig/cMake/FreeCadMacros.cmake 2013-02-02 11:09:17.000000000 -0600 -+++ freecad-0.13.1830.qt4/cMake/FreeCadMacros.cmake 2014-01-13 18:32:47.637368958 -0600 -@@ -167,67 +167,48 @@ - # - #endmacro(qt4_wrap_ui) - -- --# This is a special version of the built in macro qt4_add_resources that generates .cpp files --# --#macro(fc_add_resources outfiles ) --# #QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN}) --# set(ARGN ) --# foreach (it ${rcc_files}) --# get_filename_component(outfilename ${it} NAME_WE) --# get_filename_component(infile ${it} ABSOLUTE) --# get_filename_component(rc_path ${infile} PATH) --# set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp) --# # parse file for dependencies --# # all files are absolute paths or relative to the location of the qrc file --# file(READ "${infile}" _RC_FILE_CONTENTS) --# string(REGEX MATCHALL "]*>" "" _RC_FILE "${_RC_FILE}") --# string(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}") --# if(NOT _ABS_PATH_INDICATOR) --# set(_RC_FILE "${rc_path}/${_RC_FILE}") --# endif(NOT _ABS_PATH_INDICATOR) --# set(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}") --# endforeach(_RC_FILE) --# add_custom_command(OUTPUT ${outfile} --# COMMAND ${QT_RCC_EXECUTABLE} --# ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile} --# MAIN_DEPENDENCY ${infile} --# DEPENDS ${_RC_DEPENDS}) --# set(${outfiles} ${${outfiles}} ${outfile}) --# endforeach (it) --#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) -+ get_filename_component(infile ${it} ABSOLUTE) -+ get_filename_component(rc_path ${infile} PATH) -+ set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp) -+ -+ set(_RC_DEPENDS) -+ if(EXISTS "${infile}") -+ # parse file for dependencies -+ # all files are absolute paths or relative to the location of the qrc file -+ file(READ "${infile}" _RC_FILE_CONTENTS) -+ string(REGEX MATCHALL "]*>" "" _RC_FILE "${_RC_FILE}") -+ if(NOT IS_ABSOLUTE "${_RC_FILE}") -+ set(_RC_FILE "${rc_path}/${_RC_FILE}") -+ endif() -+ set(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}") -+ endforeach() -+ unset(_RC_FILES) -+ unset(_RC_FILE_CONTENTS) -+ # Since this cmake macro is doing the dependency scanning for these files, -+ # let's make a configured file and add it as a dependency so cmake is run -+ # again when dependencies need to be recomputed. -+ QT4_MAKE_OUTPUT_FILE("${infile}" "" "qrc.depends" out_depends) -+ configure_file("${infile}" "${out_depends}" COPY_ONLY) -+ else() -+ # The .qrc file does not exist (yet). Let's add a dependency and hope -+ # that it will be generated later -+ set(out_depends) -+ endif() - -- FOREACH (it ${rcc_files}) -- GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) -- GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) -- GET_FILENAME_COMPONENT(rc_path ${infile} PATH) -- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp) -- # parse file for dependencies -- # all files are absolute paths or relative to the location of the qrc file -- FILE(READ "${infile}" _RC_FILE_CONTENTS) -- STRING(REGEX MATCHALL "]*>" "" _RC_FILE "${_RC_FILE}") -- STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}") -- IF(NOT _ABS_PATH_INDICATOR) -- SET(_RC_FILE "${rc_path}/${_RC_FILE}") -- ENDIF(NOT _ABS_PATH_INDICATOR) -- SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}") -- ENDFOREACH(_RC_FILE) -- ADD_CUSTOM_COMMAND(OUTPUT ${outfile} -+ add_custom_command(OUTPUT ${outfile} - COMMAND ${QT_RCC_EXECUTABLE} - ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile} - MAIN_DEPENDENCY ${infile} -- DEPENDS ${_RC_DEPENDS}) -- SET(${outfiles} ${${outfiles}} ${outfile}) -- ENDFOREACH (it) -+ DEPENDS ${_RC_DEPENDS} "${out_depends}" VERBATIM) -+ set(${outfiles} ${${outfiles}} ${outfile}) -+ endforeach () - - ENDMACRO (fc_add_resources) - -diff -Naur freecad-0.13.1830.orig/CMakeLists.txt freecad-0.13.1830.qt4/CMakeLists.txt ---- freecad-0.13.1830.orig/CMakeLists.txt 2014-01-10 10:56:16.648269370 -0600 -+++ freecad-0.13.1830.qt4/CMakeLists.txt 2014-01-13 18:27:18.895600935 -0600 -@@ -325,15 +325,15 @@ - 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}") -- set(${outfiles} ${${outfiles}} ${outfile}) -+ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}") -+ list(APPEND outfiles ${outfile}) - add_file_dependencies(${it} ${outfile}) - endforeach(it) - endmacro(fc_wrap_cpp) diff --git a/freecad.spec b/freecad.spec index fa026bd..cec0d8b 100644 --- a/freecad.spec +++ b/freecad.spec @@ -1,21 +1,16 @@ %define oname FreeCAD -%define oversion 0.15.4664 Summary: FreeCAD is a general purpose 3D CAD modeler Name: freecad -Version: 0.15 +Version: 0.16 Release: 1 License: GPLv2+ and LGPLv2+ Group: Graphics -Url: http://free-cad.sourceforge.net/ +Url: http://www.freecadweb.org/ Source0: https://github.com/FreeCAD/FreeCAD/archive/%{oname}-%{version}.tar.gz -#http://dfn.dl.sourceforge.net/sourceforge/free-cad/ Source1: %{name}.desktop Source2: %{name}.1 Source3: %{name}.rpmlintrc -# Patch to build with non-backward compatible change in QT4. -# Patch1: freecad-0.13-qt4_cmake.patch - BuildRequires: cmake BuildRequires: eigen3 >= 3.0.1 BuildRequires: gcc-gfortran @@ -81,7 +76,6 @@ find ./src -name "*.py*" |xargs chmod 755 find ./src -name "*.h*" |xargs chmod 644 find ./src -name "*.cpp*" |xargs chmod 644 - %build #define Werror_cflags %%nil %cmake_qt4 -DCMAKE_BUILD_TYPE=Release \ @@ -93,7 +87,6 @@ find ./src -name "*.cpp*" |xargs chmod 644 -DRESOURCEDIR=%{_libdir}/freecad %make - %install %makeinstall_std -C build @@ -112,12 +105,10 @@ chmod +x %{buildroot}%{_libdir}/%{name}/Mod/PartDesign/Scripts/*.py desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} sed -i 's,@lib@,%{_lib},g' %{buildroot}%{_datadir}/applications/%{name}.desktop - # Install desktop icon install -pD -m 0644 src/Gui/Icons/%{name}.svg \ %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg - # Install man page install -pD -m 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/%{name}.1 # Symlink manpage to other binary names @@ -126,7 +117,6 @@ pushd %{buildroot}%{_mandir}/man1 ln -sf %{name}.1.gz FreeCADCmd.1.gz popd - # FIXME: Apparently there are no more include files to install. # For now keep the devel package and manually create the needed (empty) dir -mkdir -p %{buildroot}%{_libdir}/%{name}/include \ No newline at end of file +mkdir -p %{buildroot}%{_libdir}/%{name}/include