This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository allegro5.
commit d155bd7bd3f458d720afcca6f64dcab9601ff601 Author: Tobias Hansen <[email protected]> Date: Thu Apr 21 16:36:31 2016 +0100 Refresh patches. --- debian/changelog | 2 ++ debian/patches/fix-fallback-path-max.patch | 10 +++++----- debian/patches/fix-manpage-generation-script.patch | 2 +- debian/patches/fix-manpages.patch | 2 +- .../require-directx_shaders.c-only-on-windows.patch | 16 ---------------- debian/patches/series | 1 - debian/patches/use-debians-dejavu-font.patch | 4 ++-- 7 files changed, 11 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index 21f60b8..fe6ec82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ allegro5 (2:5.2.0-1) UNRELEASED; urgency=medium * New upstream release (Closes: #704141). + * Refresh patches. + * Remove require-directx_shaders.c-only-on-windows.patch, applied upstream. -- Tobias Hansen <[email protected]> Thu, 21 Apr 2016 16:13:21 +0100 diff --git a/debian/patches/fix-fallback-path-max.patch b/debian/patches/fix-fallback-path-max.patch index 03741f8..4b8db31 100644 --- a/debian/patches/fix-fallback-path-max.patch +++ b/debian/patches/fix-fallback-path-max.patch @@ -2,17 +2,17 @@ Author: Andreas Rönnquist Description: Defines a fallback PATH_MAX on Hurd, where it isn't defined by default --- a/src/file_stdio.c +++ b/src/file_stdio.c -@@ -38,6 +38,10 @@ - #include <sys/stat.h> - #endif +@@ -43,6 +43,10 @@ + /* forward declaration */ + const struct ALLEGRO_FILE_INTERFACE _al_file_interface_stdio; +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + - /* forward declaration */ - const struct ALLEGRO_FILE_INTERFACE _al_file_interface_stdio; + typedef struct + { --- a/src/fshook_stdio.c +++ b/src/fshook_stdio.c @@ -124,6 +124,10 @@ diff --git a/debian/patches/fix-manpage-generation-script.patch b/debian/patches/fix-manpage-generation-script.patch index a9af59c..be02700 100644 --- a/debian/patches/fix-manpage-generation-script.patch +++ b/debian/patches/fix-manpage-generation-script.patch @@ -16,7 +16,7 @@ Author: Tobias Hansen <[email protected]> static dstr last_header; --- a/docs/Refman.cmake +++ b/docs/Refman.cmake -@@ -292,7 +292,7 @@ +@@ -298,7 +298,7 @@ set(outputs) foreach(entry ${entries}) diff --git a/debian/patches/fix-manpages.patch b/debian/patches/fix-manpages.patch index 936a6dc..32500c4 100644 --- a/debian/patches/fix-manpages.patch +++ b/debian/patches/fix-manpages.patch @@ -6,7 +6,7 @@ Author: Tobias Hansen <[email protected]> --- a/docs/src/refman/font.txt +++ b/docs/src/refman/font.txt -@@ -224,13 +224,13 @@ +@@ -550,13 +550,13 @@ The bitmap format is as in the following example, which contains three glyphs for 1, 2 and 3. diff --git a/debian/patches/require-directx_shaders.c-only-on-windows.patch b/debian/patches/require-directx_shaders.c-only-on-windows.patch deleted file mode 100644 index 44d7257..0000000 --- a/debian/patches/require-directx_shaders.c-only-on-windows.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Require directx_shaders.c only on Windows - This file is only needed on Windows, - so don't complain if it's not present - on other platforms. -Author: Tobias Hansen <[email protected]> - ---- a/addons/primitives/CMakeLists.txt -+++ b/addons/primitives/CMakeLists.txt -@@ -6,7 +6,6 @@ - prim_soft.c - point_soft.c - primitives.c -- directx_shaders.c - ) - - if(WIN32) diff --git a/debian/patches/series b/debian/patches/series index d31a3d4..3714df3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,3 @@ fix-fallback-path-max.patch fix-manpages.patch fix-manpage-generation-script.patch use-debians-dejavu-font.patch -require-directx_shaders.c-only-on-windows.patch diff --git a/debian/patches/use-debians-dejavu-font.patch b/debian/patches/use-debians-dejavu-font.patch index 3a59f68..2a803b1 100644 --- a/debian/patches/use-debians-dejavu-font.patch +++ b/debian/patches/use-debians-dejavu-font.patch @@ -4,10 +4,10 @@ Author: Tobias Hansen <[email protected]> --- a/tests/test_fonts.ini +++ b/tests/test_fonts.ini -@@ -9,7 +9,7 @@ - ttf_px3=al_load_ttf_font_stretch(ttf_filename, -24, -32, flags) +@@ -11,7 +11,7 @@ # arguments bmp_filename=../examples/data/a4_font.tga + ascii_filename=../examples/data/fixed_font.tga -ttf_filename=../examples/data/DejaVuSans.ttf +ttf_filename=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf flags=ALLEGRO_NO_PREMULTIPLIED_ALPHA -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/allegro5.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
