From 60d8ad3dfc4d501612c3ee2e05e901e555504d00 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sep 20 2015 21:53:23 +0000 Subject: Drop an unneeded patch This drops Subsurface-4.4.1-qt541.patch as 4.4.2 builds fine with current Qt versions. --- diff --git a/Subsurface-4.4.1-qt541.patch b/Subsurface-4.4.1-qt541.patch deleted file mode 100644 index de89525..0000000 --- a/Subsurface-4.4.1-qt541.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up Subsurface-4.4.1/subsurfacesysinfo.cpp.qt541 Subsurface-4.4.1/subsurfacesysinfo.cpp -diff -up Subsurface-4.4.1/subsurfacesysinfo.h.qt541 Subsurface-4.4.1/subsurfacesysinfo.h ---- Subsurface-4.4.1/subsurfacesysinfo.h.qt541 2015-02-18 13:11:03.000000000 -0600 -+++ Subsurface-4.4.1/subsurfacesysinfo.h 2015-03-12 13:26:40.262317534 -0500 -@@ -205,7 +205,7 @@ - - class SubsurfaceSysInfo : public QSysInfo { - public: --#if QT_VERSION <= 0x050400 -+#if QT_VERSION <= 0x050500 - static QString cpuArchitecture(); - static QString fullCpuArchitecture(); - static QString osType(); diff --git a/subsurface.spec b/subsurface.spec index 53e5460..21137da 100644 --- a/subsurface.spec +++ b/subsurface.spec @@ -27,8 +27,6 @@ Source0: http://subsurface-divelog.org/downloads/Subsurface-%{version}.tg ## usptreamable patches # support parallel-installable libmarblewidget-qt5 Patch1: Subsurface-4.4.1-marblewidget-qt5.patch -# fix build with qt-5.4.1 -Patch2: Subsurface-4.4.1-qt541.patch BuildRequires: libdivecomputer-devel == %{libdc_version} BuildRequires: libdivecomputer-static == %{libdc_version} @@ -85,7 +83,6 @@ additional dive notes. patch -p1 --backup < packaging/ubuntu/0001-Make-build-with-Qt4.patch %patch1 -p1 -b .marblewidget-qt5 -%patch2 -p1 -b .qt541 %build %if 0%{?qt5}