From 76b4b19a342075780ccb0ff63275a7ff0d4c7478 Mon Sep 17 00:00:00 2001 From: Andreas Cord-Landwehr Date: Mon, 20 Jan 2025 21:16:17 +0100 Subject: [PATCH] kopeninghours: remove merged patch --- recipes-application/pim/kopeninghours.inc | 2 - .../0001-Fix-reproducible-builds.patch | 38 ------------------- 2 files changed, 40 deletions(-) delete mode 100644 recipes-application/pim/kopeninghours/0001-Fix-reproducible-builds.patch diff --git a/recipes-application/pim/kopeninghours.inc b/recipes-application/pim/kopeninghours.inc index 57f2a3c..bceae8d 100644 --- a/recipes-application/pim/kopeninghours.inc +++ b/recipes-application/pim/kopeninghours.inc @@ -9,8 +9,6 @@ LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSES/LGPL-2.0-or-later.txt;md5=6d2d9952d88b50a51a5c73dc431d06c7" PR = "r0" -SRC_URI:append = " file://0001-Fix-reproducible-builds.patch" - DEPENDS += " \ qtbase \ kholidays \ diff --git a/recipes-application/pim/kopeninghours/0001-Fix-reproducible-builds.patch b/recipes-application/pim/kopeninghours/0001-Fix-reproducible-builds.patch deleted file mode 100644 index 5675fef..0000000 --- a/recipes-application/pim/kopeninghours/0001-Fix-reproducible-builds.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6bbff155485af7aefd34133f2e2fa70c3f6e785b Mon Sep 17 00:00:00 2001 -From: Andreas Cord-Landwehr -Date: Mon, 4 Nov 2024 18:26:27 +0100 -Subject: [PATCH] Fix reproducible builds - -Do not generate absolute file names into headers - -Upstream-Status: Backport [https://invent.kde.org/libraries/kopeninghours/-/merge_requests/116] - -SPDX-FileCopyrightText: Andreas Cord-Landwehr -SPDX-License-Identifier: MIT -Signed-off-by: Andreas Cord-Landwehr ---- - src/lib/CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt -index 920f8b0..a05f11e 100644 ---- a/src/lib/CMakeLists.txt -+++ b/src/lib/CMakeLists.txt -@@ -6,12 +6,13 @@ flex_target(openinghoursscanner - openinghourslexer.l - ${CMAKE_CURRENT_BINARY_DIR}/openinghourslexer.cpp - DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/openinghoursscanner_p.h -- COMPILE_FLAGS "--nounistd" -+ COMPILE_FLAGS "--nounistd --noline" - ) - bison_target(openinghoursparser - openinghoursparser.y - ${CMAKE_CURRENT_BINARY_DIR}/openinghoursparser.cpp - DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/openinghoursparser_p.h -+ COMPILE_FLAGS "--no-lines" - ) - add_flex_bison_dependency(openinghoursscanner openinghoursparser) - set_source_files_properties(${BISON_openinghoursparser_OUTPUTS} ${FLEX_openinghoursscanner_OUTPUTS} PROPERTIES SKIP_AUTOMOC ON) --- -2.43.0 -