TDE
/
thirdparty
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/thirdparty
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KCmd to avoid conflicts with KDE4

Browse Source
r14.0.x
Timothy Pearson 11 years ago
parent 8c5f73ae48
commit 868c146fd3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

4
libreoffice/3.3.2/patches/libreoffice-trinity.diff
Unescape View File

@ -9018,10 +9018,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++// Main ++// Main
++////////////////////////////////////////////////////////////////////////// ++//////////////////////////////////////////////////////////////////////////
++ ++
++static KCmdLineOptions sOptions[] = ++static TDECmdLineOptions sOptions[] =
++{ ++{
++ { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" }, ++ { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" },
++ KCmdLineLastOption ++ TDECmdLineLastOption
++}; ++};
++ ++
++int main( int argc, char* argv[] ) ++int main( int argc, char* argv[] )

4
libreoffice/3.3.3/patches/libreoffice-trinity.diff
Unescape View File

@ -9018,10 +9018,10 @@ diff -urN libreoffice-build/patches/dev300/trinity-modules.diff libreoffice-buil
++// Main ++// Main
++////////////////////////////////////////////////////////////////////////// ++//////////////////////////////////////////////////////////////////////////
++ ++
++static KCmdLineOptions sOptions[] = ++static TDECmdLineOptions sOptions[] =
++{ ++{
++ { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" }, ++ { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" },
++ KCmdLineLastOption ++ TDECmdLineLastOption
++}; ++};
++ ++
++int main( int argc, char* argv[] ) ++int main( int argc, char* argv[] )

4
libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
Unescape View File

@ -9345,10 +9345,10 @@ index 0000000..eb20aa3
+// Main +// Main
+////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////
+ +
+static KCmdLineOptions sOptions[] = +static TDECmdLineOptions sOptions[] =
+{ +{
+ { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" }, + { "winid <argument>", I18N_NOOP("Window ID to which is the fpicker modal"), "0" },
+ KCmdLineLastOption + TDECmdLineLastOption
+}; +};
+ +
+int main( int argc, char* argv[] ) +int main( int argc, char* argv[] )

Write Preview
Loading…
Cancel
Save