summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/calc/file_calc.scp6
-rw-r--r--scp2/source/ooo/file_font_ooo.scp102
-rw-r--r--scp2/source/ooo/file_library_ooo.scp60
-rwxr-xr-xscp2/source/ooo/file_ooo.scp40
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp5
-rw-r--r--scp2/source/ooo/module_systemint.scp2
-rw-r--r--scp2/source/ooo/scpaction_ooo.scp4
-rwxr-xr-xscp2/source/ooo/ure.scp10
-rw-r--r--scp2/source/ooo/vc_redist.scp29
-rw-r--r--scp2/source/python/file_python.scp158
-rw-r--r--scp2/source/python/makefile.mk2
-rw-r--r--scp2/source/python/profileitem_python.scp12
-rw-r--r--scp2/source/xsltfilter/file_xsltfilter.scp2
13 files changed, 276 insertions, 156 deletions
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index aaba3cd6c2ab..7b392f173378 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -49,11 +49,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
+STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
-STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
+STD_LIB_FILE( gid_File_Lib_Scui, scui)
-STD_LIB_FILE_PATCH( gid_File_Lib_Scfilt, scfilt)
+STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index f26339fe8b1d..8ad8526d9ef6 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -27,6 +27,8 @@
#include "macros.inc"
+// OpenSymbol
+
STD_FONT_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol)
// DejaVu fonts
@@ -34,17 +36,8 @@ STD_FONT_FILE( gid_File_Fnt_Opensymb, opens___.ttf, OpenSymbol)
// DejaVuSans Proportional
#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSans, DejaVuSans.ttf, DejaVu Sans)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSans-Bold.ttf, DejaVu Sans Bold)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique)
#endif
@@ -56,51 +49,24 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSans-ExtraLight.ttf, Dej
// DejaVuSans Condensed
#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuSansCondensed-BoldOblique.ttf, DejaVu Sans Condensed Bold Oblique)
#endif
// DejaVuSans Mono
#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuSansMono.ttf, DejaVu Sans Mono)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuSansMono-BoldOblique.ttf, DejaVu Sans Mono Bold Oblique)
#endif
// DejaVuSerif Proportional
#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSerif, DejaVuSerif.ttf, DejaVu Serif)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerif-Italic.ttf, DejaVu Serif Italic)
-#endif
-
-#ifndef WITHOUT_FONTS
STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerif-BoldItalic.ttf, DejaVu Serif Bold Italic)
#endif
@@ -115,27 +81,20 @@ STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondense
// Liberation fonts
-// Liberation Mono
+// Liberation Sans Narrow
#ifndef WITHOUT_FONTS
-#ifndef WNT
-STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular)
-#endif
+STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Regular, LiberationSansNarrow-Regular.ttf, Liberation Sans Narrow Regular)
+STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Bold, LiberationSansNarrow-Bold.ttf, Liberation Sans Narrow Bold)
+STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_Italic, LiberationSansNarrow-Italic.ttf, Liberation Sans Narrow Italic)
+STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LiberationSansNarrow-BoldItalic.ttf, Liberation Sans Narrow Bold Italic)
#endif
+// Liberation Mono
#ifndef WITHOUT_FONTS
#ifndef WNT
+STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular)
STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic)
#endif
#endif
@@ -144,23 +103,8 @@ STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic
#ifndef WITHOUT_FONTS
#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic)
#endif
#endif
@@ -169,23 +113,8 @@ STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic
#ifndef WITHOUT_FONTS
#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic)
-#endif
-#endif
-
-#ifndef WITHOUT_FONTS
-#ifndef WNT
STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
#endif
#endif
@@ -206,3 +135,16 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book
STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic)
#endif
+// fontconfig updates to allow proper use of local fonts
+
+#ifdef UNX
+#ifndef WITHOUT_FONTS
+File gid_File_FcLocal_Conf
+ Dir = gid_Dir_Fonts_Truetype;
+ USER_FILE_BODY;
+# Styles = ();
+ Name = "fc_local.conf";
+End
+#endif
+#endif
+
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 3ebe0396dabb..404a1588f344 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -84,7 +84,7 @@ File gid_File_Lib_Cached1
#endif
End
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Configmgr, configmgr)
+SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno)
#ifdef WITH_LDAP
File gid_File_Lib_Ldapbe2
@@ -100,10 +100,10 @@ File gid_File_Lib_Ldapbe2
End
#endif
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartcontroller, chartcontroller)
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartmodel, chartmodel)
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Charttools, charttools)
-STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Chartview, chartview)
+STD_UNO_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
+STD_UNO_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
+STD_UNO_LIB_FILE(gid_File_Lib_Charttools, charttools)
+STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview)
#if defined WNT && defined _MSC
@@ -228,7 +228,7 @@ End
File gid_File_Lib_QStart_Gtk
Name = LIBNAME(qstart_gtk);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -363,7 +363,7 @@ File gid_File_Lib_Vbaswobj
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX));
#else
@@ -375,7 +375,7 @@ File gid_File_Lib_Vbamsforms
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX));
#else
@@ -505,7 +505,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
File gid_File_Lib_Filterconfig1
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
Name = SPECIAL_NAME(filterconfig1);
@@ -653,7 +653,7 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
File gid_File_Lib_Fwk
Name = LIBNAME(fwk);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -677,7 +677,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
File gid_File_Lib_I18npool
TXT_FILE_BODY;
- Styles = (PACKED,PATCH,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
@@ -1126,13 +1126,13 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr
File gid_File_Lib_Desktop_Detector
Name = LIBNAME(desktop_detector);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
File gid_File_Lib_Vclplug_Gen
Name = LIBNAME(vclplug_gen);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1142,7 +1142,7 @@ End
File gid_File_Lib_Vclplug_Gtk
Name = LIBNAME(vclplug_gtk);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1151,7 +1151,7 @@ End
File gid_File_Lib_Vclplug_Kde
Name = LIBNAME(vclplug_kde);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1161,7 +1161,7 @@ End
File gid_File_Lib_Vclplug_Kde4
Name = LIBNAME(vclplug_kde4);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = gid_Dir_Program;
End
#endif
@@ -1172,7 +1172,7 @@ End
File gid_File_Lib_AppleRemote
Name = LIBNAME(AppleRemote);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1181,13 +1181,13 @@ End
File gid_File_Lib_Basebmp
Name = LIBNAME(basebmp);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
#endif
#if defined UNX && ! defined QUARTZ
-STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
#endif
@@ -1195,7 +1195,7 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
File gid_File_Lib_Recentfile
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
End
@@ -1238,7 +1238,7 @@ End
File gid_File_Lib_Res
Name = LIBNAME(res);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1325,7 +1325,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
File gid_File_Lib_Sfx
Name = LIBNAME(sfx);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1381,19 +1381,19 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
STD_LIB_FILE( gid_File_Lib_Sts , sts)
STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
+STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
-STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
+STD_UNO_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
-STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
+STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
+STD_LIB_FILE( gid_File_Lib_Swui, swui)
-STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword )
+STD_LIB_FILE( gid_File_Lib_Msword, msword )
#if ! defined UNX
File gid_File_Lib_Sysdtrans
@@ -1485,6 +1485,8 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1)
SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno)
+SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
+
SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
File gid_File_Lib_Lnth
@@ -1512,7 +1514,7 @@ STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
File gid_File_Lib_Vcl
Name = LIBNAME(vcl);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1537,7 +1539,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
File gid_File_Lib_Xo
Name = LIBNAME(xo);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d72fda64f6f2..81ee4eac2960 100755
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1030,6 +1030,12 @@ File gid_File_Lm_Yiddish_Utf
Styles = (PACKED);
End
+File gid_File_Lm_Zulu
+ TXT_FILE_BODY;
+ Name = "zulu.lm";
+ Dir = gid_Dir_Share_Fingerprint;
+ Styles = (PACKED);
+End
@@ -1893,7 +1899,7 @@ End
File gid_File_Extension_Dictionary_Da
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-da.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -1902,7 +1908,7 @@ End
File gid_File_Extension_Dictionary_De_AT
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-de-AT.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -1911,7 +1917,7 @@ End
File gid_File_Extension_Dictionary_De_CH
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-de-CH.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -1920,7 +1926,7 @@ End
File gid_File_Extension_Dictionary_De_DE
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-de-DE.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -1929,7 +1935,7 @@ End
File gid_File_Extension_Dictionary_En
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-en.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -1947,7 +1953,7 @@ End
File gid_File_Extension_Dictionary_Et
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-et.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -1956,7 +1962,7 @@ End
File gid_File_Extension_Dictionary_Fr
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-fr.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -1983,7 +1989,7 @@ End
File gid_File_Extension_Dictionary_Hu
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-hu.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -1992,7 +1998,7 @@ End
File gid_File_Extension_Dictionary_It
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-it.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -2001,7 +2007,7 @@ End
File gid_File_Extension_Dictionary_Ku_Tr
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-ku-TR.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -2037,7 +2043,7 @@ End
File gid_File_Extension_Dictionary_No
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-no.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -2046,7 +2052,7 @@ End
File gid_File_Extension_Dictionary_Pl
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-pl.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -2055,7 +2061,7 @@ End
File gid_File_Extension_Dictionary_Pt
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-pt.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -2064,7 +2070,7 @@ End
File gid_File_Extension_Dictionary_Ro
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-ro.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -2082,7 +2088,7 @@ End
File gid_File_Extension_Dictionary_Sk
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-sk.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -2091,7 +2097,7 @@ End
File gid_File_Extension_Dictionary_Sl
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-sl.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
@@ -2109,7 +2115,7 @@ End
File gid_File_Extension_Dictionary_Sv
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-sv.oxt";
- Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
+ Styles = (PACKED, FORCELANGUAGEPACK);
UnixRights = 444;
End
#endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index a91114de03d7..a4ab3bfab762 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -606,6 +606,7 @@ Module gid_Module_Root_Files_6
gid_File_Lm_Vietnamese,
gid_File_Lm_Welsh,
gid_File_Lm_Yiddish_Utf,
+ gid_File_Lm_Zulu,
gid_File_Mod_Chart,
gid_File_Mod_Datastyl,
gid_File_Mod_Defs,
@@ -750,6 +751,10 @@ Module gid_Module_Root_Fonts_OOo_Hidden
gid_File_Fnt_DejaVuSerifCondensed_BoldItalic,
gid_File_Fnt_DejaVuSerifCondensed_Italic,
gid_File_Fnt_DejaVuSerifCondensed,
+ gid_File_Fnt_LibSansNarrow_Regular,
+ gid_File_Fnt_LibSansNarrow_Bold,
+ gid_File_Fnt_LibSansNarrow_BoldItalic,
+ gid_File_Fnt_LibSansNarrow_Italic,
gid_File_Fnt_LiberationMono_Bold,
gid_File_Fnt_LiberationMono_BoldItalic,
gid_File_Fnt_LiberationMono_Italic,
diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp
index f02b5be04368..12ccef46c805 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -45,6 +45,6 @@ Module gid_Module_Optional_Systemintegration
#else
PackageName = "";
#endif
- InstallOrder = "desktop-integration:1050, suse-menus:1060, freedesktop-menus:1250";
+ InstallOrder = "desktop-integration:1050, suse-menus:1060, freedesktop-menus:1250, redhat-menus:1260";
End
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index e5314c7c386e..d6f294f1da08 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -358,7 +358,11 @@ End
#ifdef MACOSX
ScpAction scp_Copy_Dmg_Background_Image
+ #if defined(BUILD_SPECIAL)
Copy = "osxdndinstall.png";
+ #else
+ Copy = "osxdndinstall_nologo.png";
+ #endif
Name = "background.png";
UnixRights = 444;
Styles = ();
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index ea0492235e91..22aba304c09e 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -634,6 +634,15 @@ File gid_File_Dl_Jpipe
End
#endif
+#if defined SOLAR_JAVA && defined WNT
+File gid_File_Dl_Jpipx
+ TXT_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+ Name = SCP2_URE_DL_NORMAL("jpipx");
+ Styles = (PACKED);
+End
+#endif
+
#if defined SOLAR_JAVA
File gid_File_Dl_Juh
TXT_FILE_BODY;
@@ -1153,6 +1162,7 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Dl_AffineUnoUno,
gid_File_Dl_LogUnoUno,
gid_File_Dl_Jpipe,
+ gid_File_Dl_Jpipx,
gid_File_Dl_Juh,
gid_File_Dl_Juhx,
gid_File_Dl_Acceptor,
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 70c490d954f8..0b71511c7f0e 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -29,32 +29,9 @@
#if defined(WITH_VC_REDIST)
-// WindowsCustomAction gid_Customaction_InstallRuntime
-// Name = "InstallRuntime";
-// Typ = "98";
-// Source = "SystemFolder";
-// Target = "[SourceDir]redist\vcredist_x86.exe /qb";
-// Inbinarytable = 0;
-// Styles = (NO_FILE);
-// Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction");
-// // Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "FileCost");
-// End
-
-// WindowsCustomAction gid_Customaction_InstallRuntime_X64
-// Name = "InstallRuntimeX64";
-// Typ = "98";
-// Source = "SystemFolder";
-// Target = "[SourceDir]redist\vcredist_x64.exe /qb";
-// Inbinarytable = 0;
-// Styles = (NO_FILE);
-// Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction");
-// // Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "FileCost");
-// End
-
-
ScpAction scp_Copy_vcredist_x86
#if defined(BUILD_SPECIAL)
- Copy = "vcredist_x86_9.0.21022.218.exe";
+ Copy = "vcredist_x86_9.0.30729.4148.exe";
#else
Copy = "vcredist_x86.exe";
#endif
@@ -63,7 +40,11 @@ ScpAction scp_Copy_vcredist_x86
End
ScpAction scp_Copy_vcredist_x64
+ #if defined(BUILD_SPECIAL)
+ Copy = "vcredist_x64_9.0.30729.4148.exe";
+ #else
Copy = "vcredist_x64.exe";
+ #endif
Name = "vcredist_x64.exe";
Subdir = "redist";
End
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 1303bf59460f..5cd84d82b3e9 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -83,11 +83,17 @@ End
File gid_File_Py_Python_Core
TXT_FILE_BODY;
Dir = gid_Dir_Program;
+ #ifdef MACOSX
+ Name = "OOoPython.framework.zip";
+ Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+ #else
Name = STRING(CONCAT3(python-core-,PYVERSION,.zip));
Styles = (ARCHIVE);
+ #endif
End
#ifdef UNX
+#ifndef MACOSX
File gid_File_Py_Python_Bin
BIN_FILE_BODY;
Dir = gid_Dir_Program;
@@ -96,6 +102,7 @@ File gid_File_Py_Python_Bin
End
#endif
#endif
+#endif
// Scripting Framework Python script proxy
@@ -126,12 +133,163 @@ File gid_File_Share_Registry_Pyuno_Xcd
End
#ifndef SYSTEM_PYTHON
+#ifndef MACOSX
File gid_File_Lib_Python_So
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Name = STRING(PY_FULL_DLL_NAME);
Styles = (PACKED);
End
+#else //MACOSX
+//directory entries solely to be able to create the symlinks
+Directory gid_Dir_PythonFramework
+ ParentID = gid_Dir_Program;
+ HostName = "OOoPython.framework";
+End
+
+Unixlink gid_Unixlink_Python_Headers
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework;
+ Name = "Headers";
+ Target = "Versions/Current/Headers";
+ Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_Resources
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework;
+ Name = "Resources";
+ Target = "Versions/Current/Resources";
+ Styles = ();
+End
+
+Directory gid_Dir_PythonFramework_Versions
+ ParentID = gid_Dir_PythonFramework;
+ HostName = "Versions";
+End
+
+Unixlink gid_Unixlink_Python_Versions_Current
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework_Versions;
+ Name = "Current";
+ Target = STRING(PYMAJMIN);
+ Styles = ();
+End
+
+Directory gid_Dir_PythonFramework_Versions_ver
+ ParentID = gid_Dir_PythonFramework_Versions;
+ HostName = STRING(PYMAJMIN);
+End
+
+Unixlink gid_Unixlink_Python_Versions_ver_Headers
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework_Versions_ver;
+ Name = "Headers";
+ Target = STRING(CONCAT2(include/python,PYMAJMIN));
+ Styles = ();
+End
+
+Directory gid_Dir_PythonFramework_Versions_ver_bin
+ ParentID = gid_Dir_PythonFramework_Versions_ver;
+ HostName = "bin";
+End
+
+Directory gid_Dir_PythonFramework_Versions_ver_lib
+ ParentID = gid_Dir_PythonFramework_Versions_ver;
+ HostName = "lib";
+End
+
+Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver
+ ParentID = gid_Dir_PythonFramework_Versions_ver_lib;
+ HostName = STRING(CONCAT2(python,PYMAJMIN));
+End
+
+Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config
+ ParentID = gid_Dir_PythonFramework_Versions_ver_lib_pythonver;
+ HostName = "config";
+End
+
+Unixlink gid_Unixlink_Python_OOoPython
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework;
+ Name = "OOoPython";
+ Target = "Versions/Current/OOoPython";
+ Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_idle
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+ Name = "idle";
+ Target = STRING(CONCAT2(idle,PYMAJMIN));
+ Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_pydoc
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+ Name = "pydoc";
+ Target = STRING(CONCAT2(pydoc,PYMAJMIN));
+ Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_python_real
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+ Name = "python";
+ Target = "../Resources/Python.app/Contents/MacOS/OOoPython";
+ Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_python
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+ Name = "python";
+ Target = STRING(CONCAT2(python,PYMAJMIN));
+ Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_pythonconfig
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+ Name = "python-config";
+ Target = STRING(CONCAT3(python,PYMAJMIN,-config));
+ Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_pythonw_real
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+ Name = "pythonw";
+ Target = "../Resources/Python.app/Contents/MacOS/OOoPython";
+ Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_pythonw
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+ Name = "pythonw";
+ Target = STRING(CONCAT2(pythonw,PYMAJMIN));
+ Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_bin_smtpdpy
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework_Versions_ver_bin;
+ Name = "smtpd.py";
+ Target = STRING(CONCAT3(smtpd,PYMAJMIN,.py));
+ Styles = ();
+End
+
+Unixlink gid_Unixlink_Python_libpython
+ BIN_FILE_BODY;
+ Dir = gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config;
+ Name = STRING(PY_FULL_DLL_NAME);
+ Target = "../../../OOoPython";
+ Styles = ();
+End
+#endif //MACOSX
+
#ifdef WNT
File gid_File_Lib_Python_So_Brand // Fix for system-python-problem on windows
TXT_FILE_BODY;
diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk
index b34c0af1491d..4e03218ff06a 100644
--- a/scp2/source/python/makefile.mk
+++ b/scp2/source/python/makefile.mk
@@ -44,7 +44,7 @@ SCPDEFS+=-DSYSTEM_PYTHON
.ENDIF
SCPDEFS+=\
- -DPYVERSION=$(PYVERSION) \
+ -DPYVERSION=$(PYVERSION) -DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \
-DPY_FULL_DLL_NAME=$(PY_FULL_DLL_NAME)
SCP_PRODUCT_TYPE=osl
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
index be8edc601eb6..1c4fdb077986 100644
--- a/scp2/source/python/profileitem_python.scp
+++ b/scp2/source/python/profileitem_python.scp
@@ -46,7 +46,11 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome
Section = "Bootstrap";
Order = 1;
Key = "PYUNO_LOADER_PYTHONHOME";
+ #ifdef MACOSX
+ Value = CONCAT2($ORIGIN,"OOoPython.framework");
+ #else
Value = CONCAT2($ORIGIN/python-core-,PYVERSION);
+ #endif
End
#endif
@@ -60,11 +64,19 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath
Value = "$ORIGIN";
#else
#ifdef UNX
+ #ifdef MACOSX
+ #define FRAMEWORKLIB CONCAT4($ORIGIN/OOoPython.framework/Versions/,PYMAJMIN,/lib/python,PYMAJMIN)
+ Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB,
+ /lib-dynload FRAMEWORKLIB,
+ /lib-tk FRAMEWORKLIB,
+ /site-packages $ORIGIN);
+ #else
Value = CONCAT9($ORIGIN/python-core-,PYVERSION,
/lib $ORIGIN/python-core-,PYVERSION,
/lib/lib-dynload $ORIGIN/python-core-,PYVERSION,
/lib/lib-tk $ORIGIN/python-core-,PYVERSION,
/lib/site-packages $ORIGIN);
+ #endif
#else
#ifdef _gcc3
Value = STRING(CONCAT9($ORIGIN/python-core-,PYVERSION,
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index e044a3dee90d..848b1c707ff7 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -57,7 +57,7 @@ End
File gid_File_Xsl_Export_Xhtml_Body
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = gid_Dir_Share_Xslt_Export_Xhtml;
Name = "/xslt/export/xhtml/body.xsl";
End
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 11:10:04 +0000