This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository asc.
commit fc4aed06e47da882a7d054b53190738fcf363026 Author: Markus Koschany <[email protected]> Date: Fri Nov 17 19:09:20 2017 +0100 Add libphysfs-3.0.1.patch and fix FTBFS with libphysfs 3.0.1. Thanks: Adrian Bunk for the report. Closes: #881998 --- debian/patches/libphysfs-3.0.1.patch | 49 +++++++++++++++++++++++++++++++++++ debian/patches/reproducible-zip.patch | 12 ++++++++- debian/patches/series | 1 + 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/debian/patches/libphysfs-3.0.1.patch b/debian/patches/libphysfs-3.0.1.patch new file mode 100644 index 0000000..61a494b --- /dev/null +++ b/debian/patches/libphysfs-3.0.1.patch @@ -0,0 +1,49 @@ +From: Markus Koschany <[email protected]> +Date: Fri, 17 Nov 2017 19:08:04 +0100 +Subject: libphysfs 3.0.1 + +Bug-Debian: https://bugs.debian.org/881998 +--- + source/libs/paragui/src/core/physfsrwops.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/source/libs/paragui/src/core/physfsrwops.h b/source/libs/paragui/src/core/physfsrwops.h +index 91ff2eb..a259622 100644 +--- a/source/libs/paragui/src/core/physfsrwops.h ++++ b/source/libs/paragui/src/core/physfsrwops.h +@@ -39,7 +39,7 @@ extern "C" { + * @return A valid SDL_RWops structure on success, NULL on error. Specifics + * of the error can be gleaned from PHYSFS_getLastError(). + */ +-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); ++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); + + /** + * Open a platform-independent filename for writing, and make it accessible +@@ -51,7 +51,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname); + * @return A valid SDL_RWops structure on success, NULL on error. Specifics + * of the error can be gleaned from PHYSFS_getLastError(). + */ +-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); ++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); + + /** + * Open a platform-independent filename for appending, and make it accessible +@@ -63,7 +63,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname); + * @return A valid SDL_RWops structure on success, NULL on error. Specifics + * of the error can be gleaned from PHYSFS_getLastError(). + */ +-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); ++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); + + /** + * Make a SDL_RWops from an existing PhysicsFS file handle. You should +@@ -75,7 +75,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname); + * @return A valid SDL_RWops structure on success, NULL on error. Specifics + * of the error can be gleaned from PHYSFS_getLastError(). + */ +-__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle); ++PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle); + + #ifdef __cplusplus + } diff --git a/debian/patches/reproducible-zip.patch b/debian/patches/reproducible-zip.patch index f3bb978..aedfa50 100644 --- a/debian/patches/reproducible-zip.patch +++ b/debian/patches/reproducible-zip.patch @@ -1,6 +1,16 @@ +From: Debian Games Team <[email protected]> +Date: Fri, 17 Nov 2017 19:07:41 +0100 +Subject: reproducible-zip + +--- + data/dialog/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/dialog/Makefile.in b/data/dialog/Makefile.in +index c3255f4..a33c111 100644 --- a/data/dialog/Makefile.in +++ b/data/dialog/Makefile.in -@@ -552,7 +552,7 @@ +@@ -552,7 +552,7 @@ uninstall-am: uninstall-pkgdataDATA asc2_dlg.zip: $(srcdir)/asc2_dlg.theme $(srcdir)/asc/*.bmp $(srcdir)/asc/*.ttf $(srcdir)/asc/*.png diff --git a/debian/patches/series b/debian/patches/series index a3ca0b9..f7b5a80 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ reproducible-build.patch reproducible-zip.patch +libphysfs-3.0.1.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/asc.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
