pool/FreeCAD
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 767032 from home:frispete:Tumbleweed

Browse Source 
- make 0003-qt-5.14.patch do what it is advertising
  * fix conditional in order to locate rcc/uic properly

OBS-URL: https://build.opensuse.org/request/show/767032
OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=103
This commit is contained in:
Stefan Brüns 2020-01-26 14:39:28 +00:00 committed by Git OBS Bridge
parent dfbe7c83a0
commit c728518a5a
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0003-qt-5.14.patch
View File

@ -23,19 +23,19 @@ index 9c9751488..7ca9690dc 100644
+ +
+FIND_PACKAGE(Qt5Core) +FIND_PACKAGE(Qt5Core)
+ +
+IF(Qt5Core_VERSION_STRING VERSION_GREATER 5.14) +IF(Qt5Core_VERSION_STRING VERSION_GREATER_EQUAL 5.14)
+ # New (>= 5.14) + # New (>= 5.14)
+ FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic) + FIND_PROGRAM(PYSIDE2UICBINARY NAMES uic-qt5 uic)
+ set(UICOPTIONS "--generator=python") + set(UICOPTIONS "--generator=python")
+ FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc) + FIND_PROGRAM(PYSIDE2RCCBINARY NAMES rcc-qt5 rcc)
+ set(RCCOPTIONS "--generator=python" "--compress-algo=zlib" "--compress=1") + set(RCCOPTIONS "--generator=python" "--compress-algo=zlib" "--compress=1")
+ELSE(Qt5Core_VERSION_STRING VERSION_GREATER 5.14) +ELSE(Qt5Core_VERSION_STRING VERSION_LESS 5.14)
+ # Legacy (< 5.14) + # Legacy (< 5.14)
+ FIND_PROGRAM(PYSIDE2UICBINARY NAMES python2-pyside2-uic pyside2-uic pyside2-uic-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR}) + FIND_PROGRAM(PYSIDE2UICBINARY NAMES python2-pyside2-uic pyside2-uic pyside2-uic-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR})
+ FIND_PROGRAM(PYSIDE2RCCBINARY NAMES pyside2-rcc pyside2-rcc-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR}) + FIND_PROGRAM(PYSIDE2RCCBINARY NAMES pyside2-rcc pyside2-rcc-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} HINTS ${PYSIDE_BIN_DIR})
+ set(UICOPTIONS "") + set(UICOPTIONS "")
+ set(RCCOPTIONS "") + set(RCCOPTIONS "")
+ENDIF(Qt5Core_VERSION_STRING VERSION_GREATER 5.14) +ENDIF(Qt5Core_VERSION_STRING VERSION_GREATER_EQUAL 5.14)
MACRO(PYSIDE_WRAP_UI outfiles) MACRO(PYSIDE_WRAP_UI outfiles)
FOREACH(it ${ARGN}) FOREACH(it ${ARGN})

2
FreeCAD-test.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package FreeCAD-test # spec file for package FreeCAD-test
# #
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed

6
FreeCAD.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Jan 25 11:03:06 UTC 2020 - Hans-Peter Jansen <hpj@urpla.net>
- make 0003-qt-5.14.patch do what it is advertising
* fix conditional in order to locate rcc/uic properly
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 24 09:02:08 UTC 2020 - Adrian Schröter <adrian@suse.de> Fri Jan 24 09:02:08 UTC 2020 - Adrian Schröter <adrian@suse.de>

2
FreeCAD.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package FreeCAD # spec file for package FreeCAD
# #
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed