FreeBSD Bugzilla – Attachment 171953 Details for
Bug 210670
games/stonesoup: Update to 0.18.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
games/stonesoup: 0.17.1 -> 0.18.1
stonesoup-0.18.1-1.diff (text/plain), 9.81 KB, created by
Nikolai Lifanov
on 2016-06-29 18:14:48 UTC
(
hide
)
Description:
games/stonesoup: 0.17.1 -> 0.18.1
Filename:
MIME Type:
Creator:
Nikolai Lifanov
Created:
2016-06-29 18:14:48 UTC
Size:
9.81 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 417783) >+++ Makefile (working copy) >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= stonesoup >-PORTVERSION= 0.17.1 >+PORTVERSION= 0.18.1 > CATEGORIES= games > MASTER_SITES= SF/crawl-ref/Stone%20Soup/${PORTVERSION} > MASTER_SITES= http://crawl.develz.org/release/ >@@ -29,7 +29,7 @@ > SUB_FILES= README.FreeBSD > PLIST_SUB= SAVEDIR="${SAVEDIR}" > >-OPTIONS_DEFINE= SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES >+OPTIONS_DEFINE= SDL SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES > > SOUND_DESC= Sound support > WIZARD_DESC= Wizard mode >@@ -42,6 +42,8 @@ > INSTALL_UGRP=root:games \ > NO_AUTO_OPT=YesPlease \ > NO_OPTIMIZE=YesPlease \ >+ NO_TRY_GOLD=YesPlease \ >+ POSIX=YesPlease \ > SQLITE_INCLUDE_DIR=${LOCALBASE}/include \ > SQLITE_LIB=-lsqlite3 > >Index: distinfo >=================================================================== >--- distinfo (revision 417783) >+++ distinfo (working copy) >@@ -1,2 +1,3 @@ >-SHA256 (stone_soup-0.17.1-nodeps.tar.xz) = 6314ea8229ec5b27804ff1788988bd110a16aadeb6b2f26660645c43ecfc49dd >-SIZE (stone_soup-0.17.1-nodeps.tar.xz) = 9114224 >+TIMESTAMP = 1467136972 >+SHA256 (stone_soup-0.18.1-nodeps.tar.xz) = 4bdad7778f88a99470c725ff74a8145bdd60032f9ae48ce597f74b8ae784d850 >+SIZE (stone_soup-0.18.1-nodeps.tar.xz) = 9716104 >Index: files/patch-Makefile >=================================================================== >--- files/patch-Makefile (revision 417783) >+++ files/patch-Makefile (working copy) >@@ -1,6 +1,6 @@ >---- Makefile.orig 2015-12-08 12:42:11 UTC >+--- Makefile.orig 2016-04-30 03:53:03 UTC > +++ Makefile >-@@ -71,7 +71,7 @@ >+@@ -72,7 +72,7 @@ > # them; you can also ask for a package with convenience libraries instead -- > # we'll try to provide them somewhere in the near future. > >@@ -9,7 +9,7 @@ > > # Disable GNU Make implicit rules and variables. Leaving them enabled will slow > # down MinGW and Cygwin builds by a very VERY noticeable degree. Besides, we have >-@@ -105,7 +105,7 @@ include Makefile.obj >+@@ -106,7 +106,7 @@ include Makefile.obj > # Which C++ standard to support > STDFLAG = -std=c++11 > >@@ -18,17 +18,8 @@ > CFWARN := > CFWARN_L := -Wall -Wformat-security -Wundef > >-@@ -114,7 +114,7 @@ DEFINES := $(EXTERNAL_DEFINES) >- ifdef ANDROID >- LDFLAGS := $(EXTERNAL_LDFLAGS) $(LDFLAGS) >- else >--LDFLAGS := $(EXTERNAL_LDFLAGS) >-+# LDFLAGS := $(EXTERNAL_LDFLAGS) >- endif >- >+@@ -121,8 +121,6 @@ endif > # >-@@ -122,8 +122,6 @@ endif >- # > AR = ar > RANLIB = ranlib > -CC = $(GCC) >@@ -36,7 +27,7 @@ > RM = rm -f > COPY = cp > COPY_R = cp -r >-@@ -512,16 +510,6 @@ ifneq ($(GCC_VER),) >+@@ -511,16 +509,6 @@ ifneq ($(GCC_VER),) > GCC_VER_SUFFIX:=-$(GCC_VER) > endif > >@@ -53,7 +44,7 @@ > ifneq ($(FORCE_CC),) > GCC := $(FORCE_CC) > HOSTCC := $(FORCE_CC) >-@@ -575,15 +563,6 @@ ifdef USE_ICC >+@@ -574,15 +562,6 @@ ifdef USE_ICC > > # Some very good optimization flags. > CFOPTIMIZE := -O2 -parallel >@@ -69,14 +60,7 @@ > endif > > ifdef LTO >-@@ -655,13 +634,13 @@ ifndef BUILD_LUA >- LUA_PACKAGE = lua-5.1 >- endif >- else >-- LUA_PACKAGE = lua5.1 >-+ LUA_PACKAGE = lua-5.1 >- endif >- endif >+@@ -660,7 +639,7 @@ ifndef BUILD_LUA > endif > ifndef BUILD_LUA > ifndef LUA_PACKAGE >@@ -85,7 +69,7 @@ > endif > INCLUDES_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-I | sed -e 's/-I/-isystem /') > CFLAGS_L += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --cflags-only-other) >-@@ -674,7 +653,7 @@ endif >+@@ -673,7 +652,7 @@ endif > > ifndef BUILD_SQLITE > ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes) >@@ -94,16 +78,7 @@ > LIBS += $(SQLITE_LIB) > ifneq ($(shell grep -q sqlite3_prepare_v2 $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes) > DEFINES_L += -DANCIENT_SQLITE >-@@ -762,7 +741,7 @@ endif >- endif >- >- DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL2_CFLAGS) >--INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL2_INCLUDE) >-+INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL2_INCLUDE) $(GL_INCLUDE) >- >- endif # TILES >- >-@@ -831,7 +810,7 @@ ifndef NOWIZARD >+@@ -830,7 +809,7 @@ ifndef NOWIZARD > DEFINES += -DWIZARD > endif > ifdef NO_OPTIMIZE >@@ -112,7 +87,7 @@ > endif > > ifdef PCH >-@@ -958,7 +937,7 @@ else >+@@ -957,7 +936,7 @@ else > SYS_PROPORTIONAL_FONT = $(shell { name=$(OUR_PROPORTIONAL_FONT);\ > {\ > fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ >@@ -121,7 +96,7 @@ > do [ -d $$dir ] && echo $$dir; done;\ > } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) > ifneq (,$(SYS_PROPORTIONAL_FONT)) >-@@ -983,7 +962,7 @@ else >+@@ -982,7 +961,7 @@ else > SYS_MONOSPACED_FONT = $(shell { name=$(OUR_MONOSPACED_FONT);\ > {\ > fc-list | sed 's/: .*//' | grep -Fi "/$$name";\ >@@ -130,14 +105,3 @@ > do [ -d $$dir ] && echo $$dir; done;\ > } | xargs -I% find % -type f -iname $$name -print | head -n1; } 2>/dev/null) > ifneq (,$(SYS_MONOSPACED_FONT)) >-@@ -1050,10 +1029,6 @@ CFWARN := -wd383,810,869,981,1418 -we14, >- CFWARN_L := >- endif >- >--ifeq (,$(shell echo 'int main(){return 1;}'|$(GXX) -x c++ - -o /dev/null -fuse-ld=gold 2>&1)) >-- LDFLAGS += -fuse-ld=gold >--endif >-- >- LDFLAGS += $(CFOPTIMIZE) $(CFOPTIMIZE_L) >- >- ifdef REPORT >Index: files/patch-crash.cc >=================================================================== >--- files/patch-crash.cc (nonexistent) >+++ files/patch-crash.cc (working copy) >@@ -0,0 +1,17 @@ >+--- crash.cc.orig 2016-06-28 19:06:21 UTC >++++ crash.cc >+@@ -270,14 +270,6 @@ void init_crash_handler() >+ >+ void dump_crash_info(FILE* file) >+ { >+-#if defined(UNIX) >+- const char *name = strsignal(_crash_signal); >+- if (name == nullptr) >+- name = "INVALID"; >+- >+- fprintf(file, "Crash caused by signal #%d: %s\n\n", _crash_signal, >+- name); >+-#endif >+ } >+ >+ #if defined(BACKTRACE_SUPPORTED) > >Property changes on: files/patch-crash.cc >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-rltiles_Makefile >=================================================================== >--- files/patch-rltiles_Makefile (revision 417783) >+++ files/patch-rltiles_Makefile (working copy) >@@ -1,15 +1,14 @@ >---- rltiles/Makefile.orig 2015-12-15 18:50:32 UTC >+--- rltiles/Makefile.orig 2016-04-30 03:53:03 UTC > +++ rltiles/Makefile >-@@ -10,8 +10,6 @@ endif >- # Also, cross-compilation with no system libraries for host rather than target >+@@ -11,7 +11,6 @@ endif > # is not supported. If host=target, contribs are enough. > >+ PKGCONFIG = pkg-config > -CFLAGS := -O2 $(STDFLAG) -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter >-- >+ > ifdef ANDROID > CXXFLAGS := >- LDFLAGS := >-@@ -49,14 +47,14 @@ endif >+@@ -50,14 +49,14 @@ endif > > # Attempt to use a full compiler name, to make > # distcc builds work nicely. >@@ -27,7 +26,7 @@ > > DELETE = rm -f > >-@@ -133,6 +131,6 @@ distclean: clean >+@@ -134,6 +133,6 @@ distclean: clean > $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@ > > $(TILEGEN): $(OBJECTS) >Index: files/patch-wiz-you.cc >=================================================================== >--- files/patch-wiz-you.cc (nonexistent) >+++ files/patch-wiz-you.cc (working copy) >@@ -0,0 +1,15 @@ >+--- wiz-you.cc.orig 2016-06-29 18:11:14 UTC >++++ wiz-you.cc >+@@ -1126,6 +1126,7 @@ void wizard_join_religion() >+ } >+ } >+ >++#ifdef WIZARD >+ void wizard_xom_acts() >+ { >+ char specs[80]; >+@@ -1158,3 +1159,4 @@ void wizard_xom_acts() >+ dprf("Okay, Xom is doing '%s'.", xom_effect_to_name(event).c_str()); >+ xom_take_action(event, severity); >+ } >++#endif > >Property changes on: files/patch-wiz-you.cc >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 417783) >+++ pkg-plist (working copy) >@@ -43,6 +43,7 @@ > %%DATADIR%%/dat/des/altar/nemelex_the_gamble.des > %%DATADIR%%/dat/des/altar/okawaru_arena.des > %%DATADIR%%/dat/des/altar/overflow.des >+%%DATADIR%%/dat/des/altar/pakellas_experiments.des > %%DATADIR%%/dat/des/altar/trog_burn_book.des > %%DATADIR%%/dat/des/altar/trog_wizard.des > %%DATADIR%%/dat/des/altar/vehumet_trees.des >@@ -169,6 +170,7 @@ > %%DATADIR%%/dat/descript/backgrounds.txt > %%DATADIR%%/dat/descript/branches.txt > %%DATADIR%%/dat/descript/cards.txt >+%%DATADIR%%/dat/descript/clouds.txt > %%DATADIR%%/dat/descript/commands.txt > %%DATADIR%%/dat/descript/cs/ability.txt > %%DATADIR%%/dat/descript/cs/branches.txt >@@ -388,6 +390,7 @@ > %%DATADIR%%/dat/descript/skills.txt > %%DATADIR%%/dat/descript/species.txt > %%DATADIR%%/dat/descript/spells.txt >+%%DATADIR%%/dat/descript/status.txt > %%DATADIR%%/dat/descript/sv/ability.txt > %%DATADIR%%/dat/descript/sv/cards.txt > %%DATADIR%%/dat/descript/sv/commands.txt >@@ -535,6 +538,7 @@ > %%DATADIR%%/docs/develop/ctags.txt > %%DATADIR%%/docs/develop/editor_tips.txt > %%DATADIR%%/docs/develop/gdb_tips.txt >+%%DATADIR%%/docs/develop/keys.txt > %%DATADIR%%/docs/develop/levels/advanced.txt > %%DATADIR%%/docs/develop/levels/introduction.txt > %%DATADIR%%/docs/develop/levels/syntax.txt >@@ -565,9 +569,9 @@ > %%DATADIR%%/settings/0.13_monster_glyphs.txt > %%DATADIR%%/settings/0.14_monster_glyphs.txt > %%DATADIR%%/settings/0.16_monster_glyphs.txt >+%%DATADIR%%/settings/0.17_monster_glyphs.txt > %%DATADIR%%/settings/0.9_monster_glyphs.txt > %%DATADIR%%/settings/034_command_keys.txt >-%%DATADIR%%/settings/034_monster_glyphs.txt > %%DATADIR%%/settings/052_monster_glyphs.txt > %%DATADIR%%/settings/060_monster_glyphs.txt > %%DATADIR%%/settings/071_monster_glyphs.txt
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 210670
:
171919
|
171953
|
172784
|
172795
|
172796
|
172798
|
172799
|
172800
|
172801
|
172802
|
172803
|
172804
|
172805
|
172806
|
172807