Compare commits
7 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| cf7ce0839e | |||
| 33ef1d1008 | |||
| 9e59d410bc | |||
| 674ac9b690 | |||
| 0594cb473d | |||
| a52f31f070 | |||
| 0e4bf37576 |
@@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 10 10:25:57 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
|
||||
|
||||
- Fix shared library packaging naming
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 8 18:39:33 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
|
||||
|
||||
- update no-static.patch
|
||||
Better fix: as long as you do not install the library. it will
|
||||
not get added to the generated files.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 21 14:49:08 UTC 2025 - Hans-Peter Jansen <hpj@urpla.net>
|
||||
|
||||
- build with 16.0 without enforcing a certain compiler
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 15 15:07:48 UTC 2025 - Hans-Peter Jansen <hpj@urpla.net>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package Clipper2
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -15,11 +15,14 @@
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
%bcond_with clipper2_testing
|
||||
%global sh_lib libClipper2_1
|
||||
%global sh_z_lib libClipper2Z_1
|
||||
|
||||
%if 0%{?sle_version} >= 150500
|
||||
%bcond_with clipper2_testing
|
||||
%global sh_lib libClipper2-1
|
||||
%global sh_z_lib libClipper2Z1
|
||||
%global broken_sh_lib libClipper2_1
|
||||
%global broken_sh_z_lib libClipper2Z_1
|
||||
|
||||
%if 0%{?suse_version} < 1600
|
||||
%global force_gcc_version 14
|
||||
%endif
|
||||
|
||||
@@ -46,6 +49,8 @@ still works very well, Clipper2 is better in just about every way.
|
||||
|
||||
%package -n %{sh_lib}
|
||||
Summary: Shared library for Clipper2
|
||||
Obsoletes: %{broken_sh_lib} < %{version}-%{release}
|
||||
|
||||
%description -n %{sh_lib}
|
||||
The Clipper2 library performs intersection, union, difference and XOR boolean
|
||||
operations on both simple and complex polygons. It also performs polygon
|
||||
@@ -55,6 +60,8 @@ still works very well, Clipper2 is better in just about every way.
|
||||
|
||||
%package -n %{sh_z_lib}
|
||||
Summary: Shared library for Clipper2
|
||||
Obsoletes: %{broken_sh_z_lib} < %{version}-%{release}
|
||||
|
||||
%description -n %{sh_z_lib}
|
||||
The Clipper2 library performs intersection, union, difference and XOR boolean
|
||||
operations on both simple and complex polygons. It also performs polygon
|
||||
@@ -66,6 +73,7 @@ still works very well, Clipper2 is better in just about every way.
|
||||
Summary: Development files for Clipper2
|
||||
Requires: %{sh_lib} = %{version}
|
||||
Requires: %{sh_z_lib} = %{version}
|
||||
|
||||
%description devel
|
||||
The Clipper2 library performs intersection, union, difference and XOR boolean
|
||||
operations on both simple and complex polygons. It also performs polygon
|
||||
@@ -73,7 +81,6 @@ offsetting. This is a major update of my original Clipper library that was
|
||||
written over 10 years ago. That library I'm now calling Clipper1, and while it
|
||||
still works very well, Clipper2 is better in just about every way.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{name}_%{version}
|
||||
|
||||
@@ -83,7 +90,7 @@ export CC="gcc-%{?force_gcc_version}"
|
||||
export CXX="g++-%{?force_gcc_version}"
|
||||
%endif
|
||||
cd CPP
|
||||
%cmake -DUSE_EXTERNAL_GTEST=ON -DCLIPPER2_HI_PRECISION:BOOL=ON
|
||||
%cmake -DUSE_EXTERNAL_GTEST=ON -DCLIPPER2_HI_PRECISION:BOOL=ON
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
@@ -102,20 +109,16 @@ cd CPP
|
||||
%files -n %{sh_lib}
|
||||
%license LICENSE
|
||||
%{_libdir}/libClipper2.so.*
|
||||
%{_libdir}/libClipper2utils.so.*
|
||||
|
||||
%files -n %{sh_z_lib}
|
||||
%license LICENSE
|
||||
%{_libdir}/libClipper2Z.so.*
|
||||
%{_libdir}/libClipper2Zutils.so.*
|
||||
|
||||
%files devel
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
%{_libdir}/libClipper2.so
|
||||
%{_libdir}/libClipper2utils.so
|
||||
%{_libdir}/libClipper2Z.so
|
||||
%{_libdir}/libClipper2Zutils.so
|
||||
%{_libdir}/pkgconfig/Clipper2.pc
|
||||
%{_libdir}/pkgconfig/Clipper2Z.pc
|
||||
%{_includedir}/clipper2/
|
||||
|
||||
@@ -2,51 +2,22 @@ Index: Clipper2-Clipper2_1.5.4/CPP/CMakeLists.txt
|
||||
===================================================================
|
||||
--- Clipper2-Clipper2_1.5.4.orig/CPP/CMakeLists.txt
|
||||
+++ Clipper2-Clipper2_1.5.4/CPP/CMakeLists.txt
|
||||
@@ -56,7 +56,7 @@ set(CLIPPER2_LIBS "") # one or both of C
|
||||
# primary Clipper2 library
|
||||
if (NOT (CLIPPER2_USINGZ STREQUAL "ONLY"))
|
||||
list(APPEND CLIPPER2_LIBS Clipper2)
|
||||
- add_library(Clipper2 ${CLIPPER2_INC} ${CLIPPER2_SRC})
|
||||
+ add_library(Clipper2 SHARED ${CLIPPER2_INC} ${CLIPPER2_SRC})
|
||||
|
||||
target_compile_definitions(
|
||||
Clipper2 PUBLIC
|
||||
@@ -81,7 +81,7 @@ endif()
|
||||
# secondary Clipper2 library with USINGZ defined (if required)
|
||||
if (NOT (CLIPPER2_USINGZ STREQUAL "OFF"))
|
||||
list(APPEND CLIPPER2_LIBS Clipper2Z)
|
||||
- add_library(Clipper2Z ${CLIPPER2_INC} ${CLIPPER2_SRC})
|
||||
+ add_library(Clipper2Z SHARED ${CLIPPER2_INC} ${CLIPPER2_SRC})
|
||||
|
||||
target_compile_definitions(
|
||||
Clipper2Z PUBLIC
|
||||
@@ -127,14 +127,14 @@ if(CLIPPER2_UTILS OR CLIPPER2_TESTS OR C
|
||||
|
||||
if (NOT (CLIPPER2_USINGZ STREQUAL "ONLY"))
|
||||
list(APPEND CLIPPER2_UTILS Clipper2utils)
|
||||
- add_library(Clipper2utils STATIC ${CLIPPER2_UTILS_INC} ${CLIPPER2_UTILS_SRC})
|
||||
+ add_library(Clipper2utils SHARED ${CLIPPER2_UTILS_INC} ${CLIPPER2_UTILS_SRC})
|
||||
|
||||
target_link_libraries(Clipper2utils PUBLIC Clipper2)
|
||||
endif()
|
||||
|
||||
if (NOT (CLIPPER2_USINGZ STREQUAL "OFF"))
|
||||
list(APPEND CLIPPER2_UTILS Clipper2Zutils)
|
||||
- add_library(Clipper2Zutils STATIC ${CLIPPER2_UTILS_INC} ${CLIPPER2_UTILS_SRC})
|
||||
+ add_library(Clipper2Zutils SHARED ${CLIPPER2_UTILS_INC} ${CLIPPER2_UTILS_SRC})
|
||||
|
||||
target_link_libraries(Clipper2Zutils PUBLIC Clipper2Z)
|
||||
endif()
|
||||
@@ -163,6 +163,12 @@ if(CLIPPER2_UTILS OR CLIPPER2_TESTS OR C
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
@@ -156,12 +156,12 @@ if(CLIPPER2_UTILS OR CLIPPER2_TESTS OR C
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Utils>
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/clipper2/Utils>
|
||||
)
|
||||
- install(TARGETS ${lib}
|
||||
- EXPORT Clipper2-targets
|
||||
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clipper2/Utils
|
||||
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
+ # install(TARGETS ${lib}
|
||||
+ # EXPORT Clipper2-targets
|
||||
+ # PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clipper2/Utils
|
||||
+ # ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ # LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ # RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endforeach()
|
||||
+set_target_properties(${CLIPPER2_UTILS} PROPERTIES FOLDER Libraries
|
||||
+ VERSION ${PROJECT_VERSION}
|
||||
+ SOVERSION ${PROJECT_VERSION_MAJOR}
|
||||
+ PUBLIC_HEADER "${CLIPPER2_INC}"
|
||||
+)
|
||||
+
|
||||
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user