unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob dd550632d8c6703f451171af7017957157eada94 1055 bytes (raw)
name: gnu/packages/patches/tome4-fix-sdl-h-path.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
 
From 2c3eedcccf2da85cffa08baefa6e437c819276e6 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Mon, 3 Apr 2017 16:20:48 +0300
Subject: [PATCH] Fix make -k config=release for GNUC

---
 src/music.h | 2 +-
 src/tSDL.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/music.h b/src/music.h
index 894426cb8..c8490e456 100644
--- a/src/music.h
+++ b/src/music.h
@@ -27,7 +27,7 @@
 #include <vorbis/vorbisfile.h>
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_thread.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__GNUC__)
 #include <AL/al.h>
 #include <AL/alc.h>
 #include <vorbis/vorbisfile.h>
diff --git a/src/tSDL.h b/src/tSDL.h
index a7d36c92f..4f7690255 100644
--- a/src/tSDL.h
+++ b/src/tSDL.h
@@ -3,7 +3,7 @@
 #include <SDL2_ttf/SDL_ttf.h>
 //#include <SDL2_mixer/SDL_mixer.h>
 #include <SDL2_image/SDL_image.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__GNUC__)
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_ttf.h>
 //#include <SDL2/SDL_mixer.h>
-- 
2.13.2


debug log:

solving dd550632d ...
found dd550632d in https://yhetil.org/guix-patches/87poczcaxz.fsf@magnolia.i-did-not-set--mail-host-address--so-tickle-me/

applying [1/1] https://yhetil.org/guix-patches/87poczcaxz.fsf@magnolia.i-did-not-set--mail-host-address--so-tickle-me/
diff --git a/gnu/packages/patches/tome4-fix-sdl-h-path.patch b/gnu/packages/patches/tome4-fix-sdl-h-path.patch
new file mode 100644
index 000000000..dd550632d

1:43: trailing whitespace.
-- 
Checking patch gnu/packages/patches/tome4-fix-sdl-h-path.patch...
1:45: new blank line at EOF.
+
Applied patch gnu/packages/patches/tome4-fix-sdl-h-path.patch cleanly.
warning: 2 lines add whitespace errors.

index at:
100644 dd550632d8c6703f451171af7017957157eada94	gnu/packages/patches/tome4-fix-sdl-h-path.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).