Hello community, here is the log from the commit of package bstone for openSUSE:Factory checked in at 2019-10-02 11:57:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bstone (Old) and /work/SRC/openSUSE:Factory/.bstone.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bstone" Wed Oct 2 11:57:59 2019 rev:3 rq:734091 version:1.1.13 Changes: -------- --- /work/SRC/openSUSE:Factory/bstone/bstone.changes 2019-07-16 08:41:20.463036574 +0200 +++ /work/SRC/openSUSE:Factory/.bstone.new.2352/bstone.changes 2019-10-02 11:58:01.495165595 +0200 @@ -1,0 +2,5 @@ +Mon Sep 30 13:28:05 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Add Fix-SDL2W.patch to fix the SDL2 detection. + +------------------------------------------------------------------- New: ---- Fix-SDL2W.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bstone.spec ++++++ --- /var/tmp/diff_new_pack.bgSO4V/_old 2019-10-02 11:58:02.235163698 +0200 +++ /var/tmp/diff_new_pack.bgSO4V/_new 2019-10-02 11:58:02.235163698 +0200 @@ -25,6 +25,8 @@ Group: Amusements/Games/3D/Shoot URL: https://bibendovsky.github.io/bstone/ Source: https://github.com/bibendovsky/bstone/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM +Patch0: Fix-SDL2W.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -48,6 +50,7 @@ %prep %setup -q +%patch0 -p1 %build cd src/ ++++++ Fix-SDL2W.patch ++++++ >From c03573710bfbc504f4480f3e08ece77df5d4aece Mon Sep 17 00:00:00 2001 From: "Boris I. Bendovsky" <[email protected]> Date: Sat, 27 Jul 2019 17:24:58 +0300 Subject: [PATCH] Fix SDL2W --- src/cmake/FindSDL2W.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cmake/FindSDL2W.cmake b/src/cmake/FindSDL2W.cmake index bb6530b7..f3d70c13 100644 --- a/src/cmake/FindSDL2W.cmake +++ b/src/cmake/FindSDL2W.cmake @@ -164,17 +164,17 @@ if (SDL2_FOUND OR SDL2W_TMP_FOUND_VC_DEV) if (EXISTS ${SDL2W_TMP_SDL_VERSION_H}) set( SDL2W_TMP_MAJOR_REGEX - "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9])$" + "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" ) set( SDL2W_TMP_MINOR_REGEX - "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9])$" + "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" ) set( SDL2W_TMP_PATCH_REGEX - "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9])$" + "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" ) file( @@ -224,7 +224,7 @@ if (SDL2_FOUND OR SDL2W_TMP_FOUND_VC_DEV) set( SDL2W_TMP_DIGIT_REGEX - "^[0-9]$" + "^[0-9]+$" ) if (SDL2W_TMP_MAJOR_VERSION MATCHES ${SDL2W_TMP_DIGIT_REGEX} AND
