Compiz

Merge lp://qastaging/~compiz-team/compiz/compiz.gtk-window-decorator.fix-metacity-cairo into lp://qastaging/compiz/0.9.8

  1. compiz.gtk-window-decorator.fix-metacity-cairo
  2. Merge into 0.9.8
Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp://qastaging/~compiz-team/compiz/compiz.gtk-window-decorator.fix-metacity-cairo
Merge into: lp://qastaging/compiz/0.9.8
Prerequisite: lp://qastaging/~compiz-team/compiz/compiz.gtk-window-decorator-gsettings.cleanup-1
Diff against target: 615 lines (+390/-40)
15 files modified
gtk/window-decorator/CMakeLists.txt (+9/-1)
gtk/window-decorator/cairo.c (+4/-2)
gtk/window-decorator/decorator.c (+14/-11)
gtk/window-decorator/gwd-cairo-window-decoration-util.c (+56/-0)
gtk/window-decorator/gwd-cairo-window-decoration-util.h (+38/-0)
gtk/window-decorator/gwd-metacity-window-decoration-util.c (+45/-0)
gtk/window-decorator/gwd-metacity-window-decoration-util.h (+39/-0)
gtk/window-decorator/gwd-settings-notified.c (+7/-16)
gtk/window-decorator/gwd-settings.c (+3/-3)
gtk/window-decorator/tests/CMakeLists.txt (+30/-0)
gtk/window-decorator/tests/test_gwd_cairo_decorations.cpp (+52/-0)
gtk/window-decorator/tests/test_gwd_metacity_decorations.cpp (+82/-0)
gtk/window-decorator/tests/test_gwd_settings.cpp (+6/-6)
include/decoration.h (+4/-0)
libdecoration/decoration.c (+1/-1)
To merge this branch: bzr merge lp://qastaging/~compiz-team/compiz/compiz.gtk-window-decorator.fix-metacity-cairo
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
jenkins (community) continuous-integration Approve
Review via email: mp+123211@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-09-06.

This proposal has been superseded by a proposal from 2012-09-10.

Commit message

Fixes some issues that were picked up in bug #1042323

1) BUILD_METACITY=OFF not working
2) Various runtime errors using the cairo mode
3) Fixes broken borders when switching from metacity to cairo mode

Fixes (LP: #1042323)

Description of the change

This branch fixes some issues that were picked up in bug #1042323

1) BUILD_METACITY=OFF not working
2) Various runtime errors using the cairo mode

This branch fixes the build issue and ensures that we switch back to cairo mode when the metacity theme is invalid. It also fixes a segfault when getting the shadow info in cairo mode and fixes weird looking borders when switching from metacity to cairo mode dynamically.

Tests added for each case.

Fixes (LP: #1042323)

The FFe is now acked and this branch can be merged

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:3420
http://jenkins.qa.ubuntu.com/job/compiz-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/26/console

review: Approve (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:3421
http://jenkins.qa.ubuntu.com/job/compiz-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/30/console

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote : Posted in a previous version of this proposal

Copyright dates need fixing again.

review: Needs Fixing
Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

Right, we need to merge lp:~compiz-team/compiz/compiz.gtk-window-decorator-gsettings.cleanup-1 into this one once the copyrights are fixed. Are there any other issues that you picked up that need fixing?

Revision history for this message
Daniel van Vugt (vanvugt) wrote : Posted in a previous version of this proposal

Works OK and valgrind agrees. Conditionally approved pending copyright year corrections.

Revision history for this message
Daniel van Vugt (vanvugt) wrote : Posted in a previous version of this proposal

I reviewed r3421.

Revision history for this message
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:3424
http://jenkins.qa.ubuntu.com/job/compiz-ci/35/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/35/console

review: Approve (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:3424
http://jenkins.qa.ubuntu.com/job/compiz-ci/36/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/36/console

review: Approve (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:3425
http://jenkins.qa.ubuntu.com/job/compiz-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/41/console

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote : Posted in a previous version of this proposal

Please resubmit. LP thinks there are conflicts when there are not.

review: Needs Resubmitting
Revision history for this message
jenkins (martin-mrazik+qa) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3426
http://jenkins.qa.ubuntu.com/job/compiz-ci/44/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/44/console

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:3426
http://jenkins.qa.ubuntu.com/job/compiz-ci/46/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/46/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

That my friend is the sound of a broken CI bot again :)

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

I: removing directory /var/cache/pbuilder/build//7284 and its subdirectories
Traceback (most recent call last):
  File "/usr/bin/pbuilderjenkins", line 92, in <module>
    builder.execute_build(hooks=args.hook_list)
  File "/usr/lib/python2.7/dist-packages/pbuilderjenkins/pbuilderjenkins.py", line 321, in execute_build
    self._build(hooks_dir)
  File "/usr/lib/python2.7/dist-packages/pbuilderjenkins/pbuilderjenkins.py", line 287, in _build
    subprocess.check_call(command)
  File "/usr/lib/python2.7/subprocess.py", line 511, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['pdebuild', '--', '--inputfile', 'ReportDir', '--bindmounts', 'results', '--basetgz', '/var/cache/pbuilder/quantal-amd64.tgz', '--buildresult', 'output', '--hookdir', '/tmp/tmpEJmFqy']' returned non-zero exit status 1
pbuilder returned ERROR.
Build step 'Debian PBuilder NG' marked build as failure

Revision history for this message
Martin Mrazik (mrazik) wrote :

Sorry for the stacktrace (there is a bug to fail gracefully) but it is not the bot. It looks like quantal is broken:

The following packages have unmet dependencies:
 gir1.2-glib-2.0 : Depends: libglib2.0-0 (>= 2.33.12) but 2.33.10-0ubuntu3 is installed.
Unable to resolve dependencies! Giving up...

Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:3426
http://jenkins.qa.ubuntu.com/job/compiz-ci/48/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/48/console

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:3426
http://jenkins.qa.ubuntu.com/job/compiz-ci/50/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/50/console

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:3426
http://jenkins.qa.ubuntu.com/job/compiz-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/51/console

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Assigning structures is more reliable, and memory safe (if there are unused bytes). So
   memcpy (win_extents, gwd_cairo_window_decoration_get_default_max_win_extents (), sizeof (decor_extents_t));
etc, should just be:
   *win_extents = *gwd_cairo_window_decoration_get_default_max_win_extents ();

Again, for simplicity...
    if (!(*get_current) ())
        return FALSE;
    return TRUE;
should just be:
    return (*get_current) ();

Overall, seems to work and valgrind is happy too.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

No proposals found for merge of lp:~compiz-team/compiz/compiz.gtk-window-decorator-gsettings.cleanup-1 into lp:compiz.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches