Accepting request 595299 from home:marxin:branches:Application:Geo
- Add fix-gcc8.patch (boo#1088885). OBS-URL: https://build.opensuse.org/request/show/595299 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/zbar?expand=0&rev=28
This commit is contained in:
parent
a074252430
commit
72257e982e
38
fix-gcc8.patch
Normal file
38
fix-gcc8.patch
Normal file
@ -0,0 +1,38 @@
|
||||
--- a/qt/QZBar.cpp 2018-04-10 16:20:27.946677757 +0200
|
||||
+++ b/qt/QZBar.cpp 2018-04-10 16:17:21.839009342 +0200
|
||||
@@ -183,7 +183,7 @@
|
||||
if(thread)
|
||||
thread->window.redraw();
|
||||
}
|
||||
- catch(Exception) {
|
||||
+ catch(Exception *) {
|
||||
// sometimes Qt attempts to paint the widget before it's parented(?)
|
||||
// just ignore this (can't throw from event anyway)
|
||||
}
|
||||
@@ -196,7 +196,7 @@
|
||||
if(thread)
|
||||
thread->window.resize(size.rwidth(), size.rheight());
|
||||
}
|
||||
- catch(Exception) { /* ignore */ }
|
||||
+ catch(Exception *) { /* ignore */ }
|
||||
}
|
||||
|
||||
void QZBar::changeEvent(QEvent *event)
|
||||
@@ -206,7 +206,7 @@
|
||||
if(event->type() == QEvent::ParentChange)
|
||||
thread->window.attach(QX11Info::display(), winId());
|
||||
}
|
||||
- catch(Exception) { /* ignore (FIXME do something w/error) */ }
|
||||
+ catch(Exception *) { /* ignore (FIXME do something w/error) */ }
|
||||
}
|
||||
|
||||
void QZBar::attach ()
|
||||
@@ -222,7 +222,7 @@
|
||||
if(_videoEnabled)
|
||||
thread->pushEvent(new QZBarThread::VideoDeviceEvent(_videoDevice));
|
||||
}
|
||||
- catch(Exception) { /* ignore (FIXME do something w/error) */ }
|
||||
+ catch(Exception *) { /* ignore (FIXME do something w/error) */ }
|
||||
}
|
||||
|
||||
void QZBar::showEvent (QShowEvent *event)
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 10 14:25:15 UTC 2018 - mliska@suse.cz
|
||||
|
||||
- Add fix-gcc8.patch (boo#1088885).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 1 14:50:59 UTC 2017 - mpluskal@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package zbar
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 Carlos Goncalves <cgoncalves@opensuse.org>.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -22,7 +22,7 @@ Name: zbar
|
||||
Version: 0.10_2013_02_28
|
||||
Release: 0
|
||||
Summary: Bar code reader
|
||||
License: LGPL-2.1+
|
||||
License: LGPL-2.1-or-later
|
||||
Group: Productivity/Other
|
||||
Url: http://zbar.sourceforge.net
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
@ -33,6 +33,7 @@ Patch1: fix_build.patch
|
||||
Patch2: fix-gcc5.patch
|
||||
# PATCH-FEATURE-OPENSUSE zbar-Qt5.patch -- build against Qt5 libraries <aloisio@gmx.com>
|
||||
Patch3: zbar-Qt5.patch
|
||||
Patch4: fix-gcc8.patch
|
||||
BuildRequires: ImageMagick-devel
|
||||
# required by mercurial archive only
|
||||
BuildRequires: autoconf
|
||||
@ -99,6 +100,7 @@ applications using the zbar-qt library.
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
%build
|
||||
# for the Mercurial-based archive we need to get proper autoconf files
|
||||
|
Loading…
Reference in New Issue
Block a user