diff --git a/0001-fix-build-with-qt-5.5.patch b/0001-fix-build-with-qt-5.5.patch deleted file mode 100644 index 700cc4b..0000000 --- a/0001-fix-build-with-qt-5.5.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7303ea207de0771d6f450a31ec4a1ce69202869b Mon Sep 17 00:00:00 2001 -From: rezso -Date: Sun, 5 Jul 2015 18:46:13 +0200 -Subject: [PATCH 01/17] fix build with qt 5.5 - -(lxqtnotification.h:43:5: error: 'Q_OBJECT' does not name a type) ---- - lxqtnotification.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lxqtnotification.h b/lxqtnotification.h -index 4334a55..2d74504 100644 ---- a/lxqtnotification.h -+++ b/lxqtnotification.h -@@ -25,6 +25,7 @@ - #ifndef LXQTNOTIFICATION_H - #define LXQTNOTIFICATION_H - -+#include - #include - #include "lxqtglobals.h" - --- -2.5.2 - diff --git a/liblxqt-0.10.0.tar.xz b/liblxqt-0.10.0.tar.xz new file mode 100644 index 0000000..dd4ab52 --- /dev/null +++ b/liblxqt-0.10.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77a42a9ae79d0887bf09cba0c6aaf59ba71edb0bc807736384d1072254aace7c +size 77732 diff --git a/liblxqt-0.9.0.tar.xz b/liblxqt-0.9.0.tar.xz deleted file mode 100644 index c627a5f..0000000 --- a/liblxqt-0.9.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4f0941bcb8839163aed5c332a26d05650a8d75be241cb39c702f9bd15fe4d52 -size 86856 diff --git a/liblxqt.changes b/liblxqt.changes index 40df939..0b51d3e 100644 --- a/liblxqt.changes +++ b/liblxqt.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Nov 10 10:02:02 UTC 2015 - mvetter@suse.com + +- Remove patch 0001-fix-build-with-qt-5.5.patch + Contained in upstream version +------------------------------------------------------------------- +Thu Nov 5 10:36:03 UTC 2015 - mvetter@suse.com + +- Upstream release 0.10.0 + ------------------------------------------------------------------- Thu Oct 8 10:31:22 UTC 2015 - mvetter@suse.com diff --git a/liblxqt.spec b/liblxqt.spec index e720591..2e48838 100644 --- a/liblxqt.spec +++ b/liblxqt.spec @@ -17,16 +17,14 @@ Name: liblxqt -Version: 0.9.0 +Version: 0.10.0 Release: 0 Summary: Core utility library for lxqt License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://www.lxqt.org Source: http://downloads.lxqt.org/lxqt/%{version}/liblxqt-%{version}.tar.xz -#factory moved to libqt5.5, we need to include QObject explicitly there -Patch: 0001-fix-build-with-qt-5.5.patch -BuildRequires: cmake +BuildRequires: cmake >= 3.0.2 BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: kwindowsystem-devel @@ -34,7 +32,7 @@ BuildRequires: pkg-config BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0 +BuildRequires: pkgconfig(Qt5Xdg) >= 1.3.0 BuildRequires: pkgconfig(x11) Obsoletes: liblxqt-qt5 < %{version} Provides: liblxqt-qt5 = %{version} @@ -65,11 +63,10 @@ lxqt libraries for development %prep %setup -q -n liblxqt-%{version} -%patch -p1 %build %cmake -%__make %{?_smp_flags} +make %{?_smp_mflags} %install %cmake_install