From 4ee15514b67616d1428f9fe93b0874e74cac4dbb Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 01:19:31 +0100 Subject: [PATCH] update to 1.9.2 [release 1.9.2-1mamba;Thu May 20 2021] --- kdiff3-1.9.2-include-limits.patch | 10 ++++++++++ kdiff3.spec | 14 ++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 kdiff3-1.9.2-include-limits.patch diff --git a/kdiff3-1.9.2-include-limits.patch b/kdiff3-1.9.2-include-limits.patch new file mode 100644 index 0000000..925a0b0 --- /dev/null +++ b/kdiff3-1.9.2-include-limits.patch @@ -0,0 +1,10 @@ +--- kdiff3-1.9.2/src/TypeUtils.h.orig 2022-09-27 12:24:49.310035932 +0200 ++++ kdiff3-1.9.2/src/TypeUtils.h 2022-09-27 12:29:03.354625366 +0200 +@@ -9,6 +9,7 @@ + + #include + #include ++#include + + #include + diff --git a/kdiff3.spec b/kdiff3.spec index f9a2c2b..87cace7 100644 --- a/kdiff3.spec +++ b/kdiff3.spec @@ -1,16 +1,18 @@ Name: kdiff3 -Version: 1.9.0 +Version: 1.9.2 Release: 1mamba Summary: A graphical text difference analyzer for up to 3 input files Group: Graphical Desktop/Applications/Development Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: https://kdiff3.sourceforge.net/ +URL: https://apps.kde.org/kdiff3/ Source: https://download.kde.org/stable/kdiff3/kdiff3-%{version}.tar.xz +Patch0: kdiff3-1.9.2-include-limits.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libX11-devel BuildRequires: libgcc BuildRequires: libkauth-devel BuildRequires: libkcodecs-devel @@ -20,7 +22,6 @@ BuildRequires: libkconfigwidgets-devel BuildRequires: libkcoreaddons-devel BuildRequires: libkcrash-devel BuildRequires: libki18n-devel -BuildRequires: libkiconthemes-devel BuildRequires: libkio-devel BuildRequires: libkjobwidgets-devel BuildRequires: libkparts-devel @@ -29,9 +30,10 @@ BuildRequires: libktextwidgets-devel BuildRequires: libkwidgetsaddons-devel BuildRequires: libkwindowsystem-devel BuildRequires: libkxmlgui-devel -BuildRequires: libqt5-devel +BuildRequires: libsolid-devel BuildRequires: libsonnet-devel BuildRequires: libstdc++6-devel +BuildRequires: qt5-qtbase-devel ## AUTOBUILDREQ-END BuildRequires: cmake BuildRequires: desktop-file-utils @@ -57,6 +59,7 @@ KDiff3 is a program that: %prep %setup -q +%patch0 -p1 %build %cmake_kde5 -d build @@ -89,6 +92,9 @@ KDiff3 is a program that: %doc AUTHORS COPYING %changelog +* Thu May 20 2021 Silvan Calarco 1.9.2-1mamba +- update to 1.9.2 + * Tue May 04 2021 Automatic Build System 1.9.0-1mamba - automatic version update by autodist