distro-configs/CPLinux.conf | 45 +++++++++++++++ distro-configs/CPOSX.conf | 19 ++++++ distro-configs/CPWin32-MPL.conf | 31 ++++++++++ distro-configs/CPWin32.conf | 25 ++++++++ extensions/source/macosx/spotlight/mdimporter/Info.plist | 4 - 5 files changed, 122 insertions(+), 2 deletions(-)
New commits: commit ab091e20cafc0484c9b53debde428fb3fd0094f5 Author: Andras Timar <[email protected]> Date: Fri Oct 17 15:12:31 2014 +0200 Collabora Office distro configs (cherry picked from commit eb38a29382aa012df6f8968ef8292f767f6a4d3a) Change-Id: Id643b47ba5870db52585f1d3406983be348a4608 diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf new file mode 100644 index 0000000..cc163fe --- /dev/null +++ b/distro-configs/CPLinux.conf @@ -0,0 +1,45 @@ +--with-vendor=Collabora +--with-branding=icon-themes/galaxy/brand_cp +--with-system-dicts +--with-myspell-dicts +--with-system-zlib +--without-system-poppler +--without-system-openssl +--without-system-libpng +--without-system-libxml +--without-system-jpeg +--without-system-jars +--without-system-postgresql +--without-junit +--with-help +--without-helppack-integration +--with-linker-hash-style=both +--with-fonts +--with-external-thes-dir=/usr/share/mythes +--with-external-hyph-dir=/usr/share/hyphen +--with-external-dict-dir=/usr/share/hunspell +--enable-dbus +--enable-extension-integration +--disable-odk +--enable-kde4 +--disable-gtk3 +--enable-gstreamer-0-10 +--disable-gstreamer-1-0 +--enable-evolution2 +--enable-gio +--enable-scripting-beanshell +--enable-scripting-javascript +--enable-ext-wiki-publisher +--enable-report-builder +--enable-ext-nlpsolver +--enable-ext-numbertext +--enable-ext-ct2n +--enable-epm +--enable-python=internal +--disable-online-update +--disable-dconf +--disable-randr-link +--enable-mergelibs +--with-package-format=deb rpm +--enable-release-build +--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf new file mode 100644 index 0000000..bbb0154 --- /dev/null +++ b/distro-configs/CPOSX.conf @@ -0,0 +1,19 @@ +--with-vendor=Collabora +--with-branding=icon-themes/galaxy/brand_cp +--without-junit +--without-help +--with-myspell-dicts +--enable-extension-integration +--disable-online-update +--disable-odk +--enable-epm +--enable-ext-wiki-publisher +--enable-report-builder +--enable-ext-nlpsolver +--enable-ext-numbertext +--enable-ext-ct2n +--enable-release-build +--without-system-postgresql +--disable-gtk +--with-package-format=dmg +--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW diff --git a/distro-configs/CPWin32-MPL.conf b/distro-configs/CPWin32-MPL.conf new file mode 100644 index 0000000..6accaed --- /dev/null +++ b/distro-configs/CPWin32-MPL.conf @@ -0,0 +1,31 @@ +--enable-mpl-subset +--with-vendor=Collabora +--with-branding=icon-themes/galaxy/brand_cp +--with-theme=tango +--without-help +--with-myspell-dicts +--without-system-mesa-headers +--without-system-postgresql +--without-junit +--without-helppack-integration +--enable-extension-integration +--enable-activex +--disable-online-update +--disable-odk +--disable-gtk +--disable-ext-wiki-publisher +--disable-report-builder +--disable-ext-nlpsolver +--disable-ext-numbertext +--disable-ext-ct2n +--disable-postgresql-sdbc +--disable-lotuswordpro +--disable-lpsolve +--with-webdav=serf +--enable-release-build +--with-package-format=msi +--enable-mergelibs +--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW +--enable-windows-build-signing +--without-java +--disable-pdfimport diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf new file mode 100644 index 0000000..4e432bc --- /dev/null +++ b/distro-configs/CPWin32.conf @@ -0,0 +1,25 @@ +--with-vendor=Collabora +--with-branding=icon-themes/galaxy/brand_cp +--without-system-mesa-headers +--without-system-postgresql +--without-junit +--without-helppack-integration +--enable-extension-integration +--enable-activex +--disable-online-update +--disable-odk +--disable-gtk +--enable-scripting-beanshell +--enable-scripting-javascript +--enable-ext-wiki-publisher +--enable-report-builder +--enable-ext-nlpsolver +--enable-ext-numbertext +--enable-ext-ct2n +--enable-release-build +--with-help +--with-myspell-dicts +--with-package-format=msi +--enable-mergelibs +--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW +--enable-windows-build-signing commit 345e3c7843e1cae01080548568fb6eaa6930a2b9 Author: Andras Timar <[email protected]> Date: Sun Jun 21 14:41:22 2015 +0200 ERROR ITMS-90511: CFBundleIdentifier Collision Change-Id: I4413853a2e8c23af770323a1e7b21cedb637cfb1 (cherry picked from commit 5c70145805eb3bc4968f1aed8695fdc4468705ab) diff --git a/extensions/source/macosx/spotlight/mdimporter/Info.plist b/extensions/source/macosx/spotlight/mdimporter/Info.plist index bc48f70..ab007af 100644 --- a/extensions/source/macosx/spotlight/mdimporter/Info.plist +++ b/extensions/source/macosx/spotlight/mdimporter/Info.plist @@ -59,7 +59,7 @@ <key>CFBundleIconFile</key> <string></string> <key>CFBundleIdentifier</key> - <string>org.openoffice.mdimporter</string> + <string>com.collaboraoffice.mdimporter</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleVersion</key> @@ -82,6 +82,6 @@ </dict> <key>CFPlugInUnloadFunction</key> <string></string> - + </dict> </plist> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
