public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
To: git-commits@fedoraproject.org
Subject: [rpms/grantlee-qt5] f44: Make it build again
Date: Fri, 19 Jun 2026 15:07:02 GMT	[thread overview]
Message-ID: <178188162205.1.5182610468209016864.rpms-grantlee-qt5-44d5144caa86@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/grantlee-qt5
            Branch : f44
            Commit : 44d5144caa86f6bb2acbf0506e7be3ebd26fbe62
            Author : Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
            Date   : 2026-06-19T15:27:25+02:00
            Stats  : +39/-2 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/grantlee-qt5/c/44d5144caa86f6bb2acbf0506e7be3ebd26fbe62?branch=f44

            Log:
            Make it build again

Patch from Pino Toscano fixes "template-id not allowed for constructor in C++20 [-Wtemplate-id-cdtor]" error.

Use of ninja instead of make allows to build docs.

---
diff --git a/0001-Remove-template-id-in-constructor-of-template-class.patch b/0001-Remove-template-id-in-constructor-of-template-class.patch
new file mode 100644
index 0000000..7f633ab
--- /dev/null
+++ b/0001-Remove-template-id-in-constructor-of-template-class.patch
@@ -0,0 +1,32 @@
+taken from https://github.com/steveire/grantlee/pull/93
+
+From 261bfe75d718abfc537ddcebfe805df01c33ab3a Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino@tiscali.it>
+Date: Sat, 25 Apr 2026 10:21:47 +0200
+Subject: [PATCH] Remove template-id in constructor of template class
+
+It was not required, and it is invalid now in C++ 20.
+
+---
+ templates/defaulttags/cycle.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/templates/defaulttags/cycle.h b/templates/defaulttags/cycle.h
+index 936c2a2..a917555 100644
+--- a/templates/defaulttags/cycle.h
++++ b/templates/defaulttags/cycle.h
+@@ -40,9 +40,9 @@ Cycles endlessly over elements.
+ template <typename T> class RingIterator
+ {
+ public:
+-  RingIterator<T>() {}
++  RingIterator() {}
+ 
+-  RingIterator<T>(const QList<T> &list)
++  RingIterator(const QList<T> &list)
+       : m_begin(list.constBegin()), m_it(list.constBegin()),
+         m_end(list.constEnd())
+   {
+-- 
+2.54.0
+

diff --git a/grantlee-qt5.spec b/grantlee-qt5.spec
index 7de9f58..0d1a1a9 100644
--- a/grantlee-qt5.spec
+++ b/grantlee-qt5.spec
@@ -4,12 +4,13 @@
 Name:    grantlee-qt5
 Summary: Qt5 string template engine based on the Django template system
 Version: 5.3.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 # Automatically converted from old format: LGPLv2+ - review is highly recommended.
 License: LicenseRef-Callaway-LGPLv2+
 URL:     https://github.com/steveire/grantlee
 Source0: http://downloads.grantlee.org/grantlee-%{version}%{?pre:-%{pre}}.tar.gz
+Patch:   0001-Remove-template-id-in-constructor-of-template-class.patch
 
 %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 Source1: macros.grantlee5
@@ -83,7 +84,8 @@ format for easy browsing.
 %cmake_build
 
 %if 0%{?apidocs}
-make docs -C %{__cmake_builddir}
+cd %{__cmake_builddir}
+ninja-build docs
 %endif
 
 
@@ -139,6 +141,9 @@ sed -i \
 
 
 %changelog
+* Fri Jun 19 2026 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 5.3.1-10
+- Make it build again. Closes #2434636
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

                 reply	other threads:[~2026-06-19 15:07 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178188162205.1.5182610468209016864.rpms-grantlee-qt5-44d5144caa86@fedoraproject.org \
    --to=marcin@juszkiewicz.com.pl \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox