Control: tags 957764 + patch Control: tags 957764 + pending Dear maintainer,
I've prepared an NMU for rmlint (versioned as 2.9.0-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. -- Regards Sudip diff -Nru rmlint-2.9.0/debian/changelog rmlint-2.9.0/debian/changelog --- rmlint-2.9.0/debian/changelog 2019-12-31 22:27:25.000000000 +0000 +++ rmlint-2.9.0/debian/changelog 2020-08-20 20:43:54.000000000 +0100 @@ -1,3 +1,11 @@ +rmlint (2.9.0-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix ftbfs with GCC-10. (Closes: #957764) + - Use upstream patch, thanks to Reiner Herrmann. + + -- Sudip Mukherjee <sudipm.mukher...@gmail.com> Thu, 20 Aug 2020 20:43:54 +0100 + rmlint (2.9.0-2) unstable; urgency=medium * Replace glib-2_62.patch with upstream implementation, which diff -Nru rmlint-2.9.0/debian/patches/0001-fix-link-error-on-compilers-with-fno-common-enabled.patch rmlint-2.9.0/debian/patches/0001-fix-link-error-on-compilers-with-fno-common-enabled.patch --- rmlint-2.9.0/debian/patches/0001-fix-link-error-on-compilers-with-fno-common-enabled.patch 1970-01-01 01:00:00.000000000 +0100 +++ rmlint-2.9.0/debian/patches/0001-fix-link-error-on-compilers-with-fno-common-enabled.patch 2020-08-20 19:57:16.000000000 +0100 @@ -0,0 +1,96 @@ +From df26dc408e78c27b8119ad06b9998fd07d6c659f Mon Sep 17 00:00:00 2001 +From: Chris Pahl <sa...@online.de> +Date: Sun, 2 Feb 2020 13:38:53 +0100 +Subject: [PATCH] fix link error on compilers with -fno-common enabled + +--- + +upstream link: https://github.com/sahib/rmlint/commit/df26dc408e78c27b8119ad06b9998fd07d6c659f + + lib/config.h.in | 62 ++++++++++++++++++++++++++----------------------- + 1 file changed, 33 insertions(+), 29 deletions(-) + +diff --git a/lib/config.h.in b/lib/config.h.in +index 44d7e5d9..d9fdeabd 100644 +--- a/lib/config.h.in ++++ b/lib/config.h.in +@@ -121,9 +121,13 @@ + # define N_(String) gettext_noop (String) + #endif + +-GMutex RM_LOG_MTX; ++static inline GMutex* rm_log_get_mutex(void) {{ ++ static GMutex RM_LOG_MTX; ++ return &RM_LOG_MTX; ++}} + +-#define RM_LOG_INIT g_mutex_init(&RM_LOG_MTX); ++#define RM_LOG_INIT \ ++ g_mutex_init(rm_log_get_mutex()); + + typedef guint64 RmOff; + +@@ -150,33 +154,33 @@ typedef guint64 RmOff; + + /////////////// + +-#define rm_log_error_line(...) \ +- g_mutex_lock(&RM_LOG_MTX); \ +- rm_log_error_prefix() \ +- rm_log_error(__VA_ARGS__); \ +- rm_log_error("\n"); \ +- g_mutex_unlock(&RM_LOG_MTX); \ +- +-#define rm_log_warning_line(...) \ +- g_mutex_lock(&RM_LOG_MTX); \ +- rm_log_warning_prefix() \ +- rm_log_warning(__VA_ARGS__); \ +- rm_log_warning("\n"); \ +- g_mutex_unlock(&RM_LOG_MTX); \ +- +-#define rm_log_info_line(...) \ +- g_mutex_lock(&RM_LOG_MTX); \ +- rm_log_info_prefix() \ +- rm_log_warning(__VA_ARGS__); \ +- rm_log_warning("\n"); \ +- g_mutex_unlock(&RM_LOG_MTX); \ +- +-#define rm_log_debug_line(...) \ +- g_mutex_lock(&RM_LOG_MTX); \ +- rm_log_debug_prefix() \ +- rm_log_debug(__VA_ARGS__); \ +- rm_log_debug("\n"); \ +- g_mutex_unlock(&RM_LOG_MTX); \ ++#define rm_log_error_line(...) \ ++ g_mutex_lock(rm_log_get_mutex()); \ ++ rm_log_error_prefix() \ ++ rm_log_error(__VA_ARGS__); \ ++ rm_log_error("\n"); \ ++ g_mutex_unlock(rm_log_get_mutex()); \ ++ ++#define rm_log_warning_line(...) \ ++ g_mutex_lock(rm_log_get_mutex()); \ ++ rm_log_warning_prefix() \ ++ rm_log_warning(__VA_ARGS__); \ ++ rm_log_warning("\n"); \ ++ g_mutex_unlock(rm_log_get_mutex()); \ ++ ++#define rm_log_info_line(...) \ ++ g_mutex_lock(rm_log_get_mutex()); \ ++ rm_log_info_prefix() \ ++ rm_log_warning(__VA_ARGS__); \ ++ rm_log_warning("\n"); \ ++ g_mutex_unlock(rm_log_get_mutex()); \ ++ ++#define rm_log_debug_line(...) \ ++ g_mutex_lock(rm_log_get_mutex()); \ ++ rm_log_debug_prefix() \ ++ rm_log_debug(__VA_ARGS__); \ ++ rm_log_debug("\n"); \ ++ g_mutex_unlock(rm_log_get_mutex()); \ + + /* Domain for reporting errors. Needed by GOptions */ + #define RM_ERROR_QUARK (g_quark_from_static_string("rmlint")) +-- +2.20.1 + diff -Nru rmlint-2.9.0/debian/patches/series rmlint-2.9.0/debian/patches/series --- rmlint-2.9.0/debian/patches/series 2019-12-31 10:07:39.000000000 +0000 +++ rmlint-2.9.0/debian/patches/series 2020-08-20 19:57:16.000000000 +0100 @@ -6,3 +6,4 @@ xattr-fixes.patch python3.8.patch glib-2_62.patch +0001-fix-link-error-on-compilers-with-fno-common-enabled.patch
