Hello community,

here is the log from the commit of package zbar for openSUSE:Factory checked in 
at 2018-04-17 11:11:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zbar (Old)
 and      /work/SRC/openSUSE:Factory/.zbar.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "zbar"

Tue Apr 17 11:11:18 2018 rev:6 rq:595311 version:0.10_2013_02_28

Changes:
--------
--- /work/SRC/openSUSE:Factory/zbar/zbar.changes        2017-11-04 
10:24:50.812584618 +0100
+++ /work/SRC/openSUSE:Factory/.zbar.new/zbar.changes   2018-04-17 
11:11:23.087667111 +0200
@@ -1,0 +2,5 @@
+Tue Apr 10 14:25:15 UTC 2018 - [email protected]
+
+- Add fix-gcc8.patch (boo#1088885).
+
+-------------------------------------------------------------------

New:
----
  fix-gcc8.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ zbar.spec ++++++
--- /var/tmp/diff_new_pack.FpPIGz/_old  2018-04-17 11:11:24.267611759 +0200
+++ /var/tmp/diff_new_pack.FpPIGz/_new  2018-04-17 11:11:24.267611759 +0200
@@ -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 <[email protected]>.
 #
 # All modifications and additions to the file contributed by third parties
@@ -22,7 +22,7 @@
 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 @@
 Patch2:         fix-gcc5.patch
 # PATCH-FEATURE-OPENSUSE zbar-Qt5.patch -- build against Qt5 libraries 
<[email protected]>
 Patch3:         zbar-Qt5.patch
+Patch4:         fix-gcc8.patch
 BuildRequires:  ImageMagick-devel
 # required by mercurial archive only
 BuildRequires:  autoconf
@@ -99,6 +100,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 # for the Mercurial-based archive we need to get proper autoconf files

++++++ fix-gcc8.patch ++++++
--- 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)

Reply via email to