[patch] Patch

libsdl2.patch (text/plain), 8.98 KB, created by Arfrever Frehtes Taifersar Arahesis on 2018-11-04 06:55:25 UTC

From 70148d47fe413122a50e848c5d1b27b60b8500d9 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
Date: Sun, 4 Nov 2018 07:51:48 +0100
Subject: [PATCH] media-libs/libsdl2: Support app-i18n/fcitx and app-i18n/ibus.

Closes: https://bugs.gentoo.org/670248

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
---
 media-libs/libsdl2/libsdl2-2.0.9.ebuild           | 15 +++++++++++++--
 media-libs/libsdl2/metadata.xml                   |  2 ++
 profiles/arch/alpha/package.use.mask              |  4 ++++
 profiles/arch/arm/package.use.mask                |  4 ++++
 profiles/arch/arm64/package.use.mask              |  4 ++++
 profiles/arch/ia64/package.use.mask               |  6 +++++-
 profiles/arch/sparc/package.use.mask              |  4 ++++
 profiles/default/linux/musl/arm/package.use.mask  |  6 ++++++
 .../default/linux/musl/arm64/package.use.mask     |  6 ++++++
 .../default/linux/uclibc/arm/package.use.mask     |  6 +++++-
 10 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 profiles/default/linux/musl/arm/package.use.mask
 create mode 100644 profiles/default/linux/musl/arm64/package.use.mask

diff --git a/media-libs/libsdl2/libsdl2-2.0.9.ebuild b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
index 559a55814eb..40b24bc15ec 100644
--- a/media-libs/libsdl2/libsdl2-2.0.9.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
@@ -13,10 +13,12 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
+IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus fcitx4 gles haptic ibus libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( sound )
+	fcitx4? ( dbus )
 	gles? ( video )
+	ibus? ( dbus )
 	nas? ( sound )
 	opengl? ( video )
 	pulseaudio? ( sound )
@@ -28,7 +30,9 @@ REQUIRED_USE="
 CDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	fcitx4? ( app-i18n/fcitx:4 )
 	gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+	ibus? ( app-i18n/ibus )
 	kms? (
 		>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
 		>=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm]
@@ -63,6 +67,7 @@ CDEPEND="
 RDEPEND="${CDEPEND}
 	vulkan? ( media-libs/vulkan-loader )"
 DEPEND="${CDEPEND}
+	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
 	vulkan? ( dev-util/vulkan-headers )
 	X? ( x11-base/xorg-proto )
 	virtual/pkgconfig"
