Merge lp:~cjwatson/gallery-app/static-exiv2 into lp:gallery-app

[Colin Watson]

Link exiv2 statically in click mode.

Link exiv2 statically in click mode.

This avoids the problem of a click package trying to use a library whose SONAME is about to change on the system image, causing synchronisation problems (can't update library without updating click package, but can't update click package without risking people downloading it from the store onto older system images). Static linking is a fairly crude solution; a better longer-term approach would be for click to (automatically?) notice this situation somehow and copy the shared libraries you need into your click package. However, that's some way off, and I think this will do for now.

Incidentally, this problem is part of the reason why gallery-app has been stuck in silo 1 for a week and a half. We won't be able to shift it until we sort this out one way or another. If you approve this branch, then it would probably be best to add it to the list of MPs in silo 1 and rebuild it there.

[Colin Watson (cjwatson)]

There are some other libraries potentially in the same situation, by the way. I haven't touched them here since I wanted to have the simplest change I could think of that would unblock us, and exiv2 is the one whose SONAME is actually trying to change in utopic.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1013
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/918/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/93/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/93
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/200/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1810
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/293/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1517
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2025
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2025/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/918/rebuild

review: Needs Fixing (continuous-integration)

[lp:~cjwatson/gallery-app/static-exiv2]

1014. By Colin Watson on 2014-07-18

Build-depend on libexpat1-dev and zlib1g-dev to ensure that we can statically link against libexiv2 in click mode.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1013
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/919/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/94
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/94/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1814
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/295
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10044
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1520
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2032
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2032/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/919/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1014
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/920/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/95
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/95/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/202
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1816
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/345
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/296
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10046
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1522
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2034
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2034/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/920/rebuild

review: Approve (continuous-integration)

[Oliver Grawert (ogra)]

Looks good to me ...

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-05-09 16:08:13 +0000
+++ debian/control	2014-07-18 08:20:32 +0000
@@ -16,6 +16,9 @@
                qtbase5-dev,
                qtdeclarative5-dev,
                python3-all,
+# for static linking of exiv2 in click mode
+               libexpat1-dev,
+               zlib1g-dev,
 Standards-Version: 3.9.5
 # If you don't have commit rights to lp:gallery-app but need to upload
 # packaging changes, just go ahead.  The developers will notice and sync

=== modified file 'src/medialoader/CMakeLists.txt'
--- src/medialoader/CMakeLists.txt	2014-03-07 17:42:35 +0000
+++ src/medialoader/CMakeLists.txt	2014-07-18 08:20:32 +0000
@@ -35,6 +35,14 @@
 
 qt5_use_modules(${GALLERY_MEDIALOADER_LIB} Core Quick)
 
+if(CLICK_MODE)
+    set(EXIV2_LIBRARIES
+        ${CMAKE_EXE_LINK_STATIC_CXX_FLAGS}
+        ${EXIV2_STATIC_LIBRARIES}
+        ${CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS})
+    install(FILES exiv2.copyright DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif(CLICK_MODE)
+
 target_link_libraries( ${GALLERY_MEDIALOADER_LIB}
     ${EXIV2_LIBRARIES}
     ${GSTLIB_LDFLAGS}

=== added file 'src/medialoader/exiv2.copyright'
--- src/medialoader/exiv2.copyright	1970-01-01 00:00:00 +0000
+++ src/medialoader/exiv2.copyright	2014-07-18 08:20:32 +0000
@@ -0,0 +1,103 @@
+The exiv2 library is linked statically into the gallery-app click package,
+using the version of the Ubuntu libexiv2-dev package that was installed on
+the build system at build time.  Its copyright and licensing information is
+reproduced below.
+
+
+Upstream Author:
+
+    Andreas HUGGEL <[e-mail]>
+
+Copyright:
+
+    (C) 2004-2008 Andreas Huggel <[e-mail]>
+
+Copyright for XMP sdk:
+
+    (C) 2005-2007 Adobe Systems Incorporated
+
+Copyright for MD5 algorithm tcode:
+
+    (C) 1991-2, RSA Data Security, Inc.
+
+exiv2 license:
+
+   Exiv2 is free software; you can redistribute it and/or modify it under
+   the terms of the GNU General Public License as published by the Free
+   Software Foundation; either version 2 of the License, or (at your
+   option) any later version.
+
+   Alternatively, Exiv2 is also available with a commercial license,
+   which allows it to be used in closed-source projects. Contact me for
+   more information.
+
+   Exiv2 is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+   for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+XMP sdk license:
+
+    NOTICE: Adobe permits you to use, modify, and distribute this file in
+    accordance with the terms of the Adobe license agreement accompanying it.
+
+Copyright (c) 1999 - 2007, Adobe Systems Incorporated
+
+The BSD License
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+* Neither the name of Adobe Systems Incorporated, nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+MD5 algorithm license:
+
+Copyright (C) 1991-2, RSA Data Security, Inc.
+
+License to copy and use this software is granted provided that it is
+identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software or
+this function.
+
+License is also granted to make and use derivative works provided that
+such works are identified as "derived from the RSA Data Security,
+Inc. MD5 Message-Digest Algorithm" in all material mentioning or
+referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either the
+merchantability of this software or the suitability of this software
+for any particular purpose. It is provided "as is" without express or
+implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+