[hercstudio] fix build with gcc 4.6
Dan Horák
sharkcz at fedoraproject.org
Fri Apr 29 11:33:05 UTC 2011
commit 5e03cdc55473052c1b681fb3191b15ee5bbad8d0
Author: Dan Horák <dan at danny.cz>
Date: Fri Apr 29 13:32:54 2011 +0200
fix build with gcc 4.6
hercstudio.spec | 7 ++++++-
herculesstudio-1.2.0-no-mutable.patch | 12 ++++++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/hercstudio.spec b/hercstudio.spec
index 28b0fc8..25140c8 100644
--- a/hercstudio.spec
+++ b/hercstudio.spec
@@ -1,6 +1,6 @@
Name: hercstudio
Version: 1.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GUI front-end to the Hercules mainframe Emulator
Group: Applications/Emulators
@@ -8,6 +8,7 @@ License: GPLv3+
URL: http://www.mvsdasd.org/hercstudio/
Source0: http://www.mvsdasd.org/hercstudio/herculesstudio-%{version}-src.tar.gz
Source1: %{name}.desktop
+Patch0: herculesstudio-1.2.0-no-mutable.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel
@@ -21,6 +22,7 @@ GUI front-end to the Hercules mainframe Emulator.
%prep
%setup -q -n HerculesStudio
+%patch0 -p1 -b .no-mutable
%build
@@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Apr 29 2011 Dan Horák <dan[at]danny.cz> - 1.2.0-3
+- fix build with gcc 4.6
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/herculesstudio-1.2.0-no-mutable.patch b/herculesstudio-1.2.0-no-mutable.patch
new file mode 100644
index 0000000..b35a716
--- /dev/null
+++ b/herculesstudio-1.2.0-no-mutable.patch
@@ -0,0 +1,12 @@
+diff -up HerculesStudio/HercConfiguration/GenericDeviceProperties.h.no-mutable HerculesStudio/HercConfiguration/GenericDeviceProperties.h
+--- HerculesStudio/HercConfiguration/GenericDeviceProperties.h.no-mutable 2011-04-29 13:00:59.000000000 +0200
++++ HerculesStudio/HercConfiguration/GenericDeviceProperties.h 2011-04-29 13:01:04.000000000 +0200
+@@ -42,7 +42,7 @@ public:
+ static GenericDeviceProperties * classFactory(DeviceConfigLine& line, QWidget *parent, DeviceTypes::Type type=DeviceTypes::Other);
+
+ protected:
+- mutable ConfigLine & mLine;
++ ConfigLine & mLine;
+ QWidget *mParent;
+
+ bool deviceNumberValidator(QLineEdit * deviceLine);
More information about the scm-commits
mailing list