diff options
| author | flz <flz@FreeBSD.org> | 2005-06-01 04:07:45 +0800 |
|---|---|---|
| committer | flz <flz@FreeBSD.org> | 2005-06-01 04:07:45 +0800 |
| commit | 4223d49c1396f6644f3180036c7fa2a2deec2940 (patch) | |
| tree | e9908d38149dfadf47f5523d1afe7d2c26335a75 /games | |
| parent | 5b372079a6c8b1f8ed710caa881e4fb9018924fa (diff) | |
| download | freebsd-ports-graphics-4223d49c1396f6644f3180036c7fa2a2deec2940.tar.gz freebsd-ports-graphics-4223d49c1396f6644f3180036c7fa2a2deec2940.tar.zst freebsd-ports-graphics-4223d49c1396f6644f3180036c7fa2a2deec2940.zip | |
- Fix compilation with vanilla gcc on ${OSVERSION} > 502126.
- Rename local patch.
PR: ports/81733
Submitted by: maintainer
Diffstat (limited to 'games')
| -rw-r--r-- | games/pykawari/Makefile | 6 | ||||
| -rw-r--r-- | games/pykawari/files/patch-build_src_gcc.mak (renamed from games/pykawari/files/patch-build::src::gcc.mak) | 0 | ||||
| -rw-r--r-- | games/pykawari/files/patch-build_src_libkawari_wordcollection.h | 19 | ||||
| -rw-r--r-- | games/pykawari/files/patch-build_src_misc_mmap.h | 20 |
4 files changed, 40 insertions, 5 deletions
diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile index f234334162c..af54fdf8c37 100644 --- a/games/pykawari/Makefile +++ b/games/pykawari/Makefile @@ -7,7 +7,7 @@ PORTNAME= pykawari PORTVERSION= 8.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= kawari @@ -39,10 +39,6 @@ CFLAGS+= ${PTHREAD_CFLAGS} -fPIC .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 502126 -USE_GCC= 3.3 -.endif - .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fPIC .endif diff --git a/games/pykawari/files/patch-build::src::gcc.mak b/games/pykawari/files/patch-build_src_gcc.mak index ddb828e5d0f..ddb828e5d0f 100644 --- a/games/pykawari/files/patch-build::src::gcc.mak +++ b/games/pykawari/files/patch-build_src_gcc.mak diff --git a/games/pykawari/files/patch-build_src_libkawari_wordcollection.h b/games/pykawari/files/patch-build_src_libkawari_wordcollection.h new file mode 100644 index 00000000000..01e6bbdabb8 --- /dev/null +++ b/games/pykawari/files/patch-build_src_libkawari_wordcollection.h @@ -0,0 +1,19 @@ +--- build/src/libkawari/wordcollection.h.orig Fri Jan 31 03:31:14 2003 ++++ build/src/libkawari/wordcollection.h Wed Jun 1 00:39:13 2005 +@@ -95,14 +95,14 @@ + // Delete NULL + virtual bool Delete(unsigned int id){ + if(TWordCollection<T*,Compare>::Delete(id)){ +- WordList[id-1]=NULL; ++ TWordCollection<T*,Compare>::WordList[id-1]=NULL; + return true; + }else{ + return false; + } + } + virtual ~TWordPointerCollection (){ +- for (typename std::vector<T*>::iterator it=WordList.begin(); it < WordList.end(); it++){ ++ for (typename std::vector<T*>::iterator it=TWordCollection<T*,Compare>::WordList.begin(); it < TWordCollection<T*,Compare>::WordList.end(); it++){ + if((*it)) + delete (*it); + } 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 00000000000..a2f27d784c3 --- /dev/null +++ b/games/pykawari/files/patch-build_src_misc_mmap.h @@ -0,0 +1,20 @@ +--- build/src/misc/mmap.h.orig Thu Jan 30 04:19:12 2003 ++++ build/src/misc/mmap.h Wed Jun 1 00:35:09 2005 +@@ -27,7 +27,7 @@ + // 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(TMMap::value_type(key,DataType())); ++ if(it==upper_bound(key)) it=insert(typename TMMap::value_type(key,DataType())); + return((*it).second); + } + /* +@@ -42,7 +42,7 @@ + void Add(const KeyType& key,const DataType& data) + { + // insert(pair<const KeyType,DataType>(key,data)); +- insert(TMMap::value_type(key,data)); ++ insert(typename TMMap::value_type(key,data)); + } + + }; |