summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO46
-rw-r--r--PKGBUILD89
-rw-r--r--PKGBUILD.0.1793
-rw-r--r--freecad.desktop14
-rw-r--r--freecad.xml8
-rw-r--r--remove-qtwebkit.patch23
-rw-r--r--remove-webgui.patch124
7 files changed, 397 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..7cc3eeb65384
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,46 @@
+# Generated by mksrcinfo v8
+# Thu Mar 22 09:24:25 UTC 2018
+pkgbase = freecad
+ pkgdesc = A general purpose 3D CAD modeler
+ pkgver = 0.16.6712
+ pkgrel = 4
+ url = http://www.freecadweb.org/
+ arch = x86_64
+ license = LGPL
+ makedepends = boost
+ makedepends = eigen
+ makedepends = gcc-fortran
+ makedepends = swig
+ makedepends = xerces-c
+ makedepends = desktop-file-utils
+ makedepends = cmake
+ makedepends = coin>=3.1.3-9
+ depends = boost-libs
+ depends = curl
+ depends = opencascade>=6.6.0
+ depends = python2-pivy
+ depends = xerces-c
+ depends = libspnav
+ depends = shared-mime-info
+ depends = hicolor-icon-theme
+ depends = python2-matplotlib
+ depends = python2-shiboken
+ depends = python2-pyside-tools
+ depends = pyside-tools-common
+ depends = qt4
+ optdepends = python2-matplotlib
+ optdepends = python2-pyqt4
+ optdepends = graphviz: Dependency graph feature
+ source = freecad-0.16.6712.tar.gz::https://github.com/FreeCAD/FreeCAD/archive/0.16.6712.tar.gz
+ source = freecad.desktop
+ source = freecad.xml
+ source = remove-qtwebkit.patch
+ source = remove-webgui.patch
+ md5sums = 40ea50aa495c0dfc2b247dc6a32aec2a
+ md5sums = b7bd72a67073c2869da263d8df61f205
+ md5sums = c2f4154c8e4678825411de8e7fa54c6b
+ md5sums = 19e9cd7d41a1ddd557cef05a6b23bdee
+ md5sums = 6b5f9253c559c7aacaa277b2973fbaf3
+
+pkgname = freecad
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..b16ce06e380b
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,89 @@
+# Maintainer: Florian Pritz <bluewind@xinu.at>
+# Contributor: Jonas Heinrich <onny@project-insanity.org>
+# Contributor: Jonas Heinrich <onny@project-insanity.org>
+# Contributor: Jordi De Groof <jordi (dot) degroof (at) gmail (dot) com>
+# Contributor: mickele
+# Contributor: manwithgrenade
+# Contributor: bricem13
+# Contributor: gborzi
+
+pkgname=freecad
+pkgver=0.16.6712
+pkgrel=4
+pkgdesc='A general purpose 3D CAD modeler'
+arch=('x86_64')
+url='http://www.freecadweb.org/'
+license=('LGPL')
+depends=('boost-libs' 'curl' 'opencascade>=6.6.0' 'python2-pivy' 'xerces-c'
+ 'libspnav' 'shared-mime-info' 'hicolor-icon-theme'
+ 'python2-matplotlib' 'python2-shiboken' 'python2-pyside-tools' 'pyside-tools-common' 'qt4')
+makedepends=('boost' 'eigen' 'gcc-fortran' 'swig' 'xerces-c' 'desktop-file-utils' 'cmake' 'coin>=3.1.3-9')
+# TODO add reasons
+optdepends=('python2-matplotlib' 'python2-pyqt4'
+"graphviz: Dependency graph feature")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeCAD/FreeCAD/archive/$pkgver.tar.gz"
+ "${pkgname}.desktop"
+ "${pkgname}.xml"
+ "remove-qtwebkit.patch"
+ "remove-webgui.patch")
+md5sums=('40ea50aa495c0dfc2b247dc6a32aec2a'
+ 'b7bd72a67073c2869da263d8df61f205'
+ 'c2f4154c8e4678825411de8e7fa54c6b'
+ '19e9cd7d41a1ddd557cef05a6b23bdee'
+ '6b5f9253c559c7aacaa277b2973fbaf3')
+
+prepare() {
+ cd "${srcdir}/FreeCAD-${pkgver}/"
+
+ # Remove QtWebkit dependency
+ patch -Np1 -i ../remove-qtwebkit.patch
+
+ # Remove features depending on Web module
+ patch -Np1 -i ../remove-webgui.patch
+
+ # http://www.freecadweb.org/tracker/view.php?id=2347
+ sed -i 's/boost::re_detail/boost::BOOST_REGEX_DETAIL_NS/' \
+ src/Mod/Drawing/App/FeaturePage.cpp
+}
+
+build() {
+ cd "${srcdir}/FreeCAD-${pkgver}/"
+ cmake \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX:PATH="/usr/lib/freecad" \
+ -DCMAKE_INSTALL_DOCDIR:PATH="/usr/share/freecad/doc" \
+ -DCMAKE_INSTALL_DATADIR:PATH="/usr/share/freecad" \
+ -DOCC_INCLUDE_DIR:PATH=/opt/opencascade/inc/ \
+ -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2 \
+ -DFREECAD_USE_EXTERNAL_PIVY:BOOL=ON \
+ -DBUILD_START=OFF \
+ -DBUILD_WEB=OFF
+ make
+}
+
+package() {
+ cd "${srcdir}/FreeCAD-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ # Symlink to /usr/bin
+ install -dm755 "$pkgdir/usr/bin"
+ ln -srf "$pkgdir/usr/lib/freecad/bin/FreeCAD" "${pkgdir}/usr/bin/freecad"
+ ln -srf "$pkgdir/usr/lib/freecad/bin/FreeCAD" "${pkgdir}/usr/bin/FreeCAD"
+ ln -srf "$pkgdir/usr/lib/freecad/bin/FreeCADCmd" "${pkgdir}/usr/bin/freecadcmd"
+ ln -srf "$pkgdir/usr/lib/freecad/bin/FreeCADCmd" "${pkgdir}/usr/bin/FreeCADCmd"
+
+ # Install pixmaps and desktop shortcut
+ desktop-file-install \
+ --dir="${pkgdir}/usr/share/applications" \
+ "${srcdir}/${pkgname}.desktop"
+ for i in 16 32 48 64; do
+ install -Dm644 "src/Gui/Icons/freecad-icon-${i}.png" \
+ "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/freecad.png"
+ done
+ install -Dm644 "src/Gui/Icons/freecad.svg" \
+ "$pkgdir/usr/share/icons/hicolor/scalable/apps/freecad.svg"
+
+ # Mime info
+ install -D -m644 "${srcdir}/${pkgname}.xml" "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
+}
diff --git a/PKGBUILD.0.17 b/PKGBUILD.0.17
new file mode 100644
index 000000000000..aa068a8047b1
--- /dev/null
+++ b/PKGBUILD.0.17
@@ -0,0 +1,93 @@
+# Maintainer: Florian Pritz <bluewind@xinu.at>
+# Contributor: Jonas Heinrich <onny@project-insanity.org>
+# Contributor: Jonas Heinrich <onny@project-insanity.org>
+# Contributor: Jordi De Groof <jordi (dot) degroof (at) gmail (dot) com>
+# Contributor: mickele
+# Contributor: manwithgrenade
+# Contributor: bricem13
+# Contributor: gborzi
+
+pkgname=freecad
+pkgver=0.17_test1
+_pkgver=master
+pkgrel=1
+pkgdesc='A general purpose 3D CAD modeler'
+arch=('x86_64')
+url='http://www.freecadweb.org/'
+license=('LGPL')
+depends=('boost-libs' 'curl' 'opencascade>=6.6.0' 'python2-pivy' 'xerces-c'
+ 'libspnav' 'shared-mime-info' 'hicolor-icon-theme'
+ 'python2-matplotlib' 'python2-shiboken' 'python2-pyside-tools' 'pyside-tools-common' 'qt5-webkit' 'qt5-tools' 'vtk' 'hdf5' 'med-fichier' 'netcdf')
+makedepends=('boost' 'eigen' 'swig' 'xerces-c' 'desktop-file-utils' 'cmake' 'coin>=3.1.3-9' 'doxygen' 'graphviz')
+# TODO add reasons
+optdepends=('python2-matplotlib' 'python2-pyqt4'
+"graphviz: Dependency graph feature")
+source=("$pkgname-$_pkgver.tar.gz::https://github.com/FreeCAD/FreeCAD/archive/$_pkgver.tar.gz"
+ "${pkgname}.desktop"
+ "${pkgname}.xml"
+ "remove-qtwebkit.patch"
+ "remove-webgui.patch")
+md5sums=('03f9d1b80681ed4b1fd74308dff06ddb'
+ 'b7bd72a67073c2869da263d8df61f205'
+ 'c2f4154c8e4678825411de8e7fa54c6b'
+ '19e9cd7d41a1ddd557cef05a6b23bdee'
+ '6b5f9253c559c7aacaa277b2973fbaf3')
+
+prepare() {
+ cd "${srcdir}/FreeCAD-${_pkgver}/"
+
+ # Remove QtWebkit dependency
+ #patch -Np1 -i ../remove-qtwebkit.patch
+
+ # Remove features depending on Web module
+ #patch -Np1 -i ../remove-webgui.patch
+
+ # http://www.freecadweb.org/tracker/view.php?id=2347
+ #sed -i 's/boost::re_detail/boost::BOOST_REGEX_DETAIL_NS/' \
+ #src/Mod/Drawing/App/FeaturePage.cpp
+}
+
+build() {
+ cd "${srcdir}/FreeCAD-${_pkgver}/"
+ cmake \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX:PATH="/usr/lib/freecad" \
+ -DCMAKE_INSTALL_DOCDIR:PATH="/usr/share/freecad/doc" \
+ -DCMAKE_INSTALL_DATADIR:PATH="/usr/share/freecad" \
+ -DOCC_INCLUDE_DIR:PATH=/opt/opencascade/inc/ \
+ -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2 \
+ -DFREECAD_USE_EXTERNAL_PIVY:BOOL=ON \
+ -DPYSIDEUIC4BINARY="/usr/bin/python2-pyside-uic" \
+ -DBUILD_QT5:BOOL=ON \
+ -DBUILD_QT5_WEBKIT:BOOL=OFF \
+ -DQT_QMAKE_EXECUTABLE:FILEPATH=/usr/bin/qmake-qt5 \
+ -DBUILD_WEB:BOOL=OFF
+ make
+}
+
+package() {
+ cd "${srcdir}/FreeCAD-${_pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ # Symlink to /usr/bin
+ install -dm755 "$pkgdir/usr/bin"
+ ln -srf "$pkgdir/usr/lib/freecad/bin/FreeCAD" "${pkgdir}/usr/bin/freecad"
+ ln -srf "$pkgdir/usr/lib/freecad/bin/FreeCAD" "${pkgdir}/usr/bin/FreeCAD"
+ ln -srf "$pkgdir/usr/lib/freecad/bin/FreeCADCmd" "${pkgdir}/usr/bin/freecadcmd"
+ ln -srf "$pkgdir/usr/lib/freecad/bin/FreeCADCmd" "${pkgdir}/usr/bin/FreeCADCmd"
+
+ # Install pixmaps and desktop shortcut
+ desktop-file-install \
+ --dir="${pkgdir}/usr/share/applications" \
+ "${srcdir}/${pkgname}.desktop"
+ for i in 16 32 48 64; do
+ install -Dm644 "src/Gui/Icons/freecad-icon-${i}.png" \
+ "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/freecad.png"
+ done
+ install -Dm644 "src/Gui/Icons/freecad.svg" \
+ "$pkgdir/usr/share/icons/hicolor/scalable/apps/freecad.svg"
+
+ # Mime info
+ install -D -m644 "${srcdir}/${pkgname}.xml" "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
+}
diff --git a/freecad.desktop b/freecad.desktop
new file mode 100644
index 000000000000..af8376df2b81
--- /dev/null
+++ b/freecad.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=FreeCAD
+Comment=A general purpose 3D CAD modeler
+GenericName=CAD Application
+Exec=/usr/bin/freecad %F
+Path=/usr/share/freecad
+Terminal=false
+Type=Application
+Icon=freecad
+Categories=Application;Science;Math;Education;
+StartupNotify=true
+MimeType=application/x-extension-fcstd;
diff --git a/freecad.xml b/freecad.xml
new file mode 100644
index 000000000000..9a27f098b7a5
--- /dev/null
+++ b/freecad.xml
@@ -0,0 +1,8 @@
+<?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</comment>
+ <glob pattern="*.fcstd"/>
+ </mime-type>
+</mime-info>
diff --git a/remove-qtwebkit.patch b/remove-qtwebkit.patch
new file mode 100644
index 000000000000..f5c8423df195
--- /dev/null
+++ b/remove-qtwebkit.patch
@@ -0,0 +1,23 @@
+diff -Naur FreeCAD-0.16.orig/src/Gui/DownloadManager.cpp FreeCAD-0.16/src/Gui/DownloadManager.cpp
+--- FreeCAD-0.16.orig/src/Gui/DownloadManager.cpp 2016-04-07 03:39:34.000000000 +0200
++++ FreeCAD-0.16/src/Gui/DownloadManager.cpp 2017-02-07 17:05:51.753657498 +0100
+@@ -33,7 +33,6 @@
+ #include <QMetaEnum>
+ #include <QSettings>
+ #include <QFileIconProvider>
+-#include <QWebSettings>
+
+ #include "DownloadItem.h"
+ #include "DownloadManager.h"
+@@ -224,11 +223,6 @@
+ ui->downloadsView->setRowHeight(row, item->minimumSizeHint().height());
+
+ bool remove = false;
+- QWebSettings *globalSettings = QWebSettings::globalSettings();
+- if (!item->downloading()
+- && globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+- remove = true;
+-
+ if (item->downloadedSuccessfully()
+ && removePolicy() == DownloadManager::SuccessFullDownload) {
+ remove = true;
diff --git a/remove-webgui.patch b/remove-webgui.patch
new file mode 100644
index 000000000000..202ac4535e05
--- /dev/null
+++ b/remove-webgui.patch
@@ -0,0 +1,124 @@
+diff -Naur FreeCAD-0.16.orig/src/Mod/Arch/ArchServer.py FreeCAD-0.16/src/Mod/Arch/ArchServer.py
+--- FreeCAD-0.16.orig/src/Mod/Arch/ArchServer.py 2016-04-07 03:39:34.000000000 +0200
++++ FreeCAD-0.16/src/Mod/Arch/ArchServer.py 2017-02-07 18:55:34.918643280 +0100
+@@ -36,20 +36,6 @@
+ __url__ = "http://www.freecadweb.org"
+
+
+-class _CommandBimserver:
+- "the Arch Bimserver command definition"
+- def GetResources(self):
+- return {'Pixmap' : 'Arch_Bimserver',
+- 'MenuText': QtCore.QT_TRANSLATE_NOOP("Arch_Bimserver","BIM server"),
+- 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_Bimserver","Opens a browser window and connects to a BIM server instance")}
+-
+- def Activated(self):
+- p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Arch")
+- url = p.GetString("BimServerUrl","http://localhost:8082")
+- FreeCADGui.addModule("WebGui")
+- FreeCADGui.doCommand("WebGui.openBrowser(\""+url+"\")")
+-
+-
+ class _CommandGit:
+ "the Arch Git Commit command definition"
+ def GetResources(self):
+@@ -161,5 +147,4 @@
+
+
+ if FreeCAD.GuiUp:
+- FreeCADGui.addCommand('Arch_Bimserver',_CommandBimserver())
+ FreeCADGui.addCommand('Arch_Git',_CommandGit())
+diff -Naur FreeCAD-0.16.orig/src/Mod/Arch/InitGui.py FreeCAD-0.16/src/Mod/Arch/InitGui.py
+--- FreeCAD-0.16.orig/src/Mod/Arch/InitGui.py 2016-04-07 03:39:34.000000000 +0200
++++ FreeCAD-0.16/src/Mod/Arch/InitGui.py 2017-02-07 18:54:19.949158114 +0100
+@@ -44,7 +44,7 @@
+ "Arch_SelectNonSolidMeshes","Arch_RemoveShape",
+ "Arch_CloseHoles","Arch_MergeWalls","Arch_Check",
+ "Arch_IfcExplorer","Arch_ToggleIfcBrepFlag","Arch_3Views",
+- "Arch_Bimserver","Arch_Git","Arch_IfcSpreadsheet"]
++ "Arch_Git","Arch_IfcSpreadsheet"]
+
+ # draft tools
+ self.drafttools = ["Draft_Line","Draft_Wire","Draft_Circle","Draft_Arc","Draft_Ellipse",
+diff -Naur FreeCAD-0.16.orig/src/Mod/Drawing/Gui/Command.cpp FreeCAD-0.16/src/Mod/Drawing/Gui/Command.cpp
+--- FreeCAD-0.16.orig/src/Mod/Drawing/Gui/Command.cpp 2016-04-07 03:39:34.000000000 +0200
++++ FreeCAD-0.16/src/Mod/Drawing/Gui/Command.cpp 2017-02-07 18:52:19.077843909 +0100
+@@ -427,43 +427,6 @@
+
+
+ //===========================================================================
+-// Drawing_OpenBrowserView
+-//===========================================================================
+-
+-DEF_STD_CMD_A(CmdDrawingOpenBrowserView);
+-
+-CmdDrawingOpenBrowserView::CmdDrawingOpenBrowserView()
+- : Command("Drawing_OpenBrowserView")
+-{
+- // seting the
+- sGroup = QT_TR_NOOP("Drawing");
+- sMenuText = QT_TR_NOOP("Open &browser view");
+- sToolTipText = QT_TR_NOOP("Opens the selected page in a browser view");
+- sWhatsThis = "Drawing_OpenBrowserView";
+- sStatusTip = QT_TR_NOOP("Opens the selected page in a browser view");
+- sPixmap = "actions/drawing-openbrowser";
+-}
+-
+-void CmdDrawingOpenBrowserView::activated(int iMsg)
+-{
+- unsigned int n = getSelection().countObjectsOfType(Drawing::FeaturePage::getClassTypeId());
+- if (n != 1) {
+- QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
+- QObject::tr("Select one Page object."));
+- return;
+- }
+- std::vector<Gui::SelectionSingleton::SelObj> Sel = getSelection().getSelection();
+- doCommand(Doc,"PageName = App.activeDocument().%s.PageResult",Sel[0].FeatName);
+- doCommand(Doc,"import WebGui");
+- doCommand(Doc,"WebGui.openBrowser(PageName)");
+-}
+-
+-bool CmdDrawingOpenBrowserView::isActive(void)
+-{
+- return (getActiveGuiDocument() ? true : false);
+-}
+-
+-//===========================================================================
+ // Drawing_Annotation
+ //===========================================================================
+
+@@ -786,7 +749,6 @@
+ rcCmdMgr.addCommand(new CmdDrawingNewA3Landscape());
+ rcCmdMgr.addCommand(new CmdDrawingNewView());
+ rcCmdMgr.addCommand(new CmdDrawingOrthoViews());
+- rcCmdMgr.addCommand(new CmdDrawingOpenBrowserView());
+ rcCmdMgr.addCommand(new CmdDrawingAnnotation());
+ rcCmdMgr.addCommand(new CmdDrawingClip());
+ rcCmdMgr.addCommand(new CmdDrawingSymbol());
+diff -Naur FreeCAD-0.16.orig/src/Mod/Drawing/Gui/Workbench.cpp FreeCAD-0.16/src/Mod/Drawing/Gui/Workbench.cpp
+--- FreeCAD-0.16.orig/src/Mod/Drawing/Gui/Workbench.cpp 2016-04-07 03:39:34.000000000 +0200
++++ FreeCAD-0.16/src/Mod/Drawing/Gui/Workbench.cpp 2017-02-07 19:10:18.512913826 +0100
+@@ -61,7 +61,6 @@
+ *part << "Drawing_NewPage";
+ *part << "Drawing_NewView";
+ *part << "Drawing_OrthoViews";
+- *part << "Drawing_OpenBrowserView";
+ *part << "Drawing_Annotation";
+ *part << "Drawing_Clip";
+ *part << "Drawing_Symbol";
+@@ -84,7 +83,6 @@
+ *part << "Drawing_NewPage";
+ *part << "Drawing_NewView";
+ *part << "Drawing_OrthoViews";
+- *part << "Drawing_OpenBrowserView";
+ *part << "Drawing_Annotation";
+ *part << "Drawing_Clip";
+ *part << "Drawing_Symbol";
+@@ -106,7 +104,6 @@
+ //*img << "Drawing_NewA3Landscape";
+ *img << "Drawing_NewPage";
+ *img << "Drawing_OrthoViews";
+- *img << "Drawing_OpenBrowserView";
+ *img << "Drawing_Annotation";
+ *img << "Drawing_Clip";
+ *img << "Drawing_DraftView";