gentoo resync : 29.12.2022

4 files changed, 79 insertions, 2 deletions

diff --git a/app-i18n/scim-bridge/Manifest b/app-i18n/scim-bridge/Manifest
index b71c6a42fa9d..6d2d830c8658 100644
--- a/app-i18n/scim-bridge/Manifest
+++ b/app-i18n/scim-bridge/Manifest
@@ -3,6 +3,8 @@ AUX scim-bridge-0.4.15.2-qt4.patch 2146 BLAKE2B 2dafb645ad58c2a09d7e43c437e78f1d
 AUX scim-bridge-0.4.16+gcc-4.4.patch 382 BLAKE2B 1b65d8c24dccd10b165a4716897b9442fd3e41c3d0984e8edea4564e1656551b418fded83df5483c26d94c4e0586a6036be3f39b764c4544e0e3e2a93eec1f73 SHA512 5b0bf2aee53d2e59e9b60e6b5db71dc8ff2b1337ebaf176cdb36bbe1aeb7bf7c28f57c8968a8551c1cddeae9057bc7b2b3864439b7422286f2652f5467aa87de
 AUX scim-bridge-0.4.16+gcc-4.7.patch 774 BLAKE2B 61b84631e8972558dba145b7c36108a726028755665720aa82e2dd9c76477536cb332c4c4d62e3555050bee898d8139a1294ce29a6c0482dbcf63ad0cb196576 SHA512 3349b93e71fdb4e6942253877ed1d84c59a099f5c3fd7d6148c780c6a8af65bb47431dde0a84995dab66bc864872130690b1ee89ee1e2db2c50591f94095c35a
 AUX scim-bridge-0.4.16-configure.ac.patch 5693 BLAKE2B bfa3fd40f07872ace34bf8fca2d3fb012e173660aab3a976c69dd2648003d79acf86b1d6da4c4a14b44e92d256f775fca44bf25b7c21beefb9c95ea545300454 SHA512 64fac34fc9d6982d61542af815ae6da5172d5e5208b938a386ad8fa67bd8988829e8c45412a47b9fef0c8b91b52d4f90b269266e49fb867a671cea1dc4581408
+AUX scim-bridge-0.4.16-fixes-send-function-call.patch 624 BLAKE2B 4fcd5279b7b836b3c63c4d6ede3db58499a92e3609f13c7141040179c56dc75d91fbe771f7bf7528aed0ad9f120f526657f6b9e94745c58e57f3045ed6ff499c SHA512 ee669a7999bb9bb4e6696d94f6d9ee70e4f078a5c1e49413b7ddb9914bf2f65726888fff9d415fb2f9dfe5c2f4e5856d9dbd7e66789481cc8c0496d3ae90eb24
+AUX scim-bridge-0.4.16-slibtool.patch 1828 BLAKE2B e9d9d9d37c30c29f69231bda8e218592bc0d7f313f0fccde6061efd16fd0d301a66b284ee9dffb2d202c5224561e2dae70ef32374c48102a07091865b0b6f6e3 SHA512 d065b005991b660fcd118be5a9d618b78a6dd2e313ee9c6dd8fd1314c7c0277ea6acfecc1b2dfa17bc2bc5c90c60cdf43fc9b1cc2dd574ee5c7ad6eb10dc6bb3
 DIST scim-bridge-0.4.16.tar.gz 508870 BLAKE2B 136a8e84b89a58852ff88a2ef632084f1f18c436fc96cd9192d4510b5e6a4adcb51a5a6f314f8c5e6a333b18ec36e2e154db161e1eb65cef0f3cd28fe47c8241 SHA512 8d40a931738f6130ab2fdc4e8dec70143874c53d5720a0403603b57c9f80d7c0a4802609e0446684fa5cba1758e78e5f333d01787527934ed7a19c9727fd66a6
-EBUILD scim-bridge-0.4.16-r3.ebuild 1699 BLAKE2B dae9e788281bf0eb905b270e9794dd1656522bf38f1fda3882819e169c9f43b168b4012ed7b26ef77d7dc668a8ec15edd13d64aa3eb4219315c02dd70e8eaba4 SHA512 42ae631fb5febef3ec1b6e946fa8466ca14ae47a76eb544014eac6bf42cb1d1ee3d33e9680944d65754acfa76c8e18b35a78a83bd73420a89f32df0638857e91
+EBUILD scim-bridge-0.4.16-r3.ebuild 1801 BLAKE2B b27bf09b1aad62d9b51013ac8fe46f45b81de49aca33f33573b2d590af190785a3c17264950bbeae1143f50e8e778979f1e9765abe0a9d1f9612dd4cd10b82fe SHA512 72196f3754973a86d2d818b06e695cb8f8bafaabaea32c4eb99e73c138dba96e05e0e266a2a710d4af5adabae53e95dc016bdb9e3fe4369ac25853d40c222903
 MISC metadata.xml 309 BLAKE2B dbae5a3009517b9481eba1b44e2db32c260bbb0f52aa2dc5ed112b782ddbed0da5094cda5ef43f87d5c7c2e2fd53683bafb15f968d46fdaa7e7172953090c951 SHA512 24868fa1884d67b6eef373a1571333f1ab4342fa982a782015383e27345f90eec98a32f4c8dbced47d3bd433edd2aaeb372360ebea8a36fabcd4e093dfd78e6b
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
+
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild
index 09cdd8f522b3..cb584cf64232 100644
--- a/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit autotools gnome2-utils readme.gentoo-r1
 
@@ -42,6 +42,8 @@ PATCHES=(
 	"${FILESDIR}/${P}+gcc-4.4.patch"
 	"${FILESDIR}/${P}+gcc-4.7.patch"
 	"${FILESDIR}/${P}-configure.ac.patch" #280887
+	"${FILESDIR}/${P}-fixes-send-function-call.patch" # 645168
+	"${FILESDIR}/${P}-slibtool.patch" # 779121
 )
 
 src_prepare() {