From ef4788a8451bd3af5e164ba0874ceb95c0c3b15eecc117a7b3ca45fd4e65dfae Mon Sep 17 00:00:00 2001 From: Uwe Drechsel Date: Thu, 22 Mar 2012 12:31:47 +0000 Subject: [PATCH] Accepting request 110581 from home:dimstar:gcc47 Fix build with gcc 4.7. OBS-URL: https://build.opensuse.org/request/show/110581 OBS-URL: https://build.opensuse.org/package/show/editors/vym?expand=0&rev=21 --- gcc47.patch | 12 ++++++++++++ vym.changes | 5 +++++ vym.spec | 21 +++++++++++---------- 3 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 gcc47.patch diff --git a/gcc47.patch b/gcc47.patch new file mode 100644 index 0000000..d31b9f8 --- /dev/null +++ b/gcc47.patch @@ -0,0 +1,12 @@ +Index: vym-2.0.1/mainwindow.cpp +=================================================================== +--- vym-2.0.1.orig/mainwindow.cpp ++++ vym-2.0.1/mainwindow.cpp +@@ -4,6 +4,7 @@ + + #include + #include ++#include + + #include "aboutdialog.h" + #include "branchpropwindow.h" diff --git a/vym.changes b/vym.changes index 0424f1b..ab87375 100644 --- a/vym.changes +++ b/vym.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 22 12:17:01 UTC 2012 - aj@suse.de + +- Fix build with gcc 4.7. + ------------------------------------------------------------------- Sat Oct 15 13:30:19 CEST 2011 - uwedr@suse.de diff --git a/vym.spec b/vym.spec index 20841a1..1149f44 100644 --- a/vym.spec +++ b/vym.spec @@ -1,7 +1,7 @@ # -# spec file for package vym (Version 1.12.8) +# spec file for package vym # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,26 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: vym -BuildRequires: libqt4-devel update-desktop-files -Requires: zip unzip -License: GPLv2 -Group: Productivity/Office/Other +BuildRequires: libqt4-devel +BuildRequires: update-desktop-files +Requires: unzip +Requires: zip Url: http://www.insilmaril.de/vym/index.html BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on Summary: View Your Mind - generate and manipulate maps which show your thoughts +License: GPL-2.0 +Group: Productivity/Office/Other Version: 2.0.1 -Release: 1 +Release: 0 #Patch: fix-midbutton.diff Source0: %name-%version.tar.bz2 Source1: %name.xml Source2: %name.desktop Source3: x-%name.desktop +Patch1: gcc47.patch %description VYM (View Your Mind) is a tool to generate and manipulate maps which @@ -51,6 +51,7 @@ Authors: %prep %setup -q +%patch1 -p1 %build qmake -o Makefile vym.pro PREFIX=%_prefix CONFIG+=RELEASE