public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/files/, app-i18n/fcitx/
@ 2016-03-24 14:43 Mike Gilbert
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2016-03-24 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     b842ab8562990a8bc92adf2cd3872f9ce83d05ab
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Mar 23 22:19:20 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 14:42:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b842ab85

app-i18n/fcitx: Version bump (4.2.9.1).

 app-i18n/fcitx/Manifest                            |   1 +
 app-i18n/fcitx/fcitx-4.2.9.1.ebuild                | 147 +++++++++++++++++++++
 app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch |  95 +++++++++++++
 app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch | 145 ++++++++++++++++++++
 app-i18n/fcitx/metadata.xml                        |  19 +--
 5 files changed, 398 insertions(+), 9 deletions(-)

diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index e40ae26..8e7d3bf 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,4 +1,5 @@
 DIST fcitx-4.2.7_dict.tar.xz 8546416 SHA256 0c902617581f04eb0d337634b0bf2b39956abbcc949512cc79d4ee24cfc9dbb5 SHA512 e5d8eb55f644250197e69315ad02b9f6bc84e697b23c20c01a731f98ce8b1a16d764a58b1e1047d45b8decb6be33144707c2a52fc427e6338d8b8186cd4da074 WHIRLPOOL e344bc92a84940d3c885d1ae87a2fc83c95d6cb0f0e95eed76078e996c4a00df82a0c09c4540771f628928db1716f90d50d04469f2c0f2d5c17b5048fbf2d482
 DIST fcitx-4.2.8.5_dict.tar.xz 8696468 SHA256 fe3d6f57805fc61130f8254f19a86fe3baa0f405406414ca2e94bcf86d3d1b72 SHA512 ee6612a34087135065537fa14f09078bad9f029f69b636fb2221193f23d86c5431a9d8a848b264bdcb259680f6bda41d08d58dcf67d19e5a200cb11fa4a26ffe WHIRLPOOL 0a394d5aaa53819bbab66b32e7ae5896187bc45fad146c7eef4ab75640e5c6670cf811bec87e482bb3516b30e1ce28f2cefa91c10838092f9329b1101b5c70db
 DIST fcitx-4.2.8.6_dict.tar.xz 8694328 SHA256 91034e9ef976bbe2649a96b67adf0c133d64e2c0d53be440cc40a4370569d597 SHA512 822e448932e735fe3087384eaf91c6b029b06d3461aa3798501bfbf8f79b8ebc5ea3ac57f01ec32674cc3cb74fcb34b6e285ef265bb49be54543f34dcaf624e4 WHIRLPOOL df24b3b6bbe18a8498732b27817caef6c28278bddd6acfbe49edd9a63d8f33b09ba93ff0bd144e1c1d3b9b9c8079a35a8a047ebf9b361b4f173ec9b23138042e
+DIST fcitx-4.2.9.1_dict.tar.xz 8684772 SHA256 5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77 SHA512 5d3b669ed97423f976116385571d07f832e9e18007e6a3c2aef12957219739a81fbf2343825fea4a1b01a83a6bf9e40e9ffa88466c651876602517c6da1fb25d WHIRLPOOL 02b2ff1b0c33b1f2c0461988bc3323ca27ba565a0d8a1f49b96aaceac857c07365aaaee0048d470dea82e60857bedf59ef8c60d3cdfa14a2ff074216d5cdc16d
 DIST fcitx-4.2.9_dict.tar.xz 8675292 SHA256 3a935b7098fe573b126f8e393d93bccc6d4e4e9988830430fa9b1c87876bfc6c SHA512 4bad2efc283858bf9af7f7f283f7beefb210aa361ff034464ff97ea0e536f084c99d876f3595a5375114b68cd51714bd0b5c622a53efc57154a4e629fd416093 WHIRLPOOL 520a6f41a68fd5dbd4b00eb5de5ed2aea0801adc9dd64449e36c442311c9c85bdd28f1d5f79917e99b7fff2f8372bed9bb780fdda7d6d16cf528e5c1a6a0914f

diff --git a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
new file mode 100644
index 0000000..caa01d5
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils gnome2-utils multilib xdg
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx"
+fi
+
+DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
+fi
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+X +autostart +cairo +dbus debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
+REQUIRED_USE="autostart? ( dbus ) cairo? ( X ) gtk2? ( dbus ) gtk3? ( dbus ) introspection? ( dbus ) pango? ( cairo ) qt4? ( X dbus )"
+
+RDEPEND="virtual/libiconv
+	virtual/libintl
+	x11-libs/libxkbcommon
+	X? (
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrender
+		xml? ( x11-libs/libxkbfile )
+	)
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo[X]
+		x11-libs/libXext
+		pango? ( x11-libs/pango )
+		!pango? ( media-libs/fontconfig )
+	)
+	dbus? ( sys-apps/dbus )
+	enchant? ( app-text/enchant )
+	gtk2? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+	)
+	gtk3? (
+		dev-libs/glib:2
+		x11-libs/gtk+:3
+	)
+	introspection? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+	)
+	lua? ( dev-lang/lua:= )
+	nls? ( sys-devel/gettext )
+	opencc? ( app-i18n/opencc )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+	)
+	xml? (
+		app-text/iso-codes
+		dev-libs/libxml2
+	)"
+DEPEND="${RDEPEND}
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS ChangeLog THANKS)
+
+PATCHES=(
+	"${FILESDIR}/${P}-tray_icon.patch"
+	"${FILESDIR}/${P}-qt-4_ucs4.patch"
+)
+
+src_prepare() {
+	# https://github.com/fcitx/fcitx/issues/250
+	sed \
+		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
+		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
+		-e "/find_package(XkbFile REQUIRED)/a\\    endif(ENABLE_X11)" \
+		-i CMakeLists.txt
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+		-DENABLE_CAIRO=$(usex cairo)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_ENCHANT=$(usex enchant)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GIR=$(usex introspection)
+		-DENABLE_GLIB2=$(if use cairo || use gtk2 || use gtk3 || use introspection; then echo yes; else echo no; fi)
+		-DENABLE_GTK2_IM_MODULE=$(usex gtk2)
+		-DENABLE_GTK3_IM_MODULE=$(usex gtk3)
+		-DENABLE_LIBXML2=$(usex xml)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_OPENCC=$(usex opencc)
+		-DENABLE_PANGO=$(usex pango)
+		-DENABLE_QT=$(usex qt4)
+		-DENABLE_QT_GUI=$(usex qt4)
+		-DENABLE_QT_IM_MODULE=$(usex qt4)
+		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
+		-DENABLE_STATIC=$(usex static-libs)
+		-DENABLE_TABLE=$(usex table)
+		-DENABLE_TEST=$(usex test)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XDGAUTOSTART=$(usex autostart)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -r "${ED}usr/share/doc/${PN}"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_pkg_postinst
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_pkg_postrm
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}

diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch b/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch
new file mode 100644
index 0000000..2e114b0
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch
@@ -0,0 +1,95 @@
+https://github.com/fcitx/fcitx/commit/14faccfbb0d87e06c25d182ae842808d18be3dc7
+https://github.com/fcitx/fcitx/commit/216a09e3ec056f272eebfbe82809b803d86012cb
+
+--- src/frontend/qt/qfcitxinputcontext.cpp
++++ src/frontend/qt/qfcitxinputcontext.cpp
+@@ -232,6 +232,20 @@
+                         anchor = var2.toInt();
+                     else
+                         anchor = cursor;
++
++                    // adjust it to real character size
++                    // QTBUG-25536;
++                    QVector<uint> tempUCS4 = text.leftRef(cursor).toUcs4();
++                    while (!tempUCS4.empty() && tempUCS4.last() == 0) {
++                        tempUCS4.pop_back();
++                    }
++                    cursor = tempUCS4.size();
++                    tempUCS4 = text.leftRef(anchor).toUcs4();
++                    while (!tempUCS4.empty() && tempUCS4.last() == 0) {
++                        tempUCS4.pop_back();
++                    }
++                    anchor = tempUCS4.size();
++
+                     if (data->surroundingText != text) {
+                         data->surroundingText = text;
+                         proxy->SetSurroundingText(text, cursor, anchor);
+@@ -581,6 +595,7 @@
+             delete data->proxy;
+         }
+         data->proxy = new FcitxQtInputContextProxy(m_connection->serviceName(), path, *m_connection->connection(), this);
++        data->proxy->setProperty("icData", qVariantFromValue(static_cast<void*>(data)));
+         connect(data->proxy, SIGNAL(CommitString(QString)), this, SLOT(commitString(QString)));
+         connect(data->proxy, SIGNAL(ForwardKey(uint, uint, int)), this, SLOT(forwardKey(uint, uint, int)));
+         connect(data->proxy, SIGNAL(UpdateFormattedPreedit(FcitxQtFormattedPreeditList,int)), this, SLOT(updateFormattedPreedit(FcitxQtFormattedPreeditList,int)));
+@@ -680,11 +695,57 @@
+     sendEvent(event);
+ }
+ 
+-void QFcitxInputContext::deleteSurroundingText(int offset, uint nchar)
++void QFcitxInputContext::deleteSurroundingText(int offset, uint _nchar)
+ {
+     QInputMethodEvent event;
+-    event.setCommitString("", offset, nchar);
+-    sendEvent(event);
++
++    FcitxQtInputContextProxy *proxy = qobject_cast<FcitxQtInputContextProxy*>(sender());
++    if (!proxy) {
++        return;
++    }
++
++    FcitxQtICData *data = static_cast<FcitxQtICData*>(proxy->property("icData").value<void *>());
++    QVector<uint> ucsText = data->surroundingText.toUcs4();
++
++    // QTBUG-25536
++    while (!ucsText.empty() && ucsText.last() == 0) {
++        ucsText.pop_back();
++    }
++
++    int cursor = data->surroundingCursor;
++    // make nchar signed so we are safer
++    int nchar = _nchar;
++    // Qt's reconvert semantics is different from gtk's. It doesn't count the current
++    // selection. Discard selection from nchar.
++    if (data->surroundingAnchor < data->surroundingCursor) {
++        nchar -= data->surroundingCursor - data->surroundingAnchor;
++        offset += data->surroundingCursor - data->surroundingAnchor;
++        cursor = data->surroundingAnchor;
++    } else if (data->surroundingAnchor > data->surroundingCursor) {
++        nchar -= data->surroundingAnchor - data->surroundingCursor;
++        cursor = data->surroundingCursor;
++    }
++
++    // validates
++    if (nchar >= 0 && cursor + offset >= 0 && cursor + offset + nchar < ucsText.size()) {
++        // order matters
++        QVector<uint> replacedChars = ucsText.mid(cursor + offset, nchar);
++        nchar = QString::fromUcs4(replacedChars.data(), replacedChars.size()).size();
++
++        int start, len;
++        if (offset >= 0) {
++            start = cursor;
++            len = offset;
++        } else {
++            start = cursor;
++            len = -offset;
++        }
++
++        QVector<uint> prefixedChars = ucsText.mid(start, len);
++        offset = QString::fromUcs4(prefixedChars.data(), prefixedChars.size()).size() * (offset >= 0 ? 1 : -1);
++        event.setCommitString("", offset, nchar);
++        sendEvent(event);
++    }
+ }
+ 
+ void QFcitxInputContext::forwardKey(uint keyval, uint state, int type)

diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch b/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch
new file mode 100644
index 0000000..4f04f5e
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch
@@ -0,0 +1,145 @@
+https://github.com/fcitx/fcitx/issues/241
+https://github.com/fcitx/fcitx/commit/c737618fffa84bfe5a6caf55cee9b9288a791bbf
+https://github.com/fcitx/fcitx/commit/353683e29be4ef26409b9a05e0cb647a5180fa8c
+https://github.com/fcitx/fcitx/commit/fe2732db27a1c2e183400ceeb3283559e10a4ca8
+https://github.com/fcitx/fcitx/commit/440c431d29876a8e4871159d289bc9a573f9a41b
+
+--- src/module/notificationitem/notificationitem.c
++++ src/module/notificationitem/notificationitem.c
+@@ -565,8 +565,17 @@
+ 
+ boolean FcitxNotificationItemEnable(FcitxNotificationItem* notificationitem, FcitxNotificationItemAvailableCallback callback, void* data)
+ {
+-    if (!callback || notificationitem->callback)
++    if (!callback)
+         return false;
++
++    if (notificationitem->callback == callback) {
++        return true;
++    }
++
++    if (notificationitem->callback) {
++        return false;
++    }
++
+     if (notificationitem->serviceName) {
+         FcitxLog(ERROR, "This should not happen, please report bug.");
+         return false;
+--- src/ui/classic/TrayWindow.c
++++ src/ui/classic/TrayWindow.c
+@@ -48,7 +48,7 @@
+     Display *dpy = classicui->dpy;
+     int iScreen = classicui->iScreen;
+     char   strWindowName[] = "Fcitx Tray Window";
+-    if (!classicui->bUseTrayIcon || classicui->isSuspend)
++    if (!classicui->bUseTrayIcon || classicui->isSuspend || classicui->notificationItemAvailable)
+         return;
+ 
+     if (trayWindow->window == None && trayWindow->dockWindow != None) {
+@@ -61,12 +61,12 @@
+             wsa.colormap = colormap;
+             wsa.background_pixel = 0;
+             wsa.border_pixel = 0;
+-            trayWindow->window = XCreateWindow(dpy, p, -1, -1, 1, 1,
++            trayWindow->window = XCreateWindow(dpy, p, -1, -1, 22, 22,
+                                             0, vi->depth, InputOutput, vi->visual,
+                                             CWBackPixmap | CWBackPixel | CWBorderPixel | CWColormap, &wsa);
+         } else {
+             trayWindow->window = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy),
+-                                -1, -1, 1, 1, 0,
++                                -1, -1, 22, 22, 0,
+                                 BlackPixel(dpy, DefaultScreen(dpy)),
+                                 WhitePixel(dpy, DefaultScreen(dpy)));
+             XSetWindowBackgroundPixmap(dpy, trayWindow->window, ParentRelative);
+@@ -74,6 +74,7 @@
+         if (trayWindow->window == (Window) NULL)
+             return;
+ 
++        trayWindow->size = 22;
+         XSizeHints size_hints;
+         size_hints.flags = PWinGravity | PBaseSize;
+         size_hints.base_width = trayWindow->size;
+@@ -161,7 +162,7 @@
+     png_surface = image->image;
+ 
+     c = cairo_create(trayWindow->cs);
+-    cairo_set_source_rgba(c, 0, 0, 0, 0);
++    cairo_set_source_rgba(c, 1, 1, 1, 0);
+     cairo_set_operator(c, CAIRO_OPERATOR_SOURCE);
+     cairo_paint(c);
+ 
+@@ -226,8 +227,6 @@
+         if (event->xclient.message_type == trayWindow->atoms[ATOM_MANAGER]
+             && event->xclient.data.l[1] == trayWindow->atoms[ATOM_SELECTION]
+             && trayWindow->dockWindow == None) {
+-            if (classicui->notificationItemAvailable)
+-                return true;
+             trayWindow->dockWindow = event->xclient.data.l[2];
+             TrayWindowRelease(trayWindow);
+             TrayWindowInit(trayWindow);
+@@ -245,6 +244,7 @@
+             int size = event->xconfigure.height;
+             if (size != trayWindow->size) {
+                 trayWindow->size = size;
++                XResizeWindow(dpy, trayWindow->window, size, size);
+                 XSizeHints size_hints;
+                 size_hints.flags = PWinGravity | PBaseSize;
+                 size_hints.base_width = trayWindow->size;
+@@ -286,6 +286,14 @@
+             return true;
+         }
+         break;
++    case PropertyNotify:
++        if (event->xproperty.atom == trayWindow->atoms[ATOM_VISUAL] &&
++            event->xproperty.window == trayWindow->dockWindow) {
++            TrayWindowRelease(trayWindow);
++            TrayWindowInit(trayWindow);
++            return true;
++        }
++        break;
+     }
+     return false;
+ }
+--- src/ui/classic/classicui.c
++++ src/ui/classic/classicui.c
+@@ -168,7 +168,7 @@
+ void ClassicUIDelayedInitTray(void* arg) {
+     FcitxClassicUI* classicui = (FcitxClassicUI*) arg;
+     // FcitxLog(INFO, "yeah we delayed!");
+-    if (!classicui->bUseTrayIcon)
++    if (!classicui->bUseTrayIcon || classicui->isSuspend)
+         return;
+     /*
+      * if this return false, something wrong happened and callback
+@@ -187,7 +187,7 @@
+ {
+     FcitxClassicUI* classicui = (FcitxClassicUI*) arg;
+     classicui->trayTimeout = 0;
+-    if (!classicui->bUseTrayIcon)
++    if (!classicui->bUseTrayIcon || classicui->isSuspend)
+         return;
+ 
+     if (!classicui->trayWindow->bTrayMapped) {
+--- src/ui/classic/tray.c
++++ src/ui/classic/tray.c
+@@ -106,8 +106,9 @@
+ 
+     XWindowAttributes attr;
+     XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &attr);
+-    if ((attr.your_event_mask & StructureNotifyMask) != StructureNotifyMask) {
+-        XSelectInput(dpy, DefaultRootWindow(dpy), attr.your_event_mask | StructureNotifyMask); // for MANAGER selection
++    int neededMask = StructureNotifyMask;
++    if ((attr.your_event_mask & neededMask) != neededMask) {
++        XSelectInput(dpy, DefaultRootWindow(dpy), attr.your_event_mask | neededMask); // for MANAGER selection
+     }
+     return True;
+ }
+@@ -123,7 +124,7 @@
+     Display* dpy = tray->owner->dpy;
+ 
+     if (tray->dockWindow != None) {
+-        XSelectInput(dpy, tray->dockWindow, StructureNotifyMask);
++        XSelectInput(dpy, tray->dockWindow, PropertyChangeMask | StructureNotifyMask);
+         TraySendOpcode(tray, SYSTEM_TRAY_REQUEST_DOCK, tray->window, 0, 0);
+         tray->bTrayMapped = True;
+         return 1;

diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index ca05448..7cec1e2 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -10,15 +10,16 @@
 		<name>Cjk</name>
 	</maintainer>
 	<use>
-		<flag name="autostart">Enable xdg-compatible autostart of fcitx</flag>
-		<flag name="enchant">Use <pkg>app-text/enchant</pkg> for text prediction</flag>
-		<flag name="introspection">Enable GObject Introspection</flag>
-		<flag name="gtk">Install GTK2 IM module</flag>
-		<flag name="gtk3">Install GTK3 IM module</flag>
-		<flag name="opencc">Enable OpenCC for Chinese Transform</flag>
+		<flag name="autostart">Enable XDG-compatible autostart of Fcitx</flag>
+		<flag name="enchant">Enable Enchant backend (using <pkg>app-text/enchant</pkg>) for spelling hinting</flag>
+		<flag name="introspection">Enable support for GObject Introspection</flag>
+		<flag name="gtk">Install input method module for GTK+ 2</flag>
+		<flag name="gtk2">Install input method module for GTK+ 2</flag>
+		<flag name="gtk3">Install input method module for GTK+ 3</flag>
+		<flag name="opencc">Enable OpenCC engine (using <pkg>app-i18n/opencc</pkg>) for converter between Simplified Chinese and Traditional Chinese</flag>
 		<flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
-		<flag name="qt4">Install Qt4 IM module</flag>
-		<flag name="snooper">Enable Key Snooper for GTK app</flag>
-		<flag name="table">Enable Table IM</flag>
+		<flag name="qt4">Install input method module for Qt 4</flag>
+		<flag name="snooper">Enable key snooper for GTK+ applications</flag>
+		<flag name="table">Install table input methods for Simplified Chinese</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/files/, app-i18n/fcitx/
@ 2016-09-15 14:47 Mike Gilbert
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2016-09-15 14:47 UTC (permalink / raw
  To: gentoo-commits

commit:     9ab392629fa40a614bbc82c32c1b0bf2e0a796a8
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Sep 15 09:00:35 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 14:45:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab39262

app-i18n/fcitx: Use EAPI="6".

 app-i18n/fcitx/fcitx-4.2.9.1.ebuild                |  2 +-
 app-i18n/fcitx/fcitx-9999.ebuild                   |  2 +-
 app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch |  4 ++--
 app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch | 16 ++++++++--------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
index fe803d0..1080af5 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 inherit cmake-utils gnome2-utils multilib xdg
 

diff --git a/app-i18n/fcitx/fcitx-9999.ebuild b/app-i18n/fcitx/fcitx-9999.ebuild
index 10f01f0..cc12012 100644
--- a/app-i18n/fcitx/fcitx-9999.ebuild
+++ b/app-i18n/fcitx/fcitx-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 inherit cmake-utils gnome2-utils multilib xdg
 

diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch b/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch
index 2e114b0..e417a06 100644
--- a/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch
+++ b/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch
@@ -1,8 +1,8 @@
 https://github.com/fcitx/fcitx/commit/14faccfbb0d87e06c25d182ae842808d18be3dc7
 https://github.com/fcitx/fcitx/commit/216a09e3ec056f272eebfbe82809b803d86012cb
 
---- src/frontend/qt/qfcitxinputcontext.cpp
-+++ src/frontend/qt/qfcitxinputcontext.cpp
+--- /src/frontend/qt/qfcitxinputcontext.cpp
++++ /src/frontend/qt/qfcitxinputcontext.cpp
 @@ -232,6 +232,20 @@
                          anchor = var2.toInt();
                      else

diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch b/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch
index 4f04f5e..7bfbc6e 100644
--- a/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch
+++ b/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch
@@ -4,8 +4,8 @@ https://github.com/fcitx/fcitx/commit/353683e29be4ef26409b9a05e0cb647a5180fa8c
 https://github.com/fcitx/fcitx/commit/fe2732db27a1c2e183400ceeb3283559e10a4ca8
 https://github.com/fcitx/fcitx/commit/440c431d29876a8e4871159d289bc9a573f9a41b
 
---- src/module/notificationitem/notificationitem.c
-+++ src/module/notificationitem/notificationitem.c
+--- /src/module/notificationitem/notificationitem.c
++++ /src/module/notificationitem/notificationitem.c
 @@ -565,8 +565,17 @@
  
  boolean FcitxNotificationItemEnable(FcitxNotificationItem* notificationitem, FcitxNotificationItemAvailableCallback callback, void* data)
@@ -25,8 +25,8 @@ https://github.com/fcitx/fcitx/commit/440c431d29876a8e4871159d289bc9a573f9a41b
      if (notificationitem->serviceName) {
          FcitxLog(ERROR, "This should not happen, please report bug.");
          return false;
---- src/ui/classic/TrayWindow.c
-+++ src/ui/classic/TrayWindow.c
+--- /src/ui/classic/TrayWindow.c
++++ /src/ui/classic/TrayWindow.c
 @@ -48,7 +48,7 @@
      Display *dpy = classicui->dpy;
      int iScreen = classicui->iScreen;
@@ -100,8 +100,8 @@ https://github.com/fcitx/fcitx/commit/440c431d29876a8e4871159d289bc9a573f9a41b
      }
      return false;
  }
---- src/ui/classic/classicui.c
-+++ src/ui/classic/classicui.c
+--- /src/ui/classic/classicui.c
++++ /src/ui/classic/classicui.c
 @@ -168,7 +168,7 @@
  void ClassicUIDelayedInitTray(void* arg) {
      FcitxClassicUI* classicui = (FcitxClassicUI*) arg;
@@ -120,8 +120,8 @@ https://github.com/fcitx/fcitx/commit/440c431d29876a8e4871159d289bc9a573f9a41b
          return;
  
      if (!classicui->trayWindow->bTrayMapped) {
---- src/ui/classic/tray.c
-+++ src/ui/classic/tray.c
+--- /src/ui/classic/tray.c
++++ /src/ui/classic/tray.c
 @@ -106,8 +106,9 @@
  
      XWindowAttributes attr;


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/files/, app-i18n/fcitx/
@ 2017-09-11 18:39 Mike Gilbert
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2017-09-11 18:39 UTC (permalink / raw
  To: gentoo-commits

commit:     2a22703601478e267c562cb671dd9e832fb52f2c
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Sep 11 18:16:05 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 18:39:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a227036

app-i18n/fcitx: Version bump (4.2.9.2).

 app-i18n/fcitx/Manifest                          |   1 +
 app-i18n/fcitx/fcitx-4.2.9.2.ebuild              | 132 +++++++++++++++++++++++
 app-i18n/fcitx/files/fcitx-4.2.9.2-scripts.patch |  60 +++++++++++
 3 files changed, 193 insertions(+)

diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 722273209a1..65b175e4293 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1 +1,2 @@
 DIST fcitx-4.2.9.1_dict.tar.xz 8684772 SHA256 5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77 SHA512 5d3b669ed97423f976116385571d07f832e9e18007e6a3c2aef12957219739a81fbf2343825fea4a1b01a83a6bf9e40e9ffa88466c651876602517c6da1fb25d WHIRLPOOL 02b2ff1b0c33b1f2c0461988bc3323ca27ba565a0d8a1f49b96aaceac857c07365aaaee0048d470dea82e60857bedf59ef8c60d3cdfa14a2ff074216d5cdc16d
+DIST fcitx-4.2.9.2_dict.tar.xz 8735848 SHA256 2cdd7c138163f717aacca8eabb18a4a823c808a408e4b0770f5be2e3e892de20 SHA512 9228fc4629479e2c518e0d0a7dbe604f6e56e864b41927d120e1f0b7a277ff53ff1b393870480bc1660662751a31885ddc1ddf43133a11edc2e96cbc7701daee WHIRLPOOL 8f19cd9f34a3957ff42e94ca7a5e28db5feecf658e9ca2535430fe6dd7a269ba9833e9273e8fd87d00a426027aebd97741c3fe909d9a0b0577ae6f64a8f4ba75

diff --git a/app-i18n/fcitx/fcitx-4.2.9.2.ebuild b/app-i18n/fcitx/fcitx-4.2.9.2.ebuild
new file mode 100644
index 00000000000..45eecfb5735
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.2.9.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx"
+fi
+
+DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
+fi
+
+LICENSE="GPL-2+ LGPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
+REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
+
+RDEPEND="dev-libs/glib:2
+	sys-apps/dbus
+	virtual/libiconv
+	virtual/libintl
+	x11-libs/libxkbcommon
+	X? (
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrender
+		xml? ( x11-libs/libxkbfile )
+	)
+	cairo? (
+		x11-libs/cairo[X]
+		x11-libs/libXext
+		pango? ( x11-libs/pango )
+		!pango? ( media-libs/fontconfig )
+	)
+	enchant? ( app-text/enchant:0= )
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	introspection? ( dev-libs/gobject-introspection )
+	lua? ( dev-lang/lua:= )
+	nls? ( sys-devel/gettext )
+	opencc? ( app-i18n/opencc:= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+	)
+	xml? (
+		app-text/iso-codes
+		dev-libs/libxml2
+	)"
+DEPEND="${RDEPEND}
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-scripts.patch"
+)
+
+DOCS=(AUTHORS ChangeLog THANKS)
+
+src_prepare() {
+	# https://github.com/fcitx/fcitx/issues/250
+	sed \
+		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
+		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
+		-e "/find_package(XkbFile REQUIRED)/a\\    endif(ENABLE_X11)" \
+		-i CMakeLists.txt
+
+	cmake-utils_src_prepare
+	xdg_environment_reset
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+		-DENABLE_CAIRO=$(usex cairo)
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_ENCHANT=$(usex enchant)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GIR=$(usex introspection)
+		-DENABLE_GTK2_IM_MODULE=$(usex gtk2)
+		-DENABLE_GTK3_IM_MODULE=$(usex gtk3)
+		-DENABLE_LIBXML2=$(usex xml)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_OPENCC=$(usex opencc)
+		-DENABLE_PANGO=$(usex pango)
+		-DENABLE_QT=$(usex qt4)
+		-DENABLE_QT_GUI=$(usex qt4)
+		-DENABLE_QT_IM_MODULE=$(usex qt4)
+		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
+		-DENABLE_STATIC=$(usex static-libs)
+		-DENABLE_TABLE=$(usex table)
+		-DENABLE_TEST=$(usex test)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XDGAUTOSTART=$(usex autostart)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -r "${ED}usr/share/doc/${PN}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}

diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.2-scripts.patch b/app-i18n/fcitx/files/fcitx-4.2.9.2-scripts.patch
new file mode 100644
index 00000000000..a3399767e7b
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-4.2.9.2-scripts.patch
@@ -0,0 +1,60 @@
+https://github.com/fcitx/fcitx/issues/342
+https://github.com/fcitx/fcitx/commit/de4bd3d535736afe061d9ac63fcc897e3ab3237e
+
+--- /cmake/fcitx-cmake-helper.sh
++++ /cmake/fcitx-cmake-helper.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ #   Copyright (C) 2012~2013 by Yichao Yu
+ #   yyc1992@gmail.com
+ #
+--- /cmake/fcitx-merge-config.sh
++++ /cmake/fcitx-merge-config.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+ #   Copyright (C) 2012~2012 by Yichao Yu
+ #   yyc1992@gmail.com
+ #
+--- /data/icon/data/gen.sh
++++ /data/icon/data/gen.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env bash
+ 
+ a="$(find scabable/status/ -type f -name \*.svg)"
+ echo $a
+--- /data/script/fcitx-configtool.sh
++++ /data/script/fcitx-configtool.sh
+@@ -28,7 +28,7 @@
+     }
+ fi
+ 
+-if type gettext > /dev/null 2>&1; then
++if which gettext > /dev/null 2>&1; then
+     _() {
+         gettext "$@"
+     }
+--- /src/lib/fcitx-utils/gen-hotkey.sh
++++ /src/lib/fcitx-utils/gen-hotkey.sh
+@@ -1,7 +1,6 @@
+ #!/bin/sh
+ 
+-function download_file()
+-{
++download_file() {
+     if [ "x$3" != "xf" ]; then
+         if [ -f $1 ]; then
+             return
+--- /src/ui/classic/fcitx-skin-installer.sh
++++ /src/ui/classic/fcitx-skin-installer.sh
+@@ -25,7 +25,7 @@
+     }
+ fi
+ 
+-if type gettext > /dev/null 2>&1; then
++if which gettext > /dev/null 2>&1; then
+     _() {
+         gettext "$@"
+     }


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/files/, app-i18n/fcitx/
@ 2025-02-08  0:18 Yixun Lan
  0 siblings, 0 replies; 5+ messages in thread
From: Yixun Lan @ 2025-02-08  0:18 UTC (permalink / raw
  To: gentoo-commits

commit:     9f78305b0c6f0acc580723ef34bca151de5aa325
Author:     Yongxiang Liang <tanekliang <AT> gmail <DOT> com>
AuthorDate: Sat Jan 25 06:09:59 2025 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Feb  7 23:56:39 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f78305b

app-i18n/fcitx: add 5.1.12

Signed-off-by: Yongxiang Liang <tanekliang <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-i18n/fcitx/Manifest                            |   1 +
 app-i18n/fcitx/fcitx-5.1.12.ebuild                 | 125 +++++++++++++++++++++
 ...itx-5.1.12-make-x11-dependencies-optional.patch |  24 ++++
 3 files changed, 150 insertions(+)

diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 9ce45682e7dd..45bb2f5f5633 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,2 +1,3 @@
 DIST fcitx-5.1.10.tar.zst 8309913 BLAKE2B a63f5c747dd1d7a519873f00f234ae43d1ab5458e57b809f01e2b6cefc3e3921ecd7fff27cf4b21d59842f11e8d397760d90cf6572b42f65d226b21acc18fefc SHA512 196bc26f7dd50596da90e6b4b0a8b4886b57ec928c182427fb8763507f1f4cb39a252bfddcbd6eccaa0cc920070b7b9fda03f18fd444f84154ddd925678ad7d4
 DIST fcitx-5.1.11.tar.zst 8310353 BLAKE2B b38daa03c40b19454cf8b82dc6c9d799730fb614bb606d86f0dfbadb6dd88f3a382f4c2b2a8f820bf4b01e27e27be82ed2624fb3f0a70843af5f72924e62e58b SHA512 d2fee4b931175d67ed29058af5dc644c6918829ca336e88566781ffaf5ccbe942281e9a41459b5ad8ad37756bed24b999127f8b17d8925bb923a9eb10d1081fb
+DIST fcitx-5.1.12.tar.zst 8317084 BLAKE2B 097881acde8fc1cf6960fd20878bb25c483684ff9ad9ffa133081d91fffd50c53b29998b1577866f10a8cb409a3c0fc96766909f6bdf268313e768de79e372ea SHA512 82943f6c2e809e8d9049d457f59e52bc202daf922abec032efc589eefad77b4db4398fbaea92c019eaeaa40ccf51585a8a80676a7909433a8576dc63fb639645

diff --git a/app-i18n/fcitx/fcitx-5.1.12.ebuild b/app-i18n/fcitx/fcitx-5.1.12.ebuild
new file mode 100644
index 000000000000..91033a878585
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-5.1.12.ebuild
@@ -0,0 +1,125 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="fcitx5"
+
+inherit cmake unpacker xdg
+
+DESCRIPTION="Fcitx 5 is a generic input method framework"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5"
+SRC_URI="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${PV}_dict.tar.zst -> ${P}.tar.zst"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+LICENSE="LGPL-2+ Unicode-DFS-2016"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="+autostart doc +emoji +enchant +keyboard presage +server systemd test wayland +X"
+REQUIRED_USE="
+	|| ( wayland X )
+	X? ( keyboard )
+	wayland? ( keyboard )
+"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!app-i18n/fcitx:4
+	dev-libs/libfmt
+	sys-devel/gettext
+	virtual/libintl
+	x11-libs/cairo[X?]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango[X?]
+	doc? (
+		app-text/doxygen
+		dev-texlive/texlive-fontutils
+	)
+	emoji? ( sys-libs/zlib )
+	enchant? ( app-text/enchant:2 )
+	keyboard? (
+		app-text/iso-codes
+		dev-libs/expat
+		dev-libs/json-c:=
+		x11-misc/xkeyboard-config
+		x11-libs/libxkbcommon[X?,wayland?]
+	)
+	systemd? (
+		sys-apps/systemd
+	)
+	!systemd? (
+		dev-libs/libuv
+		sys-apps/dbus
+	)
+	wayland? (
+		dev-libs/glib:2
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+		dev-util/wayland-scanner
+	)
+	X? (
+		dev-libs/glib:2
+		>=x11-libs/xcb-imdkit-1.0.3:5
+		x11-libs/libX11
+		x11-libs/libxkbfile
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	kde-frameworks/extra-cmake-modules:0
+"
+
+PATCHES=( "${FILESDIR}"/${P}-make-x11-dependencies-optional.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DBUS=on
+		-DENABLE_XDGAUTOSTART=$(usex autostart)
+		-DENABLE_SERVER=$(usex server)
+		-DENABLE_KEYBOARD=$(usex keyboard)
+		-DENABLE_TEST=$(usex test)
+		-DENABLE_ENCHANT=$(usex enchant)
+		-DENABLE_EMOJI=$(usex emoji)
+		-DENABLE_PRESAGE=$(usex presage)
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_DOC=$(usex doc)
+		-DUSE_SYSTEMD=$(usex systemd)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+	use doc && dodoc -r "${BUILD_DIR}"/doc/*
+}
+
+src_test() {
+	# break by sandbox
+	local CMAKE_SKIP_TESTS=(
+		testdbus
+		testservicewatcher
+	)
+	cmake_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "Follow the instrcutions on:"
+	elog "https://wiki.gentoo.org/wiki/Fcitx#Using_Fcitx"
+	elog "https://fcitx-im.org/wiki/Setup_Fcitx_5"
+	elog "https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland"
+	elog
+}

diff --git a/app-i18n/fcitx/files/fcitx-5.1.12-make-x11-dependencies-optional.patch b/app-i18n/fcitx/files/fcitx-5.1.12-make-x11-dependencies-optional.patch
new file mode 100644
index 000000000000..b177316fb7e4
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-5.1.12-make-x11-dependencies-optional.patch
@@ -0,0 +1,24 @@
+https://github.com/fcitx/fcitx5/pull/1259
+
+The header may be not available when X11 is disabled. Fixes fcitx5
+build without X11 libraries.
+
+Signed-off-by: Yao Zi <ziyao@disroot.org>
+--- a/src/ui/classic/classicui.cpp
++++ b/src/ui/classic/classicui.cpp
+@@ -20,7 +20,6 @@
+ #include <utility>
+ #include <vector>
+ #include <cairo.h>
+-#include <xcb/xcb.h>
+ #include "fcitx-config/iniparser.h"
+ #include "fcitx-config/rawconfig.h"
+ #include "fcitx-utils/color.h"
+@@ -45,6 +44,7 @@
+ #include "plasmathemewatchdog.h"
+ #include "theme.h"
+ #ifdef ENABLE_X11
++#include <xcb/xcb.h>
+ #include "xcb_public.h"
+ #include "xcbui.h"
+ #endif


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/files/, app-i18n/fcitx/
@ 2025-10-04 12:55 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2025-10-04 12:55 UTC (permalink / raw
  To: gentoo-commits

commit:     0a80f800dabb5959715fb608e8d5af28afc36154
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  2 19:29:45 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct  4 12:54:58 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a80f800

app-i18n/fcitx: drop 5.1.12

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-i18n/fcitx/Manifest                            |   1 -
 app-i18n/fcitx/fcitx-5.1.12.ebuild                 | 125 ---------------------
 ...itx-5.1.12-make-x11-dependencies-optional.patch |  24 ----
 3 files changed, 150 deletions(-)

diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 8be8caab4940..f0c3c7255f0e 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,2 +1 @@
-DIST fcitx-5.1.12.tar.zst 8317084 BLAKE2B 097881acde8fc1cf6960fd20878bb25c483684ff9ad9ffa133081d91fffd50c53b29998b1577866f10a8cb409a3c0fc96766909f6bdf268313e768de79e372ea SHA512 82943f6c2e809e8d9049d457f59e52bc202daf922abec032efc589eefad77b4db4398fbaea92c019eaeaa40ccf51585a8a80676a7909433a8576dc63fb639645
 DIST fcitx-5.1.14.tar.zst 8374893 BLAKE2B e390a2faf54ab8f3a3748d72955104b7080ead8f4bb540341902cb3ba985fd77ce19d881ef8ff387a10145b9cf0d403c6d80ffb48d0f951822e3577c20c72344 SHA512 2a85f8d79bbf483b8feb13d7617f67ec4c56e0b7ba7b1328af9fc1f0214999cc73bb1c3a541e7974d00a0a2cb31f91da4cd7709388c91de2f2737c5055fd6563

diff --git a/app-i18n/fcitx/fcitx-5.1.12.ebuild b/app-i18n/fcitx/fcitx-5.1.12.ebuild
deleted file mode 100644
index 57b1436feb8c..000000000000
--- a/app-i18n/fcitx/fcitx-5.1.12.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="fcitx5"
-
-inherit cmake unpacker xdg
-
-DESCRIPTION="Fcitx 5 is a generic input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5"
-SRC_URI="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${PV}_dict.tar.zst -> ${P}.tar.zst"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-LICENSE="LGPL-2+ Unicode-DFS-2016"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="+autostart doc +emoji +enchant +keyboard presage +server systemd test wayland +X"
-REQUIRED_USE="
-	|| ( wayland X )
-	X? ( keyboard )
-	wayland? ( keyboard )
-"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!app-i18n/fcitx:4
-	dev-libs/libfmt
-	sys-devel/gettext
-	virtual/libintl
-	x11-libs/cairo[X?]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango[X?]
-	doc? (
-		app-text/doxygen
-		dev-texlive/texlive-fontutils
-	)
-	emoji? ( sys-libs/zlib )
-	enchant? ( app-text/enchant:2 )
-	keyboard? (
-		app-text/iso-codes
-		dev-libs/expat
-		dev-libs/json-c:=
-		x11-misc/xkeyboard-config
-		x11-libs/libxkbcommon[X?,wayland?]
-	)
-	systemd? (
-		sys-apps/systemd
-	)
-	!systemd? (
-		dev-libs/libuv
-		sys-apps/dbus
-	)
-	wayland? (
-		dev-libs/glib:2
-		dev-libs/wayland
-		dev-libs/wayland-protocols
-		dev-util/wayland-scanner
-	)
-	X? (
-		dev-libs/glib:2
-		>=x11-libs/xcb-imdkit-1.0.3:5
-		x11-libs/libX11
-		x11-libs/libxkbfile
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	kde-frameworks/extra-cmake-modules:0
-"
-
-PATCHES=( "${FILESDIR}"/${P}-make-x11-dependencies-optional.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DBUS=on
-		-DENABLE_XDGAUTOSTART=$(usex autostart)
-		-DENABLE_SERVER=$(usex server)
-		-DENABLE_KEYBOARD=$(usex keyboard)
-		-DENABLE_TEST=$(usex test)
-		-DENABLE_ENCHANT=$(usex enchant)
-		-DENABLE_EMOJI=$(usex emoji)
-		-DENABLE_PRESAGE=$(usex presage)
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_DOC=$(usex doc)
-		-DUSE_SYSTEMD=$(usex systemd)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_test() {
-	# break by sandbox
-	local CMAKE_SKIP_TESTS=(
-		testdbus
-		testservicewatcher
-	)
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc -r "${BUILD_DIR}"/doc/*
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "Follow the instructions on:"
-	elog "https://wiki.gentoo.org/wiki/Fcitx#Using_Fcitx"
-	elog "https://fcitx-im.org/wiki/Setup_Fcitx_5"
-	elog "https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland"
-	elog
-}

diff --git a/app-i18n/fcitx/files/fcitx-5.1.12-make-x11-dependencies-optional.patch b/app-i18n/fcitx/files/fcitx-5.1.12-make-x11-dependencies-optional.patch
deleted file mode 100644
index b177316fb7e4..000000000000
--- a/app-i18n/fcitx/files/fcitx-5.1.12-make-x11-dependencies-optional.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/fcitx/fcitx5/pull/1259
-
-The header may be not available when X11 is disabled. Fixes fcitx5
-build without X11 libraries.
-
-Signed-off-by: Yao Zi <ziyao@disroot.org>
---- a/src/ui/classic/classicui.cpp
-+++ b/src/ui/classic/classicui.cpp
-@@ -20,7 +20,6 @@
- #include <utility>
- #include <vector>
- #include <cairo.h>
--#include <xcb/xcb.h>
- #include "fcitx-config/iniparser.h"
- #include "fcitx-config/rawconfig.h"
- #include "fcitx-utils/color.h"
-@@ -45,6 +44,7 @@
- #include "plasmathemewatchdog.h"
- #include "theme.h"
- #ifdef ENABLE_X11
-+#include <xcb/xcb.h>
- #include "xcb_public.h"
- #include "xcbui.h"
- #endif


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-10-04 12:55 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-04 12:55 [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/files/, app-i18n/fcitx/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2025-02-08  0:18 Yixun Lan
2017-09-11 18:39 Mike Gilbert
2016-09-15 14:47 Mike Gilbert
2016-03-24 14:43 Mike Gilbert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox