Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2018-01-06 18:49:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "FreeCAD" Sat Jan 6 18:49:33 2018 rev:5 rq:561795 version:0.16.6712 Changes: -------- --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2017-12-18 08:59:03.120119475 +0100 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new/FreeCAD.changes 2018-01-06 18:49:37.538008244 +0100 @@ -1,0 +2,8 @@ +Thu Jan 4 15:36:57 UTC 2018 - wba...@tmo.at + +- Add remove-qtwebkit.patch and remove-webgui.patch (taken from + Arch Linux) to fix build without QtWebKit +- Build without QtWebKit on Tumbleweed and SLE/Leap 15 as + libQtWebKit4 is about to be dropped (boo#1070901) + +------------------------------------------------------------------- New: ---- remove-qtwebkit.patch remove-webgui.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FreeCAD.spec ++++++ --- /var/tmp/diff_new_pack.WH5UZg/_old 2018-01-06 18:49:45.725625675 +0100 +++ /var/tmp/diff_new_pack.WH5UZg/_new 2018-01-06 18:49:45.725625675 +0100 @@ -27,6 +27,10 @@ Url: http://www.freecadweb.org/ Source0: %{name}-%{version}.tar.xz Source2: FreeCAD_shared_mimeinfo +# PATCH-FIX-OPENSUSE remove-qtwebkit.patch -- fix build without QtWebKit +Patch0: remove-qtwebkit.patch +# PATCH-FIX-OPENSUSE remove-webgui.patch -- remove browser view that would need QtWebKit +Patch1: remove-webgui.patch BuildRequires: Coin-devel BuildRequires: SoQt-devel %if 0%{?suse_version} >= 1330 @@ -69,7 +73,9 @@ BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: zlib-devel +%if 0%{?suse_version} < 1500 BuildRequires: pkgconfig(QtWebKit) +%endif Requires: python-CXX Requires: python-pyside %if 0%{?suse_version} <= 1320 @@ -99,6 +105,11 @@ %prep %setup -q +%if 0%{?suse_version} >= 1500 +%patch0 -p1 +%patch1 -p1 +%endif + # Fix "wrong-file-end-of-line-encoding" rpmlint warning sed -i 's/\r$//' ChangeLog.txt sed -i 's/\r$//' copying.lib @@ -134,6 +145,10 @@ %else -DBUILD_FEM_NETGEN=OFF \ %endif +%if 0%{?suse_version} >= 1500 + -DBUILD_START=OFF \ + -DBUILD_WEB=OFF \ +%endif ../ make VERBOSE=1 %{?_smp_mflags} all ++++++ remove-qtwebkit.patch ++++++ 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; ++++++ remove-webgui.patch ++++++ 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";
