Hello community,
here is the log from the commit of package grantlee5 for openSUSE:Factory checked in at 2019-04-15 11:50:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grantlee5 (Old)
and /work/SRC/openSUSE:Factory/.grantlee5.new.17052 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grantlee5"
Mon Apr 15 11:50:09 2019 rev:4 rq:692988 version:5.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/grantlee5/grantlee5.changes 2016-05-31 12:23:20.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.grantlee5.new.17052/grantlee5.changes 2019-04-15 11:50:13.238479282 +0200
@@ -1,0 +2,6 @@
+Wed Apr 10 17:42:44 UTC 2019 - Christophe Giboudeaux
+
+- Add fix-build-with-Qt-5.13.patch
+- Run spec-cleaner
+
+-------------------------------------------------------------------
New:
----
fix-build-with-Qt-5.13.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grantlee5.spec ++++++
--- /var/tmp/diff_new_pack.31mwF9/_old 2019-04-15 11:50:14.878480151 +0200
+++ /var/tmp/diff_new_pack.31mwF9/_new 2019-04-15 11:50:14.914480170 +0200
@@ -1,7 +1,7 @@
#
# spec file for package grantlee5
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -20,19 +20,21 @@
Version: 5.1.0
Release: 0
Summary: Qt string template library
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
Group: System/Libraries
-Url: http://grantlee.org/
+URL: http://grantlee.org/
Source: http://downloads.grantlee.org/grantlee-%{version}.tar.gz
Source2: baselibs.conf
# PATCH-FIX-UPSTREAM includes.diff -- since upstream doesn't provide a way to install to custom directory, we cheat!
Patch0: includes.diff
+# PATCH-FIX-UPSTREAM fix-build-with-Qt-5.13.patch
+Patch1: fix-build-with-Qt-5.13.patch
BuildRequires: cmake >= 3.1
BuildRequires: doxygen
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(Qt5Core) >= 5.3
BuildRequires: pkgconfig(Qt5Gui) >= 5.3
BuildRequires: pkgconfig(Qt5Script) >= 5.3
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Grantlee is a string template engine based on the Django template system and
@@ -53,47 +55,33 @@
%prep
%setup -q -n grantlee-%{version}
%patch0 -p1
+%patch1 -p1
%build
-%if "%{?_lib}" == "lib64"
-SUFFIX="64"
-%else
-SUFFIX=""
-%endif
-mkdir -p build
-pushd build
-cmake .. \
- cmake -DCMAKE_BUILD_TYPE=None \\\
- -DCMAKE_C_FLAGS="%{optflags} -DNDEBUG" \\\
- -DCMAKE_CXX_FLAGS="%{optflags} -DNDEBUG" \\\
- -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-Bsymbolic-functions" \\\
- -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-Bsymbolic-functions" \\\
- -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-Bsymbolic-functions" \\\
- -DCMAKE_VERBOSE_MAKEFILE=ON \\\
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \\\
- -DBUILD_TESTS=OFF \\\
- -DLIB_SUFFIX=$SUFFIX ..
-
- make %{?_smp_mflags} VERBOSE=1
-popd
+%cmake \
+ -DCMAKE_BUILD_TYPE=None \
+ -DBUILD_TESTS=OFF
+
+# Still not available on all leap flavors
+# %%cmake_build
+%make_jobs
%install
-%makeinstall -C build
+%cmake_install
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING* README*
+%license COPYING*
+%doc AUTHORS CHANGELOG README*
%{_libdir}/libGrantlee_TextDocument.so.*
%{_libdir}/libGrantlee_Templates.so.*
%{_libdir}/grantlee/
%files devel
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG COPYING* README*
+%license COPYING*
+%doc AUTHORS CHANGELOG README*
%{_includedir}/grantlee5/
%{_libdir}/libGrantlee_TextDocument.so
%{_libdir}/libGrantlee_Templates.so
++++++ fix-build-with-Qt-5.13.patch ++++++
From 0cee029ee03ab4906c6d19b57458b5036852b0f8 Mon Sep 17 00:00:00 2001
From: Michael Pyne
Date: Tue, 18 Dec 2018 17:47:21 -0500
Subject: [PATCH] Fix build with Qt 5.13 / GCC 8.2.
At this point Grantlee doesn't build for me because QList is an
incomplete type. I think the compiler is right to complain, so I fix by
including the appropriate header.
Fixes issue #47.
---
templates/lib/lexer_p.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/lib/lexer_p.h b/templates/lib/lexer_p.h
index 275aeea..1ae451a 100644
--- a/templates/lib/lexer_p.h
+++ b/templates/lib/lexer_p.h
@@ -24,7 +24,7 @@
#include "textprocessingmachine_p.h"
#include "token.h"
-template <typename T> class QList;
+#include <QList>
namespace Grantlee
{