Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package orcania for openSUSE:Factory checked in at 2026-05-10 16:48:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/orcania (Old) and /work/SRC/openSUSE:Factory/.orcania.new.1966 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "orcania" Sun May 10 16:48:02 2026 rev:15 rq:1352214 version:2.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/orcania/orcania.changes 2023-09-21 22:15:07.547613930 +0200 +++ /work/SRC/openSUSE:Factory/.orcania.new.1966/orcania.changes 2026-05-10 16:48:31.273262767 +0200 @@ -1,0 +2,8 @@ +Sat May 9 16:08:15 UTC 2026 - Martin Hauke <[email protected]> + +- Add patch: + * 0001-Change-o_strchr-and-o_strstr-return-value-to-const-c.patch + Fix build failure with glibc 2.43 +- Use ldconfig_scriptlets macro. + +------------------------------------------------------------------- New: ---- 0001-Change-o_strchr-and-o_strstr-return-value-to-const-c.patch ----------(New B)---------- New:- Add patch: * 0001-Change-o_strchr-and-o_strstr-return-value-to-const-c.patch Fix build failure with glibc 2.43 ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orcania.spec ++++++ --- /var/tmp/diff_new_pack.umG5a2/_old 2026-05-10 16:48:32.913329887 +0200 +++ /var/tmp/diff_new_pack.umG5a2/_new 2026-05-10 16:48:32.937330869 +0200 @@ -1,8 +1,8 @@ # # spec file for package orcania # -# Copyright (c) 2023 SUSE LLC -# Copyright (c) 2018-2023, Martin Hauke <[email protected]> +# Copyright (c) 2026 SUSE LLC and contributors +# Copyright (c) 2018-2026, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ Group: Development/Languages/C and C++ URL: https://github.com/babelouest/orcania Source: https://github.com/babelouest/orcania/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: 0001-Change-o_strchr-and-o_strstr-return-value-to-const-c.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -51,21 +52,21 @@ Development and header files for orcania. %prep -%setup -q +%autosetup -p1 %build +export CFLAGS="%{optflags} -Wno-error=discarded-qualifiers" %cmake make %{?_smp_mflags} %install %cmake_install -%post -n liborcania%{sover} -p /sbin/ldconfig -%postun -n liborcania%{sover} -p /sbin/ldconfig +%ldconfig_scriptlets -n liborcania%{sover} %files -n liborcania%{sover} -%doc CHANGELOG.md README.md %license LICENSE +%doc CHANGELOG.md README.md %{_libdir}/liborcania.so.* %files devel ++++++ 0001-Change-o_strchr-and-o_strstr-return-value-to-const-c.patch ++++++ >From ee2f45b5da8b7fb2c747419c17880ccdca14521d Mon Sep 17 00:00:00 2001 From: Nicolas Mora <[email protected]> Date: Sun, 26 Apr 2026 09:37:06 -0400 Subject: [PATCH] Change o_strchr* and o_strstr* return value to const char * to fit glibc 2.43 --- include/orcania.h | 10 +++++----- src/orcania.c | 17 +++++++++-------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/orcania.h b/include/orcania.h index 4482d9e..65237ac 100644 --- a/include/orcania.h +++ b/include/orcania.h @@ -148,7 +148,7 @@ int o_strncasecmp(const char * p1, const char * p2, size_t n); * @param needle the string to search in haystack * @return the pointer to the first occurence of needle in haystack or NULL if not found */ -char * o_strstr(const char * haystack, const char * needle); +const char * o_strstr(const char * haystack, const char * needle); /** * o_strnstr @@ -158,7 +158,7 @@ char * o_strstr(const char * haystack, const char * needle); * @param len the maximum length to look for in haystack * @return the pointer to the first occurence of needle in haystack or NULL if not found */ -char * o_strnstr(const char * haystack, const char * needle, size_t len); +const char * o_strnstr(const char * haystack, const char * needle, size_t len); /** * o_strcasestr @@ -167,7 +167,7 @@ char * o_strnstr(const char * haystack, const char * needle, size_t len); * @param needle the string to search in haystack * @return the pointer to the first occurence of needle in haystack or NULL if not found */ -char * o_strcasestr(const char * haystack, const char * needle); +const char * o_strcasestr(const char * haystack, const char * needle); /** * o_strchr @@ -176,7 +176,7 @@ char * o_strcasestr(const char * haystack, const char * needle); * @param c the character to look for in haystack * @return the pointer to the first occurence of c in haystack or NULL if not found */ -char * o_strchr(const char * haystack, int c); +const char * o_strchr(const char * haystack, int c); /** * o_strnchr @@ -195,7 +195,7 @@ const char * o_strnchr(const char * haystack, size_t len, char c); * @param c the character to look for in haystack * @return the pointer to the last occurence of c in haystack or NULL if not found */ -char * o_strrchr(const char * haystack, int c); +const char * o_strrchr(const char * haystack, int c); /** * o_strrnchr diff --git a/src/orcania.c b/src/orcania.c index 8dd91a8..1dffce1 100644 --- a/src/orcania.c +++ b/src/orcania.c @@ -54,7 +54,8 @@ typedef SSIZE_T ssize_t; */ char * str_replace(const char * source, const char * str_old, const char * str_new) { - char * to_return, * ptr, * pre, * next; + char * to_return, * pre, * next; + const char * ptr; size_t len, pre_len; if (source == NULL || str_old == NULL || str_new == NULL) { @@ -248,7 +249,7 @@ int o_strncasecmp(const char * p1, const char * p2, size_t n) { } } -char * o_strstr(const char * haystack, const char * needle) { +const char * o_strstr(const char * haystack, const char * needle) { if (haystack == NULL || needle == NULL) { return NULL; } else { @@ -256,7 +257,7 @@ char * o_strstr(const char * haystack, const char * needle) { } } -char * o_strchr(const char * haystack, int c) { +const char * o_strchr(const char * haystack, int c) { if (haystack == NULL) { return NULL; } else { @@ -280,7 +281,7 @@ const char * o_strnchr(const char * haystack, size_t len, char c) { * o_strrchr * a modified strrchr function that don't crash when haystack is NULL */ -char * o_strrchr(const char * haystack, int c) { +const char * o_strrchr(const char * haystack, int c) { if (haystack == NULL) { return NULL; } else { @@ -301,7 +302,7 @@ const char * o_strrnchr(const char * haystack, size_t len, char c) { } #if defined(__linux__) || defined(__GLIBC__) || defined(_WIN32) || defined(O_STRSTR) -static char *strnstr(const char *haystack, const char *needle, size_t len) { +static const char *strnstr(const char *haystack, const char *needle, size_t len) { int i; size_t needle_len; @@ -320,7 +321,7 @@ static char *strnstr(const char *haystack, const char *needle, size_t len) { #endif #ifdef _WIN32 -static char *strcasestr(const char *haystack, const char *needle) { +static const char *strcasestr(const char *haystack, const char *needle) { size_t n; if (haystack == NULL || needle == NULL) { return NULL; @@ -335,7 +336,7 @@ static char *strcasestr(const char *haystack, const char *needle) { } #endif -char * o_strnstr(const char * haystack, const char * needle, size_t len) { +const char * o_strnstr(const char * haystack, const char * needle, size_t len) { if (haystack == NULL || needle == NULL) { return NULL; } else { @@ -343,7 +344,7 @@ char * o_strnstr(const char * haystack, const char * needle, size_t len) { } } -char * o_strcasestr(const char * haystack, const char * needle) { +const char * o_strcasestr(const char * haystack, const char * needle) { if (haystack == NULL || needle == NULL) { return NULL; } else { -- 2.54.0
