public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/libkkc] rawhide: Workaround for girscanner with gcc16 -latomic_asneeded
Date: Mon, 03 Aug 2026 14:49:56 GMT	[thread overview]
Message-ID: <178576859681.1.3167109824669397963.rpms-libkkc-44eb9d8905e5@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/libkkc
Branch : rawhide
Commit : 44eb9d8905e5650479d78048af84bc41bcef4796
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date   : 2026-07-30T16:04:05+09:00
Stats  : +19/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/libkkc/c/44eb9d8905e5650479d78048af84bc41bcef4796?branch=rawhide

Log:
Workaround for girscanner with gcc16 -latomic_asneeded

---
diff --git a/libkkc-0.3.5-girscanner-gcc16-workaround.patch b/libkkc-0.3.5-girscanner-gcc16-workaround.patch
new file mode 100644
index 0000000..08487ec
--- /dev/null
+++ b/libkkc-0.3.5-girscanner-gcc16-workaround.patch
@@ -0,0 +1,12 @@
+--- libkkc-0.3.5/marisa-glib/Makefile.am.gcc16	2014-12-19 11:40:01.000000000 +0900
++++ libkkc-0.3.5/marisa-glib/Makefile.am	2026-07-30 15:30:37.801999323 +0900
+@@ -37,7 +37,8 @@ INTROSPECTION_SCANNER_ARGS = --add-inclu
+ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+ 
+ Marisa.gir: libmarisa-glib.la
+-Marisa_gir_SCANNERFLAGS = --pkg-export=marisa-glib --pkg=marisa --namespace=Marisa $(MARISA_GLIB_STATIC_DEPENDENCIES)
++MARISA_GLIB_STATIC_DEPENDENCIES_1	= $(shell echo $(MARISA_GLIB_STATIC_DEPENDENCIES) | sed -e 's/-latomic_asneeded//')
++Marisa_gir_SCANNERFLAGS = --pkg-export=marisa-glib --pkg=marisa --namespace=Marisa $(MARISA_GLIB_STATIC_DEPENDENCIES_1)
+ Marisa_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0
+ Marisa_gir_CFLAGS = $(libmarisa_glib_la_CFLAGS)
+ Marisa_gir_LIBS = libmarisa-glib.la

diff --git a/libkkc.spec b/libkkc.spec
index 2d082fd..7519dc1 100644
--- a/libkkc.spec
+++ b/libkkc.spec
@@ -2,7 +2,7 @@
 
 Name:		libkkc
 Version:	0.3.5
-Release:	35%{?dist}
+Release:	36%{?dist}
 Summary:	Japanese Kana Kanji conversion library
 
 License:	GPL-3.0-or-later
@@ -20,6 +20,9 @@ Patch3:         libkkc-pr40-int-conversion-fix.patch
 # Fix invalid escape on default.json
 Patch4:         libkkc-Fix-invalid-escape-on-json-file.patch
 Patch5:         libkkc-use-gettext.patch
+# gcc16 postdeps_CXX adds -latomic_asneeded, but g-ir-scanner cannot handle this
+# as this is wrapper library written in text. Workaround this.
+Patch6:         libkkc-0.3.5-girscanner-gcc16-workaround.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:	marisa-devel
@@ -121,6 +124,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/kkc
 
 
 %changelog
+* Thu Jul 30 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.3.5-36
+- Workaround for girscanner with gcc16 -latomic_asneeded
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.5-35
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

                 reply	other threads:[~2026-08-03 14:49 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178576859681.1.3167109824669397963.rpms-libkkc-44eb9d8905e5@fedoraproject.org \
    --to=mtasaka@fedoraproject.org \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox