Merge lp://qastaging/~sil2100/compiz/xslt_probable_fix into lp://qastaging/compiz/0.9.8

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Brandon Schaefer
Approved revision: 3373
Merged at revision: 3373
Proposed branch: lp://qastaging/~sil2100/compiz/xslt_probable_fix
Merge into: lp://qastaging/compiz/0.9.8
Diff against target: 20 lines (+3/-4)
1 file modified
xslt/CMakeLists.txt (+3/-4)
To merge this branch: bzr merge lp://qastaging/~sil2100/compiz/xslt_probable_fix
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
jenkins (community) continuous-integration Approve
Review via email: mp+124244@code.qastaging.launchpad.net

Commit message

It seems that with USE_GCONF disabled, the gsettings xslt files are not installed. I *think* this might help?

Description of the change

Ok, unity builds are broken since Unity complains that /usr/share/compiz/xslt/compiz_gsettings_schemas.xslt is missing. compiz-dev does not install it currently.

The reason for this is that recently packaging turned off USE_GCONF, which in turn disables the installation of this file. I think this should not be like this? Shouldn't this file be installed when USE_GSETTINGS is enabled?

This is basically what my change does.

Comment anyone? We need to fix unity trunk!

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Used:
cmake .. -DBUILD_KDE4=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCMAKE_BUILD_TYPE=Debug -DUSE_GSETTINGS=ON -DUSE_GCONF=OFF -DCMAKE_INSTALL_PREFIX=$PREFIX

Then:
make
sudo make install

which produced the file:
/home/bschaefer/staging/share/compiz/xslt/compiz_gsettings_schemas.xslt

And now unity builds. I also built compiz from trunk with the same command and that file was not produced. So this branch fixes the problem.

review: Approve

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