diff -Nru prison-kf5-5.97.0/CMakeLists.txt prison-kf5-5.98.0/CMakeLists.txt --- prison-kf5-5.97.0/CMakeLists.txt 2022-08-07 12:24:32.000000000 +0000 +++ prison-kf5-5.98.0/CMakeLists.txt 2022-09-05 09:32:45.000000000 +0000 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.97.0") # handled by release scripts +set(KF_VERSION "5.98.0") # handled by release scripts project(prison VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.97.0 NO_MODULE) +find_package(ECM 5.98.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${ECM_MODULE_PATH}") diff -Nru prison-kf5-5.97.0/debian/changelog prison-kf5-5.98.0/debian/changelog --- prison-kf5-5.97.0/debian/changelog 2022-08-13 13:07:36.000000000 +0000 +++ prison-kf5-5.98.0/debian/changelog 2022-09-11 10:35:11.000000000 +0000 @@ -1,3 +1,9 @@ +prison-kf5 (5.98.0-0ubuntu1) kinetic; urgency=medium + + * New upstream release (5.98.0) + + -- Rik Mills Sun, 11 Sep 2022 11:35:11 +0100 + prison-kf5 (5.97.0-0ubuntu1) kinetic; urgency=medium * New upstream release (5.97.0) diff -Nru prison-kf5-5.97.0/debian/control prison-kf5-5.98.0/debian/control --- prison-kf5-5.97.0/debian/control 2022-08-13 13:07:36.000000000 +0000 +++ prison-kf5-5.98.0/debian/control 2022-09-11 10:35:11.000000000 +0000 @@ -7,7 +7,7 @@ Build-Depends: cmake (>= 3.16~), debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.97.0~), + extra-cmake-modules (>= 5.98.0~), libdmtx-dev, libqrencode-dev, libqt5sql5-sqlite, diff -Nru prison-kf5-5.97.0/.gitlab-ci.yml prison-kf5-5.98.0/.gitlab-ci.yml --- prison-kf5-5.97.0/.gitlab-ci.yml 2022-08-07 12:24:32.000000000 +0000 +++ prison-kf5-5.98.0/.gitlab-ci.yml 2022-09-05 09:32:45.000000000 +0000 @@ -8,3 +8,4 @@ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml diff -Nru prison-kf5-5.97.0/src/lib/code39barcode.cpp prison-kf5-5.98.0/src/lib/code39barcode.cpp --- prison-kf5-5.97.0/src/lib/code39barcode.cpp 2022-08-07 12:24:32.000000000 +0000 +++ prison-kf5-5.98.0/src/lib/code39barcode.cpp 2022-09-05 09:32:45.000000000 +0000 @@ -150,9 +150,12 @@ const int smallWidth = 1; Q_ASSERT(largeWidth > smallWidth); + const int quietZoneWidth = 10 * smallWidth; + // one line of the result image QVector line; - line.reserve(wide * largeWidth + narrow * smallWidth); + line.reserve(wide * largeWidth + narrow * smallWidth + 2 * quietZoneWidth); + line.insert(0, quietZoneWidth, backgroundColor().rgba()); for (int i = 0; i < barcode.size(); i++) { const QRgb color = (((i & 1) == 0) ? foregroundColor() : backgroundColor()).rgba(); // alternate between foreground and background color const int width = barcode.at(i) ? largeWidth : smallWidth; @@ -160,6 +163,7 @@ line.append(color); } } + line.insert(line.size(), quietZoneWidth, backgroundColor().rgba()); // build the complete barcode QImage ret(line.size(), 1, QImage::Format_ARGB32); diff -Nru prison-kf5-5.97.0/src/lib/code93barcode.cpp prison-kf5-5.98.0/src/lib/code93barcode.cpp --- prison-kf5-5.97.0/src/lib/code93barcode.cpp 2022-08-07 12:24:32.000000000 +0000 +++ prison-kf5-5.98.0/src/lib/code93barcode.cpp 2022-09-05 09:32:45.000000000 +0000 @@ -645,16 +645,19 @@ } const int barWidth = 1; + const int quietZoneWidth = 10 * barWidth; // build one line of the result image QVector line; - line.reserve(barWidth * barcode.size()); + line.reserve(barWidth * barcode.size() + 2 * quietZoneWidth); + line.insert(0, quietZoneWidth, backgroundColor().rgba()); for (int i = 0; i < barcode.size(); i++) { const QRgb color = (barcode.at(i) ? foregroundColor() : backgroundColor()).rgba(); for (int j = 0; j < barWidth; j++) { line.append(color); } } + line.insert(line.size(), quietZoneWidth, backgroundColor().rgba()); // build the complete barcode QImage ret(line.size(), 1, QImage::Format_ARGB32);