diff --git a/doxygen-1.5.9-arm.patch b/doxygen-1.5.9-arm.patch deleted file mode 100644 index 3ed66bd..0000000 --- a/doxygen-1.5.9-arm.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - qtools/qstring.h | 2 ++ - 1 file changed, 2 insertions(+) - ---- qtools/qstring.h.orig -+++ qtools/qstring.h -@@ -163,8 +163,10 @@ public: - bool isLetterOrNumber() const; - bool isDigit() const; - -+#ifndef __arm__ - uchar& cell() { return cl; } - uchar& row() { return rw; } -+#endif - uchar cell() const { return cl; } - uchar row() const { return rw; } - diff --git a/doxygen.changes b/doxygen.changes index 2b18e28..e2ea6c7 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 30 12:59:51 CEST 2011 - dmueller@suse.de + +- remove arm specific patch that broke building on arm + ------------------------------------------------------------------- Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de diff --git a/doxygen.spec b/doxygen.spec index 732e9d6..493849f 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -33,7 +33,6 @@ Source2: %{name}-%{version}-html.tar.bz2 # ftp://ftp.stack.nl/pub/users/dimitri/doxygen_manual-%{version}.pdf.zip Source3: %{name}_manual-%{version}.pdf.bz2 Patch: %{name}-1.5.9-64archs.patch -Patch2: %{name}-1.5.9-arm.patch Patch3: %{name}-1.5.9-man.patch Patch4: %{name}-1.7.0-modify_footer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -67,7 +66,6 @@ as well. An executable for Windows 95/NT is also available. %prep %setup -q -b 2 %patch -%patch2 %patch3 %patch4 cp -v %{S:3} . diff --git a/doxywizard.spec b/doxywizard.spec index 4d15c73..0b25067 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -30,7 +30,6 @@ Source: doxygen-%{version}.src.tar.bz2 Source1: doxywizard.desktop Patch: doxygen-1.5.9-64archs.patch Patch2: %{name}-1.5.9-flex.patch -Patch4: doxygen-1.5.9-arm.patch Patch5: doxygen-1.5.9-man.patch Patch6: doxygen-1.7.1-qtdir.patch Patch100: doxygen-1.7.0-warnings.patch @@ -69,7 +68,6 @@ configuration files. %setup -q -n doxygen-%{version} %patch %patch2 -%patch4 %patch5 %if 0%{?suse_version} %patch6