From 2dc8b3d0f2d5bee1aaab13627959bde5b49a2ba5 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Tue, 23 Sep 2025 15:57:54 +0200 Subject: [PATCH] fatresize: upgrade 1.1.0 -> 1.1.0-3 Drop a patch that has been incorporated in this release. Shortlog: d/control: Update maintainer email Add changelog entry for previous commit Apply wrap-and-sort -at configure: Do not add -D_FILE_OFFSET_BITS to CFLAGS Clarify changelog entry releasing package fatresize version 1.1.0-2 Ignore debian/files Bump debhelper from old 12 to 13. Build-depend on pkgconf rather than pkg-config releasing package fatresize version 1.1.0-3 Signed-off-by: Gyorgy Sarvari Signed-off-by: Khem Raj --- ...not-add-D_FILE_OFFSET_BITS-to-CFLAGS.patch | 34 ------------------- .../fatresize/fatresize_1.1.0.bb | 10 +++--- 2 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 meta-filesystems/recipes-utils/fatresize/fatresize/0001-configure-Do-not-add-D_FILE_OFFSET_BITS-to-CFLAGS.patch diff --git a/meta-filesystems/recipes-utils/fatresize/fatresize/0001-configure-Do-not-add-D_FILE_OFFSET_BITS-to-CFLAGS.patch b/meta-filesystems/recipes-utils/fatresize/fatresize/0001-configure-Do-not-add-D_FILE_OFFSET_BITS-to-CFLAGS.patch deleted file mode 100644 index d0ecdcba4e..0000000000 --- a/meta-filesystems/recipes-utils/fatresize/fatresize/0001-configure-Do-not-add-D_FILE_OFFSET_BITS-to-CFLAGS.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 69647e5d393a52ed3892eccc172ee750d6aaa45d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 30 Dec 2022 21:08:25 -0800 -Subject: [PATCH] configure: Do not add -D_FILE_OFFSET_BITS to CFLAGS - -AC_SYS_LARGEFILE macro is in use and this will add a definition for -_FILE_OFFSET_BITS in generated config.h which is already included as -first include file in fatresize.c hence its not required to be added via -CFLAGS, this also fixes a case when -D_FILE_OFFSET_BITS=64 is passed via -CC from environment, where the autoconf macros set -ac_cv_sys_file_offset_bits=no and that means we will have --D_FILE_OFFSET_BITS=no added to CFLAGS which messes up builds. - -Upstream-Status: Submitted [https://salsa.debian.org/parted-team/fatresize/-/merge_requests/3] -Signed-off-by: Khem Raj ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index d6e6cb2..4dcec28 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -29,7 +29,6 @@ AC_CHECK_FUNCS([memset strtoll]) - - # Check for LFS - AC_SYS_LARGEFILE --CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=${ac_cv_sys_file_offset_bits}" - - dnl libparted - # hack --- -2.39.0 - diff --git a/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb b/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb index 7f90bfd666..fc18b2cef8 100644 --- a/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb +++ b/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb @@ -3,12 +3,12 @@ SECTION = "console/tools" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https;branch=master \ - file://0001-build-Do-not-build-.sgml-file.patch \ - file://0001-configure-Do-not-add-D_FILE_OFFSET_BITS-to-CFLAGS.patch \ - " -SRCREV = "12da22087de2ec43f0fe5af1237389e94619c483" +PV = "1.1.0-3" +SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https;branch=master;tag=debian/${PV} \ + file://0001-build-Do-not-build-.sgml-file.patch \ + " +SRCREV = "7494fba0f14f706c17b9d89ae273efd113c944ca" DEPENDS = "parted"