mediascanner2

Merge lp:~jamesh/mediascanner2/break-abi-for-lightning-talk into lp:mediascanner2

  1. break-abi-for-lightning-talk
  2. Merge into trunk
Proposed by James Henstridge
Status: Rejected
Rejected by: Michi Henning
Proposed branch: lp:~jamesh/mediascanner2/break-abi-for-lightning-talk
Merge into: lp:mediascanner2
Diff against target: 75 lines (+9/-2)
6 files modified
debian/libmediascanner-2.0-3.symbols (+1/-0)
src/mediascanner/Filter.cc (+3/-0)
src/mediascanner/Filter.hh (+2/-0)
src/mediascanner/MediaFile.hh (+1/-0)
src/mediascanner/MediaStoreBase.hh (+1/-1)
src/mediascanner/scannercore.hh (+1/-1)
To merge this branch: bzr merge lp:~jamesh/mediascanner2/break-abi-for-lightning-talk
Reviewer Review Type Date Requested Status
Michi Henning (community) Disapprove
unity-api-1-bot continuous-integration Approve
Review via email: mp+308779@code.launchpad.net

Commit message

Break the ABI

Description of the change

DO NOT LAND

Break the ABI to show we can detect ABI breakage

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:337
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/10/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/899/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/906
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/710/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/710
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/710/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/710
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/710/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/710/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/710
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/710/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/710
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/710/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/710/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/710
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/710/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/710
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/710/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/10/rebuild

review: Needs Fixing (continuous-integration)
lp:~jamesh/mediascanner2/break-abi-for-lightning-talk updated
338. By James Henstridge

Update symbols.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:338
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/11/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/901
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/908
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/711/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/711/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/711/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/711/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/711/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/711/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/711/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/711/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/711
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/711/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/11/rebuild

review: Approve (continuous-integration)
lp:~jamesh/mediascanner2/break-abi-for-lightning-talk updated
339. By James Henstridge

Reorder an enum.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:339
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/12/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/904
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/911
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/714
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/714
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/714
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/714
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/714
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/714
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/714
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/714
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/714
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/714/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/12/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Rejecting this now, just in case ;-)

review: Disapprove

Unmerged revisions

339. By James Henstridge

Reorder an enum.

338. By James Henstridge

Update symbols.

337. By James Henstridge

Break the ABI for lightning talk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/libmediascanner-2.0-3.symbols'
2--- debian/libmediascanner-2.0-3.symbols 2016-02-25 01:53:33 +0000
3+++ debian/libmediascanner-2.0-3.symbols 2016-10-20 12:46:31 +0000
4@@ -34,6 +34,7 @@
5 (c++)"mediascanner::Filter::hasAlbum() const@Base" 0.101+14.10.20140613
6 (c++)"mediascanner::Filter::hasArtist() const@Base" 0.101+14.10.20140613
7 (c++)"mediascanner::Filter::hasGenre() const@Base" 0.101+14.10.20140613
8+ (c++)"mediascanner::Filter::newMethod()@Base" 0replaceme
9 (c++)"mediascanner::Filter::operator=(mediascanner::Filter&&)@Base" 0.105+14.10.20140903
10 (c++)"mediascanner::Filter::operator=(mediascanner::Filter const&)@Base" 0.101+14.10.20140613
11 (c++)"mediascanner::Filter::operator==(mediascanner::Filter const&) const@Base" 0.101+14.10.20140613
12
13=== modified file 'src/mediascanner/Filter.cc'
14--- src/mediascanner/Filter.cc 2014-09-01 00:50:24 +0000
15+++ src/mediascanner/Filter.cc 2016-10-20 12:46:31 +0000
16@@ -207,4 +207,7 @@
17 return p->reverse;
18 }
19
20+void Filter::newMethod() {
21+}
22+
23 }
24
25=== modified file 'src/mediascanner/Filter.hh'
26--- src/mediascanner/Filter.hh 2014-09-01 00:50:24 +0000
27+++ src/mediascanner/Filter.hh 2016-10-20 12:46:31 +0000
28@@ -69,6 +69,8 @@
29 void setReverse(bool reverse);
30 bool getReverse() const;
31
32+ void newMethod();
33+
34 private:
35 struct Private;
36 Private *p;
37
38=== modified file 'src/mediascanner/MediaFile.hh'
39--- src/mediascanner/MediaFile.hh 2015-07-07 04:36:02 +0000
40+++ src/mediascanner/MediaFile.hh 2016-10-20 12:46:31 +0000
41@@ -73,6 +73,7 @@
42
43 private:
44 MediaFilePrivate *p;
45+ int padding = 0;
46 };
47
48 }
49
50=== modified file 'src/mediascanner/MediaStoreBase.hh'
51--- src/mediascanner/MediaStoreBase.hh 2016-02-22 03:21:13 +0000
52+++ src/mediascanner/MediaStoreBase.hh 2016-10-20 12:46:31 +0000
53@@ -48,8 +48,8 @@
54 virtual std::vector<Album> listAlbums(const Filter &filter) const = 0;
55 virtual std::vector<std::string> listArtists(const Filter &filter) const = 0;
56 virtual std::vector<std::string>listAlbumArtists(const Filter &filter) const = 0;
57+ virtual bool hasMedia(MediaType type) const = 0;
58 virtual std::vector<std::string>listGenres(const Filter &filter) const = 0;
59- virtual bool hasMedia(MediaType type) const = 0;
60 };
61
62 }
63
64=== modified file 'src/mediascanner/scannercore.hh'
65--- src/mediascanner/scannercore.hh 2015-07-07 05:07:07 +0000
66+++ src/mediascanner/scannercore.hh 2016-10-20 12:46:31 +0000
67@@ -25,8 +25,8 @@
68 enum MediaType {
69 UnknownMedia,
70 AudioMedia,
71+ ImageMedia,
72 VideoMedia,
73- ImageMedia,
74 AllMedia = 255,
75 };
76

Subscribers

People subscribed via source and target branches