Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Feb 2019 21:00:12 +0000 (UTC)
From:      Christoph Moench-Tegeder <cmt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r492521 - in head/cad/freecad: . files
Message-ID:  <201902092100.x19L0CKk081115@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cmt
Date: Sat Feb  9 21:00:11 2019
New Revision: 492521
URL: https://svnweb.freebsd.org/changeset/ports/492521

Log:
  switch cad/freecad to Qt5

Added:
  head/cad/freecad/files/patch-src_Gui_Command.h   (contents, props changed)
  head/cad/freecad/files/patch-src_Mod_Fem_Gui_TaskFemConstraintBearing.cpp   (contents, props changed)
  head/cad/freecad/files/patch-src_Mod_Part_Gui_DlgSettingsGeneral.h   (contents, props changed)
Modified:
  head/cad/freecad/files/patch-src_Gui_CMakeLists.txt
  head/cad/freecad/pkg-plist

Modified: head/cad/freecad/files/patch-src_Gui_CMakeLists.txt
==============================================================================
--- head/cad/freecad/files/patch-src_Gui_CMakeLists.txt	Sat Feb  9 20:53:33 2019	(r492520)
+++ head/cad/freecad/files/patch-src_Gui_CMakeLists.txt	Sat Feb  9 21:00:11 2019	(r492521)
@@ -1,11 +1,11 @@
---- src/Gui/CMakeLists.txt.orig	2017-06-16 13:00:26 UTC
+--- src/Gui/CMakeLists.txt.orig	2019-02-08 22:48:01 UTC
 +++ src/Gui/CMakeLists.txt
-@@ -58,7 +58,7 @@ else(MSVC)
+@@ -57,7 +57,7 @@ else(MSVC)
          FreeCADApp
          ${COIN3D_LIBRARIES}
          ${Boost_LIBRARIES}
 -        ${OPENGL_gl_LIBRARY}
-+        ${OPENGL_gl_LIBRARY} -L%%LOCALBASE%%/lib
++        ${OPENGL_gl_LIBRARY} -L${CMAKE_INSTALL_PREFIX}/lib
          ${3DCONNEXION_LINKFLAGS}
      )
  endif(MSVC)

Added: head/cad/freecad/files/patch-src_Gui_Command.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/freecad/files/patch-src_Gui_Command.h	Sat Feb  9 21:00:11 2019	(r492521)
@@ -0,0 +1,12 @@
+--- src/Gui/Command.h.orig	2019-02-08 22:48:01 UTC
++++ src/Gui/Command.h
+@@ -30,6 +30,9 @@
+ #include <string>
+ #include <vector>
+ 
++#include <QtCore/QtCore>
++#include <QtWidgets/QtWidgets>
++
+ #include <Base/Type.h>
+ 
+ class QWidget;

Added: head/cad/freecad/files/patch-src_Mod_Fem_Gui_TaskFemConstraintBearing.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/freecad/files/patch-src_Mod_Fem_Gui_TaskFemConstraintBearing.cpp	Sat Feb  9 21:00:11 2019	(r492521)
@@ -0,0 +1,10 @@
+--- src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp.orig	2019-02-08 22:48:02 UTC
++++ src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp
+@@ -44,6 +44,7 @@
+ #include <App/Application.h>
+ #include <App/Document.h>
+ #include <App/PropertyGeo.h>
++#include <Gui/Action.h>
+ #include <Gui/Application.h>
+ #include <Gui/Document.h>
+ #include <Gui/BitmapFactory.h>

Added: head/cad/freecad/files/patch-src_Mod_Part_Gui_DlgSettingsGeneral.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/freecad/files/patch-src_Mod_Part_Gui_DlgSettingsGeneral.h	Sat Feb  9 21:00:11 2019	(r492521)
@@ -0,0 +1,10 @@
+--- src/Mod/Part/Gui/DlgSettingsGeneral.h.orig	2019-02-08 22:48:01 UTC
++++ src/Mod/Part/Gui/DlgSettingsGeneral.h
+@@ -25,6 +25,7 @@
+ #define PARTGUI_DLGSETTINGSGENERAL_H
+ 
+ #include <Gui/PropertyPage.h>
++#include <QtWidgets/QtWidgets>
+ 
+ class QButtonGroup;
+ 

Modified: head/cad/freecad/pkg-plist
==============================================================================
--- head/cad/freecad/pkg-plist	Sat Feb  9 20:53:33 2019	(r492520)
+++ head/cad/freecad/pkg-plist	Sat Feb  9 21:00:11 2019	(r492521)
@@ -1,4 +1,8 @@
 FreeCAD/Ext/freecad/__init__.py
+FreeCAD/Ext/PySide/QtCore.py
+FreeCAD/Ext/PySide/QtGui.py
+FreeCAD/Ext/PySide/QtSvg.py
+FreeCAD/Ext/PySide/__init__.py
 FreeCAD/Mod/AddonManager/AddonManager.py
 FreeCAD/Mod/AddonManager/AddonManagerGui.py
 FreeCAD/Mod/AddonManager/Init.py



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902092100.x19L0CKk081115>