Hello community, here is the log from the commit of package gle-graphics for openSUSE:Factory checked in at 2012-03-28 00:00:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gle-graphics (Old) and /work/SRC/openSUSE:Factory/.gle-graphics.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gle-graphics", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gle-graphics/gle-graphics.changes 2012-02-14 11:24:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gle-graphics.new/gle-graphics.changes 2012-03-28 00:01:04.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Mar 17 22:35:39 UTC 2012 - [email protected] + +- Add gle-graphics-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- gle-graphics-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gle-graphics.spec ++++++ --- /var/tmp/diff_new_pack.QHFvZh/_old 2012-03-28 00:01:07.000000000 +0200 +++ /var/tmp/diff_new_pack.QHFvZh/_new 2012-03-28 00:01:07.000000000 +0200 @@ -16,7 +16,6 @@ # - Name: gle-graphics Version: 4.2.4b Release: 0 @@ -35,6 +34,8 @@ Source1000: gle-graphics-rpmlintrc # PATCH-UPSTREAM: needs for build with gcc4.4 - was sent to upstream Patch0: gle-graphics-gcc44.patch +# PATCH-FIX-UPSTREAM gle-graphics-gcc47.patch [email protected] -- Fix build for gcc4.7 +Patch1: gle-graphics-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: c++_compiler @@ -56,8 +57,8 @@ %endif Requires: ghostscript -Requires: perl Requires: lib%{name} = %{version} +Requires: perl # The old libgle-graphics package Provides: libgle-graphics = %{version} @@ -97,6 +98,7 @@ %package doc Summary: Documentation for %{name} +License: BSD-3-Clause Group: Documentation/Other %description doc @@ -106,6 +108,7 @@ %setup -q %patch0 -b .gcc44 +%patch1 -b .gcc47 cp %{SOURCE3} . ++++++ gle-graphics-gcc47.patch ++++++ --- src/gle/tokens/StringKeyHash.h 2010-06-14 17:34:39.000000000 +0200 +++ src/gle/tokens/StringKeyHash.h 2012-03-17 23:18:52.683785502 +0100 @@ -254,7 +254,7 @@ return i->second; } else { ElemType nelem(key); - insert(StringKeyPair<ElemType>(key, nelem)); + this->insert(StringKeyPair<ElemType>(key, nelem)); return nelem; } } @@ -269,7 +269,7 @@ } void add_item(const name_hash_key& key, const ElemType& elem) { - insert(StringKeyPair<ElemType>(key, elem)); + this->insert(StringKeyPair<ElemType>(key, elem)); } ostream& write(ostream &os, int tab) const { @@ -309,7 +309,7 @@ } void add_item(int key, ElemType elem) { - insert(IntKeyPair<ElemType>(key, elem)); + this->insert(IntKeyPair<ElemType>(key, elem)); } }; --- src/gle/tokens/RefCount.h 2010-06-14 17:34:39.000000000 +0200 +++ src/gle/tokens/RefCount.h 2012-03-17 23:24:59.823283918 +0100 @@ -78,11 +78,11 @@ unsafe_ptr = NULL; } inline RefCountPtr<T>& operator =(RefCountPtr<T> src) { - setPtr(src.unsafe_ptr); + this->setPtr(src.unsafe_ptr); return *this; } inline RefCountPtr<T>& operator =(T *src) { - setPtr(src); + this->setPtr(src); return *this; } void setPtr(T *ptr) { @@ -94,7 +94,7 @@ } unsafe_ptr = ptr; } - inline void SetPtr(T *ptr) { setPtr(ptr); } + inline void SetPtr(T *ptr) { this->setPtr(ptr); } inline T& operator*() const { return *unsafe_ptr; } inline T* operator->() const { return unsafe_ptr; } inline T* get() const {return unsafe_ptr;} @@ -125,7 +125,7 @@ template <class T> class MutableRefCountPtr : public RefCountPtr<T> { public: inline RefCountPtr<T>& operator =(RefCountPtr<T> src) { - setPtr(src.get()); return *this; + this->setPtr(src.get()); return *this; }; }; --- src/gle/gle-interface/gle-base.h 2011-05-15 12:14:01.000000000 +0200 +++ src/gle/gle-interface/gle-base.h 2012-03-17 23:28:42.928013138 +0100 @@ -130,7 +130,7 @@ template <class T> class GLERCVector : public vector< GLERC<T> > { public: - inline void add(T* elem) { push_back(GLERC<T>(elem)); } + inline void add(T* elem) { this->push_back(GLERC<T>(elem)); } inline T* get(int i) { return (*this)[i].get(); } }; @@ -147,7 +147,7 @@ } void deleteAll() { for (typename vector<T*>::size_type i = 0; i < vector<T*>::size(); i++) { - T* elem = at(i); + T* elem = this->at(i); if (elem != NULL) delete elem; } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
