From 8aebb228036d5e2863b7eaa6e319ab41c1669269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 16 Apr 2018 16:47:37 +0100 Subject: gentoo resync : 16.04.2018 --- .../criticalmass/files/criticalmass-1.0.2-cflags.patch | 4 ++-- .../criticalmass/files/criticalmass-1.0.2-libpng14.patch | 4 ++-- .../criticalmass/files/criticalmass-1.0.2-libpng15.patch | 8 ++++---- .../criticalmass/files/criticalmass-1.0.2-system_curl.patch | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'games-arcade/criticalmass/files') diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch index 8b801e51c2cb..0d9063c37538 100644 --- a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch +++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch @@ -1,5 +1,5 @@ ---- configure.in.orig 2011-07-20 11:23:19.849122541 -0400 -+++ configure.in 2011-07-20 11:24:28.169713094 -0400 +--- a/configure.in.orig 2011-07-20 11:23:19.849122541 -0400 ++++ b/configure.in 2011-07-20 11:24:28.169713094 -0400 @@ -35,9 +35,6 @@ AM_CONDITIONAL(APPLE,test "x$TARGET" = xAPPLE) AM_CONDITIONAL(WIN32,test "x$TARGET" = xWIN32) diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch index 882869b43a14..f8a0eec2ad57 100644 --- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch +++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch @@ -1,5 +1,5 @@ ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -99,7 +99,7 @@ if test "x$TARGET" = xWIN32; then else LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS" diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch index ac1b8c0c617f..dbdfc9f32275 100644 --- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch +++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch @@ -1,5 +1,5 @@ ---- game/main.cpp -+++ game/main.cpp +--- a/game/main.cpp ++++ b/game/main.cpp @@ -28,6 +28,8 @@ #include #include @@ -9,8 +9,8 @@ void migrateConfig( void) { //if onlineCheck is not set, default it to true ---- utilssdl/PNG.cpp -+++ utilssdl/PNG.cpp +--- a/utilssdl/PNG.cpp ++++ b/utilssdl/PNG.cpp @@ -45,7 +45,7 @@ { png_size_t check; diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch index 02307ad7d8fc..1ab1a2d5ce52 100644 --- a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch +++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch @@ -1,5 +1,5 @@ ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -115,8 +115,6 @@ fi AC_CHECK_LIB(m, sin,, AC_MSG_ERROR(libm is needed)) @@ -9,8 +9,8 @@ AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile) echo "Configuration: ---- game/Makefile.am -+++ game/Makefile.am +--- a/game/Makefile.am ++++ b/game/Makefile.am @@ -41,7 +41,7 @@ critter_SOURCES = \ main.cpp @@ -20,8 +20,8 @@ ../utils/libutils.a \ ../utilssdl/libutilssdl.a \ ../utilsgl/libutilsgl.a \ ---- Makefile.am -+++ Makefile.am +--- a/Makefile.am ++++ b/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 -- cgit v1.2.3