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
This commit is contained in:
parent
7326f2190d
commit
ef4788a845
12
gcc47.patch
Normal file
12
gcc47.patch
Normal file
@ -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 <iostream>
|
||||||
|
#include <typeinfo>
|
||||||
|
+#include <unistd.h>
|
||||||
|
|
||||||
|
#include "aboutdialog.h"
|
||||||
|
#include "branchpropwindow.h"
|
@ -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
|
Sat Oct 15 13:30:19 CEST 2011 - uwedr@suse.de
|
||||||
|
|
||||||
|
21
vym.spec
21
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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -15,26 +15,26 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
# norootforbuild
|
|
||||||
|
|
||||||
|
|
||||||
Name: vym
|
Name: vym
|
||||||
|
|
||||||
BuildRequires: libqt4-devel update-desktop-files
|
BuildRequires: libqt4-devel
|
||||||
Requires: zip unzip
|
BuildRequires: update-desktop-files
|
||||||
License: GPLv2
|
Requires: unzip
|
||||||
Group: Productivity/Office/Other
|
Requires: zip
|
||||||
Url: http://www.insilmaril.de/vym/index.html
|
Url: http://www.insilmaril.de/vym/index.html
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
AutoReqProv: on
|
|
||||||
Summary: View Your Mind - generate and manipulate maps which show your thoughts
|
Summary: View Your Mind - generate and manipulate maps which show your thoughts
|
||||||
|
License: GPL-2.0
|
||||||
|
Group: Productivity/Office/Other
|
||||||
Version: 2.0.1
|
Version: 2.0.1
|
||||||
Release: 1
|
Release: 0
|
||||||
#Patch: fix-midbutton.diff
|
#Patch: fix-midbutton.diff
|
||||||
Source0: %name-%version.tar.bz2
|
Source0: %name-%version.tar.bz2
|
||||||
Source1: %name.xml
|
Source1: %name.xml
|
||||||
Source2: %name.desktop
|
Source2: %name.desktop
|
||||||
Source3: x-%name.desktop
|
Source3: x-%name.desktop
|
||||||
|
Patch1: gcc47.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
VYM (View Your Mind) is a tool to generate and manipulate maps which
|
VYM (View Your Mind) is a tool to generate and manipulate maps which
|
||||||
@ -51,6 +51,7 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
qmake -o Makefile vym.pro PREFIX=%_prefix CONFIG+=RELEASE
|
qmake -o Makefile vym.pro PREFIX=%_prefix CONFIG+=RELEASE
|
||||||
|
Loading…
Reference in New Issue
Block a user