@@ -96,6 +101,11 @@ src_prepare() {
 multilib_src_configure() {
 	use custom-cflags || strip-flags
 
+	local CPPFLAGS="${CPPFLAGS}"
+	if use ibus; then
+		append-cppflags -I/usr/include/ibus-1.0 -I/usr/include/glib-2.0 -I/usr/$(get_libdir)/glib-2.0/include
+	fi
+
 	# sorted by `./configure --help`
 	local myeconfargs=(
 		$(use_enable static-libs static)
@@ -161,7 +171,8 @@ multilib_src_configure() {
 		$(use_enable vulkan video-vulkan)
 		$(use_enable udev libudev)
 		$(use_enable dbus)
-		--disable-ibus
+		$(use_enable ibus)
+		$(use_enable fcitx4 fcitx)
 		$(use_enable tslib input-tslib)
 		--disable-directx
 		--disable-rpath
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index 253e9af8f2d..9bf41e6b52f 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/metadata.xml
@@ -24,8 +24,10 @@
 		Perl, PHP, Pike, Python, and Ruby.
 	</longdescription>
 	<use>
+		<flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag>
 		<flag name="gles">include OpenGL ES support</flag>
 		<flag name="haptic">Enable the haptic (force feedback) subsystem</flag>
+		<flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="joystick">Control joystick support (disable at your own risk)</flag>
 		<flag name="kms">Build the KMSDRM video driver</flag>
 		<flag name="sound">Control audio support (disable at your own risk)</flag>
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index d64b7654297..6c88ac053d4 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Arfrever Frehtes Taifersar Arahesis <[e-mail]> (04 Nov 2018)
+# app-i18n/fcitx:4 not keyworded.
+media-libs/libsdl2 fcitx4
+
 # Thomas Deutschmann <[e-mail]> (15 Oct 2018)
 # Requires app-text/mecab which isn't yet keyworded
 # on alpha, bug 668674
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 0e7d0e04432..e1f91b5b854 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Arfrever Frehtes Taifersar Arahesis <[e-mail]> (04 Nov 2018)
+# app-i18n/fcitx:4 not keyworded.
+media-libs/libsdl2 fcitx4
+
 # Aaron W. Swenson <[e-mail]> (19 Oct 2018)
 # Requires sys-devel/clang which isn’t keyworded for ARM.
 dev-db/postgresql llvm
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 3255e280d63..996b15f7c68 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Arfrever Frehtes Taifersar Arahesis <[e-mail]> (04 Nov 2018)
+# app-i18n/fcitx:4 not keyworded.
+media-libs/libsdl2 fcitx4
+
 # Thomas Deutschmann <[e-mail]> (12 Oct 2018)
 # Requires www-client/firefox which isn't yet keyworded on ARM64
 dev-ruby/capybara test
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index ff147fbde48..2e3ee66ccd2 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Arfrever Frehtes Taifersar Arahesis <[e-mail]> (04 Nov 2018)
+# app-i18n/fcitx:4 not keyworded.
+media-libs/libsdl2 fcitx4
+
 # Sergei Trofimovich <[e-mail]> (13 Oct 2018)
 # USE=debug needs support for target-specific _FPU_MASK_IM. ia64
 # does not define those.
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index fad34bb3419..9b669a55785 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Arfrever Frehtes Taifersar Arahesis <[e-mail]> (04 Nov 2018)
+# app-i18n/fcitx:4 not keyworded.
+media-libs/libsdl2 fcitx4
+
 # Virgil Dupras <[e-mail]> (08 Oct 2018)
 # app-text/mupdf sparc keyword was dropped in bug #631970
 net-print/cups-filters pdf
diff --git a/profiles/default/linux/musl/arm/package.use.mask b/profiles/default/linux/musl/arm/package.use.mask
new file mode 100644
index 00000000000..a3eaeddd2a6
--- /dev/null
+++ b/profiles/default/linux/musl/arm/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Arfrever Frehtes Taifersar Arahesis <[e-mail]> (04 Nov 2018)
+# app-i18n/fcitx:4 not keyworded.
+media-libs/libsdl2 fcitx4
diff --git a/profiles/default/linux/musl/arm64/package.use.mask b/profiles/default/linux/musl/arm64/package.use.mask
new file mode 100644
index 00000000000..a3eaeddd2a6
--- /dev/null
+++ b/profiles/default/linux/musl/arm64/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Arfrever Frehtes Taifersar Arahesis <[e-mail]> (04 Nov 2018)
+# app-i18n/fcitx:4 not keyworded.
+media-libs/libsdl2 fcitx4
diff --git a/profiles/default/linux/uclibc/arm/package.use.mask b/profiles/default/linux/uclibc/arm/package.use.mask
index ffa17387218..d1fc21bedfe 100644
--- a/profiles/default/linux/uclibc/arm/package.use.mask
+++ b/profiles/default/linux/uclibc/arm/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Arfrever Frehtes Taifersar Arahesis <[e-mail]> (04 Nov 2018)
+# app-i18n/fcitx:4 not keyworded.
+media-libs/libsdl2 fcitx4
+
 # Thomas Deutschmann <[e-mail]> (28 Nov 2017)
 # Requires dev-libs/mongo-c-driver which isn't keyworded
 >=app-admin/rsyslog-8.31 mongodb
-- 
2.19.1