[packages/swami] - remove braindead cmake assumptions to use our CLFLAGS, rel 2

baggins baggins at pld-linux.org
Sat Jan 29 23:29:41 CET 2022


commit fbb77c60991418d9722b7932a61a653b118abd35
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jan 29 23:28:46 2022 +0100

    - remove braindead cmake assumptions to use our CLFLAGS, rel 2

 build.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 swami.spec  |  4 +++-
 2 files changed, 43 insertions(+), 1 deletion(-)
---
diff --git a/swami.spec b/swami.spec
index 8cf75f8..9b4a2b5 100644
--- a/swami.spec
+++ b/swami.spec
@@ -2,12 +2,13 @@ Summary:	Sampled Waveforms And Musical Instruments - SoundFont editor
 Summary(pl.UTF-8):	Sampled Waveforms And Musical Instruments - edytor fontów dźwiękowych
 Name:		swami
 Version:	2.2.0
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/Sound
 #Source0Download: https://github.com/swami/swami/releases
 Source0:	https://github.com/swami/swami/archive/v%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	d3d5ddffe5227e70e1bf4731b01c3b23
+Patch0:		build.patch
 URL:		http://www.swamiproject.org/
 BuildRequires:	cmake >= 2.6.3
 BuildRequires:	fftw3-single-devel >= 3.0
@@ -101,6 +102,7 @@ Pliki nagłówkowe biblioteki GUI SWAMI.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..f4a421f
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,40 @@
+--- swami-2.2.0/CMakeLists.txt~	2022-01-29 23:16:50.000000000 +0100
++++ swami-2.2.0/CMakeLists.txt	2022-01-29 23:19:16.388525959 +0100
+@@ -62,28 +62,6 @@
+ 
+ unset ( SWAMI_LIBS CACHE )
+ 
+-# Options for the GNU C compiler only
+-if ( CMAKE_COMPILER_IS_GNUCC )
+-  if ( NOT APPLE )
+-    set ( CMAKE_EXE_LINKER_FLAGS 
+-          "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed" )
+-    set ( CMAKE_SHARED_LINKER_FLAGS 
+-          "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+-  endif ( NOT APPLE )
+-  set ( GNUCC_WARNING_FLAGS "-Wall")
+-  set ( CMAKE_C_FLAGS_DEBUG "-g -DDEBUG ${GNUCC_WARNING_FLAGS}" )
+-  set ( CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${GNUCC_WARNING_FLAGS}" )
+-  set ( CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${GNUCC_WARNING_FLAGS}" )
+-endif ( CMAKE_COMPILER_IS_GNUCC )
+-
+-if ( enable-debug )  
+-    set ( CMAKE_BUILD_TYPE "Debug" CACHE STRING
+-          "Choose the build type, options: Debug Release RelWithDebInfo" FORCE )
+-else ( enable-debug )
+-    set ( CMAKE_BUILD_TYPE "Release" CACHE STRING
+-          "Choose the build type, options: Debug Release RelWithDebInfo" FORCE )
+-endif ( enable-debug )
+-
+ unset ( MINGW32 CACHE )
+ if ( WIN32 )
+   # MinGW compiler (a Windows GCC port)
+@@ -238,7 +238,7 @@
+ include ( InstallRequiredSystemLibraries )
+ set ( CPACK_GENERATOR STGZ;TGZ;TBZ2;ZIP )
+ set ( CPACK_PACKAGE_NAME ${PACKAGE} )
+-set ( CPACK_STRIP_FILES ON )
++set ( CPACK_STRIP_FILES OFF )
+ 
+ include ( CPack )
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/swami.git/commitdiff/fbb77c60991418d9722b7932a61a653b118abd35



More information about the pld-cvs-commit mailing list