diff options
author | root <root@rshg054.dnsready.net> | 2013-07-17 00:58:52 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-07-17 00:58:52 -0700 |
commit | dee9f17b595ea903a982d31d1124b302bb17e2ff (patch) | |
tree | 295fdab78e28e1952fbc13ce824d57c88ede4e3b /community/ibus-qt | |
parent | 380530d02a5449fdef97b63b394a6743c3de0092 (diff) |
Wed Jul 17 00:58:51 PDT 2013
Diffstat (limited to 'community/ibus-qt')
-rw-r--r-- | community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch | 75 | ||||
-rw-r--r-- | community/ibus-qt/PKGBUILD | 31 |
2 files changed, 0 insertions, 106 deletions
diff --git a/community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch b/community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch deleted file mode 100644 index eab3a51fe..000000000 --- a/community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch +++ /dev/null @@ -1,75 +0,0 @@ -From fab6dc760edc39b9b4e561cfbf21b38c4fa86234 Mon Sep 17 00:00:00 2001 -From: Peter Wu <lekensteyn@gmail.com> -Date: Tue, 4 Sep 2012 19:40:08 +0200 -Subject: [PATCH] Do not crash on missing/invalid DISPLAY envvar. - -- Check whether the passed DISPLAY environment variable contains ":". - -- Fallback to "-display" parameter passed to QApplication. ---- - src/CMakeLists.txt | 2 ++ - src/qibusbus.cpp | 23 ++++++++++++++++------- - 2 files changed, 18 insertions(+), 7 deletions(-) - -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() + --- -1.7.12 diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD deleted file mode 100644 index 0f26672df..000000000 --- a/community/ibus-qt/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 87047 2013-03-26 11:49:40Z foutrelis $ -# Maintainer: Felix Yan <felixonmars@gmail.com> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: garion < garion @ mailoo.org > -# Contributor: leemars - -pkgname=ibus-qt -pkgver=1.3.2 -pkgrel=1 -pkgdesc='IBus qt library and IBus qt input method plugin' -arch=('i686' 'x86_64') -license=('LGPL') -url='http://ibus.googlecode.com' -depends=('qt4' 'ibus' 'icu') -makedepends=('cmake' 'automoc4' 'doxygen') -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz") - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-Source" - mkdir build - cd build - - cmake .. -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-Source/build" - make DESTDIR="${pkgdir}" install -} -md5sums=('e53cb59f993d0c93ba968330dbc62c22') |