diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-14 18:33:48 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-14 18:33:48 +0800 |
| commit | 1b3327761c8bcb98d89b529daeae9600844b4361 (patch) | |
| tree | 0be1cd4eb5fec6661da4798906b0d9bd522e794f /textproc/scim/files/extra-patch-4-stable | |
| parent | a65aedbb59fd9dfb33a4633611777da99ec4dcd5 (diff) | |
| download | marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.gz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.bz2 marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.lz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.xz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.zst marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.zip | |
Clean out MarcusCom after the big import into ports.
Next stop, GNOME 2.17.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7799 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'textproc/scim/files/extra-patch-4-stable')
| -rw-r--r-- | textproc/scim/files/extra-patch-4-stable | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/textproc/scim/files/extra-patch-4-stable b/textproc/scim/files/extra-patch-4-stable deleted file mode 100644 index 4507a5e57..000000000 --- a/textproc/scim/files/extra-patch-4-stable +++ /dev/null @@ -1,31 +0,0 @@ ---- modules/Config/scim_simple_config.cpp.orig Mon Jan 10 17:30:45 2005 -+++ modules/Config/scim_simple_config.cpp Wed Mar 2 01:41:40 2005 -@@ -595,13 +595,13 @@ - std::vector <String> strs; - if (scim_split_string_list (strs, it->second, ':') == 2) { - time_t sec = (time_t) strtol (strs [0].c_str (), 0, 10); -- suseconds_t usec = (suseconds_t) strtol (strs [1].c_str (), 0, 10); -+ long usec = (long) strtol (strs [1].c_str (), 0, 10); - - // The config file is newer, so load it. - if (m_update_timestamp.tv_sec < sec || (m_update_timestamp.tv_sec == sec && m_update_timestamp.tv_usec < usec)) { - m_config.swap (config); - m_update_timestamp.tv_sec = (time_t) sec; -- m_update_timestamp.tv_usec = (suseconds_t) usec; -+ m_update_timestamp.tv_usec = (long) usec; - return true; - } - } -Index: modules/Config/scim_socket_config.cpp -diff -u modules/Config/scim_socket_config.cpp.orig modules/Config/scim_socket_config.cpp ---- modules/Config/scim_socket_config.cpp.orig Mon Jan 10 17:30:45 2005 -+++ modules/Config/scim_socket_config.cpp Wed Mar 2 01:41:40 2005 -@@ -582,7 +582,7 @@ - std::vector <String> strs; - if (scim_split_string_list (strs, str, ':') == 2) { - time_t sec = (time_t) strtol (strs [0].c_str (), 0, 10); -- suseconds_t usec = (suseconds_t) strtol (strs [1].c_str (), 0, 10); -+ long usec = (long) strtol (strs [1].c_str (), 0, 10); - - // The config file is newer, so load it. - if (m_update_timestamp.tv_sec < sec || |