[arch-commits] Commit in freecad/trunk (3 files)
Balló György
bgyorgy at archlinux.org
Tue Feb 7 19:03:50 UTC 2017
Date: Tuesday, February 7, 2017 @ 19:03:49
Author: bgyorgy
Revision: 210836
upgpkg: freecad 0.16-8
Disable Start and Web modules (removes qtwebkit dependency)
Added:
freecad/trunk/remove-qtwebkit.patch
freecad/trunk/remove-webgui.patch
Modified:
freecad/trunk/PKGBUILD
-----------------------+
PKGBUILD | 22 ++++++--
remove-qtwebkit.patch | 23 ++++++++
remove-webgui.patch | 124 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 164 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-07 17:55:12 UTC (rev 210835)
+++ PKGBUILD 2017-02-07 19:03:49 UTC (rev 210836)
@@ -9,7 +9,7 @@
pkgname=freecad
pkgver=0.16
-pkgrel=7
+pkgrel=8
pkgdesc='A general purpose 3D CAD modeler'
arch=('i686' 'x86_64')
url='http://www.freecadweb.org/'
@@ -16,20 +16,30 @@
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' 'qtwebkit')
+ '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' 'pycollada-git' 'python2-pyqt4')
source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeCAD/FreeCAD/archive/$pkgver.tar.gz"
"${pkgname}.desktop"
- "${pkgname}.xml")
+ "${pkgname}.xml"
+ "remove-qtwebkit.patch"
+ "remove-webgui.patch")
md5sums=('6e992c98ae2b8448bcf428e3e9efb02f'
'382cd66757dae635b53105d207679fce'
- 'c2f4154c8e4678825411de8e7fa54c6b')
+ '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
+
sed -i \
-e "46i\\\tModDir = '/usr/share/freecad/Mod'" \
-e "50i\\\tLibDir = '/usr/lib/freecad'" \
@@ -50,7 +60,9 @@
-DCMAKE_INSTALL_LIBDIR:PATH="lib/freecad" \
-DOCC_INCLUDE_DIR:PATH=/opt/opencascade/inc/ \
-DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2 \
- -DFREECAD_USE_EXTERNAL_PIVY:BOOL=ON
+ -DFREECAD_USE_EXTERNAL_PIVY:BOOL=ON \
+ -DBUILD_START=OFF \
+ -DBUILD_WEB=OFF
make
}
Added: remove-qtwebkit.patch
===================================================================
--- remove-qtwebkit.patch (rev 0)
+++ remove-qtwebkit.patch 2017-02-07 19:03:49 UTC (rev 210836)
@@ -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;
Added: remove-webgui.patch
===================================================================
--- remove-webgui.patch (rev 0)
+++ remove-webgui.patch 2017-02-07 19:03:49 UTC (rev 210836)
@@ -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";
More information about the arch-commits
mailing list