Hello community,
here is the log from the commit of package imagewriter for openSUSE:Factory
checked in at 2018-05-15 10:09:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/imagewriter (Old)
and /work/SRC/openSUSE:Factory/.imagewriter.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "imagewriter"
Tue May 15 10:09:33 2018 rev:23 rq:603835 version:1.10.1432200249.1d253d9
Changes:
--------
--- /work/SRC/openSUSE:Factory/imagewriter/imagewriter.changes 2015-01-10
23:05:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.imagewriter.new/imagewriter.changes
2018-05-15 10:31:50.227636681 +0200
@@ -1,0 +2,6 @@
+Thu May 3 16:44:50 UTC 2018 - fi...@opensuse.org
+
+- Update to 1d253d9.
+- Build with Qt5.
+
+-------------------------------------------------------------------
Old:
----
imagewriter-1.10.1420800585.134a9b3.tar.xz
New:
----
imagewriter-1.10.1432200249.1d253d9.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ imagewriter.spec ++++++
--- /var/tmp/diff_new_pack.82nVf3/_old 2018-05-15 10:31:51.219600246 +0200
+++ /var/tmp/diff_new_pack.82nVf3/_new 2018-05-15 10:31:51.223600099 +0200
@@ -1,7 +1,7 @@
#
# spec file for package imagewriter
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -41,9 +41,9 @@
%endif
%if 0%{?suse_version}
- %define breq libqt4-devel update-desktop-files
- %define qmake /usr/bin/qmake
- %define lrelease /usr/bin/lrelease
+ %define breq pkgconfig(Qt5DBus) pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets)
update-desktop-files
+ %define qmake /usr/bin/qmake-qt5
+ %define lrelease /usr/bin/lrelease-qt5
%endif
%if 0%{?suse_version} <= 1130
@@ -62,19 +62,19 @@
%endif
Name: imagewriter
-Version: 1.10.1420800585.134a9b3
+Version: 1.10.1432200249.1d253d9
Release: 0
Summary: Utility for writing disk images to USB keys
-License: GPL-2.0
+License: GPL-2.0-only
Group: Hardware/Other
-Url: https://github.com/openSUSE/imagewriter
+URL: https://github.com/openSUSE/imagewriter
Source0: imagewriter-%{version}.tar.xz
+BuildRequires: %{backend}
+BuildRequires: %{breq}
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
-BuildRequires: %{breq} %{backend}
BuildRequires: xz
Requires: xdg-utils
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
A graphical utility for writing raw disk images & hybrid ISOs to USB keys.
@@ -82,6 +82,7 @@
%prep
%setup -q
+
%build
# Create qmake cache file for building and use optflags.
cat > .qmake.cache <<EOF
@@ -89,11 +90,11 @@
QMAKE_CXXFLAGS_RELEASE += "%{optflags} -DKIOSKHACK"
DEFINES=%{definedbackend}
EOF
-%{qmake}
-make
+%qmake
+make %{?_smp_mflags}
%install
-make INSTALL_ROOT=%{buildroot} install
+make %{?_smp_mflags} INSTALL_ROOT=%{buildroot} install
%if 0%{?suse_version}
%suse_update_desktop_file imagewriter
%endif
++++++ imagewriter-1.10.1420800585.134a9b3.tar.xz ->
imagewriter-1.10.1432200249.1d253d9.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imagewriter-1.10.1420800585.134a9b3/MainWindow.cpp
new/imagewriter-1.10.1432200249.1d253d9/MainWindow.cpp
--- old/imagewriter-1.10.1420800585.134a9b3/MainWindow.cpp 2015-01-09
12:01:01.000000000 +0100
+++ new/imagewriter-1.10.1432200249.1d253d9/MainWindow.cpp 2015-05-21
11:24:09.000000000 +0200
@@ -28,6 +28,12 @@
#include <QtDBus>
#include <QFile>
#include <QDebug>
+#include <QVBoxLayout>
+#include <QStackedLayout>
+#include <QPushButton>
+#include <QDesktopWidget>
+#include <QMessageBox>
+#include <QApplication>
#include <unistd.h>
#include <sys/types.h>
@@ -479,7 +485,7 @@
qDebug() << event->mimeData()->urls();
#endif
if (event->mimeData()->hasFormat("text/uri-list"))
- if ((event->mimeData()->text().endsWith("iso")) ||
(event->mimeData()->text().endsWith("raw")))
+ if ((event->mimeData()->urls()[0].toString().endsWith("iso")) ||
(event->mimeData()->urls()[0].toString().endsWith("raw")))
event->acceptProposedAction();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imagewriter-1.10.1420800585.134a9b3/MainWindow.h
new/imagewriter-1.10.1432200249.1d253d9/MainWindow.h
--- old/imagewriter-1.10.1420800585.134a9b3/MainWindow.h 2015-01-09
12:01:01.000000000 +0100
+++ new/imagewriter-1.10.1432200249.1d253d9/MainWindow.h 2015-05-21
11:24:09.000000000 +0200
@@ -27,6 +27,8 @@
#include <QtGui>
#include <QWidget>
#include <QDBusMessage>
+#include <QLabel>
+#include <QComboBox>
#include "MetaTypes.h"
#include "Platform.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imagewriter-1.10.1420800585.134a9b3/Platform.cpp
new/imagewriter-1.10.1432200249.1d253d9/Platform.cpp
--- old/imagewriter-1.10.1420800585.134a9b3/Platform.cpp 2015-01-09
12:01:01.000000000 +0100
+++ new/imagewriter-1.10.1432200249.1d253d9/Platform.cpp 2015-05-21
11:24:09.000000000 +0200
@@ -11,7 +11,6 @@
#include <errno.h>
#define BLOCKSIZE 1048576
-#define _GNU_SOURCE
Platform::Platform(bool kioskMode, bool unsafe)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/imagewriter-1.10.1420800585.134a9b3/PlatformUdisks.cpp
new/imagewriter-1.10.1432200249.1d253d9/PlatformUdisks.cpp
--- old/imagewriter-1.10.1420800585.134a9b3/PlatformUdisks.cpp 2015-01-09
12:01:01.000000000 +0100
+++ new/imagewriter-1.10.1432200249.1d253d9/PlatformUdisks.cpp 2015-05-21
11:24:09.000000000 +0200
@@ -32,6 +32,7 @@
#include <QRegExp>
#include <QDir>
#include <QProgressDialog>
+#include <QMessageBox>
#include "DeviceItem.h"
#include "PlatformUdisks.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/imagewriter-1.10.1420800585.134a9b3/PlatformUdisks2.cpp
new/imagewriter-1.10.1432200249.1d253d9/PlatformUdisks2.cpp
--- old/imagewriter-1.10.1420800585.134a9b3/PlatformUdisks2.cpp 2015-01-09
12:01:01.000000000 +0100
+++ new/imagewriter-1.10.1432200249.1d253d9/PlatformUdisks2.cpp 2015-05-21
11:24:09.000000000 +0200
@@ -10,6 +10,7 @@
#include <QRegExp>
#include <QDir>
#include <QProgressDialog>
+#include <QMessageBox>
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusPendingReply>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imagewriter-1.10.1420800585.134a9b3/imagewriter.pro
new/imagewriter-1.10.1432200249.1d253d9/imagewriter.pro
--- old/imagewriter-1.10.1420800585.134a9b3/imagewriter.pro 2015-01-09
12:01:01.000000000 +0100
+++ new/imagewriter-1.10.1432200249.1d253d9/imagewriter.pro 2015-05-21
11:24:09.000000000 +0200
@@ -9,6 +9,8 @@
DESTDIR += .
VERSION=1.10
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
+QMAKE_CXXFLAGS_RELEASE += "-fvisibility=hidden -fvisibility-inlines-hidden"
+QT += dbus gui widgets
# Input
HEADERS += DeviceItem.h \
@@ -29,8 +31,8 @@
udisks2_interface.cpp \
udisks2_mountpoints_interface.cpp
-CONFIG += link_pkgconfig \
- qdbus
+CONFIG += c++11 link_pkgconfig
+
exists("/usr/include/hal/libhal.h") {
PKGCONFIG += hal \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/imagewriter-1.10.1420800585.134a9b3/main.cpp
new/imagewriter-1.10.1432200249.1d253d9/main.cpp
--- old/imagewriter-1.10.1420800585.134a9b3/main.cpp 2015-01-09
12:01:01.000000000 +0100
+++ new/imagewriter-1.10.1432200249.1d253d9/main.cpp 2015-05-21
11:24:09.000000000 +0200
@@ -113,7 +113,7 @@
for (i = list.begin(); i != list.end(); ++i)
{
if (!(*i)->getPath().isEmpty())
- fprintf(stdout, "%s\n", (*i)->getPath().toAscii().data());
+ fprintf(stdout, "%s\n", (*i)->getPath().toLatin1().data());
}
exit(0);
}
