diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /app-i18n/scim-bridge/files | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'app-i18n/scim-bridge/files')
-rw-r--r-- | app-i18n/scim-bridge/files/scim-bridge-0.4.16-fixes-send-function-call.patch | 15 | ||||
-rw-r--r-- | app-i18n/scim-bridge/files/scim-bridge-0.4.16-slibtool.patch | 58 |
2 files changed, 73 insertions, 0 deletions
diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16-fixes-send-function-call.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-fixes-send-function-call.patch new file mode 100644 index 000000000000..fd894441a5a7 --- /dev/null +++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-fixes-send-function-call.patch @@ -0,0 +1,15 @@ +From Fedora: +https://src.fedoraproject.org/rpms/scim-bridge/c/0532ab48617e02f5bfb1edaba17b22e88d9beaf4 +Index: scim-bridge-0.4.16/agent/scim-bridge-agent-signal-listener.cpp +=================================================================== +--- scim-bridge-0.4.16.orig/agent/scim-bridge-agent-signal-listener.cpp ++++ scim-bridge-0.4.16/agent/scim-bridge-agent-signal-listener.cpp +@@ -64,7 +64,7 @@ static void sig_quit (int sig) + { + if (!signal_occurred) { + signal_occurred = true; +- send (pipe_in, '\0', sizeof (char), MSG_NOSIGNAL); ++ send (pipe_in, "", sizeof (char), MSG_NOSIGNAL); + } + } + diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16-slibtool.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-slibtool.patch new file mode 100644 index 000000000000..fdd5583d8ea6 --- /dev/null +++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-slibtool.patch @@ -0,0 +1,58 @@ +From 9b46a64aea5adac5b992b4133065b52f527ec881 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sun, 15 May 2022 10:46:17 -0700 +Subject: [PATCH] client-gtk: Fix X11 undefined references + +With slibtool the client-gtk build fails with undefined references for +-lx11. This happens because the build includes -no-undefined and then +fails to test for the libX11 pkgconfig file. + +GNU libtool silently ignores -no-undefined and hides this issue while +slibtool does not do this. +--- + client-gtk/Makefile.am | 7 ++++--- + configure.ac | 6 ++++++ + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/client-gtk/Makefile.am b/client-gtk/Makefile.am +index 4318519..27728b8 100644 +--- a/client-gtk/Makefile.am ++++ b/client-gtk/Makefile.am +@@ -33,13 +33,14 @@ im_scim_bridge_la_SOURCES = im-scim-bridge-gtk.c \ + scim-bridge-client-imcontext-gtk.c \ + scim-bridge-client-key-event-utility-gtk.c + +-im_scim_bridge_la_CXXFLAGS=@GTK2_CFLAGS@ +-im_scim_bridge_la_CFLAGS =@GTK2_CFLAGS@ ++im_scim_bridge_la_CXXFLAGS=@GTK2_CFLAGS@ @X11_CFLAGS@ ++im_scim_bridge_la_CFLAGS =@GTK2_CFLAGS@ @X11_CFLAGS@ + + im_scim_bridge_la_LDFLAGS = -rpath $(moduledir) \ + -avoid-version -no-undefined \ + -module \ +- @GTK2_LIBS@ ++ @GTK2_LIBS@ \ ++ @X11_LIBS@ + + im_scim_bridge_la_LIBADD = $(top_srcdir)/common/libscimbridgecommon.la \ + $(top_srcdir)/client-common/libscimbridgeclientcommon.la +diff --git a/configure.ac b/configure.ac +index 4c4b1fb..8b2a7a8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -205,6 +205,12 @@ else + enable_qt4_immodule=no + fi + ++if test "$SCIM_BRIDGE_BUILD_IMMODULE" = "1"; then ++ PKG_CHECK_MODULES(X11, [x11]) ++ AC_SUBST(X11_LIBS) ++ AC_SUBST(X11_CFLAGS) ++fi ++ + AM_CONDITIONAL(SCIM_BRIDGE_BUILD_TESTS, + [test "$enable_tests" = "yes"]) + +-- +2.35.1 + |