[Libreoffice-commits] core.git: Changes to 'distro/collabora/lov-4.4'

Tue May 19 03:06:21 PDT 2015

New branch 'distro/collabora/lov-4.4' available with the following commits:
commit a154d52364a9cccdd30cff340275eb38b58b07ca
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun May 17 17:50:33 2015 +0200

    codesign --force
    
    Change-Id: I4128e4eb127098eafa96e82cc3e698a75079b53b

commit 69026b340b5f17a7700046219f5b4c28087cdd83
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun May 17 16:26:15 2015 +0200

    use Info.plist from cp-4.3
    
    Change-Id: I61d8d9fca19fe6e02b2d7f9129b1a15dbd9758c5

commit 0e00c08031d1c6e2b5eb002e9efdddcf89bcb46d
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun May 17 16:19:34 2015 +0200

    remove unoinfo from App Store package
    
    Change-Id: I12f07c688966d610191a801c7838052d57f197c4

commit 210efcea13a3f7c91eabd8ddc1b73230ece9ca9a
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

commit fa54c12fd63ba90ffea193eb63364df041a7d228
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

commit 1fecaf9041c2721c03fe6bf5849d5147fe0abd20
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
    
    Change-Id: Ica4cfd3befa67aa1d03140ad2a766dfbb208ec0a

commit 458a78e0a1aa630f5102582fbead166d47ef6544
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

commit 5450adcab4751e1bd0e56b9bf129596e9e7d9d70
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
    
    Change-Id: Ia7002e5f56cad7efd264baa940ccc350ae5ee08c

commit 66ad93e6a0b06441e09749d3a35cc457d9e3080f
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
    
    Change-Id: I1b095586b66fbbe582b0e7266609895bb288c6fb

commit 201e8d9dc5a00f660321f77bea2a3f882a46ccf2
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun May 17 10:50:40 2015 +0200

    scp2: fix --disable-python
    
    Change-Id: I621ef88aefa91fb8f970a9ccb7d974019841cdc7

commit 388061224cbb8a19160d0a1ed9c6c9d9876b8251
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 28 22:51:10 2015 +0300

    Fix --disable-pdfimport build
    
    Conflicts:
    	sd/qa/unit/import-tests.cxx
    
    Change-Id: I932f584ef3c054abe738d59e9957c3a40be1d2c9

commit 64339ef8b96d7ac64f86123fc87cfdd6b71b165f
Author: Tomáš Chvátal <tomas.chvatal at gmail.com>
Date:   Thu Apr 16 10:13:06 2015 +0200

    Make cpp/poppler-version.h header optional
    
    Older popler (SLE11) does not have this header yet.
    With the code simply if the header not found define version to oldest
    possible working candidate and also raise the .pc check to the same.
    
    Change-Id: I039c879879188fe2eb90cd119b80a1d6354a6a9c
    Reviewed-on: https://gerrit.libreoffice.org/15339
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

commit 568791565a933fedfd81cdcb682a1d6e1fcb8ed4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 28 19:13:08 2015 +0300

    Check ENABLE_PDFIMPORT
    
    (cherry picked from commit baee89d5a068fe950e78e9ec13937f237c5a2c9e)
    
    Conflicts:
    	sd/CppunitTest_sd_import_tests.mk
    
    Change-Id: I1c0e7e5ecfcd62315e367d537cd3e0466b66e48f

commit 136215ab53a7926a5e08f8f43d0c34dfce194f6b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 20 01:12:17 2014 +0300

    This test was the wrong way surely?
    
    Change-Id: I3470fbd2992cd96a772452d75fb2f0320bb529bf

commit 4fdd40bca56cfca083315d0213bcee2e6fea57e1
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

commit f1e63c1dfd38987e7ed5a1b1b5cf1e6eab636206
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu May 14 00:01:17 2015 +0200

    do not set unix executable bit for CREDITS.fodt, LICENSE.fodt and NOTICE
    
    (cherry picked from commit cb5a0b03bef4eb8ab0d8689ec73ed83bb73ef5c0)
    
    Conflicts:
    	scp2/source/ooo/common_brand.scp
    
    Change-Id: Iab15ca1479d39e480369a18a7b043675d319f2ca
    
    Conflicts:
    	scp2/source/ooo/common_brand.scp

commit c88bfcebbe7b8f1b231313b02eb6694a7b891589
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri May 15 16:59:20 2015 +0200

    OS X codesign

commit 2b8d99acb71067a11593cfa0df88dc41aff51afb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Mar 16 14:24:45 2015 +0100

    Exclude Python components if --disable-python
    
    Change-Id: I05c1e9d7b270bcafa7fbfe526c8b12733d8ed708

commit a397026d958da4548295ce1e4589e57f6903f10c
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

commit 4306371bbf09fff152db40e83b1325608b076482
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

commit 790828da1c35890b669d7937f664f9150946039d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Sep 23 21:45:32 2014 +0300

    Add targets 'patch' and 'unpatch' to assist in handling of temporary patches
    
    'make patch' applies any patch file in the uncommitted-patches
    directory, if it exists. These files should be as produced by git
    format-patch. 'make unpatch' correspondingly undos what 'make patch'
    did. None of this is done using git, that is the very point.
    
    Change-Id: I348d96be54bc8e544e833206c922cb4bdcbabc4c
    
    Conflicts:
    	Makefile.in

commit 08c30d0a37dc00311c7d2f31d722d8ef8f670f21
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
    
    Change-Id: I3bc499b15c31724dca2d49123dcdbec8dfd934f6

commit ccd85c769a552dc4a678319d4aab4f7730e08f5d
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.
    
    Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24
    (cherry picked from commit 11b4f4bfbee257d63f6a52808fb02b903ddea0d5)
    
    Conflicts:
    	Makefile.in
    	Repository.mk

commit c9d079262f101cf1366a65a5558a5883246fbee0
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)

commit ada2eb73d15989e4a51bc86d38607e906e447934
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

commit a214d76322265eca77cb7e1ea0df7005659b8af6
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 19 15:45:07 2014 +0300

    We need CFBundleVersion, too
    
    Change-Id: I50c12ffd741baf12589069d90f47566c5324ce7f
    (cherry picked from commit 68d186d3428df91c3efddb26294807d573c6306e)

commit f1d77b4595df0b5cd675562b3b001ce4211ec113
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)

commit 419687b4304b53d31ccb71a3822dcbb763f41ed0
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
    
    Change-Id: I29eefa599f175d98303fca8f5ccf1c8fe85b0bbc
    (cherry picked from commit 7956d38fa3c0db77b9b2b41f870bd3587e3dc1af)

commit 109a671e3a3491e4dbf632a5e7a31b721af3e6fe
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Aug 7 23:26:10 2014 +0300

    Make this work better in the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case
    
    In that case the dylibs won't be in the parent directory of where the
    jars are (Resources), but in Frameworks.
    
    Change-Id: I628d828ca820d07724947050f54f9f5f9148e159
    (cherry picked from commit 6ac523554213f11838443de0cd9b62415f5d2ffd)

commit bd7655e8a379ab507d868735202b3ee0564afd21
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Aug 16 21:59:11 2013 +0300

    Decouple the "Mac-like" app bundle structure choice from sandboxing choice
    
    Add a switch --enable-canonical-installation-tree-structure. Only implemented
    for OS X for now, but the same switch can be used if and when we want to make
    it possible to make the Unix installation tree more "standard", too.
    
    Change-Id: Icb0ad500b77d7e986f2f188fd17faabaf2e2fe99
    
    Conflicts:
    	configure.ac

commit 86ee90af16578a62f9146627242f9e5d5074b384
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Sep 22 00:07:53 2014 +0300

    The com.apple.application-identifier value should be prefixed with the teamid
    
    Change-Id: I6b58492ba051bb5032870aa47cfacbe3a292e31f
    
    Conflicts:
    	configure.ac

commit fa0bd8cb8fcb442e5b527458bd7638f79b87ab27
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri May 15 11:59:50 2015 +0200

    Just use version number 4.4.4.0 here, no extra suffix