* [gentoo-commits] repo/gentoo:master commit in: games-simulation/simutrans/files/
@ 2017-12-23 13:11 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-12-23 13:11 UTC (permalink / raw
To: gentoo-commits
commit: f791bd876f08d64d41f0d95c3b66f4b3f6982934
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec 22 15:28:09 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 13:10:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f791bd87
games-simulation/simutrans: remove unused patches
.../files/simutrans-0.120.0.1-Makefile.patch | 89 ----------------------
.../files/simutrans-0.120.1.3-Makefile.patch | 89 ----------------------
2 files changed, 178 deletions(-)
diff --git a/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch
deleted file mode 100644
index d1ff41f33fe..00000000000
--- a/games-simulation/simutrans/files/simutrans-0.120.0.1-Makefile.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -81,8 +81,6 @@
- ifeq ($(findstring $(OSTYPE), amiga haiku mac),)
- CFLAGS += -minline-all-stringops
- endif
--else
-- CFLAGS += -O
- endif
-
- ifdef DEBUG
-@@ -101,6 +99,7 @@
- endif
- else
- CFLAGS += -DNDEBUG
-+ CXXFLAGS += -DNDEBUG
- endif
-
- ifneq ($(PROFILE),)
-@@ -114,6 +113,7 @@
- ifneq ($(MULTI_THREAD),)
- ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)
- CFLAGS += -DMULTI_THREAD
-+ CXXFLAGS += -DMULTI_THREAD
- ifeq ($(OSTYPE),mingw)
- #use lpthreadGC2d for debug alternatively
- LDFLAGS += -lpthreadGC2
-@@ -132,11 +132,13 @@
- endif
- ifneq ($(REV),)
- CFLAGS += -DREVISION="$(REV)"
-+ CXXFLAGS += -DREVISION="$(REV)"
- endif
- endif
- endif
-
- CFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
-+CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
- CCFLAGS += -Wstrict-prototypes
-
-
-@@ -492,6 +494,7 @@
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
- endif
- CFLAGS += $(SDL_CFLAGS)
-+ CXXFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS)
- endif
-
-@@ -523,6 +526,7 @@
- SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)
- endif
- CFLAGS += $(SDL_CFLAGS)
-+ CXXFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS)
- endif
-
-@@ -538,6 +542,7 @@
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
- endif
- CFLAGS += $(SDL_CFLAGS)
-+ CXXFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS) -lSDL_mixer
- endif
-
-@@ -564,6 +569,7 @@
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
- endif
- CFLAGS += $(SDL_CFLAGS)
-+ CXXFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS) -lglew32
- ifeq ($(OSTYPE),mingw)
- LIBS += -lopengl32
-@@ -579,6 +585,7 @@
- endif
-
- CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
-+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
-
- ifneq ($(findstring $(OSTYPE), cygwin mingw),)
- SOURCES += simres.rc
-@@ -586,7 +593,6 @@
- endif
-
- CCFLAGS += $(CFLAGS)
--CXXFLAGS += $(CFLAGS)
-
- BUILDDIR ?= build/$(CFG)
- PROGDIR ?= $(BUILDDIR)
diff --git a/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch
deleted file mode 100644
index d3d9aae5b4e..00000000000
--- a/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -81,8 +81,6 @@
- ifeq ($(findstring $(OSTYPE), amiga haiku mac),)
- CFLAGS += -minline-all-stringops
- endif
--else
-- CFLAGS += -O
- endif
-
- ifdef DEBUG
-@@ -101,6 +99,7 @@
- endif
- else
- CFLAGS += -DNDEBUG
-+ CXXFLAGS += -DNDEBUG
- endif
-
- ifneq ($(PROFILE),)
-@@ -114,6 +113,7 @@
- ifneq ($(MULTI_THREAD),)
- ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)
- CFLAGS += -DMULTI_THREAD
-+ CXXFLAGS += -DMULTI_THREAD
- ifeq ($(OSTYPE),mingw)
- #use lpthreadGC2d for debug alternatively
- LDFLAGS += -lpthreadGC2
-@@ -132,11 +132,13 @@
- endif
- ifneq ($(REV),)
- CFLAGS += -DREVISION="$(REV)"
-+ CXXFLAGS += -DREVISION="$(REV)"
- endif
- endif
- endif
-
- CFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
-+CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
- CCFLAGS += -Wstrict-prototypes
-
-
-@@ -492,6 +494,7 @@
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
- endif
- CFLAGS += $(SDL_CFLAGS)
-+ CXXFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS)
- endif
-
-@@ -523,6 +526,7 @@
- SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)
- endif
- CFLAGS += $(SDL_CFLAGS)
-+ CXXFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS)
- endif
-
-@@ -538,6 +542,7 @@
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
- endif
- CFLAGS += $(SDL_CFLAGS)
-+ CXXFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS) -lSDL_mixer
- endif
-
-@@ -564,6 +569,7 @@
- SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
- endif
- CFLAGS += $(SDL_CFLAGS)
-+ CXXFLAGS += $(SDL_CFLAGS)
- LIBS += $(SDL_LDFLAGS) -lglew32
- ifeq ($(OSTYPE),mingw)
- LIBS += -lopengl32
-@@ -579,6 +585,7 @@
- endif
-
- CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
-+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
-
- ifneq ($(findstring $(OSTYPE), cygwin mingw),)
- SOURCES += simres.rc
-@@ -586,7 +593,6 @@
- endif
-
- CCFLAGS += $(CFLAGS)
--CXXFLAGS += $(CFLAGS)
-
- BUILDDIR ?= build/$(CFG)
- PROGDIR ?= $(BUILDDIR)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/simutrans/files/
@ 2024-08-28 7:25 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2024-08-28 7:25 UTC (permalink / raw
To: gentoo-commits
commit: 4abd6030a14aa83e36616b8d63387303fa52bc53
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Aug 28 07:14:04 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 07:25:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4abd6030
games-simulation/simutrans: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...utrans-123.0.1-silence-svn-and-git-errors.patch | 46 ----------------------
1 file changed, 46 deletions(-)
diff --git a/games-simulation/simutrans/files/simutrans-123.0.1-silence-svn-and-git-errors.patch b/games-simulation/simutrans/files/simutrans-123.0.1-silence-svn-and-git-errors.patch
deleted file mode 100644
index 05d40c5cd5e0..000000000000
--- a/games-simulation/simutrans/files/simutrans-123.0.1-silence-svn-and-git-errors.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 51b78d7e6021ed7787991d6122da52293fbafa89 Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Sun, 7 Aug 2022 18:33:46 +0200
-Subject: [PATCH] silence svn and git errors
-
----
- Makefile | 2 +-
- configure.ac | 9 ++-------
- 2 files changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 69f2b8a..c683b8a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -254,7 +254,7 @@ else
- endif
- endif
-
--GIT_HASH := $(shell git rev-parse --short=7 HEAD 2>/dev/null 1>/dev/null; echo $$?)
-+GIT_HASH :=
- ifneq ($(GIT_HASH),)
- GIT_HASH := $(shell git rev-parse --short=7 HEAD)
- $(info Git hash is 0x$(GIT_HASH))
-diff --git a/configure.ac b/configure.ac
-index e776f6b..41cd584 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -141,13 +141,8 @@ else
- fi
-
-
--# are we in a svn?
--if svn info
--then
-- AC_SUBST(svn, 1)
--else
-- AC_SUBST(svn, 0)
--fi
-+# we are not in an svn
-+AC_SUBST(svn, 0)
-
-
- #switch off assembler on 64 bit (MISSING: Check for GNU Assembler and i86)
---
-2.35.1
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-08-28 7:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-23 13:11 [gentoo-commits] repo/gentoo:master commit in: games-simulation/simutrans/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-08-28 7:25 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox