forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
- Loading branch information
Showing
7 changed files
with
36 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,12 @@ | ||
From d2a4e30fdb92aeaf476dcaaf2b5d6f8275d6af70 Mon Sep 17 00:00:00 2001 | ||
From: Peter Wu <[email protected]> | ||
Date: Tue, 4 Sep 2012 19:40:08 +0200 | ||
Subject: [PATCH] Do not crash on missing/invalid DISPLAY envvar. | ||
commit d2a4e30fdb92aeaf476dcaaf2b5d6f8275d6af70 | ||
Author: Peter Wu <[email protected]> | ||
Date: Tue Sep 4 19:40:08 2012 +0200 | ||
|
||
- Check whether the passed DISPLAY environment variable contains ":". | ||
Do not crash on missing/invalid DISPLAY envvar. | ||
|
||
- Fallback to "-display" parameter passed to QApplication. | ||
--- | ||
src/CMakeLists.txt | 2 ++ | ||
src/qibusbus.cpp | 23 ++++++++++++++++------- | ||
2 files changed, 18 insertions(+), 7 deletions(-) | ||
- 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 | ||
|
@@ -41,7 +38,7 @@ index 6a45d65..ed8248a 100644 | |
|
||
namespace IBus { | ||
/** | ||
@@ -121,15 +122,23 @@ | ||
@@ -121,15 +122,23 @@ QString | ||
Bus::getSocketPath (void) | ||
{ | ||
QString display = getenv ("DISPLAY"); | ||
|
@@ -71,6 +68,3 @@ index 6a45d65..ed8248a 100644 | |
|
||
QString path = | ||
QDir::homePath() + | ||
-- | ||
1.7.10 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,12 @@ | ||
src/CMakeLists.txt | 1 + | ||
1 file changed, 1 insertion(+) | ||
commit 0f3b716934f5e5e2b8a72140f875a6e598b28750 | ||
Author: fujiwarat <[email protected]> | ||
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,19 @@ | ||
From 40e119bd5577fc383990ad02b175ec64292f764b Mon Sep 17 00:00:00 2001 | ||
From: Jekyll Wu <[email protected]> | ||
Date: Tue, 16 Oct 2012 11:24:06 +0900 | ||
Subject: [PATCH] Fix a non-const lvalue build error with clang-3.1 | ||
commit 40e119bd5577fc383990ad02b175ec64292f764b | ||
Author: Jekyll Wu <[email protected]> | ||
Date: Tue Oct 16 11:24:06 2012 +0900 | ||
|
||
BUG=http://code.google.com/p/ibus/issues/detail?id=1506 | ||
Fix a non-const lvalue build error with clang-3.1 | ||
|
||
Review URL: https://codereview.appspot.com/6697048 | ||
Patch from Jekyll Wu <[email protected]>. | ||
--- | ||
src/qibusserializable.h | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
BUG=http://code.google.com/p/ibus/issues/detail?id=1506 | ||
|
||
Review URL: https://codereview.appspot.com/6697048 | ||
Patch from Jekyll Wu <[email protected]>. | ||
|
||
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 @@ class Serializable : public Object | ||
@@ -91,7 +91,7 @@ private: | ||
|
||
template<typename T> | ||
QVariant & | ||
|
@@ -24,6 +22,3 @@ index 594d973..92a32ed 100644 | |
{ | ||
QDBusArgument argument; | ||
|
||
-- | ||
1.8.1.5 | ||
|
4 changes: 2 additions & 2 deletions
4
app-i18n/ibus-qt/files/ibus-qt-1.3-doc.patch → app-i18n/ibus-qt/files/ibus-qt-doc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters