Merge lp:~mir-team/mir/fix-1388686 into lp:mir

[Kevin DuBois]

finish fixing the ftbfs for USC and for unity8 (and mir clients as well) that happened from splitting out libmirprotobuf. The first half of this fix was in lp:~vanvugt/mir/fix-1388686, which added libmirprotobuf to the mirserver.pc and mirclient.pc files. This fix adds a libmirprotobuf-dev package, which installs the libmirprotobuf.so symlink needed by the compiler now that we tell it "-lmirprotobuf" in the .pc files

fixes: lp: #1388686

finish fixing the ftbfs for USC and for unity8 (and mir clients as well) that happened from splitting out libmirprotobuf. The first half of this fix was in lp:~vanvugt/mir/fix-1388686, which added libmirprotobuf to the mirserver.pc and mirclient.pc files. This fix adds a libmirprotobuf-dev package, which installs the libmirprotobuf.so symlink needed by the compiler now that we tell it "-lmirprotobuf" in the .pc files

fixes: lp: #1388686

note: If testing, use sbuild to build the packages. If you "make install", cmake will install the libmirprotobuf.so symlink, and you won't see the problem.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2048
http://jenkins.qa.ubuntu.com/job/mir-ci/2070/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/77
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/77/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/57
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3349
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15708

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2070/rebuild

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

Urgh, this should be unnecessary. Client code does *not* need the libmirprotobuf.so link. Let me investigate...

[Daniel van Vugt (vanvugt)]

The new package libmirprotobuf-dev should not exist, by design. No external projects should access it directly.

I think you might have made a mistake in the bug report and been using the wrong (out of date system-installed) *.pc files.

review: Disapprove

[Daniel van Vugt (vanvugt)]

Although some of your reasoning is correct too. Something about our packaging needs fixing, but that new package should still not exist.

review: Needs Fixing

[Chris Halse Rogers (raof)]

The addititon of -lprotobuf to mirserver.pc and mirclient.pc in r2021 is what is causing the requirement for libmirprotobuf.so.

It's not clear to me why that change was made; unity-system-compositor builds just fine (testing qtmir now) with that change reverted.

[Chris Halse Rogers (raof)]

https://code.launchpad.net/~raof/mir/dont-ask-downstreams-to-link-against-private-libraries/+merge/241475 fixes this properly. Tested by building unity-system-compositor and qtmir against it.

review: Disapprove

[Kevin DuBois (kdub)]

Happily withdrawn for the better fix. I thought that we were intending to have the users link to libprotobuf (but didn't quite see why)

[Alan Griffiths (alan-griffiths)]

On 12/11/14 13:05, Kevin DuBois wrote:
> Happily withdrawn for the better fix. I thought that we were intending to have the users link to libprotobuf (but didn't quite see why)

the platform-api client used to use the deprecated "PrivateProtobuf"
facility for cut & paste. (But that code got deleted a while ago.)

--
Alan Griffiths [phone]
Octopull Ltd http://www.octopull.co.uk/

Unmerged revisions

2048. By Kevin DuBois on 2014-11-11

roll back out the cross compile changes needed

2047. By Kevin DuBois on 2014-11-11

add a libmirprotobuf-dev.install so the downstreams linking to libmirclient and libmirserver can link via the .pc file we provide

=== modified file 'debian/control'
--- debian/control	2014-11-06 11:39:02 +0000
+++ debian/control	2014-11-11 20:54:50 +0000
@@ -121,12 +121,26 @@
  .
  Contains header files required for hardware/driver support development.
 
+Package: libmirprotobuf-dev
+Section: libdevel
+Architecture: i386 amd64 armhf arm64
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libmirprotobuf0 (= ${binary:Version}), 
+         ${misc:Depends},
+Description: Display server for Ubuntu - development headers
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains common library needed by server and client
+
 Package: libmirserver-dev
 Section: libdevel
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libmirserver27 (= ${binary:Version}),
+         libmirprotobuf-dev (= ${binary:Version}),
          libmirplatform-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libglm-dev,
@@ -157,6 +171,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libmirclient8 (= ${binary:Version}),
+         libmirprotobuf-dev (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libprotobuf-dev (>= 2.4.1),
          ${misc:Depends},

=== added file 'debian/libmirprotobuf-dev.install'
--- debian/libmirprotobuf-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libmirprotobuf-dev.install	2014-11-11 20:54:50 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libmirprotobuf.so

=== modified file 'debian/rules'
--- debian/rules	2014-10-22 18:55:40 +0000
+++ debian/rules	2014-11-11 20:54:50 +0000
@@ -51,10 +51,6 @@
 	dh_makeshlibs -V
 
 override_dh_install:
-# Nothing outside Mir should link to libmirprotobuf directly.
-# Delete the symlink so that --fail-missing doesn't think we've missed it
-# accidentally.
-	rm debian/tmp/usr/lib/*/libmirprotobuf.so
 	dh_install --fail-missing \
 	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmir$(PLATFORM_DRIVER).so \
 	  -Xusr/lib/$(DEB_HOST_MULTIARCH)/libmir$(CLIENT_DRIVER).so