From 8d5dbd847cbc704a6a06405856e94b461011afe3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Mar 2021 06:06:27 +0000 Subject: gentoo resync : 27.03.2021 --- app-i18n/scim/Manifest | 3 ++- app-i18n/scim/files/scim-1.4.18-slibtool.patch | 36 ++++++++++++++++++++++++++ app-i18n/scim/scim-1.4.18.ebuild | 6 ++++- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 app-i18n/scim/files/scim-1.4.18-slibtool.patch (limited to 'app-i18n/scim') diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest index 136be145428d..1d6e9a4a0158 100644 --- a/app-i18n/scim/Manifest +++ b/app-i18n/scim/Manifest @@ -1,4 +1,5 @@ +AUX scim-1.4.18-slibtool.patch 1406 BLAKE2B 32390a24dd0e9865f13fc177e16131693c8f6b4df9a41f0552b8a2fea8ae72f2ab346372a8b274de36c8d7425547508d27382e1ad9f7aae93addba93106dcdb8 SHA512 3e209659da0a99f300fa93e2ce6637c1f345a2a7c0c8b4b009af3698114e05fbf0177f0f9cff17e3de47ca0af9785fa62f241183aadd4f35507933ed71e1e490 AUX xinput-scim 240 BLAKE2B 8c235304288f531db5bea179ff0100f6152b55348057a2604f37e37522a54883d06c954f2804ad4c04dfd3b3518fc5401ad5185e85a85a68d80e38dbbd728eef SHA512 1cfe95fdbf840b9fa43c980bb3f2e16fc6008714f8807650582ca906cb91ddd28b3b7b3c9f1325035e2c614d587d172071b2b7e3c6b30ca3128902b335773893 DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb -EBUILD scim-1.4.18.ebuild 2544 BLAKE2B e5d8efb8a109575df125b70e27a64cb3450db3194dff524576aa98bc3fc8258b2cd44e482f088612b3556813238a58a769149809adde588d70cd82e77f4b4275 SHA512 fd4bf07abf7acb22eb93fa9df9009e9ff7f1223652b588cf192b5a2a9d61f416b4a042532ca6d34a5391055e5c8a0ff06375f485adff44ab5d77aa68ea3f93b1 +EBUILD scim-1.4.18.ebuild 2600 BLAKE2B f1f64f803854368c4f9bef10b4e2737ff5044890a1116940c04f3ea25a79aefe56d530da3d4e4b0f786f37d0b0763f667d8df3358000fcb9b2cce899100deac5 SHA512 93b161c0b85f5d4317e31cd9eeb3de0f47a68cdeec7f09cff11ade65083ffb4b4ceaa144a75af891d5d3e9bacd187bd1e0490515e8140ad5b270d89032dd4e32 MISC metadata.xml 399 BLAKE2B 35834cd16ccba6bf71752ae33d56e8a70391517ba09f83526d402b3aec5fc5d9c13513e090bb014cad67658c905c1dbbe396cc0c9dfc6f1e7c32c4c09a81d777 SHA512 3bbbad26a22cc5222316cf769f638a0e181ea94d8cee39058bcbd1a08e61dd0096441721190323ddb285c504dc061027e4c4185f8bee1d4d0b4b197903f3be0e diff --git a/app-i18n/scim/files/scim-1.4.18-slibtool.patch b/app-i18n/scim/files/scim-1.4.18-slibtool.patch new file mode 100644 index 000000000000..b80db440dfd1 --- /dev/null +++ b/app-i18n/scim/files/scim-1.4.18-slibtool.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/777297 + +From dea50ce8e57aeb99034b880ee20ed91103e44555 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Fri, 19 Mar 2021 10:05:37 -0700 +Subject: [PATCH] build: Fix undefined X11 references. + +--- + extras/immodules/client-gtk/gtk2/Makefile.am | 1 + + extras/immodules/client-gtk/gtk3/Makefile.am | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/extras/immodules/client-gtk/gtk2/Makefile.am b/extras/immodules/client-gtk/gtk2/Makefile.am +index 8192f08..e7a7937 100644 +--- a/extras/immodules/client-gtk/gtk2/Makefile.am ++++ b/extras/immodules/client-gtk/gtk2/Makefile.am +@@ -41,6 +41,7 @@ im_scim_la_CFLAGS =@GTK2_CFLAGS@ + im_scim_la_LDFLAGS = -rpath $(moduledir) \ + -avoid-version -no-undefined \ + -module \ ++ @X_LIBS@ \ + @GTK2_LIBS@ + + im_scim_la_LIBADD = $(top_builddir)/extras/immodules/common/libscimbridgecommon.la \ +diff --git a/extras/immodules/client-gtk/gtk3/Makefile.am b/extras/immodules/client-gtk/gtk3/Makefile.am +index b868c80..d6f656d 100644 +--- a/extras/immodules/client-gtk/gtk3/Makefile.am ++++ b/extras/immodules/client-gtk/gtk3/Makefile.am +@@ -41,6 +41,7 @@ im_scim_la_CFLAGS =@GTK3_CFLAGS@ + im_scim_la_LDFLAGS = -rpath $(moduledir) \ + -avoid-version -no-undefined \ + -module \ ++ @X_LIBS@ \ + @GTK3_LIBS@ + + im_scim_la_LIBADD = $(top_builddir)/extras/immodules/common/libscimbridgecommon.la \ diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild index 80693dc30bb9..55f287f69021 100644 --- a/app-i18n/scim/scim-1.4.18.ebuild +++ b/app-i18n/scim/scim-1.4.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -35,6 +35,10 @@ DOCS=( docs/scim.cfg ) +PATCHES=( + "${FILESDIR}"/${PN}-1.4.18-slibtool.patch +) + src_prepare() { default eautoreconf -- cgit v1.2.3