Bug#564867: avida: patch to fix build

[Andreas Moog]

Package: avida
Version: 2.0b7-4.2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch



*** /tmp/tmpIfHx0v
In Ubuntu, the attached patch was applied to achieve the following:

  * patch n_orig_instruction_scrollview.cc to fix FTBFS (LP: #749244)

Thanks for considering the patch.


-- System Information:
Debian Release: squeeze/sid
  APT prefers natty
  APT policy: (500, 'natty')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-8-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

only in patch2:
unchanged:
--- avida-2.0b7.orig/source/qt-viewer/n_orig_instruction_scrollview.cc
+++ avida-2.0b7/source/qt-viewer/n_orig_instruction_scrollview.cc
@@ -413,7 +413,7 @@
     QRect(vx,vy,w,h),
     QApplication::palette().active(),
     (raised)?(QStyle::Style_Raised):(QStyle::Style_Sunken),
-    QStyleOption::QStyleOption(s_field_spacing, 0)
+    QStyleOption(s_field_spacing, 0)
   );
   m_last_mouse_in_line = mouse_in_line;
   m_last_mouse_in_button = mouse_in_button;