-DIST ibus-qt-1.3.1-Source.tar.gz 141488 SHA256 4079577a240c961278f7bdab11a5ad546dff414c687c60560fdbc19208b3ac85 SHA512 2cd28f8ff3fff411496ccaf9ab67ab5332b7f2d2d0d0e3460dbeb34874ed931aa56c222c3ea5ce39053577b91cd2de4ebe01152039cd6def37c366ab3065cff2 WHIRLPOOL 585ead9a02d2014f7536aa633c72e07f8ce990c768d0aa9b5bf00105166f467307fb12457c5da4c2aa0b7b5cf9656d616de7d0e344e8d02161e123368bdad9ff
DIST ibus-qt-1.3.3.tar.gz 141523 SHA256 29bff835a4a07396c5f174d29c2266a39767c1abad48b2b0da1ab8d4c66fb44a SHA512 825a32fec51f10f466efd4255743a12ae98af63bacd07d5dc04e18fab6b830501b04491146c1f8bc92edd93dbf8eaeb68cf71062ffdbf25c2970d807b655c80a WHIRLPOOL 692f5dcf1e89c28a90a4fdfbd0bc62e00e5f680798ecfe9c7a47c9d26510c30415a07facae0e7e44f0416f7b3675a6c4445c8812294ec37ea523603a68d7c6a0
+++ /dev/null
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,7 +76,7 @@
- # pkg_check_modules(IBUS REQUIRED ibus-1.0>=1.2.0)
-
- # check doxygen
--find_package(Doxygen REQUIRED)
-+find_package(Doxygen)
-
- # =====
- # Define variables
-@@ -100,8 +100,7 @@
- # install
- set(MAIN_DOCS
- AUTHORS
-- README
-- INSTALL)
-+ README)
- install(FILES ${MAIN_DOCS}
- DESTINATION ${DOCDIR})
-
+++ /dev/null
-commit d2a4e30fdb92aeaf476dcaaf2b5d6f8275d6af70
-Author: Peter Wu <lekensteyn@gmail.com>
-Date: Tue Sep 4 19:40:08 2012 +0200
-
- Do not crash on missing/invalid DISPLAY envvar.
-
- - Check whether the passed DISPLAY environment variable contains ":".
-
- - Fallback to "-display" parameter passed to QApplication.
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2ad5588..8866ac0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -92,9 +92,11 @@ set_target_properties(
- target_link_libraries(
- ibus-qt
- debug ${QT_QTCORE_LIBRARY_DEBUG}
-+ debug ${QT_QTGUI_LIBRARY_DEBUG}
- debug ${QT_QTDBUS_LIBRARY_DEBUG}
- debug ${QT_QTXML_LIBRARY_DEBUG}
- optimized ${QT_QTCORE_LIBRARY_RELEASE}
-+ optimized ${QT_QTGUI_LIBRARY_RELEASE}
- optimized ${QT_QTDBUS_LIBRARY_RELEASE}
- optimized ${QT_QTXML_LIBRARY_RELEASE}
- ${DBUS_LIBRARIES}
-diff --git a/src/qibusbus.cpp b/src/qibusbus.cpp
-index 6a45d65..ed8248a 100644
---- a/src/qibusbus.cpp
-+++ b/src/qibusbus.cpp
-@@ -12,7 +12,8 @@
- #include "qibusbus.h"
- #include "qibusibusproxy.h"
- #include "qibusdbusproxy.h"
--
-+#include <X11/Xlib.h>
-+#include <QX11Info>
-
- namespace IBus {
- /**
-@@ -121,15 +122,23 @@ QString
- Bus::getSocketPath (void)
- {
- QString display = getenv ("DISPLAY");
-- QStringList strs = display.split(":");
- QString hostname = "unix";
- QString display_number = "0";
-+ /* fallback when -display is passed to QApplication with no DISPLAY env */
-+ if (display == NULL) {
-+ Display * dpy = QX11Info::display();
-+ if (dpy)
-+ display = XDisplayString(dpy);
-+ }
-+ if (display != NULL && display.contains(':')) {
-+ QStringList strs = display.split(":");
-
-- if (!strs[0].isEmpty())
-- hostname = strs[0];
-- strs = strs[1].split(".");
-- if (!strs[0].isEmpty())
-- display_number = strs[0];
-+ if (!strs[0].isEmpty())
-+ hostname = strs[0];
-+ strs = strs[1].split(".");
-+ if (!strs[0].isEmpty())
-+ display_number = strs[0];
-+ }
-
- QString path =
- QDir::homePath() +
+++ /dev/null
-commit 0f3b716934f5e5e2b8a72140f875a6e598b28750
-Author: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Thu Dec 13 07:10:19 2012 +0900
-
- Fix an undefined reference to 'XDisplayString'
-
- BUG=http://code.google.com/p/ibus/issues/detail?id=1560
-
- Review URL: https://codereview.appspot.com/6923057
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 8866ac0..f419141 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -100,6 +100,7 @@ target_link_libraries(
- optimized ${QT_QTDBUS_LIBRARY_RELEASE}
- optimized ${QT_QTXML_LIBRARY_RELEASE}
- ${DBUS_LIBRARIES}
-+ ${X11_LIBRARIES}
- )
-
- install(TARGETS ibus-qt
+++ /dev/null
-commit 40e119bd5577fc383990ad02b175ec64292f764b
-Author: Jekyll Wu <adaptee@gmail.com>
-Date: Tue Oct 16 11:24:06 2012 +0900
-
- Fix a non-const lvalue build error with clang-3.1
-
- BUG=http://code.google.com/p/ibus/issues/detail?id=1506
-
- Review URL: https://codereview.appspot.com/6697048
- Patch from Jekyll Wu <adaptee@gmail.com>.
-
-diff --git a/src/qibusserializable.h b/src/qibusserializable.h
-index 594d973..92a32ed 100644
---- a/src/qibusserializable.h
-+++ b/src/qibusserializable.h
-@@ -91,7 +91,7 @@ private:
-
- template<typename T>
- QVariant &
--qVariantFromSerializable (const Pointer<T> &p, QVariant & variant = QVariant ())
-+qVariantFromSerializable (const Pointer<T> &p, QVariant & variant)
- {
- QDBusArgument argument;
-
+++ /dev/null
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-MY_P="${P}-Source"
-
-DESCRIPTION="Qt IBus library and Qt input method plugin"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://ibus.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="app-i18n/ibus
- dev-libs/icu:=
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- sys-apps/dbus
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.0.20091217-doc.patch
- "${FILESDIR}"/${P}-display-unset.patch
- "${FILESDIR}"/${P}-gold.patch
- "${FILESDIR}"/${P}-qvariant.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DLIBDIR=$(get_libdir)
- -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use doc; then
- emake -C "${BUILD_DIR}" docs
- fi
-}
-
-src_install() {
- if use doc; then
- HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
- fi
-
- cmake-utils_src_install
-}
projects / gentoo.git / commitdiff