diff options
| author | gabor <gabor@FreeBSD.org> | 2009-03-03 13:42:18 +0800 |
|---|---|---|
| committer | gabor <gabor@FreeBSD.org> | 2009-03-03 13:42:18 +0800 |
| commit | e91cf3bd976c320d3fe058eab0a560e6a3520d8a (patch) | |
| tree | 57269635361c89b31339974c2ad16c9535f67ba2 /games/pykawari/files | |
| parent | 980c8122f4c51489f837f1aff0ecfe0243c983ee (diff) | |
| download | freebsd-ports-gnome-e91cf3bd976c320d3fe058eab0a560e6a3520d8a.tar.gz freebsd-ports-gnome-e91cf3bd976c320d3fe058eab0a560e6a3520d8a.tar.zst freebsd-ports-gnome-e91cf3bd976c320d3fe058eab0a560e6a3520d8a.zip | |
- Update to 8.2.8
- Unbreak on GCC 4.X
PR: ports/131085
Submitted by: UMENO Takashi <umeno@rr.iij4u.or.jp> (maintainer)
Diffstat (limited to 'games/pykawari/files')
| -rw-r--r-- | games/pykawari/files/patch-build__src__misc__mmap.h | 16 | ||||
| -rw-r--r-- | games/pykawari/files/patch-build_src_gcc.mak | 17 |
2 files changed, 29 insertions, 4 deletions
diff --git a/games/pykawari/files/patch-build__src__misc__mmap.h b/games/pykawari/files/patch-build__src__misc__mmap.h new file mode 100644 index 000000000000..079d4ed9d403 --- /dev/null +++ b/games/pykawari/files/patch-build__src__misc__mmap.h @@ -0,0 +1,16 @@ +--- ./build/src/misc/mmap.h.orig 2009-03-02 17:17:28.000000000 +0100 ++++ ./build/src/misc/mmap.h 2009-03-02 17:17:37.000000000 +0100 +@@ -24,11 +24,11 @@ + { + // iterator it=lower_bound(key); + // std::multimap<KeyType,DataType>::iterator it; +- typename std::multimap<KeyType, DataType>::iterator it=lower_bound(key); ++ typename std::multimap<KeyType, DataType>::iterator it=std::multimap<KeyType, DataType>::lower_bound(key); + // 2001/12/16 suikyo@yk.rim.or.jp : imortal entry bug + // if(it==end()) it=insert(pair<KeyType,DataType>(key,DataType())); + // if(it==upper_bound(key)) it=insert(pair<const KeyType,DataType>(key,DataType())); +- if(it==upper_bound(key)) it=insert(typename TMMap<KeyType,DataType>::value_type(key,DataType())); ++ if(it==std::multimap<KeyType, DataType>::upper_bound(key)) it=insert(typename TMMap<KeyType,DataType>::value_type(key,DataType())); + return((*it).second); + } + /* diff --git a/games/pykawari/files/patch-build_src_gcc.mak b/games/pykawari/files/patch-build_src_gcc.mak index 7bcf2f6ce81e..c618ee0451c3 100644 --- a/games/pykawari/files/patch-build_src_gcc.mak +++ b/games/pykawari/files/patch-build_src_gcc.mak @@ -1,5 +1,5 @@ ---- build/src/gcc.mak.orig Tue Jun 21 22:28:54 2005 -+++ build/src/gcc.mak Wed Sep 14 10:00:26 2005 +--- build/src/gcc.mak.orig 2008-01-20 17:13:34.000000000 +0900 ++++ build/src/gcc.mak 2009-01-29 01:34:48.000000000 +0900 @@ -8,14 +8,14 @@ #========================================================================== @@ -32,13 +32,22 @@ +SHIORI_PYTHON = yes ## Global options --CFLAGS = -Os -I. -DNDEBUG -Wall -fomit-frame-pointer +-CFLAGS = -O1 -I. -DNDEBUG -Wall -fomit-frame-pointer -LDFLAGS = -s +CFLAGS += -Os -I. -DNDEBUG -Wall -fomit-frame-pointer +LDFLAGS += -s #========================================================================== # Directories +@@ -70,7 +70,7 @@ + ifeq ($(STLport),yes) + CFLAGS := $(CFLAGS_STLP) -DHAVE_SSTREAM $(CFLAGS) + LDFLAGS := $(LDFLAGS) $(LDFLAGS_STLP) +- LIBS := $(LIBS) $(LIBS_STLP) ++ LIBS := $(LIBS) -L${PYTHONBASE}/lib -l${PYTHON_VERSION} + endif + + ifeq ($(SAORI_NATIVE),yes) @@ -104,7 +104,7 @@ ifndef CFLAGS_PYTHON CFLAGS_PYTHON = -I$(shell python -c "import sys; print sys.prefix+'/include/python'+sys.version[:3]") @@ -53,7 +62,7 @@ .PHONY: clean cleanall depend upx -all : $(ALLTARGET) upx -+#all : $(ALLTARGET) ++#all : $(ALLTARGET) upx +all : $(ALLTARGET) $(UPX) $(MACH)/$(DYNLIBPREFIX)$(SHIORI)$(DYNLIBEXT) : $(SHIOOBJ) $(COREOBJ) $(DEPLIB) |