From bc6954af018b6f7cdc22f5e8e5f0da4ad8ee6f46 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 26 Mar 2019 10:49:00 +0100 Subject: [PATCH 1/2] Fix an error in Fedora RPM ``` CGAL-devel.x86_64: E: zero-length /usr/lib64/cmake/CGAL/config/support/test_syntaxonly.cpp ``` https://taskotron.fedoraproject.org/artifacts/all/bf72d02c-4aff-11e9-a48a-525400fc9f92/tests.yml/CGAL-4.14-0.1beta2.fc30.log --- Installation/cmake/modules/config/support/test_syntaxonly.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Installation/cmake/modules/config/support/test_syntaxonly.cpp b/Installation/cmake/modules/config/support/test_syntaxonly.cpp index e69de29bb2d..237c8ce1817 100644 --- a/Installation/cmake/modules/config/support/test_syntaxonly.cpp +++ b/Installation/cmake/modules/config/support/test_syntaxonly.cpp @@ -0,0 +1 @@ +int main() {} From 15d74af234a54b665d3f48e6406604cf6b6e8f5f Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 26 Mar 2019 10:49:31 +0100 Subject: [PATCH 2/2] Bump the SONAME of libCGAL_Qt5.so ``` ABI changes between build CGAL-4.14-0.1beta2.fc30 and its latest stable build ================================================================================ This file contains possible ABI changes which have occurred due to this package update against latest stable build available in koji for the given Fedora release. If you want to filter out these kind of ABI changes in the future, you can add a proper .abignore file to this package. To know more about how to write one, please look at the wiki page https://fedoraproject.org/wiki/Taskotron/Tasks/dist.abicheck#filtering . On armv7hl architecture ************************* * No ABI change between: CGAL-devel-4.13-3.fc30.armv7hl.rpm CGAL-devel-4.14-0.1beta2.fc30.armv7hl.rpm ABI comparison took 8.88 second(s). * ABI changes found between: CGAL-4.13-3.fc30.armv7hl.rpm CGAL-4.14-0.1beta2.fc30.armv7hl.rpm ABI comparison took 11.54 second(s). Please review them. ================ changes of 'libCGAL_Qt5.so.13.0.2'=============== Functions changes summary: 0 Removed, 1 Changed, 0 Added function Variables changes summary: 0 Removed, 0 Changed, 0 Added variable 1 function with some indirect sub-type change: [C]'method CGAL::Qt::DemosMainWindow::DemosMainWindow(QWidget*, Qt::WindowFlags)' at DemosMainWindow_impl.h:62:1 has some indirect sub-type changes: return type changed: in pointed to type 'class CGAL::Qt::DemosMainWindow' at DemosMainWindow.h:52:1: type size changed from 544 to 608 (in bits) 1 data member insertion: 'QSettings CGAL::Qt::DemosMainWindow::settings', at offset 544 (in bits) at DemosMainWindow.h:129:1 ================ end of changes of 'libCGAL_Qt5.so.13.0.2'=============== Removed binaries: /usr/lib/libCGAL_ImageIO.so.13.0.2, SONAME: libCGAL_ImageIO.so.13 Added binaries: /usr/lib/libCGAL_ImageIO.so.14.0.0, SONAME: libCGAL_ImageIO.so.14 * No ABI change between: CGAL-demos-source-4.13-3.fc30.armv7hl.rpm CGAL-demos-source-4.14-0.1beta2.fc30.armv7hl.rpm ABI comparison took 8.67 second(s). ``` https://taskotron.fedoraproject.org/artifacts/all/bfca5e3c-4aff-11e9-b891-525400fc9f92/tests.yml/CGAL-4.14-0.1beta2.fc30.log --- Installation/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 0a1e33d64ab..18133ff36fc 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -367,13 +367,16 @@ endif() # CGAL-4.11 : 13.0.1 (Nothing different in CGAL compiled libraries.) # CGAL-4.12 : 13.0.2 (Nothing different in CGAL compiled libraries.) # CGAL-4.14 : 14.0.0 , but only for CGAL_ImageIO (ABI broken in CGAL::Image_3.) -# CGAL-4.14 : 13.0.3 , for other libraries +# and for CGAL_Qt5 (ABI broken in DemoMainWindow) +# CGAL-4.14 : 13.0.3 , for other libraries # ยน) According to http://upstream-tracker.org/versions/cgal.html set( CGAL_SONAME_VERSION "13" ) set( CGAL_SOVERSION "13.0.3" ) set( CGAL_ImageIO_SONAME_VERSION "14" ) set( CGAL_ImageIO_SOVERSION "14.0.0" ) +set( CGAL_Qt5_SONAME_VERSION "14" ) +set( CGAL_Qt5_SOVERSION "14.0.0" ) message( STATUS "CGAL_SONAME_VERSION=${CGAL_SONAME_VERSION}" ) message( STATUS "CGAL_SOVERSION =${CGAL_SOVERSION}" )