[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 5 commits - avmedia/Module_avmedia.mk configure.ac postprocess/Rdb_services.mk sysui/desktop vcl/osx
Tor Lillqvist
tml at collabora.com
Fri Oct 14 06:49:04 UTC 2016
avmedia/Module_avmedia.mk | 2 +
configure.ac | 17 ++++++++++----
postprocess/Rdb_services.mk | 4 ++-
sysui/desktop/macosx/Info.plist.in | 44 +++++++++++++++++++++++++++++++++++++
vcl/osx/PictToBmpFlt.cxx | 1
vcl/osx/salinst.cxx | 3 ++
6 files changed, 65 insertions(+), 6 deletions(-)
New commits:
commit 275daca2beecc5bb7a3ffc57afa882434971110b
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Oct 14 09:37:26 2016 +0300
Add CFBundleTypeIconFile properties to the CFBundleDocumentTypes entries
Thought it wouldt have an effect on icons displayed for LO-edited/able
documents, but not. Still, probably doesn't hurt. More properly native
macOS applications seem to have CFBundleTypeIconFile things in their
Info.plist and not UTTypeIconFile, so probably it is the right way to
go.
It would be lovely to have a good understanding of how macOS
Info.plist, file types, document icons and previews in Finder, file
system metadata, etc actually work. At least Info.plist seemed to be a
mess of backward compatible stuff last time I tried to understand
documentation.
Change-Id: I2a141adb4bdb202a372a55aed91a1761464fcc2e
diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in
index bd10c26..536a3c0 100755
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1478,6 +1478,8 @@
<array>
<string>org.openoffice.text</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>text.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1490,6 +1492,8 @@
<array>
<string>org.oasis-open.opendocument.text</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>oasis-text.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1502,6 +1506,8 @@
<array>
<string>org.openoffice.spreadsheet</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>spreadsheet.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1514,6 +1520,8 @@
<array>
<string>org.oasis-open.opendocument.spreadsheet</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>oasis-spreadsheet.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1526,6 +1534,8 @@
<array>
<string>org.openoffice.presentation</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>presentation.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1538,6 +1548,8 @@
<array>
<string>org.oasis-open.opendocument.presentation</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>oasis-presentation.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1550,6 +1562,8 @@
<array>
<string>org.openoffice.graphics</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>drawing.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1562,6 +1576,8 @@
<array>
<string>org.oasis-open.opendocument.graphics</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>oasis-drawing.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1586,6 +1602,8 @@
<array>
<string>org.openoffice.text-master</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>master-document.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1598,6 +1616,8 @@
<array>
<string>org.oasis-open.opendocument.text-master</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>oasis-master-document.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1610,6 +1630,8 @@
<array>
<string>org.openoffice.formula</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>formula.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1622,6 +1644,8 @@
<array>
<string>org.oasis-open.opendocument.formula</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>oasis-formula.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1634,6 +1658,8 @@
<array>
<string>org.openoffice.text-template</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>text-template.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1646,6 +1672,8 @@
<array>
<string>org.oasis-open.opendocument.text-template</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>oasis-text-template.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1670,6 +1698,8 @@
<array>
<string>org.openoffice.spreadsheet-template</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>spreadsheet-template.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1682,6 +1712,8 @@
<array>
<string>org.oasis-open.opendocument.spreadsheet-template</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>oasis-spreadsheet-template.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1694,6 +1726,8 @@
<array>
<string>org.openoffice.presentation-template</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>presentation-template.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1706,6 +1740,8 @@
<array>
<string>org.oasis-open.opendocument.presentation-template</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>oasis-presentation-template.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1718,6 +1754,8 @@
<array>
<string>org.openoffice.graphics-template</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>drawing-template.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1730,6 +1768,8 @@
<array>
<string>org.oasis-open.opendocument.graphics-template</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>oasis-drawing-template.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1742,6 +1782,8 @@
<array>
<string>org.oasis-open.opendocument.database</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>oasis-database.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
@@ -1754,6 +1796,8 @@
<array>
<string>org.openoffice.extension</string>
</array>
+ <key>CFBundleTypeIconFile</key>
+ <string>extension.icns</string>
</dict>
<dict>
<key>CFBundleTypeName</key>
commit 808e376c6664cae3b0a2d8e26be9fa11ad007e09
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Sep 24 00:13:45 2016 +0300
tdf#102382: nextEventMatchingMask should only be called from the Main Thread
So don't then unless we are on the main thread.
Change-Id: I6ba52ed7db5d73a4c1c6acf10bdf254a6f959da8
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 4bfe5bc..ecc0aed 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -736,6 +736,9 @@ bool AquaSalInstance::AnyInput( VclInputFlags nType )
}
}
+ if (![NSThread isMainThread])
+ return false;
+
unsigned/*NSUInteger*/ nEventMask = 0;
if( nType & VclInputFlags::MOUSE)
nEventMask |=
commit e07bc2fbf929f056dadbefe9f639fa5d40782662
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Aug 4 23:29:12 2016 +0300
No QuickTime in the 10.12 SDK
Finally. It has been documented as deprecated for years, after all.
Change-Id: Ia7f81639b2e0b313e0a8931f49c3902c5856339d
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index 06af36f..2d2fc92 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -37,11 +37,13 @@ endif
ifeq ($(OS),MACOSX)
ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
+ifneq ($(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)),)
$(eval $(call gb_Module_add_targets,avmedia,\
Library_avmediaQuickTime \
))
endif
endif
+endif
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,avmedia,\
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 1974b59..e133f6b 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -127,7 +127,9 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(filter MACOSX,$(OS)), \
$(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
- $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
+ $(if $(filter 1080 1090 101000 101100,$(MACOSX_SDK_VERSION)), \
+ $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
+ ) \
) \
lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \
fpicker/source/aqua/fps_aqua \
commit 54784562f535061840327fdcd3cf27b9288e2e55
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Aug 4 23:24:12 2016 +0300
Drop unneeded include
There is no <QuickTime/QuickTime.h> in the 10.12 SDK anyway.
Change-Id: I0d937d4b036d118fcb503543a516e55f859a3718
diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx
index af8740b..153c036 100644
--- a/vcl/osx/PictToBmpFlt.cxx
+++ b/vcl/osx/PictToBmpFlt.cxx
@@ -19,7 +19,6 @@
#include <premac.h>
#include <Carbon/Carbon.h>
-#include <QuickTime/QuickTime.h>
#include <postmac.h>
#include <string.h>
commit b7d49b078e9a8262491aac57a1533d37d3d586fc
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Aug 4 22:48:22 2016 +0300
Accept also macOS SDK 10.12
Change-Id: I2e654de8af40486ef63146ad42a3f2988f9c3579
diff --git a/configure.ac b/configure.ac
index b155bd1..873dded 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2825,7 +2825,7 @@ if test $_os = Darwin; then
AC_MSG_CHECKING([what Mac OS X SDK to use])
- for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11; do
+ for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11 10.12; do
MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> /dev/null`
if test -d "$MACOSX_SDK_PATH"; then
with_macosx_sdk="${_macosx_sdk}"
@@ -2856,8 +2856,11 @@ if test $_os = Darwin; then
10.11)
MACOSX_SDK_VERSION=101100
;;
+ 10.12)
+ MACOSX_SDK_VERSION=101200
+ ;;
*)
- AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.8--11])
+ AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.8--12])
;;
esac
@@ -2889,8 +2892,11 @@ if test $_os = Darwin; then
10.11)
MAC_OS_X_VERSION_MIN_REQUIRED="101100"
;;
+ 10.12)
+ MAC_OS_X_VERSION_MIN_REQUIRED="101200"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.8--11])
+ AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.8--12])
;;
esac
@@ -2926,8 +2932,11 @@ if test $_os = Darwin; then
10.11)
MAC_OS_X_VERSION_MAX_ALLOWED="101100"
;;
+ 10.12)
+ MAC_OS_X_VERSION_MAX_ALLOWED="101200"
+ ;;
*)
- AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.8--11])
+ AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.8--12])
;;
esac
More information about the Libreoffice-commits
mailing list