diff options
author | heinz <heinz@pkgsrc.org> | 2005-04-20 00:58:08 +0000 |
---|---|---|
committer | heinz <heinz@pkgsrc.org> | 2005-04-20 00:58:08 +0000 |
commit | a66ad168bd85db29b65060dad45c0c22436d8776 (patch) | |
tree | 8706940fce896177793099148614fadc285b527d /games/enigma | |
parent | c53e5bdd885becca5e7a7a4a530cf6db943bdafc (diff) | |
download | pkgsrc-a66ad168bd85db29b65060dad45c0c22436d8776.tar.gz |
Applied patches found at
http://bugzilla.fedora.us/attachment.cgi?id=919&action=view
as patch-aj .. patch-an in order to fix PR pkg/29385.
Patch-am was changed slightly: a white-space-only change was omitted and
the comments from two "friend" declarations were removed in order to not
break support for gcc 2.95.
Diffstat (limited to 'games/enigma')
-rw-r--r-- | games/enigma/Makefile | 4 | ||||
-rw-r--r-- | games/enigma/distinfo | 7 | ||||
-rw-r--r-- | games/enigma/patches/patch-aj | 22 | ||||
-rw-r--r-- | games/enigma/patches/patch-ak | 32 | ||||
-rw-r--r-- | games/enigma/patches/patch-al | 95 | ||||
-rw-r--r-- | games/enigma/patches/patch-am | 27 | ||||
-rw-r--r-- | games/enigma/patches/patch-an | 24 |
7 files changed, 208 insertions, 3 deletions
diff --git a/games/enigma/Makefile b/games/enigma/Makefile index 3b2f28cd745..9ba53e41c3d 100644 --- a/games/enigma/Makefile +++ b/games/enigma/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:49 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/04/20 00:58:08 heinz Exp $ # DISTNAME= enigma-0.81 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= games MASTER_SITES= http://savannah.nongnu.org/download/enigma/ diff --git a/games/enigma/distinfo b/games/enigma/distinfo index f1fccc4d340..d9172df58ba 100644 --- a/games/enigma/distinfo +++ b/games/enigma/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2005/02/23 23:11:56 agc Exp $ +$NetBSD: distinfo,v 1.3 2005/04/20 00:58:08 heinz Exp $ SHA1 (enigma-0.81.tar.gz) = 3f42bf495a62934649266ec04be5ed214b4429ab RMD160 (enigma-0.81.tar.gz) = dc1508f188ba2547ea192654c799dc9d75d47421 @@ -12,3 +12,8 @@ SHA1 (patch-af) = b0dd5a949c9cefbbc4f048f6ce83b62a781716e7 SHA1 (patch-ag) = 455cdb80b0971c3cee5bda7ce7cc2e0619bdecbf SHA1 (patch-ah) = 24302914139ce8580d9378a8c4d5a61a6680c13b SHA1 (patch-ai) = 0240adb55183e5bc1148413a55e0c5612b662efa +SHA1 (patch-aj) = 6911bf7470b0a4e8389b578544858e720ea30a16 +SHA1 (patch-ak) = 7de9e0880e400d071c86679513117ef52d840101 +SHA1 (patch-al) = 321d25d25f0e903e6150e4a7ab7ffec8a353fbac +SHA1 (patch-am) = 0d164c8a2d0791906745733cde12434ceed24843 +SHA1 (patch-an) = b61d7d3e969d03840e820fff2dc76550e50623f3 diff --git a/games/enigma/patches/patch-aj b/games/enigma/patches/patch-aj new file mode 100644 index 00000000000..0203bc1ed4e --- /dev/null +++ b/games/enigma/patches/patch-aj @@ -0,0 +1,22 @@ +diff -Nur enigma-0.81-orig/src/object_mixins.hh enigma-0.81/src/object_mixins.hh +--- src/object_mixins.hh 2003-07-12 12:04:47.000000000 +0200 ++++ src/object_mixins.hh 2004-11-11 00:05:24.000000000 +0100 +@@ -80,14 +80,14 @@ + template <class T> + class OnOffBase : public T { + protected: +- OnOffBase(const char *kind) : T(kind) { set_attrib("on", 0.0); } ++ OnOffBase(const char *kind) : T(kind) { this->set_attrib("on", 0.0); } + +- bool is_on() const { return int_attrib("on") == 1; } ++ bool is_on() const { return this->int_attrib("on") == 1; } + + void set_on(bool newon) { + if (newon != is_on()) { +- set_attrib("on", Value(newon)); +- init_model(); ++ this->set_attrib("on", Value(newon)); ++ this->init_model(); + notify_onoff(newon); + } + } diff --git a/games/enigma/patches/patch-ak b/games/enigma/patches/patch-ak new file mode 100644 index 00000000000..d8ead796d8d --- /dev/null +++ b/games/enigma/patches/patch-ak @@ -0,0 +1,32 @@ +diff -Nur enigma-0.81-orig/src/px/alist.hh enigma-0.81/src/px/alist.hh +--- src/px/alist.hh 2003-01-12 20:32:43.000000000 +0100 ++++ src/px/alist.hh 2004-11-11 00:04:26.855388248 +0100 +@@ -43,7 +43,7 @@ + // Lookup of keys + // + iterator find (const key_type &key) { +- iterator i=begin(), e=end(); ++ iterator i=this->begin(), e=this->end(); + for (; i!=e; ++i) + if (i->first == key) + break; +@@ -51,7 +51,7 @@ + } + + const_iterator find (const key_type &key) const { +- const_iterator i=begin(), e=end(); ++ const_iterator i=this->begin(), e=this->end(); + for (; i!=e; ++i) + if (i->first == key) + break; +@@ -60,8 +60,8 @@ + + VAL &operator[] (const key_type &key) { + iterator i=find(key); +- if (i==end()) +- i=insert(end(), make_pair(key, VAL())); ++ if (i==this->end()) ++ i=insert(this->end(), make_pair(key, VAL())); + return i->second; + } + }; diff --git a/games/enigma/patches/patch-al b/games/enigma/patches/patch-al new file mode 100644 index 00000000000..87ee179d85e --- /dev/null +++ b/games/enigma/patches/patch-al @@ -0,0 +1,95 @@ +diff -Nur enigma-0.81-orig/src/px/array2.hh enigma-0.81/src/px/array2.hh +--- src/px/array2.hh 2003-05-19 14:14:36.000000000 +0200 ++++ src/px/array2.hh 2004-11-11 00:04:26.855388248 +0100 +@@ -70,14 +70,14 @@ + // Destructor + ~Array2() { destroy_elements(); } + +- iterator begin() { return first; } +- iterator end() { return last; } +- const_iterator begin() const { return first; } +- const_iterator end() const { return last; } +- iterator row_begin(size_type y) { return first + y*w; } +- iterator row_end(size_type y) { return first + y*w + w; } +- const_iterator row_begin(size_type y) const { return first + y*w; } +- const_iterator row_end(size_type y) const { return first + y*w + w; } ++ iterator begin() { return this->first; } ++ iterator end() { return this->last; } ++ const_iterator begin() const { return this->first; } ++ const_iterator end() const { return this->last; } ++ iterator row_begin(size_type y) { return this->first + y*w; } ++ iterator row_end(size_type y) { return this->first + y*w + w; } ++ const_iterator row_begin(size_type y) const { return this->first + y*w; } ++ const_iterator row_end(size_type y) const { return this->first + y*w + w; } + + + void swap(Array2<T,A> &a2); +@@ -86,13 +86,13 @@ + size_type height()const { return h; } + + +- T& get(size_type x, size_type y) { return first[y*w+x]; } +- const T& get(size_type x, size_type y) const { return first[y*w+x]; } ++ T& get(size_type x, size_type y) { return this->first[y*w+x]; } ++ const T& get(size_type x, size_type y) const { return this->first[y*w+x]; } + T& operator()(size_type x, size_type y) { return get(x,y); } + const T& operator()(size_type x, size_type y) const { return get(x,y); } + + void set(size_type x, size_type y, const T& val) { +- first[y*w+x] = val; ++ this->first[y*w+x] = val; + } + + /*! Fill the array with some value or the default value. */ +@@ -112,19 +112,19 @@ + Array2<T,A>::Array2(int ww, int hh, const T& val, const A& a) + : Array2Base<T,A>(a, ww*hh), w(ww), h(hh) + { +- std::uninitialized_fill(first, last, val); ++ std::uninitialized_fill(this->first, this->last, val); + } + + template <class T, class A> + Array2<T,A>::Array2(const Array2<T,A> &a) + : Array2Base<T,A>(a.alloc, a.last-a.first) + { +- std::uninitialized_copy(a.begin(), a.end(), first); ++ std::uninitialized_copy(a.begin(), a.end(), this->first); + } + + template <class T, class A> + void Array2<T,A>::destroy_elements() { +- for (T* p=first; p!=last; ++p) ++ for (T* p=this->first; p!=this->last; ++p) + p->~T(); + } + +@@ -132,7 +132,7 @@ + void Array2<T,A>::fill (const T& val) + { + destroy_elements(); +- std::uninitialized_fill(first, last, val); ++ std::uninitialized_fill(this->first, this->last, val); + } + + /*! Resize the array in place, but discard any old array +@@ -142,7 +142,7 @@ + { + destroy_elements(); + Array2Base<T,A>::resize(w_*h_); +- std::uninitialized_fill(first, last, val); ++ std::uninitialized_fill(this->first, this->last, val); + w = w_; + h = h_; + } +@@ -150,8 +150,8 @@ + template <class T, class A> + void Array2<T,A>::swap(Array2<T,A> &a2) + { +- std::swap(first, a2.first); +- std::swap(last, a2.last); ++ std::swap(this->first, a2.first); ++ std::swap(this->last, a2.last); + std::swap(w, a2.w); + std::swap(h, a2.h); + } diff --git a/games/enigma/patches/patch-am b/games/enigma/patches/patch-am new file mode 100644 index 00000000000..58d03eb36e8 --- /dev/null +++ b/games/enigma/patches/patch-am @@ -0,0 +1,27 @@ +diff -Nur enigma-0.81-orig/src/px/dict.hh enigma-0.81/src/px/dict.hh +--- src/px/dict.hh.orig Sun May 18 20:45:07 2003 ++++ src/px/dict.hh +@@ -101,8 +101,11 @@ namespace px + public: + typedef Iter<value_type> iterator; + typedef Iter<const value_type> const_iterator; +- friend class iterator; +- friend class const_iterator; ++ // pkgsrc: In order to still support gcc 2.95 we do not remove those ++ // two friends (like the Fedora patch does). OTOH gcc3.4.3 does not ++ // like using the typedef'ed types from above as friends. ++ friend class Iter<value_type>; ++ friend class Iter<const value_type>; + + Dict(size_type table_size = 257); + ~Dict(); +@@ -126,7 +129,8 @@ namespace px + + const T& lookup(const std::string &key) const { + Entry *e = find_entry(key); +- if (!e) throw XInvalidKey(); ++// rational: see above + XInvalidKey is not declared anywhere ++// if (!e) throw XInvalidKey(); + return e->pair.second; + } + diff --git a/games/enigma/patches/patch-an b/games/enigma/patches/patch-an new file mode 100644 index 00000000000..ba54178ecb0 --- /dev/null +++ b/games/enigma/patches/patch-an @@ -0,0 +1,24 @@ +diff -Nur enigma-0.81-orig/src/px/video.cc enigma-0.81/src/px/video.cc +--- src/px/video.cc 2003-07-31 09:28:04.000000000 +0200 ++++ src/px/video.cc 2004-11-11 00:04:26.855388248 +0100 +@@ -207,16 +207,16 @@ + void set_pixels(int n, const int* xlist, const int* ylist, Uint32 color) + { + const int *xp = xlist, *yp = ylist; +- if (NOCLIP(gs)) { ++ if (NOCLIP(this->gs)) { + for (int i=n; i > 0; --i) { + int x = *xp++, y = *yp++; +- *pixel_pointer(x,y) = gs.pcolor; ++ *pixel_pointer(x,y) = this->gs.pcolor; + } + } else { + for (int i=n; i > 0; --i) { + int x = *xp++, y = *yp++; +- if (clip_pixel (gs, x, y)) +- *pixel_pointer(x,y) = gs.pcolor; ++ if (clip_pixel (this->gs, x, y)) ++ *pixel_pointer(x,y) = this->gs.pcolor; + } + } + } |