openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package libqxt

--- libqxt.changes.orig
+++ libqxt.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Fri Apr 27 17:14:48 UTC 2018 - hpj@urpla.net
+
+- add another patch: libqxt-header-fix.patch
+- always apply libqxt-gcc6.patch
+
+-------------------------------------------------------------------
 Thu Jun 22 10:01:23 UTC 2017 - tchvatal@suse.com
 
 - Add two patches to allow proper building
--- libqxt.spec.orig
+++ libqxt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libqxt
 #
-# Copyright (c) 2017 SUSE LINUX 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
@@ -21,7 +21,7 @@ Name:           libqxt
 Version:        0.6.2
 Release:        0
 Summary:        Library extending Qt
-License:        CPL-1.0 AND LGPL-2.1
+License:        CPL-1.0 AND LGPL-2.1-only
 Group:          Development/Libraries/C and C++
 Url:            https://bitbucket.org/libqxt/libqxt/wiki/Home
 # SourceUrl seems to be unavailable.
@@ -38,6 +38,9 @@ Patch2:         libqxt-gcc6.patch
 Patch3:         libqxt-use-system-qdoc3.patch
 # PATCH-FIX-UPSTREAM detect xrandr properly
 Patch4:         libqxt-xrandr-missing-lib.patch
+# PATCH-FIX-UPSTREAM use the correct jsonrpc header
+Patch5:         libqxt-header-fix.patch
+
 BuildRequires:  fdupes
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(QtCore)
@@ -69,11 +72,10 @@ LibQxt is an extension library for Qt pr
 %setup -q -n libqxt-libqxt-%{versionhash}
 %patch0 -p1
 %patch1
-%if 0%{?suse_version} > 1320
 %patch2 -p1
-%endif
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 # remove rpath
 sed -i -e '/^QMAKE_RPATHDIR /d' src/qxtlibs.pri

Places

File project.diff of Package libqxt

Places