| 1 |
mr_bones_ 10/04/20 19:10:58 |
| 2 |
|
| 3 |
Added: freedoko-0.7.8-gentoo.patch |
| 4 |
Log: |
| 5 |
version bump |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-board/freedoko/files/freedoko-0.7.8-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-board/freedoko/files/freedoko-0.7.8-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-board/freedoko/files/freedoko-0.7.8-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: freedoko-0.7.8-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
diff -ru FreeDoko_0.7.8.orig/src/Makefile FreeDoko_0.7.8/src/Makefile |
| 17 |
--- FreeDoko_0.7.8.orig/src/Makefile 2010-03-13 14:22:58.000000000 -0500 |
| 18 |
+++ FreeDoko_0.7.8/src/Makefile 2010-04-20 12:52:29.294499776 -0400 |
| 19 |
@@ -211,15 +211,7 @@ |
| 20 |
# compile FreeDoko |
| 21 |
$(PROGNAME) : show_settings objects $(DIRECTORIES) |
| 22 |
@echo "compiling $(PROGNAME)..." |
| 23 |
-# Gentoo users do want to see the real compile line. |
| 24 |
-# So remove the next five lines (the echo lines) |
| 25 |
-# and remove the '@' in the line after. |
| 26 |
- @echo '$(CXX) $(CXXFLAGS)' |
| 27 |
- @echo ' $$(OBJECTS)' |
| 28 |
- @echo ' $(INCLUDE_ALL)' |
| 29 |
- @echo ' $(LIBS_ALL)' |
| 30 |
- @echo ' -o $@' |
| 31 |
- @$(CXX) $(CXXFLAGS) \ |
| 32 |
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) \ |
| 33 |
$(OBJECTS_ALL:%.o=$(FREEDOKO_WORKING_DIRECTORY)/%.o) \ |
| 34 |
$(INCLUDE_ALL) \ |
| 35 |
$(LIBS_ALL) \ |
| 36 |
diff -ru FreeDoko_0.7.8.orig/src/Makefile.os FreeDoko_0.7.8/src/Makefile.os |
| 37 |
--- FreeDoko_0.7.8.orig/src/Makefile.os 2010-03-13 14:22:58.000000000 -0500 |
| 38 |
+++ FreeDoko_0.7.8/src/Makefile.os 2010-04-20 12:52:29.294499776 -0400 |
| 39 |
@@ -1,6 +1,5 @@ |
| 40 |
include $(DEPTH)/../Makefile.os |
| 41 |
|
| 42 |
-include $(DEPTH)/Makefile.local |
| 43 |
include $(DEPTH)/Makefile.modules |
| 44 |
|
| 45 |
ifeq ($(OPERATING_SYSTEM), Linux) |
| 46 |
diff -ru FreeDoko_0.7.8.orig/src/Makefile.rules FreeDoko_0.7.8/src/Makefile.rules |
| 47 |
--- FreeDoko_0.7.8.orig/src/Makefile.rules 2010-03-13 14:22:59.000000000 -0500 |
| 48 |
+++ FreeDoko_0.7.8/src/Makefile.rules 2010-04-20 12:52:29.295507223 -0400 |
| 49 |
@@ -81,9 +81,7 @@ |
| 50 |
$(DEPTH)/Makefile.local \ |
| 51 |
$(DEPTH)/Makefile.os |
| 52 |
# Gentoo users do want to see the real compile line. |
| 53 |
-# So remove the next line and remove the '@' in the line after. |
| 54 |
- @echo $(CXX) -c $(SUBDIR)/$< |
| 55 |
- @$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(DEPGEN_FLAGS) -o $@ -c $< |
| 56 |
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(DEPGEN_FLAGS) -o $@ -c $< |
| 57 |
|
| 58 |
|
| 59 |
-include $(OBJECTS:%.o=$(TARGET_DIR_LOCAL)%.d) |
| 60 |
diff -ru FreeDoko_0.7.8.orig/src/ui/help.cpp FreeDoko_0.7.8/src/ui/help.cpp |
| 61 |
--- FreeDoko_0.7.8.orig/src/ui/help.cpp 2010-03-13 14:23:02.000000000 -0500 |
| 62 |
+++ FreeDoko_0.7.8/src/ui/help.cpp 2010-04-20 13:00:28.862375812 -0400 |
| 63 |
@@ -142,14 +142,14 @@ |
| 64 |
for (list<string>::const_iterator d = datadir.begin(); |
| 65 |
d != datadir.end(); |
| 66 |
d++) |
| 67 |
- directories.push_back(*d + "/" |
| 68 |
+ directories.push_back("/" |
| 69 |
+ ::setting(Setting::MANUAL_DIRECTORY) + "/" |
| 70 |
+ ::translator.token()); |
| 71 |
if (::translator.token() != ::setting(Setting::LANGUAGE)) |
| 72 |
for (list<string>::const_iterator d = datadir.begin(); |
| 73 |
d != datadir.end(); |
| 74 |
d++) |
| 75 |
- directories.push_back(*d + "/" |
| 76 |
+ directories.push_back("/" |
| 77 |
+ ::setting(Setting::MANUAL_DIRECTORY) + "/" |
| 78 |
+ ::setting(Setting::LANGUAGE)); |
| 79 |
} // fill the directories list |
Archives