Christophe Marin 2023-03-20 08:51:55 +00:00 committed by Git OBS Bridge
parent 4b7d146e3b
commit 2bb23fed76
7 changed files with 52 additions and 71 deletions

View File

@ -1,30 +0,0 @@
From 0ef772c3e0ff8f049f299ad14b3c65327e4fe69e Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sun, 11 Dec 2022 13:29:11 +0000
Subject: [PATCH] asn1: Fix build with GCC 13 (add missing <cstdint> include)
GCC 13 (as usual for new compiler releases) shuffles around some
internal includes and so <cstdint> is no longer transitively included.
Explicitly include <cstdint> for uint8_t.
Bug: https://bugs.gentoo.org/885423
---
src/lib/asn1/bitvectorview.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/asn1/bitvectorview.h b/src/lib/asn1/bitvectorview.h
index 5a4da315..f924a1fe 100644
--- a/src/lib/asn1/bitvectorview.h
+++ b/src/lib/asn1/bitvectorview.h
@@ -8,6 +8,7 @@
#include <bitset>
#include <cassert>
+#include <cstdint>
#include <string_view>
#include <type_traits>
--
2.39.2

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmP9SJ8ACgkQu0YzUNbv
Me+jbw//XfM19oTM5FDu+A568A09lLra1QgiSitHxBS9yLwx167s354Wim6fJA+B
8Jh3Q3IAp/97JicYQ4OyGQ8kMm/ChWpKowDRiRsBr0VQMCwkK46XcbFFV2NMLJt3
ktegjQF27vDljFBr4AzAwPZcuxIhiE6FMT8lc991gKDThD2yGFtCjpeoLSYrhpxS
eSGqkRirAac/xAtV0ySrRHIXRO34LDOmiQ2gS0fj9QlF2joMOAEjmQs8pEj9VTT8
/JQXQ+50nqTKMOKYTWxp+JUPmz0kiy+oP1+TrGYZo7BL2wSN8iZjzHFmmz16oLrm
5ymJ/7fiZGN2oGklCA9wj/JXEa2m4vnE2HmmxB7jBqLD9QJoajJsfcoNHiTNd7WI
Txs/IGHk0EERDEGdtxvWLu8LuARjpN+QY9V5l51NoUkYuEkFy59ZHgDhHemVtEND
741Jpps1Nj+Pvh0InwF8T+JwG8G7KMgkNZ/yqnv1KPHkBo4neAKv8iSEK/x6f9+M
RqF4HdMRrpgOwcUDaJcCe5NNaqxdoiHt/RekGCydHdk884TihyzYTlXaRLg99sHW
ReuNvSTyLSN6lsDOIWKqujUmoxhsbPwW7FCkWd9F8NKAf1DXgLkgeXAx5qkmRv/r
renO5sHqjRPjdhyffA8RSGDNnK2wxRbjpIXQ4pEljmmEbDMk+ns=
=/2/d
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmQUHEwACgkQOmpNuDnq
ptfzZA//f6saGxj/UOLNVPrA0SpzRvIRqhSzbI9CfUB+/eZWicE8iK0DQ/OqqGa2
4EzSLxpRnEjwilasyFvSXo0T5OQQSgGz4DG8mLImP0DnpYMPp3JfFWaWBrePqAD6
N2KsDq9T3juSUq+mjjEjQmqR6Hkg1YeDG9CWt2RNXWHcC+/V48ukxD3jPoiIUtGW
adXt6hj6+Sx8NULX/KC9dlL3dQlY1EeF8zh8nMsBYlgxM/8YxI+CYLoj28IpXNtB
5gf2LOqN7kj2sUrk2PU4D/ym8L6cF//UeWsKawV3UTcv7303WrUyaecHecNEB9B9
zL3iyHmB6EysDR3z+yfYSKsDUmVCK769t94242HqWQyGsIotiYi2200I7WzmhDaJ
tzE1gzewRIjd3+PSa+7oSVebQVxYCSQlyAvKFmVc51tXrqgKylf0+R+P+XO2/vMm
Fx8P0uZpYl8q9Dnox+ggAzbAUbXZPkCnt1z8h2zjmMr2h+teo9icyEChiL1OD9lj
JZpeuGy2DgInTL+CW7+pBlyxfRdYHSYxAz2lWvjQ26/ciuGQHGD5BHWY5DSY3yho
SIElLMhBafqkkQj17edyG1H/6ZdeNl9RcjTWIRSKio/Yr6RMXPrE3NV+caFxqKnX
yMh0iEcC4tybFU1r5Ma7RFXWQxrTET+cboKGhfTV/NQ4sde6fTs=
=GX2v
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Mar 17 20:43:39 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Update to 23.03.80
* New feature release
- Drop patch, merged upstream:
* 0001-asn1-Fix-build-with-GCC-13-add-missing-cstdint-inclu.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 28 09:46:08 UTC 2023 - Christophe Marin <christophe@krop.fr> Tue Feb 28 09:46:08 UTC 2023 - Christophe Marin <christophe@krop.fr>

View File

@ -16,20 +16,19 @@
# #
%define libname libKPimItinerary5
%bcond_without released %bcond_without released
Name: kitinerary Name: kitinerary
Version: 22.12.3 Version: 23.03.80
Release: 0 Release: 0
Summary: Data model and extraction system for travel reservations Summary: Data model and extraction system for travel reservations
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
URL: https://www.kde.org URL: https://www.kde.org
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
%if %{with released} %if %{with released}
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
Source2: applications.keyring Source2: applications.keyring
%endif %endif
# PATCH-FIX-UPSTREAM
Patch0: 0001-asn1-Fix-build-with-GCC-13-add-missing-cstdint-inclu.patch
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem
%if 0%{?suse_version} == 1500 %if 0%{?suse_version} == 1500
@ -46,42 +45,45 @@ BuildRequires: cmake(KF5CalendarCore)
BuildRequires: cmake(KF5Contacts) BuildRequires: cmake(KF5Contacts)
BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5Mime) BuildRequires: cmake(KF5Mime)
BuildRequires: cmake(KPimPkPass) BuildRequires: cmake(KPim5PkPass)
BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5Qml) BuildRequires: cmake(Qt5Qml)
BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Test)
BuildRequires: cmake(ZXing) BuildRequires: cmake(ZXing)
Requires: libKPimItinerary5 = %{version} Requires: libKPim5Itinerary5 = %{version}
%description %description
Kitinerary is a library which provides a data model and a system to extract information Kitinerary is a library which provides a data model and a system to extract information
from travel reservations. The model can then be reused in other applications. from travel reservations. The model can then be reused in other applications.
%package -n libKPimItinerary5 %package -n libKPim5Itinerary5
Summary: Data model and extraction system for travel reservations Summary: Data model and extraction system for travel reservations
Recommends: %{name} Recommends: %{name}
Recommends: libKPimItinerary5-lang # Renamed
Obsoletes: libKPimItinerary5-lang
Provides: libKPimItinerary5 = %{version}
Obsoletes: libKPimItinerary5 < %{version}
%description -n libKPimItinerary5 %description -n libKPim5Itinerary5
Kitinerary is a library which provides a data model and a system to extract information Kitinerary is a library which provides a data model and a system to extract information
from travel reservations. The model can then be reused in other applications. from travel reservations. The model can then be reused in other applications.
This package contains the library itself. This package contains the library itself.
%package devel %package devel
Summary: Development files for kitinerary Summary: Development files for kitinerary
Requires: libKPimItinerary5 = %{version} Requires: libKPim5Itinerary5 = %{version}
Requires: libqt5-qtdeclarative-private-headers-devel Requires: libqt5-qtdeclarative-private-headers-devel
Requires: cmake(KF5CalendarCore) Requires: cmake(KF5CalendarCore)
Requires: cmake(KF5Contacts) Requires: cmake(KF5Contacts)
Requires: cmake(KF5Mime) Requires: cmake(KF5Mime)
Requires: cmake(KPimPkPass) Requires: cmake(KPim5PkPass)
Requires: cmake(Qt5Gui) Requires: cmake(Qt5Gui)
%description devel %description devel
This package contains all necessary include files and libraries needed This package contains all necessary include files and libraries needed
to build programs that use the kitinerary library. to build programs that use the kitinerary library.
%lang_package -n libKPimItinerary5 %lang_package -n libKPim5Itinerary5
%prep %prep
%autosetup -p1 %autosetup -p1
@ -102,25 +104,26 @@ export CXX=g++-10
%check %check
%ctest %ctest
%ldconfig_scriptlets -n libKPimItinerary5 %ldconfig_scriptlets -n libKPim5Itinerary5
%files %files
%{_kf5_libexecdir}/kitinerary-extractor %{_kf5_libexecdir}/kitinerary-extractor
%{_kf5_sharedir}/mime/packages/application-vnd-kde-itinerary.xml %{_kf5_sharedir}/mime/packages/application-vnd-kde-itinerary.xml
%files -n libKPimItinerary5 %files -n libKPim5Itinerary5
%license LICENSES/* %license LICENSES/*
%{_kf5_debugdir}/*.categories %{_kf5_debugdir}/*.categories
%{_kf5_libdir}/libKPimItinerary.so.* %{_kf5_libdir}/libKPim5Itinerary.so.*
%files devel %files devel
%dir %{_includedir}/KPim/ %dir %{_includedir}/KPim5/
%{_includedir}/KPim/KItinerary/ %{_includedir}/KPim5/KItinerary/
%{_includedir}/KPim/kitinerary/ %{_includedir}/KPim5/kitinerary/
%{_includedir}/KPim/kitinerary_version.h %{_includedir}/KPim5/kitinerary_version.h
%{_kf5_cmakedir}/KPimItinerary/ %{_kf5_cmakedir}/KPimItinerary/
%{_kf5_libdir}/libKPimItinerary.so %{_kf5_cmakedir}/KPim5Itinerary/
%{_kf5_libdir}/libKPim5Itinerary.so
%files -n libKPimItinerary5-lang -f %{name}.lang %files -n libKPim5Itinerary5-lang -f %{name}.lang
%changelog %changelog