automatic version update by autodist [release 24.12.3-1mamba;Sat Mar 08 2025]

kitinerary-22.04.3-zxing-1.4.0.patch

@@ -0,0 +1,49 @@
+--- kitinerary-22.04.3/src/lib/barcodedecoder.cpp.orig	2022-07-01 21:21:06.000000000 +0200
++++ kitinerary-22.04.3/src/lib/barcodedecoder.cpp	2022-08-05 10:10:54.434176947 +0200
+@@ -15,6 +15,7 @@
+ #include <QString>
+ 
+ #ifdef HAVE_ZXING
++#define ZX_USE_UTF8 1
+ #ifdef ZXING_USE_READBARCODE
+ #include <ZXing/ReadBarcode.h>
+ #else
+@@ -244,6 +245,30 @@
+ #endif
+ 
+     if (res.isValid()) {
++#if ZXING_VERSION >= QT_VERSION_CHECK(1, 4, 0)
++        // detect content type
++        std::string zxUtf8Text;
++        if (res.contentType() == ZXing::ContentType::Text) {
++            result.contentType = Result::Any;
++            zxUtf8Text = res.text();
++            // check if the text is ASCII-only (in which case we allow access as byte array as well)
++            if (std::any_of(zxUtf8Text.begin(), zxUtf8Text.end(), [](unsigned char c) { return c > 0x7F; })) {
++                result.contentType &= ~Result::ByteArray;
++            }
++        } else {
++            result.contentType = Result::ByteArray;
++        }
++
++        // decode content
++        if (result.contentType & Result::ByteArray) {
++            QByteArray b;
++            b.resize(res.bytes().size());
++            std::copy(res.bytes().begin(), res.bytes().end(), b.begin());
++            result.content = b;
++        } else {
++            result.content = QString::fromStdString(zxUtf8Text);
++        }
++#else
+         // detect content type
+         result.contentType = Result::Any;
+         if (std::any_of(res.text().begin(), res.text().end(), [](const auto c) { return c > 255; })) {
+@@ -262,6 +287,7 @@
+         } else {
+             result.content = QString::fromStdWString(res.text());
+         }
++#endif
+         result.positive |= formatToType(res.format());
+     } else {
+         result.negative |= format;

kitinerary.spec

@@ -1,47 +1,55 @@
 %define majver %(echo %version | cut -d. -f1-2)
 
 Name:          kitinerary
-Version:       20.04.0
+Version:       24.12.3
 Release:       1mamba
-Summary:       KDE Frameworks 5 library containing itinerary data model and itinerary extraction code
+Summary:       KDE library containing itinerary data model and itinerary extraction code
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://www.kde.org
-Source:        https://download.kde.org/stable/release-service/%{version}/src/kitinerary-%{version}.tar.xz
-# Source:        http://download.kde.org/stable/frameworks/%{majver}/...-%{version}.tar.xz
+URL:           https://kde.org/
+Source:        https://download.kde.org/%{stable_kde6}/release-service/%{version}/src/kitinerary-%{version}.tar.xz
+Patch0:        kitinerary-22.04.3-zxing-1.4.0.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: ldconfig
+BuildRequires: libQt6Core
+BuildRequires: libQt6Gui
+BuildRequires: libQt6Network
 BuildRequires: libgcc
-BuildRequires: libkarchive-devel
-BuildRequires: libkcalendarcore-devel
-BuildRequires: libkcontacts-devel
-BuildRequires: libki18n-devel
+BuildRequires: libglvnd-devel
+BuildRequires: libkf6-karchive-devel
+BuildRequires: libkf6-kcalendarcore-devel
+BuildRequires: libkf6-kcodecs-devel
+BuildRequires: libkf6-kcontacts-devel
+BuildRequires: libkf6-ki18n-devel
 BuildRequires: libkmime-devel
 BuildRequires: libkpkpass-devel
+BuildRequires: libopenssl-devel
 BuildRequires: libphonenumber-devel
 BuildRequires: libpoppler-devel
-BuildRequires: libqt5-devel
 BuildRequires: libstdc++6-devel
 BuildRequires: libxml2-devel
 BuildRequires: libz-devel
 BuildRequires: libzxing-cpp-devel
+BuildRequires: qt6-qtdeclarative-devel
 ## AUTOBUILDREQ-END
+BuildRequires: libpoppler-devel >= 24.02.0-1mamba
 BuildRequires: cmake
-BuildRequires: rpm-macros-kde5
+BuildRequires: kf6-rpm-macros
 BuildRequires: extra-cmake-modules
+BuildRequires: libphonenumber-devel >= 8.13.31
+BuildRequires: libpoppler-qt5-devel >= 22.05.0
+BuildRequires: libzxing-cpp-devel >= 2.0.0
 Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 A library containing itinerary data model and itinerary extraction code.
 
 %package -n lib%{name}
 Group:         System/Libraries
-Summary:       KDE Frameworks 5 library containing itinerary data model and itinerary extraction code
+Summary:       KDE library containing itinerary data model and itinerary extraction code
 
 %description -n lib%{name}
 A library containing itinerary data model and itinerary extraction code.
@@ -54,52 +62,237 @@ Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
 %description -n lib%{name}-devel
 This package contains libraries and header files for developing applications that use %{name}.
 
-%debug_package
 
 %prep
 %setup -q
 
 %build
-%cmake_kde5 -d build
-%make
+%cmake_kf6
+%cmake_build
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall -C build
+%cmake_install
 
-%find_lang %{name}5_qt --with-qt --with-man --all-name || touch %{name}5_qt.lang
+%find_lang %{name} --with-qt --with-man --all-name || touch %{name}.lang
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-%post -n lib%{name}
-/sbin/ldconfig
-exit 0
 
-%postun -n lib%{name}
-/sbin/ldconfig
-exit 0
-
-%files -n lib%{name} -f %{name}5_qt.lang
+%files -n lib%{name} -f %{name}.lang
 %defattr(-,root,root)
-%{_libdir}/libKPimItinerary.so.*
-%{_libexecdir}/kf5/kitinerary-extractor
+%{_libdir}/libKPim6Itinerary.so.*
+%{_libexecdir}/kf6/kitinerary-extractor
 %{_datadir}/mime/packages/application-vnd-kde-itinerary.xml
-%{_datadir}/qlogging-categories5/org_kde_kitinerary.categories
-%doc COPYING.LIB
+%{_datadir}/qlogging-categories6/org_kde_kitinerary.categories
+%doc LICENSES
 
 %files -n lib%{name}-devel
 %defattr(-,root,root)
-%dir %{_includedir}/KPim/KItinerary
-%{_includedir}/KPim/KItinerary/*
-%dir %{_includedir}/KPim/kitinerary
-%{_includedir}/KPim/kitinerary/*
-%{_includedir}/KPim/kitinerary_version.h
-%dir %{_libdir}/cmake/KPimItinerary
-%{_libdir}/cmake/KPimItinerary/KPimItinerary*.cmake
-%{_libdir}/libKPimItinerary.so
+%dir %{_includedir}/KPim6/KItinerary
+%{_includedir}/KPim6/KItinerary/*
+%dir %{_includedir}/KPim6/kitinerary
+%{_includedir}/KPim6/kitinerary/*
+%{_includedir}/KPim6/kitinerary_version.h
+%{_libdir}/libKPim6Itinerary.so
+%dir %{_libdir}/cmake/KPim6Itinerary
+%{_libdir}/cmake/KPim6Itinerary/*.cmake
+%{_qt6_docdir}/KPim6Itinerary.*
 
 %changelog
+* Sat Mar 08 2025 Automatic Build System <autodist@openmamba.org> 24.12.3-1mamba
+- automatic version update by autodist
+
+* Sat Feb 08 2025 Automatic Build System <autodist@openmamba.org> 24.12.2-1mamba
+- automatic version update by autodist
+
+* Fri Jan 10 2025 Automatic Build System <autodist@openmamba.org> 24.12.1-1mamba
+- automatic version update by autodist
+
+* Fri Dec 13 2024 Automatic Build System <autodist@openmamba.org> 24.12.0-1mamba
+- automatic version update by autodist
+
+* Fri Nov 08 2024 Automatic Build System <autodist@openmamba.org> 24.08.3-1mamba
+- automatic version update by autodist
+
+* Fri Oct 11 2024 Automatic Build System <autodist@openmamba.org> 24.08.2-1mamba
+- automatic version update by autodist
+
+* Fri Sep 13 2024 Automatic Build System <autodist@openmamba.org> 24.08.1-1mamba
+- automatic version update by autodist
+
+* Sat Aug 24 2024 Automatic Build System <autodist@openmamba.org> 24.08.0-1mamba
+- automatic version update by autodist
+
+* Fri Jul 05 2024 Automatic Build System <autodist@openmamba.org> 24.05.2-1mamba
+- automatic version update by autodist
+
+* Sat Jun 15 2024 Automatic Build System <autodist@openmamba.org> 24.05.1-1mamba
+- automatic version update by autodist
+
+* Sat May 25 2024 Automatic Build System <autodist@openmamba.org> 24.05.0-1mamba
+- automatic version update by autodist
+
+* Sat Apr 13 2024 Automatic Build System <autodist@openmamba.org> 24.02.2-1mamba
+- automatic version update by autodist
+
+* Sat Mar 23 2024 Automatic Build System <autodist@openmamba.org> 24.02.1-1mamba
+- automatic version update by autodist
+
+* Sat Mar 02 2024 Automatic Build System <autodist@openmamba.org> 24.02.0-1mamba
+- automatic version update by autodist
+
+* Sun Feb 25 2024 Automatic Build System <autodist@mambasoft.it> 23.08.5-2mamba
+- rebuilt by autoport with build requirements: libpoppler-devel>=24.02.0-1mamba
+
+* Sat Feb 17 2024 Automatic Build System <autodist@openmamba.org> 23.08.5-1mamba
+- automatic version update by autodist
+
+* Fri Dec 08 2023 Automatic Build System <autodist@mambasoft.it> 23.08.4-1mamba
+- automatic version update by autodist
+
+* Sat Nov 11 2023 Automatic Build System <autodist@mambasoft.it> 23.08.3-1mamba
+- automatic version update by autodist
+
+* Sun Oct 15 2023 Automatic Build System <autodist@mambasoft.it> 23.08.2-1mamba
+- automatic version update by autodist
+
+* Fri Sep 15 2023 Automatic Build System <autodist@mambasoft.it> 23.08.1-1mamba
+- automatic version update by autodist
+
+* Sat Aug 26 2023 Automatic Build System <autodist@mambasoft.it> 23.08.0-1mamba
+- automatic version update by autodist
+
+* Sat Jul 08 2023 Automatic Build System <autodist@mambasoft.it> 23.04.3-1mamba
+- automatic version update by autodist
+
+* Sat Jun 10 2023 Automatic Build System <autodist@mambasoft.it> 23.04.2-1mamba
+- automatic version update by autodist
+
+* Fri May 12 2023 Automatic Build System <autodist@mambasoft.it> 23.04.1-1mamba
+- automatic version update by autodist
+
+* Thu Apr 27 2023 Automatic Build System <autodist@mambasoft.it> 23.04.0-1mamba
+- automatic version update by autodist
+
+* Sat Mar 04 2023 Automatic Build System <autodist@mambasoft.it> 22.12.3-1mamba
+- automatic version update by autodist
+
+* Sat Feb 04 2023 Automatic Build System <autodist@mambasoft.it> 22.12.2-1mamba
+- automatic version update by autodist
+
+* Sun Jan 22 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 22.12.1-2mamba
+- rebuilt with zxing-cpp 2.0.0
+
+* Fri Jan 06 2023 Automatic Build System <autodist@mambasoft.it> 22.12.1-1mamba
+- automatic version update by autodist
+
+* Fri Dec 09 2022 Automatic Build System <autodist@mambasoft.it> 22.12.0-1mamba
+- automatic version update by autodist
+
+* Sat Nov 05 2022 Automatic Build System <autodist@mambasoft.it> 22.08.3-1mamba
+- automatic version update by autodist
+
+* Sat Oct 15 2022 Automatic Build System <autodist@mambasoft.it> 22.08.2-1mamba
+- automatic version update by autodist
+
+* Fri Sep 09 2022 Automatic Build System <autodist@mambasoft.it> 22.08.1-1mamba
+- automatic version update by autodist
+
+* Sun Aug 21 2022 Automatic Build System <autodist@mambasoft.it> 22.08.0-1mamba
+- automatic version update by autodist
+
+* Fri Aug 05 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 22.04.3-2mamba
+- added upstream patch to fix crash with zxing-cpp 1.4.0
+
+* Fri Jul 08 2022 Automatic Build System <autodist@mambasoft.it> 22.04.3-1mamba
+- automatic version update by autodist
+
+* Sat Jun 11 2022 Automatic Build System <autodist@mambasoft.it> 22.04.2-1mamba
+- automatic version update by autodist
+
+* Tue Jun 07 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 22.04.1-2mamba
+- rebuilt by autoport with build requirements: libpoppler-devel>=22.06.0-1mamba
+
+* Sun May 15 2022 Automatic Build System <autodist@mambasoft.it> 22.04.1-1mamba
+- automatic version update by autodist
+
+* Sun May 08 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 22.04.0-2mamba
+- rebuilt with poppler 22.05.0
+
+* Mon Apr 25 2022 Automatic Build System <autodist@mambasoft.it> 22.04.0-1mamba
+- automatic version update by autodist
+
+* Fri Mar 04 2022 Automatic Build System <autodist@mambasoft.it> 21.12.3-1mamba
+- automatic version update by autodist
+
+* Sun Feb 06 2022 Automatic Build System <autodist@mambasoft.it> 21.12.2-1mamba
+- automatic version update by autodist
+
+* Fri Jan 07 2022 Automatic Build System <autodist@mambasoft.it> 21.12.1-1mamba
+- automatic version update by autodist
+
+* Sat Dec 11 2021 Automatic Build System <autodist@mambasoft.it> 21.12.0-1mamba
+- automatic version update by autodist
+
+* Sat Nov 06 2021 Automatic Build System <autodist@mambasoft.it> 21.08.3-1mamba
+- automatic version update by autodist
+
+* Sat Oct 09 2021 Automatic Build System <autodist@mambasoft.it> 21.08.2-1mamba
+- automatic version update by autodist
+
+* Fri Sep 03 2021 Automatic Build System <autodist@mambasoft.it> 21.08.1-1mamba
+- automatic version update by autodist
+
+* Mon Aug 16 2021 Automatic Build System <autodist@mambasoft.it> 21.08.0-1mamba
+- automatic version update by autodist
+
+* Fri Jul 09 2021 Automatic Build System <autodist@mambasoft.it> 21.04.3-1mamba
+- automatic version update by autodist
+
+* Thu Jun 17 2021 Automatic Build System <autodist@mambasoft.it> 21.04.2-1mamba
+- automatic version update by autodist
+
+* Sat May 15 2021 Automatic Build System <autodist@mambasoft.it> 21.04.1-1mamba
+- automatic version update by autodist
+
+* Fri Apr 23 2021 Automatic Build System <autodist@mambasoft.it> 21.04.0-1mamba
+- automatic version update by autodist
+
+* Fri Mar 19 2021 Automatic Build System <autodist@mambasoft.it> 20.12.3-1mamba
+- automatic version update by autodist
+
+* Sat Feb 06 2021 Automatic Build System <autodist@mambasoft.it> 20.12.2-1mamba
+- automatic version update by autodist
+
+* Fri Jan 08 2021 Automatic Build System <autodist@mambasoft.it> 20.12.1-1mamba
+- automatic version update by autodist
+
+* Sat Dec 19 2020 Automatic Build System <autodist@mambasoft.it> 20.12.0-1mamba
+- automatic version update by autodist
+
+* Sat Nov 07 2020 Automatic Build System <autodist@mambasoft.it> 20.08.3-1mamba
+- automatic version update by autodist
+
+* Sat Oct 10 2020 Automatic Build System <autodist@mambasoft.it> 20.08.2-1mamba
+- automatic version update by autodist
+
+* Fri Sep 04 2020 Automatic Build System <autodist@mambasoft.it> 20.08.1-1mamba
+- automatic version update by autodist
+
+* Sat Aug 22 2020 Automatic Build System <autodist@mambasoft.it> 20.08.0-1mamba
+- automatic version update by autodist
+
+* Sun Jul 12 2020 Automatic Build System <autodist@mambasoft.it> 20.04.3-1mamba
+- automatic version update by autodist
+
+* Sun Jun 14 2020 Automatic Build System <autodist@mambasoft.it> 20.04.2-1mamba
+- automatic version update by autodist
+
+* Sat May 16 2020 Automatic Build System <autodist@mambasoft.it> 20.04.1-1mamba
+- automatic version update by autodist
+
 * Sat Apr 25 2020 Automatic Build System <autodist@mambasoft.it> 20.04.0-1mamba
 - automatic version update by autodist