[gle] Add patches from upstream to fix gcc-4.7 build
terjeros
terjeros at fedoraproject.org
Sat Jan 21 17:22:38 UTC 2012
commit c35c9f1d80d31e15f9cd94f93c0e962dabd2795c
Author: Terje Røsten <terje.rosten at ntnu.no>
Date: Sat Jan 21 18:22:33 2012 +0100
Add patches from upstream to fix gcc-4.7 build
gle-4.2.4b-configure.patch | 31 ++++++++++++
gle-4.2.4b-gcc-4.7.patch | 117 ++++++++++++++++++++++++++++++++++++++++++++
gle.spec | 14 +++++-
3 files changed, 160 insertions(+), 2 deletions(-)
---
diff --git a/gle-4.2.4b-configure.patch b/gle-4.2.4b-configure.patch
new file mode 100644
index 0000000..16f0d7b
--- /dev/null
+++ b/gle-4.2.4b-configure.patch
@@ -0,0 +1,31 @@
+--- ../gle-graphics-4.2.4b/configure 2012-01-14 15:03:44.000000000 +0100
++++ configure 2012-01-21 13:32:37.540153482 +0100
+@@ -605,6 +605,8 @@
+ ac_subst_vars='LTLIBOBJS
+ LIBOBJS
+ HAVE_EXTRA_FONTS
++QT_LDFLAGS
++QT_CPPFLAGS
+ QT_LIBGLU_LIB
+ QT_RPATH
+ QT_CONFIG
+@@ -2941,6 +2943,10 @@
+ GLE_SNAPSHOT=""
+
+
++QT_CPPFLAGS=$CPPFLAGS
++QT_LDFLAGS=$LDFLAGS
++
++
+ ac_aux_dir=
+ for ac_dir in platform/autoconf "$srcdir"/platform/autoconf; do
+ if test -f "$ac_dir/install-sh"; then
+@@ -5621,6 +5627,8 @@
+
+
+
++
++
+
+
+
diff --git a/gle-4.2.4b-gcc-4.7.patch b/gle-4.2.4b-gcc-4.7.patch
new file mode 100644
index 0000000..ab799ef
--- /dev/null
+++ b/gle-4.2.4b-gcc-4.7.patch
@@ -0,0 +1,117 @@
+diff --git a/configure.ac b/configure.ac
+index 19c6677..8ae968e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -139,6 +139,13 @@ dnl ****************************************************************************
+ GLE_SNAPSHOT=""
+
+ dnl ********************************************************************************
++dnl remember CPPFLAGS for qmake
++dnl ********************************************************************************
++
++QT_CPPFLAGS=$CPPFLAGS
++QT_LDFLAGS=$LDFLAGS
++
++dnl ********************************************************************************
+ dnl check CPU type and OS
+ dnl ********************************************************************************
+
+@@ -886,6 +893,8 @@ AC_SUBST(MAKE_AUTOPACKAGE)
+ AC_SUBST(QT_CONFIG)
+ AC_SUBST(QT_RPATH)
+ AC_SUBST(QT_LIBGLU_LIB)
++AC_SUBST(QT_CPPFLAGS)
++AC_SUBST(QT_LDFLAGS)
+ AC_SUBST(HAVE_EXTRA_FONTS)
+
+ AC_CONFIG_FILES([Makefile src/gle/Makefile src/gle/bitmap/Makefile src/gle/letzfitz/Makefile src/gle/surface/Makefile src/gle/tokens/Makefile src/fbuild/Makefile src/makefmt/Makefile src/manip/Makefile src/TeX/Makefile src/gui/MakefileAC src/gui/qgle.pro src/doc/gle.1 platform/autoconf/gle-graphics.pc platform/autopackage/gle4.apspec])
+diff --git a/src/gle/gle-interface/gle-base.h b/src/gle/gle-interface/gle-base.h
+index 26ce8f3..84755e6 100644
+--- a/src/gle/gle-interface/gle-base.h
++++ b/src/gle/gle-interface/gle-base.h
+@@ -130,7 +130,7 @@ inline GLERefCountObject* GLE_SET_RC(GLERefCountObject* rc, GLERefCountObject* v
+
+ 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(); }
+ };
+
+@@ -139,15 +139,15 @@ public:
+ GLEVectorAutoDelete() : vector<T*>() {
+ }
+ ~GLEVectorAutoDelete() {
+- deleteAll();
++ this->deleteAll();
+ }
+ void clear() {
+- deleteAll();
++ this->deleteAll();
+ vector<T*>::clear();
+ }
+ 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;
+ }
+ }
+diff --git a/src/gle/tokens/RefCount.h b/src/gle/tokens/RefCount.h
+index eef1824..b9664cc 100644
+--- a/src/gle/tokens/RefCount.h
++++ b/src/gle/tokens/RefCount.h
+@@ -125,7 +125,8 @@ public:
+ 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;
+ };
+ };
+
+diff --git a/src/gle/tokens/StringKeyHash.h b/src/gle/tokens/StringKeyHash.h
+index 7db46c3..0966676 100644
+--- a/src/gle/tokens/StringKeyHash.h
++++ b/src/gle/tokens/StringKeyHash.h
+@@ -254,7 +254,7 @@ public:
+ return i->second;
+ } else {
+ ElemType nelem(key);
+- insert(StringKeyPair<ElemType>(key, nelem));
++ this->insert(StringKeyPair<ElemType>(key, nelem));
+ return nelem;
+ }
+ }
+@@ -309,7 +309,7 @@ public:
+ }
+
+ void add_item(int key, ElemType elem) {
+- insert(IntKeyPair<ElemType>(key, elem));
++ this->insert(IntKeyPair<ElemType>(key, elem));
+ }
+ };
+
+diff --git a/src/gui/qgle.pro.in b/src/gui/qgle.pro.in
+index 877394e..82d274f 100644
+--- a/src/gui/qgle.pro.in
++++ b/src/gui/qgle.pro.in
+@@ -168,7 +168,7 @@ unix {
+ LIBS += -lgle-graphics- at GLE_VERSION@ -L../../build/lib/
+ }
+ win32 {
+- LIBS += -lglu32
++ LIBS += -lglu32
+ LIBS += -lgle-graphics- at GLE_VERSION@ -L../../build/bin/
+ }
+
+@@ -180,4 +180,8 @@ unix {
+ LIBS += @QT_RPATH@ @QT_LIBGLU_LIB@
+ }
+
++QMAKE_CXXFLAGS += @QT_CPPFLAGS@
++QMAKE_CFLAGS += @QT_CPPFLAGS@
++QMAKE_LDFLAGS += @QT_LDFLAGS@
++
+ # vim:et
diff --git a/gle.spec b/gle.spec
index b96c657..b8352cd 100644
--- a/gle.spec
+++ b/gle.spec
@@ -3,12 +3,15 @@
Summary: Graphics Layout Engine
Name: gle
Version: 4.2.4b
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.gle-graphics.org/
Source0: http://downloads.sourceforge.net/glx/gle-graphics-%{version}f-src.tar.gz
Source1: http://downloads.sourceforge.net/glx/GLEusersguide.pdf
+# Patches from upstream, thanks!
+Patch0: gle-4.2.4b-configure.patch
+Patch1: gle-4.2.4b-gcc-4.7.patch
# Due to branching of docs and qgle
Obsoletes: %{name} < 4.2.2-8
@@ -23,6 +26,7 @@ BuildRequires: zlib-devel
BuildRequires: xorg-x11-proto-devel
BuildRequires: qt-devel >= 4.1.1
BuildRequires: dos2unix
+BuildRequires: texlive-latex
Requires: ghostscript
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -77,6 +81,9 @@ This package contains the user documentation.
%prep
%setup -q -n %{oname}-%{version}
install -p -m 0644 %{SOURCE1} .
+%patch0 -p0
+%patch1 -p1
+touch -r README.txt configure.ac
%build
export CPPFLAGS="%{optflags}"
@@ -89,7 +96,7 @@ export CXXFLAGS="%{optflags}"
--docdir=%{_docdir}/%{name}-doc-%{version} \
CPPFLAGS="%{optflags}" \
CXXFLAGS="%{optflags}"
-make
+make
# %{?_smp_mflags} build fails
# docs
@@ -127,6 +134,9 @@ rm -rf %{buildroot}
%doc LICENSE.txt gle-manual.pdf GLEusersguide.pdf
%changelog
+* Tue Jan 17 2012 Terje Rosten <terje.rosten at ntnu.no> - 4.2.4b-2
+- Add patches from upstream to fix gcc-4.7 build
+
* Tue Jan 17 2012 Terje Rosten <terje.rosten at ntnu.no> - 4.2.4b-1
- 4.2.4b
- docs
More information about the scm-commits
mailing list