Accepting request 1313660 from KDE:Extra

Update to 1.7.1

OBS-URL: https://build.opensuse.org/request/show/1313660
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kommit?expand=0&rev=3

0001-Fix-build-with-libgit2-1.9.1.patch

@@ -0,0 +1,73 @@
+From 3f3af7de3a918bc83e7523e50aa6b27711d5bd24 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sat, 7 Jun 2025 12:37:22 +0200
+Subject: [PATCH] Fix build with libgit2 1.9.1
+
+The libgit2 headers are not correct and including blame.h for example
+makes it failt to build because it doesn't know what
+git_signature is because blame.h does not include types.h
+
+So just include git2.h that includes everthing and be happy
+---
+ src/libkommit/blame.h                | 2 +-
+ src/libkommit/blamehunk.h            | 2 +-
+ src/libkommit/config.h               | 3 +--
+ src/libkommit/options/blameoptions.h | 2 +-
+ 4 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/libkommit/blame.h b/src/libkommit/blame.h
+index 506a7623..bbef4c4f 100644
+--- a/src/libkommit/blame.h
++++ b/src/libkommit/blame.h
+@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ #pragma once
+ 
+-#include <git2/blame.h>
++#include <git2.h>
+ 
+ #include <QList>
+ #include <QSharedPointer>
+diff --git a/src/libkommit/blamehunk.h b/src/libkommit/blamehunk.h
+index ada20f42..740da5e1 100644
+--- a/src/libkommit/blamehunk.h
++++ b/src/libkommit/blamehunk.h
+@@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
+ 
+ #pragma once
+ 
+-#include <git2/blame.h>
++#include <git2.h>
+ 
+ #include <Kommit/Commit>
+ #include <Kommit/Oid>
+diff --git a/src/libkommit/config.h b/src/libkommit/config.h
+index d09c6b8e..165394f5 100644
+--- a/src/libkommit/config.h
++++ b/src/libkommit/config.h
+@@ -9,8 +9,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
+ #include <QSharedPointer>
+ #include <QString>
+ 
+-#include <git2/config.h>
+-#include <git2/version.h>
++#include <git2.h>
+ 
+ namespace Git
+ {
+diff --git a/src/libkommit/options/blameoptions.h b/src/libkommit/options/blameoptions.h
+index d4e65ab4..9e6103f7 100644
+--- a/src/libkommit/options/blameoptions.h
++++ b/src/libkommit/options/blameoptions.h
+@@ -10,7 +10,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
+ #include <QScopedPointer>
+ #include <QSharedPointer>
+ 
+-#include <git2/blame.h>
++#include <git2.h>
+ 
+ namespace Git
+ {
+-- 
+2.51.1
+

kommit-1.6.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac30eb5f1a8c4035c6499d27325d499121ac2de7b3d381cacb0dd7427fb45025
-size 1225548

kommit-1.6.0.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmZ6hz4ACgkQ11dEg7tX
-sY383BAAsuPbXvJsl21GDLragJ3O9tPaMFajMC6DNp8BwI0e/RNjmrZTDD1gtLvG
-careWw5nVbiuiDnwzSJHWgAqGOcvHkLjfDD6Mc3m41D+jG4cUtFXA0oy/+QB66WV
-cqC/CEgf4QQx75kU7cL+Xm6bfhM6e5/6+E7c79zepZUCEGAlP4Sb8cA2HzLI/VSo
-40wWQ8j+QxTfzOJ0fH94KKsR4VJohV7icgGD+4B/1Yd/xDHtjNRV01hj1T4WCq/x
-vEDIJ7xy0bA+XDP5Y0qq56x1tiLlq9dHLMCGGIing7x61W+Ag3Ov8X1dKwGqO6+K
-flM54w2Hldq4XCX1lZRulcHAF9Ba2vdbrPk8jWKECeX1zMqPJC9OuFaqajUme9YD
-FhOBhNesRhiBpWLs35qXismGjphAtJkU+KRIJo1gjNIR1sXLrH8ng3pl1H7t4Qqj
-fccjec3LFpKjW+Sy34nRh2shcUapg6wQ/e2Wc7sSPFnMKCexita5HQ53VXqvV4wd
-8caboEVwiW2mAO3t6lKgwWpsdU7z5o9FFxa9UTgWUdqriejTBLhVxRKfcGa+VV6P
-eOiqTR3cBR+UJoIqEog3v9pOqIxh1mbwu5dI6V0EWuTbzJdh57X0R8AZkcTcGMTC
-TJFSMlbLcIbtaRXEmXoG+9m5NXAP1BSGVdBhqMz3imbcLzMxEAs=
-=S6wE
------END PGP SIGNATURE-----

kommit-v1.7.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ddde514faed998f780b169be110c2bf116e9c817ceb5ecc73487c6947405f991
+size 1293848

kommit-v1.7.1.tar.xz.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEXkMBKCXiLuMMEHGwhc2i4xCcjsEFAmdIIxQACgkQhc2i4xCc
+jsGStQ//QesjE9b6gyzGznKj4O6VdKvwhQbetfSgCdKYmWUGuw4lONDW681DaOyv
+P8qzuVNSqJ29sLMnmvLVstyii9eVwNIXZ61JDLiO4u/DA23HjRlkH/gINWmYpFYO
+pfGF25A22MfiE59BzJuSzjLGNiXOzDRPBqPj0vAmAz3PNlPunBNrjVGyGXkpe4hv
+CzQ0etqNAhlY02x7IjHosY9P0zC9j/Ui+7Iijbgosxdy54KKxlxwnZxWqw7lEvNQ
+DSW3Sv+OgwgCqcz4j9lHZmDTIYKDGoSg+fj3A5jjzU3fuhWZzSxDhlV+cZBF++JU
+ljzl0hhEv0Jxsh9v897caJf+EQdqEx9JxAPQ7vXZCcEHpEHdL4DY+DX311uGm8aS
+SWSiE9nqetHJanVJVe6VKkJg5TUTPO28K7HIuYpTAlL+95HUFXk3+aQgeM0jIjn7
+6944dGGmN0aOPVBUVvQrAaITi0LXkl+oKk8a3viwpI5ZsFa2VY4IS9mjw8Z2zcXR
+ABrtmon2YrQGHSTH9gd3zPI0iYxsboxhoPR1Fi4a7fBJWAbWpbUt7AnGkdQZVEJh
+ovPhnyPmTuVUYfdCsC15r43O7uTHbvTaCeOghCXQ7arMtThfvAEM+55Fbt9wUIqM
+ZkM9HGOfOvs1lpCqQ2LAMva3OFcrRqKbU96dJj/+PAQdNENW8JE=
+=Nmpm
+-----END PGP SIGNATURE-----

kommit.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat Oct 25 13:12:09 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 1.7.1
+  * Fix bugs in diff widget
+  * Adjust style for commit message
+  * Fix crash on blame
+  * Fix diff view if file is new or deleted
+  * Fix crash of click on folder in diffview
+  * fix: show commit summary instead of whole commit message on
+    commit title
+- Add patch:
+  * 0001-Fix-build-with-libgit2-1.9.1.patch
+
 -------------------------------------------------------------------
 Tue Jun 25 10:25:53 UTC 2024 - Christophe Marin <christophe@krop.fr>
 

kommit.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package kommit
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 # Copyright (c) 2023 Matteo De Carlo
 #
 # All modifications and additions to the file contributed by third parties
@@ -22,16 +22,19 @@
 
 %bcond_without released
 Name:           kommit
-Version:        1.6.0
+Version:        1.7.1
 Release:        0
 Summary:        Graphical Git Client
 License:        GPL-3.0-only
 URL:            https://apps.kde.org/kommit
-Source0:        https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
+Source0:        https://download.kde.org/stable/%{name}/%{name}-v%{version}.tar.xz
 %if %{with released}
-Source1:        https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz.sig
+Source1:        https://download.kde.org/stable/%{name}/%{name}-v%{version}.tar.xz.sig
+# https://invent.kde.org/sysadmin/release-keyring/-/blob/master/keys/hamedmasafi@key1.asc
 Source2:        kommit.keyring
 %endif
+# PATCH-FIX-UPSTREAM
+Patch0:         0001-Fix-build-with-libgit2-1.9.1.patch
 BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}
 BuildRequires:  pkgconfig
 BuildRequires:  cmake(DolphinVcs)
@@ -59,7 +62,7 @@ Graphical Git Client
 %lang_package
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-v%{version}
 
 %build
 %cmake_kf6 -DBUILD_WITH_QT6:BOOL=TRUE
@@ -69,6 +72,9 @@ Graphical Git Client
 %install
 %kf6_install
 
+# No use
+rm -r %{buildroot}%{_includedir}/Kommit
+
 %find_lang %{name} --with-man --all-name --with-html
 
 %ldconfig_scriptlets