From 929510a45daf622213d46bfb97b7c37b8501625c Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 10 Apr 2020 15:54:10 +0200
Subject: gnu: sdl-pango: Shorten file name of patch.

* gnu/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch:
Rename to...
* gnu/packages/patches/sdl-pango-header-guard.patch: ... this.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/sdl.scm (sdl-pango):
Likewise.
---
 ...-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch | 20 --------------------
 gnu/packages/patches/sdl-pango-header-guard.patch    | 20 ++++++++++++++++++++
 gnu/packages/sdl.scm                                 | 14 ++++++--------
 3 files changed, 26 insertions(+), 28 deletions(-)
 delete mode 100644 gnu/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch
 create mode 100644 gnu/packages/patches/sdl-pango-header-guard.patch

(limited to 'gnu/packages')

diff --git a/gnu/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch b/gnu/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch
deleted file mode 100644
index 3d4b10cc10..0000000000
--- a/gnu/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/SDL_Pango.h
-+++ b/src/SDL_Pango.h
-@@ -171,7 +171,7 @@
-     SDLPango_Direction direction);
- 
- 
--#ifdef __FT2_BUILD_UNIX_H__
-+#ifdef FT2BUILD_H_
- 
- extern DECLSPEC void SDLCALL SDLPango_CopyFTBitmapToSurface(
-     const FT_Bitmap *bitmap,
-@@ -179,7 +179,7 @@
-     const SDLPango_Matrix *matrix,
-     SDL_Rect *rect);
- 
--#endif	/* __FT2_BUILD_UNIX_H__ */
-+#endif
- 
- 
- #ifdef __PANGO_H__
diff --git a/gnu/packages/patches/sdl-pango-header-guard.patch b/gnu/packages/patches/sdl-pango-header-guard.patch
new file mode 100644
index 0000000000..3d4b10cc10
--- /dev/null
+++ b/gnu/packages/patches/sdl-pango-header-guard.patch
@@ -0,0 +1,20 @@
+--- a/src/SDL_Pango.h
++++ b/src/SDL_Pango.h
+@@ -171,7 +171,7 @@
+     SDLPango_Direction direction);
+ 
+ 
+-#ifdef __FT2_BUILD_UNIX_H__
++#ifdef FT2BUILD_H_
+ 
+ extern DECLSPEC void SDLCALL SDLPango_CopyFTBitmapToSurface(
+     const FT_Bitmap *bitmap,
+@@ -179,7 +179,7 @@
+     const SDLPango_Matrix *matrix,
+     SDL_Rect *rect);
+ 
+-#endif	/* __FT2_BUILD_UNIX_H__ */
++#endif
+ 
+ 
+ #ifdef __PANGO_H__
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 7b36d5509c..105296cd0f 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -345,14 +345,12 @@ (define-public sdl-pango
              "SDL_Pango-" version  ".tar.gz"))
        (sha256
         (base32 "197baw1dsg0p4pljs5k0fshbyki00r4l49m1drlpqw6ggawx6xbz"))
-       (patches
-        (search-patches
-         "sdl-pango-api_additions.patch"
-         "sdl-pango-blit_overflow.patch"
-         "sdl-pango-fillrect_crash.patch"
-         "sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch"
-         "sdl-pango-matrix_declarations.patch"
-         "sdl-pango-sans-serif.patch"))))
+       (patches (search-patches "sdl-pango-api_additions.patch"
+                                "sdl-pango-blit_overflow.patch"
+                                "sdl-pango-fillrect_crash.patch"
+                                "sdl-pango-header-guard.patch"
+                                "sdl-pango-matrix_declarations.patch"
+                                "sdl-pango-sans-serif.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list "--disable-static")
-- 
cgit v1.2.3