From d48e8f1f801a9841394c18929bde1d312112e40a Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 22 Aug 2025 08:45:14 +0800 Subject: [PATCH] try build with cmake 4.0 --- cdrkit-1.1.11-cmakewarn.patch | 4 ++-- cdrkit-1.1.11-usalinst.patch | 12 +++++++----- cdrkit.spec | 5 ++++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cdrkit-1.1.11-cmakewarn.patch b/cdrkit-1.1.11-cmakewarn.patch index a171e39..8f889eb 100644 --- a/cdrkit-1.1.11-cmakewarn.patch +++ b/cdrkit-1.1.11-cmakewarn.patch @@ -2,8 +2,8 @@ diff -up cdrkit-1.1.11/CMakeLists.txt.cmakewarn cdrkit-1.1.11/CMakeLists.txt --- cdrkit-1.1.11/CMakeLists.txt.cmakewarn 2012-07-31 13:11:10.075500531 +0200 +++ cdrkit-1.1.11/CMakeLists.txt 2012-07-31 13:11:41.069108287 +0200 @@ -1,3 +1,5 @@ -+cmake_minimum_required(VERSION 2.8) -+cmake_policy(SET CMP0015 OLD) ++cmake_minimum_required(VERSION 2.8...${CMAKE_VERSION}) ++cmake_policy(SET CMP0015 NEW) PROJECT (cdrkit C) SUBDIRS(include genisoimage wodim libedc libhfs_iso icedax libusal librols libunls readom netscsid 3rd-party/dirsplit) diff --git a/cdrkit-1.1.11-usalinst.patch b/cdrkit-1.1.11-usalinst.patch index de8dbbf..23a11c4 100644 --- a/cdrkit-1.1.11-usalinst.patch +++ b/cdrkit-1.1.11-usalinst.patch @@ -1,23 +1,24 @@ diff -up cdrkit-1.1.11/librols/CMakeLists.txt.usalinst cdrkit-1.1.11/librols/CMakeLists.txt --- cdrkit-1.1.11/librols/CMakeLists.txt.usalinst 2012-07-31 10:51:30.270669381 +0200 +++ cdrkit-1.1.11/librols/CMakeLists.txt 2012-07-31 10:52:02.365378257 +0200 -@@ -3,5 +3,11 @@ INCLUDE_DIRECTORIES(../include ../libhfs +@@ -3,5 +3,12 @@ INCLUDE_DIRECTORIES(../include ../libhfs SET(LIBROLS_SRCS astoi.c astoll.c astoull.c breakline.c cmpbytes.c comerr.c error.c fexec.c fillbytes.c getargs.c getav0.c getdomainname.c geterrno.c gethostid.c gethostname.c getpagesize.c handlecond.c movebytes.c raisecond.c rename.c saveargs.c seterrno.c spawn.c strcatl.c strdup.c streql.c swabbytes.c usleep.c stdio/cvmod.c stdio/dat.c stdio/fcons.c stdio/fdown.c stdio/fdup.c stdio/ffileread.c stdio/ffilewrite.c stdio/fgetline.c stdio/file_raise.c stdio/fileclose.c stdio/fileluopen.c stdio/filemopen.c stdio/fileopen.c stdio/filepos.c stdio/fileread.c stdio/filereopen.c stdio/fileseek.c stdio/filesize.c stdio/filestat.c stdio/filewrite.c stdio/flag.c stdio/flush.c stdio/fpipe.c stdio/niread.c stdio/niwrite.c stdio/nixread.c stdio/nixwrite.c stdio/openfd.c stdio/peekc.c default.c) -ADD_LIBRARY (rols STATIC ${CMAKE_CURRENT_SOURCE_DIR}/../include/xconfig.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/align.h ${LIBROLS_SRCS}) -+ADD_LIBRARY (rols SHARED ${CMAKE_CURRENT_SOURCE_DIR}/../include/xconfig.h ${CMAKE_CURRENT_SOURCE_DIR}/../include/align.h ${LIBROLS_SRCS}) ++ADD_LIBRARY (rols SHARED ${CMAKE_CURRENT_BINARY_DIR}/../include/xconfig.h ${CMAKE_CURRENT_BINARY_DIR}/../include/align.h ${LIBROLS_SRCS}) +SET_TARGET_PROPERTIES(rols PROPERTIES + VERSION 0.0.1 + SOVERSION 0 +) + -+INSTALL(TARGETS rols DESTINATION lib${LIB_SUFFIX}) ++include(GNUInstallDirs) ++INSTALL(TARGETS rols DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff -up cdrkit-1.1.11/libusal/CMakeLists.txt.usalinst cdrkit-1.1.11/libusal/CMakeLists.txt --- cdrkit-1.1.11/libusal/CMakeLists.txt.usalinst 2012-07-31 10:51:30.302670085 +0200 +++ cdrkit-1.1.11/libusal/CMakeLists.txt 2012-07-31 10:52:09.190528942 +0200 -@@ -6,5 +6,12 @@ ADD_DEFINITIONS(-DUSE_RCMD_RSH) +@@ -6,5 +6,13 @@ ADD_DEFINITIONS(-DUSE_RCMD_RSH) #SET(LIBSCG_SRCS rdummy.c usalsettarget.c usaltimes.c scsi-linux-ata.c scsi-linux-pg.c scsi-linux-sg.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c) SET(LIBSCG_SRCS usalsettarget.c usaltimes.c scsierrs.c scsihack.c scsihelp.c scsiopen.c scsitransp.c scsi-remote.c) LINK_DIRECTORIES(../librols) @@ -29,5 +30,6 @@ diff -up cdrkit-1.1.11/libusal/CMakeLists.txt.usalinst cdrkit-1.1.11/libusal/CMa + VERSION 0.0.1 + SOVERSION 0 +) -+INSTALL(TARGETS usal DESTINATION lib${LIB_SUFFIX}) ++include(GNUInstallDirs) ++INSTALL(TARGETS usal DESTINATION ${CMAKE_INSTALL_LIBDIR}) +INSTALL(FILES usal/scsicdb.h usal/aspi-dos.h usal/usalcmd.h usal/usalio.h usal/scsireg.h usal/usalops.h usal/scsidefs.h usal/spti-wnt.h usal/srb_os2.h usal/scsitransp.h usal/aspi-win32.h usal/scsisense.h usaltimes.h pg.h DESTINATION include/usal) diff --git a/cdrkit.spec b/cdrkit.spec index 070744b..d042ff1 100644 --- a/cdrkit.spec +++ b/cdrkit.spec @@ -1,6 +1,6 @@ Name: cdrkit Version: 1.1.11 -Release: 53 +Release: 54 Summary: A collection of CD/DVD utilities License: GPL-2.0-only URL: https://cdrkit.org/ @@ -213,6 +213,9 @@ fi %{_includedir}/usal %changelog +* Sun Mar 02 2025 Funda Wang - 1.1.11-54 +- try build with cmake 4.0 + * Mon Dec 09 2024 shenzhongwei - 1.1.11-53 - Type:bugfix - ID:NA -- Gitee