gentoo auto-resync : 31:10:2022 - 21:05:59

3 files changed, 0 insertions, 185 deletions

diff --git a/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch b/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch
deleted file mode 100644
index f9120e051919..000000000000
--- a/media-gfx/freecad/files/freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From fc4ae2ff217c67eae39947ed6b655b8afaa83859 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sun, 20 Jun 2021 15:38:45 +0200
-Subject: [PATCH] add boost::serialization to find_package
-
-Swaps SetupBoost() after SetupSalomeSMESH() has been called.
-SetupSalomeSMESH() looks for vtk, which searches for boost::serialization
-overriding the default libraries detected by SetupBoost().
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- CMakeLists.txt                         | 4 +++-
- cMake/FreeCAD_Helpers/SetupBoost.cmake | 2 +-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b17736..c241ebe 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,7 +45,6 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
-     SetupPython()
-     SetupPCL()
-     SetupPybind11()
--    SetupBoost()
-     SetupXercesC()
-     find_package(ZLIB REQUIRED)
-     find_package(PyCXX REQUIRED)
-@@ -57,6 +56,9 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
-         SetupOpenGL()
-     endif(BUILD_GUI)
-     SetupSalomeSMESH()
-+    # needs to be called after SMESH which pulls in VTK, which only add boost::serialization
-+    # overriding the values of SetupBoost()
-+    SetupBoost()
-     if (BUILD_FEM_NETGEN)
-         find_package(NETGEN)
-     endif(BUILD_FEM_NETGEN)
-diff --git a/cMake/FreeCAD_Helpers/SetupBoost.cmake b/cMake/FreeCAD_Helpers/SetupBoost.cmake
-index 76c6d64..77c415b 100644
---- a/cMake/FreeCAD_Helpers/SetupBoost.cmake
-+++ b/cMake/FreeCAD_Helpers/SetupBoost.cmake
-@@ -3,7 +3,7 @@ macro(SetupBoost)
- 
-     set(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS})
- 
--    set (BOOST_COMPONENTS filesystem program_options regex system thread)
-+    set (BOOST_COMPONENTS filesystem program_options regex serialization system thread)
-     find_package(Boost ${BOOST_MIN_VERSION}
-         COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
- 
--- 
-2.32.0
-
diff --git a/media-gfx/freecad/files/freecad-0.19.4-backport-correctly-find-PySide2Tools.patch b/media-gfx/freecad/files/freecad-0.19.4-backport-correctly-find-PySide2Tools.patch
deleted file mode 100644
index b297727033db..000000000000
--- a/media-gfx/freecad/files/freecad-0.19.4-backport-correctly-find-PySide2Tools.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From https://github.com/FreeCAD/FreeCAD/tree/6b062b25e118fc6d260d8caff6cf46fafd6cfa0f
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 2 Apr 2022 09:30:09 +0200
-Subject: [PATCH] backport correctly find PySide2Tools
-
-Backported from current HEAD
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/cMake/FindPySide2Tools.cmake
-+++ b/cMake/FindPySide2Tools.cmake
-@@ -23,7 +23,7 @@ endif(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- # Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc, with '-g python' option
- # We test Qt5Core version to act accordingly
- 
--FIND_PACKAGE(Qt5Core)
-+FIND_PACKAGE(Qt5 COMPONENTS Core)
- 
- IF(Qt5Core_VERSION VERSION_LESS 5.14)
-   # Legacy (< 5.14)
-@@ -33,13 +33,20 @@ IF(Qt5Core_VERSION VERSION_LESS 5.14)
-   set(RCCOPTIONS "")
- ELSE(Qt5Core_VERSION VERSION_LESS 5.14)
-   # New (>= 5.14)
--  FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic pyside2-uic)
--  set(UICOPTIONS "--generator=python")
--  FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc pyside2-rcc)
--  set(RCCOPTIONS "--generator=python" "--compress-algo=zlib" "--compress=1")
-+  if (TARGET Qt::uic)
-+    get_property(PYSIDE2UICBINARY TARGET Qt::uic PROPERTY LOCATION)
-+    set(UICOPTIONS "--generator=python")
-+  endif()
-+  if (TARGET Qt::rcc)
-+    get_property(PYSIDE2RCCBINARY TARGET Qt::rcc PROPERTY LOCATION)
-+    set(RCCOPTIONS "--generator=python" "--compress-algo=zlib" "--compress=1")
-+  endif()
- ENDIF(Qt5Core_VERSION VERSION_LESS 5.14)
- 
- MACRO(PYSIDE_WRAP_UI outfiles)
-+  if (NOT PYSIDE2UICBINARY)
-+    message(FATAL_ERROR "Qt uic is required for generating ${ARGN}")
-+  endif()
-   FOREACH(it ${ARGN})
-     GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
-     GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-@@ -58,7 +65,7 @@ MACRO(PYSIDE_WRAP_UI outfiles)
-         # we follow the tool command with in-place sed.
-         ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-           COMMAND "${PYSIDE2UICBINARY}" ${UICOPTIONS} "${infile}" -o "${outfile}"
--          COMMAND sed -i "/^# /d" "${outfile}"
-+          COMMAND sed "/^# /d" "${outfile}" >"${outfile}.tmp" && mv "${outfile}.tmp" "${outfile}"
-           MAIN_DEPENDENCY "${infile}"
-         )
-     endif()
-@@ -67,6 +74,9 @@ MACRO(PYSIDE_WRAP_UI outfiles)
- ENDMACRO (PYSIDE_WRAP_UI)
- 
- MACRO(PYSIDE_WRAP_RC outfiles)
-+  if (NOT PYSIDE2RCCBINARY)
-+    message(FATAL_ERROR "Qt rcc is required for generating ${ARGN}")
-+  endif()
-   FOREACH(it ${ARGN})
-     GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
-     GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-@@ -85,7 +95,7 @@ MACRO(PYSIDE_WRAP_RC outfiles)
-         # we follow the tool command with in-place sed.
-         ADD_CUSTOM_COMMAND(OUTPUT "${outfile}"
-           COMMAND "${PYSIDE2RCCBINARY}" ${RCCOPTIONS} "${infile}" ${PY_ATTRIBUTE} -o "${outfile}"
--          COMMAND sed -i "/^# /d" "${outfile}"
-+          COMMAND sed "/^# /d" "${outfile}" >"${outfile}.tmp" && mv "${outfile}.tmp" "${outfile}"
-           MAIN_DEPENDENCY "${infile}"
-         )
-     endif()
-@@ -93,20 +103,17 @@ MACRO(PYSIDE_WRAP_RC outfiles)
-   ENDFOREACH(it)
- ENDMACRO (PYSIDE_WRAP_RC)
- 
--IF(EXISTS ${PYSIDE2UICBINARY} AND EXISTS ${PYSIDE2RCCBINARY})
--   set(PYSIDE2_TOOLS_FOUND TRUE)
--ENDIF(EXISTS ${PYSIDE2UICBINARY} AND EXISTS ${PYSIDE2RCCBINARY})
--
- if(PYSIDE2RCCBINARY AND PYSIDE2UICBINARY)
-+  set(PYSIDE2_TOOLS_FOUND TRUE)
-+  if (NOT PySide2Tools_FIND_QUIETLY)
-+    message(STATUS "Found PySide2 tools: ${PYSIDE2UICBINARY}, ${PYSIDE2RCCBINARY}")
-+  endif (NOT PySide2Tools_FIND_QUIETLY)
-+else(PYSIDE2RCCBINARY AND PYSIDE2UICBINARY)
-+  if(PySide2Tools_FIND_REQUIRED)
-+    message(FATAL_ERROR "PySide2 tools could not be found, but are required.")
-+  else(PySide2Tools_FIND_REQUIRED)
-     if (NOT PySide2Tools_FIND_QUIETLY)
--        message(STATUS "Found PySide2 tools: ${PYSIDE2UICBINARY}, ${PYSIDE2RCCBINARY}")
-+      message(STATUS "PySide2 tools: not found.")
-     endif (NOT PySide2Tools_FIND_QUIETLY)
--else(PYSIDE2RCCBINARY AND PYSIDE2UICBINARY)
--    if(PySide2Tools_FIND_REQUIRED)
--        message(FATAL_ERROR "PySide2 tools could not be found, but are required.")
--    else(PySide2Tools_FIND_REQUIRED)
--        if (NOT PySide2Tools_FIND_QUIETLY)
--                message(STATUS "PySide2 tools: not found.")
--        endif (NOT PySide2Tools_FIND_QUIETLY)
--    endif(PySide2Tools_FIND_REQUIRED)
-+  endif(PySide2Tools_FIND_REQUIRED)
- endif(PYSIDE2RCCBINARY AND PYSIDE2UICBINARY)
--- 
-2.35.1
-
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
deleted file mode 100644
index ac8d194d00ea..000000000000
--- a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From acc8a26b73a87ae024bce30e9f1531610b6e0e5f Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 13 Feb 2021 14:54:28 +0100
-Subject: [PATCH] [Gentoo specific] don't check vcs
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- src/Tools/SubWCRev.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py
-index 9795450..59938bd 100644
---- a/src/Tools/SubWCRev.py
-+++ b/src/Tools/SubWCRev.py
-@@ -455,7 +455,7 @@ def main():
-         if o in ("-b", "--bindir"):

-             bindir = a

- 

--    vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()]

-+    vcs=[UnknownControl()]

-     for i in vcs:

-         if i.extractInfo(srcdir, bindir):

-             # Open the template file and the version file

--- 
-2.30.1
-