commit 159539d3d52a31b85754e2475ccf4ced6be0a7da
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sat Dec 14 22:26:31 2024 +0100
- builds only with internal zipios++ for now
- removed obsolete files
FreeCAD.spec | 43 ++------------------------
freecad-0.14-DraftSnap.patch | 25 ---------------
freecad-0.14-Version_h.patch | 13 --------
freecad-0.14-Xlib_h.patch | 11 -------
freecad-0.15-zipios.patch | 17 -----------
freecad-3rdParty.patch | 10 ------
freecad.1 | 73 --------------------------------------------
freecad.appdata.xml | 21 -------------
freecad.desktop | 17 -----------
freecad.sharedmimeinfo | 8 -----
10 files changed, 3 insertions(+), 235 deletions(-)
---
diff --git a/FreeCAD.spec b/FreeCAD.spec
index 7ee8b1b..05aa7d1 100644
--- a/FreeCAD.spec
+++ b/FreeCAD.spec
@@ -1,6 +1,7 @@
#
# Conditional build:
%bcond_with system_smesh # use system version of Salome's Mesh
+%bcond_with system_zipios # use system version of zipios++
Summary: A general purpose 3D CAD modeler
Name: FreeCAD
@@ -10,10 +11,6 @@ License: LGPL v2
Group: Applications/Engineering
Source0:
https://github.com/FreeCAD/FreeCAD/releases/download/%{version}/freecad_source.tar.gz
# Source0-md5: 6f0d75711b1d3b3ba35cb4e79c200c2d
-#Source101: %{name}.desktop
-#Source102: %{name}.1
-#Source103: %{name}.appdata.xml
-#Source104: %{name}.sharedmimeinfo
URL: http://freecadweb.org/
# Utilities
BuildRequires: cmake
@@ -65,7 +62,7 @@ BuildRequires: python3-matplotlib
BuildRequires: vtk-devel
BuildRequires: xerces-c
BuildRequires: xerces-c-devel
-BuildRequires: zipios++-devel
+%{?with_system_zipios:BuildRequires: zipios++-devel}
Requires: %{name}-data = %{version}-%{release}
Requires: glib2 >= 1:2.26.0
# Needed for plugin support and is not a soname dependency.
@@ -132,50 +129,16 @@ cd build
-DFREECAD_USE_EXTERNAL_SMESH=TRUE \
-DSMESH_INCLUDE_DIR=%{_includedir}/smesh \
%endif
- -DFREECAD_USE_EXTERNAL_ZIPIOS=TRUE \
+ %{cmake_on_off system_zipios FREECAD_USE_EXTERNAL_ZIPIOS} \
-DPYCXX_INCLUDE_DIR=%{_includedir}
%{__make}
-%{__make} doc
%install
rm -rf $RPM_BUILD_ROOT
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-# Symlink binaries to %{_bindir}
-install -d $RPM_BUILD_ROOT%{_bindir}
-ln -s ../%{_lib}/freecad/bin/FreeCAD $RPM_BUILD_ROOT%{_bindir}
-ln -s ../%{_lib}/freecad/bin/FreeCADCmd $RPM_BUILD_ROOT%{_bindir}
-
-# Fix problems with unittestgui.py
-#chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/Mod/Test/unittestgui.py
-
-# Install desktop file
-desktop-file-install --dir=$RPM_BUILD_ROOT%{_desktopdir} %{SOURCE101}
-sed -i 's,@lib@,%{_lib},g' $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-
-# Install desktop icon
-install -pD src/Gui/Icons/%{name}.svg
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-
-# Install man page
-install -pD %{SOURCE102} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
-
-# groff link manpage to other binary names
-echo %{name}.1 > $RPM_BUILD_ROOT%{_mandir}/man1/FreeCAD.1
-echo %{name}.1 > $RPM_BUILD_ROOT%{_mandir}/man1/FreeCADCmd.1
-
-# Remove obsolete Start_Page.html
-rm $RPM_BUILD_ROOT%{_docdir}/%{name}/Start_Page.html
-
-# Install MimeType file
-install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
-cp -p %{SOURCE104} $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{name}.xml
-
-# Install appdata file
-install -d $RPM_BUILD_ROOT%{_datadir}/appdata
-cp -p %{SOURCE103} $RPM_BUILD_ROOT%{_datadir}/appdata/
-
# Bug maintainers to keep %%{plugins} macro up to date.
#
# Make sure there are no plugins that need to be added to plugins macro
diff --git a/freecad-0.14-DraftSnap.patch b/freecad-0.14-DraftSnap.patch
deleted file mode 100644
index e2d881d..0000000
--- a/freecad-0.14-DraftSnap.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 328bdcf6363f1107447858c2dd939ecae1005f47 Mon Sep 17 00:00:00 2001
-From: Yorik van Havre <yo...@uncreated.net>
-Date: Thu, 18 Sep 2014 19:39:37 -0300
-Subject: [PATCH] Draft: small fix in trackers - fixes #1757
-
----
- src/Mod/Draft/DraftSnap.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/Mod/Draft/DraftSnap.py b/src/Mod/Draft/DraftSnap.py
-index ac57d43..af53881 100644
---- a/src/Mod/Draft/DraftSnap.py
-+++ b/src/Mod/Draft/DraftSnap.py
-@@ -575,7 +575,10 @@ def snapToPolar(self,point,last):
- vecs.extend([v,v.negative()])
- for v in vecs:
- if not DraftVecUtils.isNull(v):
-- de = Part.Line(last,last.add(v)).toShape()
-+ try:
-+ de = Part.Line(last,last.add(v)).toShape()
-+ except:
-+ return point,None
- np = self.getPerpendicular(de,point)
- if ((self.radius == 0) and
(point.sub(last).getAngle(v) < 0.087)) \
- or ((np.sub(point)).Length < self.radius):
diff --git a/freecad-0.14-Version_h.patch b/freecad-0.14-Version_h.patch
deleted file mode 100644
index 6309690..0000000
--- a/freecad-0.14-Version_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur freecad-0.14.3702.orig/src/CMakeLists.txt
freecad-0.14.3702/src/CMakeLists.txt
---- freecad-0.14.3702.orig/src/CMakeLists.txt 2015-05-28 11:24:13.393935311
-0500
-+++ freecad-0.14.3702/src/CMakeLists.txt 2015-05-28 11:24:03.937354886
-0500
-@@ -1,5 +1,7 @@
--
--add_subdirectory(Build)
-+# Do not generate a new Version.h if the source is a release tarball.
-+if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Build/Version.h)
-+ add_subdirectory(Build)
-+endif()
- add_subdirectory(Base)
- add_subdirectory(App)
- add_subdirectory(Main)
diff --git a/freecad-0.14-Xlib_h.patch b/freecad-0.14-Xlib_h.patch
deleted file mode 100644
index 72b6f0a..0000000
--- a/freecad-0.14-Xlib_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur freecad-0.14.3702.orig/src/Gui/CMakeLists.txt
freecad-0.14.3702/src/Gui/CMakeLists.txt
---- freecad-0.14.3702.orig/src/Gui/CMakeLists.txt 2014-07-13
10:33:02.000000000 -0500
-+++ freecad-0.14.3702/src/Gui/CMakeLists.txt 2014-07-22 21:25:04.508664979
-0500
-@@ -57,6 +57,7 @@
- set(FreeCADGui_LIBS
- ${FreeCADGui_LIBS}
- ${SPNAV_LIBRARIES}
-+ X11
- )
- ENDIF(SPNAV_FOUND)
-
diff --git a/freecad-0.15-zipios.patch b/freecad-0.15-zipios.patch
deleted file mode 100644
index 1cd9b0f..0000000
--- a/freecad-0.15-zipios.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur freecad-0.15.4671.orig/src/Base/CMakeLists.txt
freecad-0.15.4671/src/Base/CMakeLists.txt
---- freecad-0.15.4671.orig/src/Base/CMakeLists.txt 2015-04-05
12:25:02.000000000 -0500
-+++ freecad-0.15.4671/src/Base/CMakeLists.txt 2015-04-11 07:19:09.729155453
-0500
-@@ -301,9 +301,11 @@
- # Use external zipios++ if specified.
- if(FREECAD_USE_EXTERNAL_ZIPIOS)
- find_library(ZIPIOS_LIBRARY zipios)
-- find_path(ZIPIOS_INCLUDES zipios++/zipios-config.h)
-+ find_path(ZIPIOS_INCLUDES NAMES
-+ zipios++/zipios-config.h
-+ zipios++/zipios-config.hpp)
- if(ZIPIOS_LIBRARY)
-- message(STATUS "Found zipios++: ${ZIPIOS}")
-+ message(STATUS "Found zipios++: ${ZIPIOS_LIBRARY}")
- endif()
- if(ZIPIOS_INCLUDES)
- message(STATUS "Found zipios++ headers.")
diff --git a/freecad-3rdParty.patch b/freecad-3rdParty.patch
deleted file mode 100644
index ce12641..0000000
--- a/freecad-3rdParty.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur freecad-0.12-svn5325.orig/src/CMakeLists.txt
freecad-0.12-svn5325/src/CMakeLists.txt
---- freecad-0.12-svn5325.orig/src/CMakeLists.txt 2011-03-03
09:57:25.000000000 -0600
-+++ freecad-0.12-svn5325/src/CMakeLists.txt 2011-12-21 10:58:18.396896819
-0600
-@@ -1,6 +1,5 @@
-
- add_subdirectory(Build)
--add_subdirectory(3rdParty)
- add_subdirectory(Base)
- add_subdirectory(App)
- add_subdirectory(Main)
diff --git a/freecad.1 b/freecad.1
deleted file mode 100644
index 191f221..0000000
--- a/freecad.1
+++ /dev/null
@@ -1,73 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FREECAD 1 "July 25, 2007" freecad "Linux User's Manual"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-freecad \- An extensible Open Source CAx program for Unix/X11
-.SH SYNOPSIS
-.B freecad
-.RI [ options ] " files"
-.br
-.B freecadcmd
-.RI [ options ] " files"
-.SH DESCRIPTION
-.B FreeCAD
-is an Open Source CAx RAD based on OpenCasCade, Qt and Python. It features
-some key concepts like macro recording, workbenches, ability to run as a
-server and dynamically loadable application extensions and it is designed
-to be platform independent.
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-.SH USAGE
-\fBfreecad\fR starts with a GUI while \fBfreecadcmd\fR is only a pure command
line version that starts a Python interpreter.
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of the options supported by \fBfreecad\fR is included below.
-.SS "Generic options"
-.TP
-\fB\-h, \-\-help\fR
-Show summary of options.
-.TP
-\fB\-v, \-\-version\fR
-Show version of program.
-.TP
-\fB\-c, \-\-console\fR
-Start in console mode.
-.TP
-\fB\-\-response\-file\fR \fIarg\fR
-Can be specified with '@name', too.
-
-.SS "Configuration"
-.TP
-\fB\-l, \-\-write\-log\fR
-Write a log file.
-.TP
-\fB\-t, \-\-run\-test\fR \fIarg\fR
-Test level.
-.TP
-\fB\-M, \-\-module\-path\fR \fIarg\fR
-Additional module path.
-.TP
-\fB\-P, \-\-python\-path\fR \fIarg\fR
-Additional Python path.
-.SH SEE ALSO
-To get more information about \fBFreeCAD\fR, please visit
\fIhttp://juergen\-riegel.net/FreeCAD/Docu/index.php/Main_Page\fR
-.SH BUGS
-To report a bug, please visit \fIhttp://free-cad.sf.net/\fR
-.SH AUTHOR
-This manual page was written by Werner Mayer.
diff --git a/freecad.appdata.xml b/freecad.appdata.xml
deleted file mode 100644
index 6580e94..0000000
--- a/freecad.appdata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application>
- <id type="desktop">freecad.desktop</id>
- <licence>LGPL</licence>
- <name>FreeCAD</name>
- <summary>An open source parametric 3D CAD modeler</summary>
- <description>
- <p>FreeCAD is a parametric 3D modeler. Parametric modeling
- allows you to easily modify your design by going back into
- your model history and changing its parameters. FreeCAD is
- open source (LGPL license) and completely modular, allowing
- for very advanced extension and customization.</p>
- <p>FreeCAD is multiplatfom, and reads and writes many open
- file formats such as STEP, IGES, STL and others.</p>
- </description>
- <screenshots>
- <screenshot type="default" width="800"
height="600">http://www.freecadweb.org/wiki/index.php?title=File:FreeCAD011.png</screenshot>
- </screenshots>
- <url type="homepage">http://www.freecadweb.org</url>
- <updatecontact>yo...@uncreated.net</updatecontact>
-</application>
diff --git a/freecad.desktop b/freecad.desktop
deleted file mode 100644
index d45e539..0000000
--- a/freecad.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=FreeCAD
-Name[de]=FreeCAD
-Comment=Feature based Parametric Modeler
-Comment[de]=Feature-basierter parametrischer Modellierer
-GenericName=CAD Application
-GenericName[de]=CAD-Anwendung
-Exec=/usr/bin/FreeCAD %F
-Path=/usr/@lib@/freecad
-Terminal=false
-Type=Application
-Icon=freecad
-Categories=Graphics;Science;Education;Engineering;
-StartupNotify=true
-GenericName[de_DE]=Feature-basierter parametrischer Modellierer
-MimeType=application/x-extension-fcstd;
diff --git a/freecad.sharedmimeinfo b/freecad.sharedmimeinfo
deleted file mode 100644
index 6d5e93e..0000000
--- a/freecad.sharedmimeinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
- <mime-type type="application/x-extension-fcstd">
- <!-- <sub-class-of type="application/zip"/> -->
- <comment>FreeCAD document files</comment>
- <glob pattern="*.fcstd"/>
- </mime-type>
-</mime-info>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/FreeCAD.git/commitdiff/159539d3d52a31b85754e2475ccf4ced6be0a7da
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
