[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - scp2/source
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 18 +
1 file changed, 18 insertions(+)
New commits:
commit 1c5b55c92d3ea9ad43534f6020ba627e95178e28
Author: Maxime de Roucy mdero...@linagora.com
Date: Mon Dec 22 13:57:55 2014 +0100
fdo#67534 Fix Property Handler shared lock
As explained in the following link, access mode should be set to
EnableShareDenyNone to avoid blocking others process to access the
file opened by the Property Handler.
http://msdn.microsoft.com/en-us/library/windows/desktop/dd894084%28v=vs.85%29.aspx
Reviewed-on: https://gerrit.libreoffice.org/13596
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
Conflicts:
scp2/source/winexplorerext/registryitem_winexplorerext.scp
Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index a8eda1d..ccd1dba 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -339,6 +339,15 @@ RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
Value = %PRODUCTNAME Property Handler;
End
+RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext;
+ComponentCondition = VersionNT = 600;
+Subkey = CLSID\{AE424E85-F6DF-4910-A6A9-438797986431};
+Name = EnableShareDenyNone;
+Value = #1;
+End
+
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
@@ -347,6 +356,15 @@ RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
Value = %PRODUCTNAME Property Handler;
End
+RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite_x64
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Optional_Winexplorerext_x64;
+ComponentCondition = VersionNT = 600;
+Subkey = CLSID\{AE424E85-F6DF-4910-A6A9-438797986431};
+Name = EnableShareDenyNone;
+Value = #1;
+End
+
RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - scp2/source
scp2/source/ooo/ure.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2a6e20670c5081165e0895bc1cdbe65d898c5d86 Author: Andras Timar andras.ti...@collabora.com Date: Fri Sep 12 07:05:34 2014 -0700 scp2: fix non-OSX build Change-Id: Id80906ca0f754bb839e8998a73e8cfb81825e7a3 diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index ab7e0fd..cc10293 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -91,7 +91,7 @@ Directory gid_Dir_Ure_Share_Misc #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE ParentID = gid_Brand_Dir_Share_Ure_Share; #else -ParentID = gid_Dir_Ure_Share; +ParentID = SCP2_URE_SHARE_DIR; #endif DosName = misc; End ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - scp2/source
scp2/source/ooo/common_brand.scp |6 ++
scp2/source/ooo/ure.scp | 10 --
2 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit c8177f0fafe80d343e2cd48053fdadba641a08f8
Author: Tor Lillqvist t...@collabora.com
Date: Sat Sep 13 07:36:33 2014 +0300
Fix issues with the URE unorc in the MACLIKE_APP_STRUCTURE case
Not sure it it is cleaner to use relative paths from ${ORIGIN}, or
paths below ${BRAND_BASE_DIR}. Now I use the former in the URE unorc
constructed in scp2, and the latter in the one expanded from
ure/source/unorc.in. (Whether these two really need to be separate or
not, no idea. Historical reasons? Different use cases, unit tests and
actual end-user install tree?)
Change-Id: Ib5f11176de1d5d983cac8358d67788ebc20f2b13
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a6e9580..6267af8 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -45,6 +45,7 @@ Module gid_Module_Root_Brand
gid_Brand_Dir_Share_Uno_Packages,
gid_Brand_Dir_Share_Uno_Packages_Cache,
gid_Brand_Dir_Share_Ure,
+gid_Brand_Dir_Share_Ure_Etc,
gid_Brand_Dir_Share_Ure_Share,
gid_Brand_Dir_Share_Glade,
gid_Brand_Dir_Share_Labels,
@@ -455,6 +456,11 @@ Directory gid_Brand_Dir_Share_Ure
DosName = ure;
End
+Directory gid_Brand_Dir_Share_Ure_Etc
+ParentID = gid_Brand_Dir_Share_Ure;
+DosName = etc;
+End
+
Directory gid_Brand_Dir_Share_Ure_Share
ParentID = gid_Brand_Dir_Share_Ure;
DosName = share;
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index cc10293..34e77b2 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -164,7 +164,7 @@ End
Profile gid_Profile_Dl_Uno_Ini
ModuleID = gid_Module_Root_Ure_Hidden;
#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Dir = gid_Brand_Dir_Share_Ure;
+Dir = gid_Brand_Dir_Share_Ure_Etc;
#else
Dir = SCP2_URE_DL_DIR;
#endif
@@ -177,7 +177,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir
Section = Bootstrap;
Key = URE_INTERNAL_LIB_DIR;
#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Value = ${ORIGIN}/../../Frameworks;
+Value = ${ORIGIN}/../../../Frameworks;
#else
Value = ${ORIGIN};
#endif
@@ -189,7 +189,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir
Section = Bootstrap;
Key = URE_INTERNAL_JAVA_DIR;
#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Value = ${ORIGIN}/../java;
+Value = ${ORIGIN}/../../java;
#elif defined WNT
Value = ${ORIGIN}/../java;
#else
@@ -210,9 +210,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Types
ProfileID = gid_Profile_Dl_Uno_Ini;
Section = Bootstrap;
Key = UNO_TYPES;
-#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Value = ${ORIGIN}/types.rdb ${URE_MORE_TYPES};
-#elif defined WNT
+#if defined WNT
Value = ${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES};
#else
Value = ${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - scp2/source
scp2/source/ooo/file_font_ooo.scp | 10 +++--- scp2/source/ooo/module_hidden_ooo.scp |2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) New commits: commit 27df6cd7d168f637b9b642e826bed8f2e25cfb34 Author: Andras Timar andras.ti...@collabora.com Date: Fri Jul 4 14:29:01 2014 +0200 add Carlito/Caladea fonts to install script They were added in libreoffice-4-1 branch but not anywhere else. See 2158e8bf85e139fd3cf59d00059ed2e2026f6a4a Change-Id: I2dcec7898590b526161be7eec1afe4610e6fe534 (cherry picked from commit 97f63c17f7bc069a12e3afc3975f09897731a693) diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index 5e27d1f..e13dee3 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -1,7 +1,7 @@ /* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ STD_FONT_FILELIST( gid_File_Fnt_Opensymb, extras_fonts.filelist ) -#ifndef WITHOUT_FONTS +#ifndef WITHOUT_FONTS // DejaVu fonts STD_FONT_FILELIST(gid_File_Fnt_DejaVu, fonts_dejavu.filelist) @@ -60,12 +60,16 @@ STD_FONT_FILELIST(gid_File_Fnt_SourceSans, fonts_sourcesans.filelist) // Source Code Pro fonts STD_FONT_FILELIST(gid_File_Fnt_SourceCode, fonts_sourcecode.filelist) +//Carlito and Caladea fonts +STD_FONT_FILELIST(gid_File_Fnt_Carlito, fonts_carlito.filelist) +STD_FONT_FILELIST(gid_File_Fnt_Caladea, fonts_caladea.filelist) + #endif // fontconfig updates to allow proper use of local fonts #ifdef UNX -#ifndef WITHOUT_FONTS +#ifndef WITHOUT_FONTS File gid_File_FcLocal_Conf Dir = FILELIST_DIR; USER_FILE_BODY; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 22edd6c..e75d860 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -374,6 +374,8 @@ Module gid_Module_Root_Fonts_OOo_Hidden Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Fnt_Opensymb, + gid_File_Fnt_Caladea, + gid_File_Fnt_Carlito, gid_File_Fnt_DejaVu, gid_File_Fnt_Gentium, gid_File_Fnt_LibSansNarrow, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - scp2/source
scp2/source/ooo/file_font_ooo.scp |2 ++ 1 file changed, 2 insertions(+) New commits: commit 66420bb9d1a4d38f0cc81d83957a685d7279911d Author: Andras Timar andras.ti...@collabora.com Date: Thu Oct 24 16:29:23 2013 +0200 disable Liberation fonts on Windows Change-Id: Ief9ee02f78f08a3002cc3ced3b9da80fc855aeef diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp index e7a2da35..5e27d1f 100644 --- a/scp2/source/ooo/file_font_ooo.scp +++ b/scp2/source/ooo/file_font_ooo.scp @@ -36,9 +36,11 @@ STD_FONT_FILELIST( gid_File_Fnt_Opensymb, extras_fonts.filelist ) // DejaVu fonts STD_FONT_FILELIST(gid_File_Fnt_DejaVu, fonts_dejavu.filelist) +#ifndef WNT // fdo#62764 - Libreration fonts reportedly cause BSOD on Win7 SP1 // Liberation fonts STD_FONT_FILELIST(gid_File_Fnt_LibSansNarrow, fonts_liberation_narrow.filelist) STD_FONT_FILELIST(gid_File_Fnt_Liberation, fonts_liberation.filelist) +#endif // Gentium fonts STD_FONT_FILELIST(gid_File_Fnt_Gentium, fonts_gentium.filelist) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
