automatic version update by autodist [release 1.11.0-1mamba;Thu Apr 25 2024]
This commit is contained in:
parent
0ca27565b8
commit
24caf2820c
@ -1,10 +0,0 @@
|
||||
--- 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 <stdlib.h>
|
||||
#include <type_traits>
|
||||
+#include <limits>
|
||||
|
||||
#include <QtGlobal>
|
||||
|
60
kdiff3.spec
60
kdiff3.spec
@ -1,5 +1,5 @@
|
||||
Name: kdiff3
|
||||
Version: 1.10.7
|
||||
Version: 1.11.0
|
||||
Release: 1mamba
|
||||
Summary: A graphical text difference analyzer for up to 3 input files
|
||||
Group: Graphical Desktop/Applications/Development
|
||||
@ -8,32 +8,27 @@ Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
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
|
||||
BuildRequires: libkcompletion-devel
|
||||
BuildRequires: libkconfig-devel
|
||||
BuildRequires: libkconfigwidgets-devel
|
||||
BuildRequires: libkcoreaddons-devel
|
||||
BuildRequires: libkcrash-devel
|
||||
BuildRequires: libki18n-devel
|
||||
BuildRequires: libkio-devel
|
||||
BuildRequires: libkjobwidgets-devel
|
||||
BuildRequires: libkparts-devel
|
||||
BuildRequires: libkservice-devel
|
||||
BuildRequires: libktextwidgets-devel
|
||||
BuildRequires: libkwidgetsaddons-devel
|
||||
BuildRequires: libkwindowsystem-devel
|
||||
BuildRequires: libkxmlgui-devel
|
||||
BuildRequires: libsolid-devel
|
||||
BuildRequires: libsonnet-devel
|
||||
BuildRequires: libglvnd-devel
|
||||
BuildRequires: libkf6-kcolorscheme-devel
|
||||
BuildRequires: libkf6-kcompletion-devel
|
||||
BuildRequires: libkf6-kconfig-devel
|
||||
BuildRequires: libkf6-kconfigwidgets-devel
|
||||
BuildRequires: libkf6-kcoreaddons-devel
|
||||
BuildRequires: libkf6-kcrash-devel
|
||||
BuildRequires: libkf6-ki18n-devel
|
||||
BuildRequires: libkf6-kio-devel
|
||||
BuildRequires: libkf6-kjobwidgets-devel
|
||||
BuildRequires: libkf6-kservice-devel
|
||||
BuildRequires: libkf6-kwidgetsaddons-devel
|
||||
BuildRequires: libkf6-kxmlgui-devel
|
||||
BuildRequires: libkf6-solid-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
BuildRequires: qt6-qt5compat-devel
|
||||
BuildRequires: qt6-qtbase-devel
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRequires: cmake
|
||||
BuildRequires: desktop-file-utils
|
||||
@ -59,15 +54,15 @@ KDiff3 is a program that:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
#%patch0 -p1
|
||||
|
||||
%build
|
||||
%cmake_kde5 -d build
|
||||
%make
|
||||
%cmake_kf6
|
||||
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
%makeinstall -C build
|
||||
%cmake_install
|
||||
|
||||
%find_lang %{name} --all-name --with-html --with-man
|
||||
|
||||
@ -77,21 +72,18 @@ KDiff3 is a program that:
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/kdiff3
|
||||
%{_libdir}/qt5/plugins/kf5/kfileitemaction/kdiff3fileitemaction.so
|
||||
%{_libdir}/qt5/plugins/kf5/parts/kdiff3part.so
|
||||
%{_kf6_plugindir}/kfileitemaction/kdiff3fileitemaction.so
|
||||
%{_datadir}/applications/org.kde.kdiff3.desktop
|
||||
%{_datadir}/metainfo/org.kde.kdiff3.appdata.xml
|
||||
%{_datadir}/kservices5/kdiff3part.desktop
|
||||
%dir %{_datadir}/kxmlgui5/kdiff3
|
||||
%{_datadir}/kxmlgui5/kdiff3/kdiff3_shell.rc
|
||||
%dir %{_datadir}/kxmlgui5/kdiff3part
|
||||
%{_datadir}/kxmlgui5/kdiff3part/kdiff3_part.rc
|
||||
%{_datadir}/icons/hicolor/*/apps/kdiff3.png
|
||||
%{_datadir}/icons/hicolor/scalable/apps/kdiff3.svgz
|
||||
%{_mandir}/man1/kdiff3.1*
|
||||
%doc AUTHORS COPYING
|
||||
%doc COPYING
|
||||
|
||||
%changelog
|
||||
* Thu Apr 25 2024 Automatic Build System <autodist@openmamba.org> 1.11.0-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Mon Dec 11 2023 Automatic Build System <autodist@mambasoft.it> 1.10.7-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user