[packages/widelands] - up to 1.2.1

mrozowik mrozowik at pld-linux.org
Fri Nov 15 16:54:12 CET 2024


commit fb9b81539d3eecdbf37ac4a3bdf46a4ab6ada1b3
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Fri Nov 15 15:19:59 2024 +0000

    - up to 1.2.1

 widelands-pld.patch | 40 ++++++++++++++++++++--------------------
 widelands.spec      |  4 ++--
 2 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/widelands.spec b/widelands.spec
index 745641a..e351537 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -5,13 +5,13 @@
 Summary:	A real-time build-up strategy game
 Summary(pl.UTF-8):	Gra strategiczna czasu rzeczywistego z budowaniem
 Name:		widelands
-Version:	1.2
+Version:	1.2.1
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Games
 #Source0Download: https://wl.widelands.org/wiki/Download/#release
 Source0:	https://github.com/widelands/widelands/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	0c52ea59b7822616f10cfe36860e2642
+# Source0-md5:	51f835c83e6b1197ec416af634398843
 Patch0:		%{name}-pld.patch
 URL:		https://wl.widelands.org/
 BuildRequires:	Mesa-libGL-devel
diff --git a/widelands-pld.patch b/widelands-pld.patch
index 9d64e20..1d4196c 100644
--- a/widelands-pld.patch
+++ b/widelands-pld.patch
@@ -1,6 +1,6 @@
---- widelands-1.2/CMakeLists.txt~	2024-03-28 10:12:05.000000000 +0000
-+++ widelands-1.2/CMakeLists.txt	2024-03-30 10:51:23.584411957 +0000
-@@ -200,6 +200,10 @@
+--- widelands-1.2.1/CMakeLists.txt~	2024-11-12 20:03:25.000000000 +0000
++++ widelands-1.2.1/CMakeLists.txt	2024-11-15 13:45:30.653051845 +0000
+@@ -201,6 +201,10 @@
    option(OPTION_ASAN "Build with AddressSanitizer" OFF)
  elseif(CMAKE_BUILD_TYPE STREQUAL "None")
    message(STATUS "Not setting any default flags.")
@@ -11,68 +11,68 @@
  else()
    message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
  endif()
-@@ -328,7 +332,7 @@
+@@ -329,7 +333,7 @@
  endif()
  
  if(NOT MSVC)
--  if(CMAKE_BUILD_TYPE STREQUAL "Release")
-+  if( (CMAKE_BUILD_TYPE STREQUAL "PLD") OR (CMAKE_BUILD_TYPE STREQUAL "Release") )
+-  if((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
++  if( (CMAKE_BUILD_TYPE STREQUAL "PLD") OR (CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
      message(STATUS "Compiler warnings will be ignored.")
    elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND (
           ((NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0)) AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.2))
-@@ -482,7 +486,6 @@
+@@ -487,7 +491,6 @@
  install (
    FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
    DESTINATION ${WL_INSTALL_BASEDIR}
--  CONFIGURATIONS Debug;Release;None
+-  CONFIGURATIONS Debug;Release;RelWithDebInfo;None
    COMPONENT CoreVersionFile
  )
  
-@@ -498,7 +501,6 @@
+@@ -513,7 +516,6 @@
    FILES
      data/datadirversion
    DESTINATION ${WL_INSTALL_DATADIR}
--  CONFIGURATIONS Debug;Release;None
+-  CONFIGURATIONS Debug;Release;RelWithDebInfo;None
    COMPONENT VersionFile
  )
  
-@@ -515,7 +517,6 @@
+@@ -530,7 +532,6 @@
      data/txts
      data/world
    DESTINATION ${WL_INSTALL_DATADIR}
--  CONFIGURATIONS Debug;Release;None
+-  CONFIGURATIONS Debug;Release;RelWithDebInfo;None
    COMPONENT CoreDataFiles
  )
  
-@@ -523,7 +524,6 @@
+@@ -538,7 +539,6 @@
    DIRECTORY
      data/maps
    DESTINATION ${WL_INSTALL_DATADIR}
--  CONFIGURATIONS Debug;Release;None
+-  CONFIGURATIONS Debug;Release;RelWithDebInfo;None
    COMPONENT MapFiles
  )
  
-@@ -532,7 +532,6 @@
+@@ -547,7 +547,6 @@
      data/music
      data/sound
    DESTINATION ${WL_INSTALL_DATADIR}
--  CONFIGURATIONS Debug;Release;None
+-  CONFIGURATIONS Debug;Release;RelWithDebInfo;None
    COMPONENT MusicFiles
  )
  
-@@ -542,7 +541,6 @@
+@@ -557,7 +556,6 @@
      CREDITS
      ChangeLog
    DESTINATION ${WL_INSTALL_BASEDIR}
--  CONFIGURATIONS Debug;Release;None
+-  CONFIGURATIONS Debug;Release;RelWithDebInfo;None
    COMPONENT CoreLicenseFiles
  )
  
-@@ -561,7 +559,6 @@
+@@ -576,7 +574,6 @@
      DIRECTORY
        ${CMAKE_CURRENT_BINARY_DIR}/locale/
      DESTINATION ${WL_INSTALL_DATADIR}/locale
--    CONFIGURATIONS Debug;Release;None
+-    CONFIGURATIONS Debug;Release;RelWithDebInfo;None
      COMPONENT CoreLanguageFiles
    )
  endif(OPTION_BUILD_TRANSLATIONS)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/widelands.git/commitdiff/fb9b81539d3eecdbf37ac4a3bdf46a4ab6ada1b3



More information about the pld-cvs-commit mailing list