diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:49:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:49:08 -0600 |
| commit | 868c146fd385af6c8ee13c5759cc58d1af1b5c9a (patch) | |
| tree | 5fd74ca59310f668a46954b12ba170e755f3da1b | |
| parent | 8c5f73ae48a29b136425255cb6cbecb5470f7f1a (diff) | |
| download | thirdparty-868c146fd385af6c8ee13c5759cc58d1af1b5c9a.tar.gz thirdparty-868c146fd385af6c8ee13c5759cc58d1af1b5c9a.zip | |
Rename KCmd to avoid conflicts with KDE4
| -rw-r--r-- | libreoffice/3.3.2/patches/libreoffice-trinity.diff | 4 | ||||
| -rw-r--r-- | libreoffice/3.3.3/patches/libreoffice-trinity.diff | 4 | ||||
| -rw-r--r-- | libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libreoffice/3.3.2/patches/libreoffice-trinity.diff b/libreoffice/3.3.2/patches/libreoffice-trinity.diff index d660eb9..c9af693 100644 --- a/libreoffice/3.3.2/patches/libreoffice-trinity.diff +++ b/libreoffice/3.3.2/patches/libreoffice-trinity.diff @@ -9018,10 +9018,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++// Main ++////////////////////////////////////////////////////////////////////////// ++ -++static KCmdLineOptions sOptions[] = +++static TDECmdLineOptions sOptions[] = ++{ ++ { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" }, -++ KCmdLineLastOption +++ TDECmdLineLastOption ++}; ++ ++int main( int argc, char* argv[] ) diff --git a/libreoffice/3.3.3/patches/libreoffice-trinity.diff b/libreoffice/3.3.3/patches/libreoffice-trinity.diff index c190a2e..e533f57 100644 --- a/libreoffice/3.3.3/patches/libreoffice-trinity.diff +++ b/libreoffice/3.3.3/patches/libreoffice-trinity.diff @@ -9018,10 +9018,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil ++// Main ++////////////////////////////////////////////////////////////////////////// ++ -++static KCmdLineOptions sOptions[] = +++static TDECmdLineOptions sOptions[] = ++{ ++ { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" }, -++ KCmdLineLastOption +++ TDECmdLineLastOption ++}; ++ ++int main( int argc, char* argv[] ) diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff index 9423239..17dcc45 100644 --- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff +++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff @@ -9345,10 +9345,10 @@ index 0000000..eb20aa3 +// Main +////////////////////////////////////////////////////////////////////////// + -+static KCmdLineOptions sOptions[] = ++static TDECmdLineOptions sOptions[] = +{ + { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" }, -+ KCmdLineLastOption ++ TDECmdLineLastOption +}; + +int main( int argc, char* argv[] ) |