[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 17 commits - configure.ac lo.xcent.in Makefile.in pyuno/Package_python_shell.mk registry/Module_registry.mk Repository.mk scp2/source ure/Package_install.mk vcl/Module_vcl.mk
Andras Timar
andras.timar at collabora.com
Tue Mar 8 09:21:09 UTC 2016
Makefile.in | 25 +++++++++++++++++++++++++
Repository.mk | 10 +++++++---
configure.ac | 2 +-
lo.xcent.in | 9 ---------
pyuno/Package_python_shell.mk | 4 ++++
registry/Module_registry.mk | 6 ++++--
scp2/source/ooo/common_brand.scp | 2 +-
scp2/source/ooo/file_ooo.scp | 4 ++--
ure/Package_install.mk | 2 ++
vcl/Module_vcl.mk | 2 +-
10 files changed, 47 insertions(+), 19 deletions(-)
New commits:
commit bb431cd1e089aa5f4f7d28bdd07e594dacaaaf0d
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun May 17 10:56:20 2015 +0200
Don't build ui-previewer in the App Store case
Conflicts:
vcl/Module_vcl.mk
Change-Id: I1b095586b66fbbe582b0e7266609895bb288c6fb
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 93a9446..4489bcc 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
Package_opengl \
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
StaticLibrary_vclmain \
- $(if $(ENABLE_HEADLESS),, \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
Executable_ui-previewer) \
$(if $(filter LINUX MACOSX WNT,$(OS)), \
Executable_outdevgrind \
commit 5b004e8ab7c5c6780e339d92bb111fe94aba2b61
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun May 17 11:43:08 2015 +0200
remove unopkg script from MacOSX folder of sandboxed app
Change-Id: Ib59953225480e6923e418b966cce289f07f863b5
diff --git a/Makefile.in b/Makefile.in
index 3264a77..b802121 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -324,8 +324,9 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]*
#
ifneq ($ENABLE_MACOSX_SANDBOX),)
-# Remove the gengal.bin binary that we don't want
+# Remove the gengal.bin binary and unopkg script that we don't want
rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin
+ rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/unopkg
endif
#
# Then use the macosx-codesign-app-bundle script
commit 1f63dc5ebb0ededd358f97a785559588efd92cf7
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun May 17 11:39:44 2015 +0200
Don't put symlink to MacOS folder of sandboxed app
Conflicts:
ure/Package_install.mk
Change-Id: Ica4cfd3befa67aa1d03140ad2a766dfbb208ec0a
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 99801c7..e8b6515 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -14,7 +14,9 @@ $(eval $(call gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/uno,uno))
endif
ifeq (MACOSX,$(OS))
+ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
$(eval $(call gb_Package_add_symbolic_link,ure_install,MacOS/urelibs,../Frameworks))
endif
+endif
# vim:set noet sw=4 ts=4:
commit d745e1dfd09a32efaea815ea4ac00059b956849f
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun May 17 11:07:14 2015 +0200
Don't package unoinfo in case of Mac OS X like app structure
Change-Id: I517ed7ac43b0655c7e571e0b9fead32c4f2e7948
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6961151..4abe743 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -511,7 +511,7 @@ File gid_Brand_File_Desktophelper_Txt
End
#endif
-#if !defined WNT
+#if !defined WNT && !defined MACOSX
File gid_Brand_File_Bin_Unoinfo
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
commit 7680527415f89e6c76101bdb257c27fe9b607b07
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun May 17 10:59:11 2015 +0200
Don't package gengal script in App Store case
Conflicts:
scp2/source/ooo/file_ooo.scp
Change-Id: Ia7002e5f56cad7efd264baa940ccc350ae5ee08c
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 7d261b3..0be456e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -48,7 +48,7 @@ File gid_File_Basic_User_Standard
Name = "wizards_basicsrvstandard.filelist";
End
-#if defined UNX
+#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
File gid_File_Script_Gengal
BIN_FILE_BODY;
commit 4ecd2dd60d1685255fdf947a7bdfea20eac68e65
Author: Andras Timar <andras.timar at collabora.com>
Date: Fri May 15 17:05:17 2015 +0200
shell script in Contents/MacOS is not accepted
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b0f3382..7d261b3 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -84,7 +84,7 @@ End
#endif
-#if defined UNX
+#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
File gid_File_Bin_Senddoc
BIN_FILE_BODY;
Dir = FILELIST_DIR;
commit e013f39a3fe928ea22cdde6e0da1c3fe8072c588
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon May 11 22:26:29 2015 +0200
create empty .lproj directories for languages supported by OS X
The previous solution had problems. InfoPlist.strings were empty,
because localization has not been working since the CFBundleTypeIconFile
entries were removed from Info.plist. Icon file basename was the key
in documents.ulf. So we packages 0 bytes long files. The second problem
was that we used LibreOffice language codes, and OS X language codes are
different in some cases. This caused problems such as French strings on
English UI (e.g. Open/Save dialogs), because the system did not
recognize en-US.lproj and en-GB.lproj, and fell back to the next one: fr.
Change-Id: I9c502cdf737b497ca2ceef8f3c535ccfea2f6134
Conflicts:
Makefile.in
diff --git a/Makefile.in b/Makefile.in
index 5844dcc..3264a77 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -306,14 +306,13 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
@$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-# Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj directories.
- set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \
- bn=`basename $$F .zip`; \
- lang=$${bn#InfoPlist_}; \
+#
+# Create Resources/*.lproj directories for languages supported by OS X
+ set -x; for lang in ca cs da de el en es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW; do \
lproj=$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \
mkdir $$lproj; \
- (cd $$lproj; unzip $$F); \
done
+#
# And remove the "bin" folder which should not be there
rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
#
commit 8adb16acb1aeccfacc39c2edb10d4f90374e8ff2
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 9 10:35:51 2014 +0300
Remove potential old leftover before moving the app bundle
Change-Id: I7f0a8ae184a2f3d8a4476415b56df4ad8e4e342f
diff --git a/Makefile.in b/Makefile.in
index 2f7e4cc..5844dcc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -337,6 +337,7 @@ endif
mac-app-store-package: test-install
ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),)
+ rm -rf "$(MACOSX_APP_NAME).app"
mv "$(TESTINSTALLDIR)/$(PRODUCTNAME).app" "$(MACOSX_APP_NAME).app"
productbuild --component "$(MACOSX_APP_NAME).app" /Applications --sign $(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo "$(MACOSX_APP_NAME)" | tr ' ' '-').pkg
else
commit e85145049d7f47e17fdc3eb7d502d1e4279d8db8
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 23 14:57:52 2014 +0300
Seems that we don't need the com.apple.application-identifier after all
Conflicts:
lo.xcent.in
Change-Id: I3bc499b15c31724dca2d49123dcdbec8dfd934f6
diff --git a/lo.xcent.in b/lo.xcent.in
index 19802dd..02d8929 100644
--- a/lo.xcent.in
+++ b/lo.xcent.in
@@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>com.apple.application-identifier</key>
- <string>@MACOSX_BUNDLE_IDENTIFIER@</string>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.bookmarks.app-scope</key>
commit ff489b6161654d378c70ed5e3f6be82e24ec09c9
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 23 00:27:58 2014 +0300
We need the gengal program at build time
But don't bother shipping it on OS X, at least not in the sandboxed
(App Store) case.
(cherry picked from commit 11b4f4bfbee257d63f6a52808fb02b903ddea0d5)
Conflicts:
Makefile.in
Repository.mk
Conflicts:
Makefile.in
Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24
diff --git a/Makefile.in b/Makefile.in
index f38aa9b..2f7e4cc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -316,6 +316,20 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
done
# And remove the "bin" folder which should not be there
rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
+#
+# Remove unnecessary executables in the LibreOfficePython framework
+ rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/bin
+#
+# Remove the python.o object file which is weird and interferes with app store uploading
+# And with it removed, presumably the other stuff in the Python lib/python3.3/config-3.3m probably does not make sense either.
+ rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Frameworks/LibreOfficePython.framework/Versions/[1-9]*/lib/python[1-9]*/config-[1-9]*
+#
+ifneq ($ENABLE_MACOSX_SANDBOX),)
+# Remove the gengal.bin binary that we don't want
+ rm $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/MacOS/gengal.bin
+endif
+#
+# Then use the macosx-codesign-app-bundle script
@$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
endif
endif
diff --git a/Repository.mk b/Repository.mk
index c5360ba..297098c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -143,9 +143,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
- $(if $(ENABLE_MACOSX_SANDBOX),, \
- gengal \
- )\
+ gengal \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \
$(if $(filter WNT,$(OS)),,uri-encode) \
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index ab26b9f..67dbe01 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_check_targets,svx,\
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-ifeq (,$(ENABLE_MACOSX_SANDBOX))
$(eval $(call gb_Module_add_targets,svx,\
Executable_gengal \
$(if $(filter-out WNT,$(OS)), \
@@ -45,7 +44,6 @@ $(eval $(call gb_Module_add_targets,svx,\
Executable_pixelctl) \
))
endif
-endif
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
commit d0f39bc3b82e4835ede9b136e81ff2e18bd12cd6
Author: Tor Lillqvist <tml at collabora.com>
Date: Sun Sep 21 23:55:38 2014 +0300
We don't build the Apple Remote code when sandboxed
So no need for the related entitlements.
Change-Id: I54ba7c0586ee77f30096b50755a9a85bbb7965a5
(cherry picked from commit a1379c6d2555c77b1b096165ac2aab42808e90a7)
diff --git a/lo.xcent.in b/lo.xcent.in
index ca636d7..19802dd 100644
--- a/lo.xcent.in
+++ b/lo.xcent.in
@@ -20,13 +20,6 @@
<true/>
<key>com.apple.security.device.bluetooth</key>
<true/>
- <!-- usb needed for the apple_remote thingie... -->
- <key>com.apple.security.device.usb</key>
- <true/>
- <key>com.apple.security.temporary-exception.apple-events</key>
- <array>
- <string>mac.remotecontrols</string>
- </array>
<key>com.apple.security.print</key>
<true/>
</dict>
commit 72e8d549fae0aa6278a6b2d64cf65d4df8f27f94
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Sep 20 01:01:09 2014 +0300
Skip some executables in the OS X sandboxed (Mac App Store) case
I doubt end-users will miss gengal.bin, regview, or regmerge.
Change-Id: I353610c0d039f25fa415f35902fe2b9890cd423f
(cherry picked from commit beb30bbd867f9a28878e0d004458c3507f6c0956)
Conflicts:
Repository.mk
diff --git a/Repository.mk b/Repository.mk
index 64f50af..c5360ba 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -143,7 +143,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \
))
$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
- gengal \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
+ gengal \
+ )\
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \
$(if $(filter WNT,$(OS)),,uri-encode) \
@@ -183,8 +185,10 @@ endif
$(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
$(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
- regmerge \
- regview \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
+ regmerge \
+ regview \
+ ) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \
))
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index fb962c6..5f70ed9 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -12,8 +12,10 @@ $(eval $(call gb_Module_Module,registry))
$(eval $(call gb_Module_add_targets,registry,\
Library_reg \
$(if $(filter-out $(OS),IOS), \
- Executable_regmerge \
- Executable_regview \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
+ Executable_regmerge \
+ Executable_regview \
+ ) \
StaticLibrary_registry_helper \
) \
))
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 67dbe01..ab26b9f 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_check_targets,svx,\
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+ifeq (,$(ENABLE_MACOSX_SANDBOX))
$(eval $(call gb_Module_add_targets,svx,\
Executable_gengal \
$(if $(filter-out WNT,$(OS)), \
@@ -44,6 +45,7 @@ $(eval $(call gb_Module_add_targets,svx,\
Executable_pixelctl) \
))
endif
+endif
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
commit 4094a45c3b3c0c366e9ba9d51825f5627e21967d
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Sep 19 12:47:02 2014 +0300
Unzip the InfoPlist.strings files into correct locations
Not sure how useful it is to only provide translations for the ODF
document format names, though.
Change-Id: I22a2e5b896e077ca3067a30635f7cdf67c2f5e7c
(cherry picked from commit 16f62d80c38f3920a40fc078edecad905ba2b196)
diff --git a/Makefile.in b/Makefile.in
index 4295b2d..f38aa9b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -306,9 +306,15 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
@$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-# The InfoPlist_*.zip files in "bin" are totally pointless and should
-# not be there. I am too lazy at the moment to figure out how to
-# prevent them from ending up there.
+# Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj directories.
+ set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \
+ bn=`basename $$F .zip`; \
+ lang=$${bn#InfoPlist_}; \
+ lproj=$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \
+ mkdir $$lproj; \
+ (cd $$lproj; unzip $$F); \
+ done
+# And remove the "bin" folder which should not be there
rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
@$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
endif
commit e3e3a1f3300975858caf4dff17ffb8775a6ef015
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Sep 15 21:50:35 2014 +0300
We don't want those bin/InfoPlist_*.zip files in the app bundle
(cherry picked from commit 7956d38fa3c0db77b9b2b41f870bd3587e3dc1af)
Conflicts:
Makefile.in
Change-Id: I29eefa599f175d98303fca8f5ccf1c8fe85b0bbc
diff --git a/Makefile.in b/Makefile.in
index 0cbd026..4295b2d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -306,6 +306,10 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
@$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
+# The InfoPlist_*.zip files in "bin" are totally pointless and should
+# not be there. I am too lazy at the moment to figure out how to
+# prevent them from ending up there.
+ rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
@$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
endif
endif
commit 0c1e534ee642a3802f4ab896fc36d2aa0153ac3f
Author: Andras Timar <andras.timar at collabora.com>
Date: Sun May 17 14:32:02 2015 +0200
Don't package ui-previewer in App Store case
Change-Id: I122c65d7f6dec7588ea2624e291e9dfe04dff22c
diff --git a/Repository.mk b/Repository.mk
index f7c89c0..64f50af 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -147,7 +147,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \
$(if $(filter WNT,$(OS)),,uri-encode) \
- ui-previewer \
+ $(if $(ENABLE_MACOSX_SANDBOX),, \
+ ui-previewer \
+ ) \
$(if $(filter WNT,$(OS)), \
senddoc \
) \
commit 783ae75d8f979bd91169082dee2d14cfb2254f53
Author: Andras Timar <andras.timar at collabora.com>
Date: Thu Jul 2 16:26:50 2015 +0200
put python starter shell script to Resources folder of OS X app
Change-Id: Iaed947b9168fbd1e2d2c79da724426b56bd8a830
diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk
index e8c3fa6..f75cda3 100644
--- a/pyuno/Package_python_shell.mk
+++ b/pyuno/Package_python_shell.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_Package_Package,python_shell,$(call gb_CustomTarget_get_workdir,pyuno/python_shell)))
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Package_add_file,python_shell,$(LIBO_ETC_FOLDER)/python,python.sh))
+else
$(eval $(call gb_Package_add_file,python_shell,$(LIBO_BIN_FOLDER)/python,python.sh))
+endif
# vim: set noet sw=4 ts=4:
commit ace78a2e440cc71ba69179c2c715e1d96981a8cb
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Aug 24 10:07:45 2015 +0200
enable breeze and sifr
Change-Id: Id46452b5121077de7d5368257b538a85d1ef7dae
diff --git a/configure.ac b/configure.ac
index a7a9dfb..e5c6b1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12814,7 +12814,7 @@ if test "$enable_mpl_subset" = "yes"; then
fi
for theme in $WITH_THEMES; do
case $theme in
- breeze|crystal|default|hicontrast|human|oxygen|sifr)
+ crystal|default|hicontrast|human|oxygen)
AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': $theme present, use --with-theme=tango]) ;;
*) : ;;
esac
More information about the Libreoffice-commits
mailing list