[hyperrogue] 13/30: Remove patches directory

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository hyperrogue.

commit 1d62c9114c851c5acab9bb5707b316fb2358a929
Author: Markus Koschany <apo at debian.org>
Date:   Fri Sep 9 22:29:01 2016 +0200

    Remove patches directory
---
 debian/patches/01-sdl_wm.patch     | 16 -------
 debian/patches/10-fontconfig.patch | 85 --------------------------------------
 debian/patches/series              |  2 -
 3 files changed, 103 deletions(-)

diff --git a/debian/patches/01-sdl_wm.patch b/debian/patches/01-sdl_wm.patch
deleted file mode 100644
index b5f0d09..0000000
--- a/debian/patches/01-sdl_wm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Set window title
-Author: chrysn <chrysn at fsfe.org>
-
-Avoid "Unknown window" titles as suggested by Adam Borowski
-
---- a/graph.cpp
-+++ b/graph.cpp
-@@ -2378,6 +2378,8 @@ void initgraph() {
-   const SDL_VideoInfo *inf = SDL_GetVideoInfo();
-   vid.xscr = vid.xres = inf->current_w;
-   vid.yscr = vid.yres = inf->current_h;
-+
-+  SDL_WM_SetCaption("HyperRogue", "HyperRogue");
-   
-   loadConfig();
- 
diff --git a/debian/patches/10-fontconfig.patch b/debian/patches/10-fontconfig.patch
deleted file mode 100644
index 3527a75..0000000
--- a/debian/patches/10-fontconfig.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Description: Use fontconfig to find TTFs
-Author: chrysn <chrysn at fsfe.org>
-
-This patch bridges the gap between the hardcoded font file path upstream uses
-and a (finally easier) rewrite in SDL_Pango.
-
---- a/graph.cpp
-+++ b/graph.cpp
-@@ -28,6 +28,7 @@ int audiovolume = 60;
- #endif
- 
- #include <SDL/SDL_ttf.h>
-+#include <fontconfig/fontconfig.h>
- 
- #ifdef GFX
- #include <SDL/SDL_gfxPrimitives.h>
-@@ -67,6 +68,7 @@ int audiovolume = 60;
- #define NUMMODES 7
- 
- SDL_Surface *s;
-+char *fontfile = NULL;
- TTF_Font *font[256];
- 
- #endif
-@@ -150,7 +152,7 @@ int qpixel3(SDL_Surface *surf, int x, in
- 
- void loadfont(int siz) {
-   if(!font[siz]) {
--    font[siz] = TTF_OpenFont("VeraBd.ttf", siz);
-+    font[siz] = TTF_OpenFont(fontfile, siz);
-     if (font[siz] == NULL) {
-       printf("error: Font file not found\n");
-       exit(1);
-@@ -2419,6 +2421,43 @@ void initgraph() {
-       Mix_AllocateChannels(4);
-       }
-     }
-+
-+  if (FcInit())
-+  {
-+    FcResult result;
-+    FcFontSet *fs;
-+    FcPattern* pat;
-+    FcPattern *match;
-+
-+    pat = FcNameParse((FcChar8 *)"Bitstream Vera Sans");
-+    FcConfigSubstitute(0, pat, FcMatchPattern);
-+
-+    FcPatternDel(pat, FC_WEIGHT);
-+    FcPatternAddInteger(pat, FC_WEIGHT, FC_WEIGHT_BOLD);
-+
-+    FcDefaultSubstitute(pat);
-+    fs = FcFontSetCreate();
-+    match = FcFontMatch(0, pat, &result);
-+
-+    if (match) FcFontSetAdd(fs, match);
-+    if (pat) FcPatternDestroy(pat);
-+    if (fs) {
-+      if( FcPatternGetString(fs->fonts[0], FC_FILE, 0, (FcChar8**)&fontfile) == FcResultMatch ) {
-+        fontfile = strdup(fontfile);
-+      };
-+      if (fontfile == NULL)
-+      {
-+        printf("Failed to find suitable font\n");
-+	exit(2);
-+      }
-+      FcFontSetDestroy(fs);
-+    }
-+    FcFini();
-+  } else {
-+    printf("Failed to initialize FontConfig.\n");
-+    exit(2);
-+  }
-+
-   #endif
-     
-   #endif
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,4 @@
- CXXFLAGS ?=
- 
- hyper: hyper.cpp graph.cpp hyperpoint.cpp geometry.cpp cell.cpp heptagon.cpp game.cpp classes.cpp polygons.cpp
--	g++ hyper.cpp -o hyper -lSDL -lSDL_ttf -lSDL_mixer -DFHS -Wall -g -lSDL_gfx ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} -lGL -O3
-+	g++ hyper.cpp -o hyper -lSDL -lSDL_ttf -lSDL_mixer -lfontconfig -DFHS -Wall -g -lSDL_gfx ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} -lGL -O3
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bc44ff2..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01-sdl_wm.patch
-10-fontconfig.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/hyperrogue.git