r3927 - in packages/trunk/hex-a-hop/debian: . patches
Jens Seidel
jseidel-guest at alioth.debian.org
Tue Aug 28 21:40:23 UTC 2007
Author: jseidel-guest
Date: 2007-08-28 21:40:23 +0000 (Tue, 28 Aug 2007)
New Revision: 3927
Removed:
packages/trunk/hex-a-hop/debian/patches/bug439393.patch
Modified:
packages/trunk/hex-a-hop/debian/changelog
packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch
packages/trunk/hex-a-hop/debian/patches/series
Log:
* Use a bold font as suggested by Piotr Engelking
<inkerman42 at gmail.com> to increase readability.
Closes: #439290.
Integrated patch bug439393.patch into pango_fonts.patch.
Modified: packages/trunk/hex-a-hop/debian/changelog
===================================================================
--- packages/trunk/hex-a-hop/debian/changelog 2007-08-28 21:35:03 UTC (rev 3926)
+++ packages/trunk/hex-a-hop/debian/changelog 2007-08-28 21:40:23 UTC (rev 3927)
@@ -36,6 +36,9 @@
manpage, removed "Encoding" line in desktop file).
* Fixed a superfluous space in a level name. Thanks to
Piotr Engelking <inkerman42 at gmail.com>. Closes: #439289.
+ * Use a bold font as suggested by Piotr Engelking
+ <inkerman42 at gmail.com> to increase readability.
+ Closes: #439290.
* Fixed an error in one of the applied patches and allow
displaying of end credits. Thanks to Piotr Engelking
<inkerman42 at gmail.com>. Closes: #439291.
Deleted: packages/trunk/hex-a-hop/debian/patches/bug439393.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/bug439393.patch 2007-08-28 21:35:03 UTC (rev 3926)
+++ packages/trunk/hex-a-hop/debian/patches/bug439393.patch 2007-08-28 21:40:23 UTC (rev 3927)
@@ -1,31 +0,0 @@
-# Copyright (C) 2007 Jens Seidel <jensseidel at users.sf.net>
-# Licensed under the GPL, see /usr/share/common-licenses/GPL
-
-Index: hex-a-hop.svn/gfx.cpp
-===================================================================
---- hex-a-hop.svn.orig/gfx.cpp 2007-08-28 00:31:39.000000000 +0200
-+++ hex-a-hop.svn/gfx.cpp 2007-08-28 00:34:48.000000000 +0200
-@@ -197,6 +197,7 @@
- if (text_utf8.size() == 0 || text_utf8.size() == 1 && text_utf8[0]==127)
- return;
- assert(text_utf8.find("\n") == std::string::npos);
-+ SDLPango_SetMinimumSize(context, SCREEN_W, 0);
- SDLPango_SetText(context, text_utf8.c_str(), -1);
- SDL_Surface *surface = SDLPango_CreateSurfaceDraw(context);
- SDL_Rect dst = {x, y, 1, 1};
-@@ -221,8 +222,14 @@
- // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439071
- if (text_utf8.size() == 0 || text_utf8.size() == 1 && text_utf8[0]==127)
- return;
-- assert(width>0);
-+ if (width<=0)
-+ return;
- SDLPango_SetMinimumSize(context, width, 0);
-+ int real_width = SDLPangoTextWidth(text_utf8);
-+ // Workaround for a crash in SDL Pango, see
-+ // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439855
-+ if (real_width>width)
-+ SDLPango_SetMinimumSize(context, real_width, 0);
-
- // SDLPango_SetText_GivenAlignment is not (yet?) part of the official Pango
- // distribution, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=437865
Modified: packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch 2007-08-28 21:35:03 UTC (rev 3926)
+++ packages/trunk/hex-a-hop/debian/patches/pango_fonts.patch 2007-08-28 21:40:23 UTC (rev 3927)
@@ -3,8 +3,8 @@
Index: hex-a-hop.svn/gfx.cpp
===================================================================
---- hex-a-hop.svn.orig/gfx.cpp 2007-08-26 22:45:51.000000000 +0200
-+++ hex-a-hop.svn/gfx.cpp 2007-08-26 22:45:56.000000000 +0200
+--- hex-a-hop.svn.orig/gfx.cpp 2007-08-28 23:27:39.000000000 +0200
++++ hex-a-hop.svn/gfx.cpp 2007-08-28 23:31:02.000000000 +0200
@@ -19,6 +19,7 @@
#include "i18n.h"
@@ -44,7 +44,7 @@
16, 0xf800, 0x07e0, 0x001f, 0);
screen = SDL_DisplayFormat(tempscreen);
-@@ -157,6 +168,71 @@
+@@ -157,6 +168,78 @@
}
String base_path;
@@ -77,6 +77,7 @@
+ if (text_utf8.size() == 0 || text_utf8.size() == 1 && text_utf8[0]==127)
+ return;
+ assert(text_utf8.find("\n") == std::string::npos);
++ SDLPango_SetMinimumSize(context, SCREEN_W, 0);
+ SDLPango_SetText(context, text_utf8.c_str(), -1);
+ SDL_Surface *surface = SDLPango_CreateSurfaceDraw(context);
+ SDL_Rect dst = {x, y, 1, 1};
@@ -101,8 +102,14 @@
+ // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439071
+ if (text_utf8.size() == 0 || text_utf8.size() == 1 && text_utf8[0]==127)
+ return;
-+ assert(width>0);
++ if (width<=0)
++ return;
+ SDLPango_SetMinimumSize(context, width, 0);
++ int real_width = SDLPangoTextWidth(text_utf8);
++ // Workaround for a crash in SDL Pango, see
++ // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439855
++ if (real_width>width)
++ SDLPango_SetMinimumSize(context, real_width, 0);
+
+ // SDLPango_SetText_GivenAlignment is not (yet?) part of the official Pango
+ // distribution, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=437865
@@ -116,18 +123,18 @@
int TickTimer()
{
static int time = SDL_GetTicks();
-@@ -204,6 +280,10 @@
+@@ -204,6 +287,10 @@
*/
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
+ SDLPango_Init();
-+ context = SDLPango_CreateContext();
++ context = SDLPango_CreateContext_GivenFontDesc("sans-serif bold 12");
+ SDLPango_SetDefaultColor(context, MATRIX_TRANSPARENT_BACK_WHITE_LETTER);
+ SDLPango_SetMinimumSize(context, SCREEN_W, 0);
SDL_Surface* icon = SDL_LoadBMP("graphics/icon.bmp");
if (icon)
-@@ -378,7 +458,7 @@
+@@ -378,7 +465,7 @@
if (!td.isValid())
printf("No tablet/driver found\n");
#endif
@@ -136,7 +143,7 @@
if (m->msg == WM_DROPFILES)
{
HDROP h = (HDROP)m->wParam;
-@@ -476,6 +556,7 @@
+@@ -476,6 +563,7 @@
}
}
@@ -146,8 +153,8 @@
}
Index: hex-a-hop.svn/hex_puzzzle.cpp
===================================================================
---- hex-a-hop.svn.orig/hex_puzzzle.cpp 2007-08-26 22:45:51.000000000 +0200
-+++ hex-a-hop.svn/hex_puzzzle.cpp 2007-08-26 22:45:56.000000000 +0200
+--- hex-a-hop.svn.orig/hex_puzzzle.cpp 2007-08-28 23:27:39.000000000 +0200
++++ hex-a-hop.svn/hex_puzzzle.cpp 2007-08-28 23:30:49.000000000 +0200
@@ -17,6 +17,11 @@
*/
@@ -282,8 +289,8 @@
#include "menus.h"
Index: hex-a-hop.svn/Makefile
===================================================================
---- hex-a-hop.svn.orig/Makefile 2007-08-26 22:45:51.000000000 +0200
-+++ hex-a-hop.svn/Makefile 2007-08-26 22:45:56.000000000 +0200
+--- hex-a-hop.svn.orig/Makefile 2007-08-28 23:27:39.000000000 +0200
++++ hex-a-hop.svn/Makefile 2007-08-28 23:30:44.000000000 +0200
@@ -19,7 +19,7 @@
$(GCC) $(CXXFLAGS) -D_VERSION=\"$(VERSION)\" -DDATA_DIR=\"$(DATA_DIR)\" `sdl-config --cflags` -c -o $@ $<
@@ -295,8 +302,8 @@
clean :
Index: hex-a-hop.svn/menus.h
===================================================================
---- hex-a-hop.svn.orig/menus.h 2007-08-26 22:45:51.000000000 +0200
-+++ hex-a-hop.svn/menus.h 2007-08-26 22:45:56.000000000 +0200
+--- hex-a-hop.svn.orig/menus.h 2007-08-28 23:27:39.000000000 +0200
++++ hex-a-hop.svn/menus.h 2007-08-28 23:30:49.000000000 +0200
@@ -16,11 +16,14 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: packages/trunk/hex-a-hop/debian/patches/series
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/series 2007-08-28 21:35:03 UTC (rev 3926)
+++ packages/trunk/hex-a-hop/debian/patches/series 2007-08-28 21:40:23 UTC (rev 3927)
@@ -10,4 +10,3 @@
array_subscripts_warning.patch
i18n_increase_array_sizes.patch
mouse_cursor_without_font.patch
-bug439393.patch
More information about the Pkg-games-commits
mailing list