Hello community, here is the log from the commit of package xclass for openSUSE:Factory checked in at 2016-07-03 12:27:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xclass (Old) and /work/SRC/openSUSE:Factory/.xclass.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xclass" Changes: -------- --- /work/SRC/openSUSE:Factory/xclass/xclass.changes 2014-11-03 13:13:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xclass.new/xclass.changes 2016-07-03 12:27:58.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jun 29 09:43:07 UTC 2016 - [email protected] + +- add patch: xclass-0.9.2-gcc6.patch + * fix boo#985124 + * fix call of overloaded 'abs(unsigned int)' is ambiguous + * fix narrowing conversion from int to char inside {} + +------------------------------------------------------------------- New: ---- xclass-0.9.2-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xclass.spec ++++++ --- /var/tmp/diff_new_pack.HryNgD/_old 2016-07-03 12:27:59.000000000 +0200 +++ /var/tmp/diff_new_pack.HryNgD/_new 2016-07-03 12:27:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xclass # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,8 +28,12 @@ Patch1: %{name}-%{version}-gcc-3.1.patch Patch2: %{name}-%{version}-gcc-4.0.patch Patch3: %{name}-%{version}-gcc-4.1.patch +#PATCH-FIX-UPSTREAM [email protected] - fix call of overloaded 'abs(unsigned int)' is ambiguous +Patch4: %{name}-%{version}-gcc6.patch BuildRequires: autoconf +BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: pkgconfig BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) @@ -43,7 +47,7 @@ %package devel Summary: Library for Uniform Presentation of fvwm95 Programs - development files License: LGPL-2.1+ -Group: System/Libraries +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: libstdc++-devel Requires: pkgconfig @@ -60,6 +64,7 @@ %patch1 -p1 %patch2 %patch3 +%patch4 -p1 %build autoconf @@ -69,12 +74,13 @@ %install mv lib/libxclass/icons/*.xpm icons/ -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make %{?_smp_mflags} DESTDIR=%{buildroot} install make DESTDIR=%{buildroot} install_shared install -m 644 include/xclass/XCconfig.h %{buildroot}%{_includedir}/XCconfig.h +rm -rf %{buildroot}%{_docdir}/%{name}/INSTALL +%fdupes %{buildroot} %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files ++++++ xclass-0.9.2-gcc6.patch ++++++ Index: b/lib/libxclass/OXFrame.cc =================================================================== --- a/lib/libxclass/OXFrame.cc +++ b/lib/libxclass/OXFrame.cc @@ -23,6 +23,7 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> #include <sys/time.h> +#include <cmath> #include <xclass/utils.h> #include <xclass/OXClient.h> @@ -345,8 +346,8 @@ int OXFrame::HandleEvent(XEvent *event) case ButtonPress: if ((event->xbutton.time - _lastclick < 350) && (event->xbutton.button == _lastbutton) && - (abs(event->xbutton.x_root - _dbx) < 3) && - (abs(event->xbutton.y_root - _dby) < 3) && + (std::abs(event->xbutton.x_root - _dbx) < 3) && + (std::abs(event->xbutton.y_root - _dby) < 3) && (event->xbutton.window == _dbw)) ++_clickcount; else Index: b/lib/libxclass/icons/VResizer.xbm =================================================================== --- a/lib/libxclass/icons/VResizer.xbm +++ b/lib/libxclass/icons/VResizer.xbm @@ -1,6 +1,6 @@ #define VResizer_width 32 #define VResizer_height 32 -static char VResizer_bits[] = { +static unsigned char VResizer_bits[] = { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0x7f,0xfd,0xff,0xff,0x7f,0xfd,0xff,0xff,0x7f,0xfd,0xff,0xff, Index: b/lib/libxclass/icons/VmaskResizer.xbm =================================================================== --- a/lib/libxclass/icons/VmaskResizer.xbm +++ b/lib/libxclass/icons/VmaskResizer.xbm @@ -1,6 +1,6 @@ #define VmaskResizer_width 32 #define VmaskResizer_height 32 -static char VmaskResizer_bits[] = { +static unsigned char VmaskResizer_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x80,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0x80,0x03,0x00,0x00, Index: b/lib/libxclass/OXResizer.cc =================================================================== --- a/lib/libxclass/OXResizer.cc +++ b/lib/libxclass/OXResizer.cc @@ -55,9 +55,9 @@ OXHorizontalResizer::OXHorizontalResizer int hspotx = 16, hspoty = 16; - curPix = XCreateBitmapFromData(GetDisplay(), GetId(), HResizer_bits, + curPix = XCreateBitmapFromData(GetDisplay(), GetId(), (const char*)HResizer_bits, HResizer_width, HResizer_height); - maskPix = XCreateBitmapFromData(GetDisplay(), GetId(), HmaskResizer_bits, + maskPix = XCreateBitmapFromData(GetDisplay(), GetId(), (const char*)HmaskResizer_bits, HmaskResizer_width, HmaskResizer_height); XColor black, white; @@ -305,9 +305,9 @@ OXVerticalResizer::OXVerticalResizer(con int hspotx = 16, hspoty = 16; - curPix = XCreateBitmapFromData(GetDisplay(), GetId(), VResizer_bits, + curPix = XCreateBitmapFromData(GetDisplay(), GetId(), (const char*)VResizer_bits, VResizer_width, VResizer_height); - maskPix = XCreateBitmapFromData(GetDisplay(), GetId(), VmaskResizer_bits, + maskPix = XCreateBitmapFromData(GetDisplay(), GetId(), (const char*)VmaskResizer_bits, VmaskResizer_width, VmaskResizer_height); XColor black, white; Index: b/lib/libxclass/icons/HResizer.xbm =================================================================== --- a/lib/libxclass/icons/HResizer.xbm +++ b/lib/libxclass/icons/HResizer.xbm @@ -1,6 +1,6 @@ #define HResizer_width 32 #define HResizer_height 32 -static char HResizer_bits[] = { +static unsigned char HResizer_bits[] = { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0xff,0xff,0xff,0xbf, 0xfe,0xff,0xff,0xdf,0xfd,0xff,0xff,0xef,0xfb,0xff,0xff,0xf7,0xf7,0xff,0xff, Index: b/lib/libxclass/icons/HmaskResizer.xbm =================================================================== --- a/lib/libxclass/icons/HmaskResizer.xbm +++ b/lib/libxclass/icons/HmaskResizer.xbm @@ -1,6 +1,6 @@ #define HmaskResizer_width 32 #define HmaskResizer_height 32 -static char HmaskResizer_bits[] = { +static unsigned char HmaskResizer_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xc0, 0x01,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,0x07,0x00,0x00,0xf8,0x0f,0x00,0x00,
