Merge lp:~smspillaz/unity/unity.fix_modern_gl_build into lp:unity

[Sam Spilsbury]

Fixes build with USE_MODERN_COMPIZ_GL

fixes build with USE_MODERN_COMPIZ_GL

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:2520
http://jenkins.qa.ubuntu.com/job/unity-ci/127/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/127/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/127/console

review: Needs Fixing (continuous-integration)

[Martin Mrazik (mrazik)]

Sorry for the jenkins failure. I'm looking into this.

[Daniel van Vugt (vanvugt)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/985/console reported an error when processing this lp:~smspillaz/unity/unity.fix_modern_gl_build branch.
Not merging it.

[Sam Spilsbury (smspillaz)]

^ bug in the packaging

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/986/console reported an error when processing this lp:~smspillaz/unity/unity.fix_modern_gl_build branch.
Not merging it.

[Łukasz Zemczak (sil2100)]

Actually, I'm not really sure if it's a bug in packaging, as I cannot even access the job console! And I don't even see those two jobs (986, 985) in the jenkins automerger job list - not even listed as failed. Looks to me like a jenkins problem?

[Martin Mrazik (mrazik)]

Lukasz, it indeed looks like packaging error:
-----------------------------snip-----------------------------------
dpkg-source -b unity-6.0.0+bzr2530ubuntu0+744
dpkg-source: warning: no source format specified in debian/source/format, see dpkg-source(1)
dpkg-source: warning: Version number suggests Ubuntu changes, but there is no XSBC-Original-Maintainer field
dpkg-source: info: using source format `1.0'
dpkg-source: info: building unity using existing unity_6.0.0+bzr2530ubuntu0+744.orig.tar.gz
dpkg-source: info: building unity in unity_6.0.0+bzr2530ubuntu0+744.diff.gz
dpkg-source: warning: diff `/tmp/buildd/unity_6.0.0+bzr2530ubuntu0+744.diff.gz.new.218thj' doesn't contain any patch
dpkg-source: info: building unity in unity_6.0.0+bzr2530ubuntu0+744.dsc
 debian/rules build
dh build --with translations,quilt,python2,migrations --parallel
   dh_testdir -O--parallel
   debian/rules override_dh_quilt_patch
make[1]: Entering directory `/tmp/buildd/unity-6.0.0+bzr2530ubuntu0+744'
dh_quilt_patch
Applying patch libgeis-rename.patch
patching file CMakeLists.txt
Hunk #1 FAILED at 134.
1 out of 1 hunk FAILED -- rejects in file CMakeLists.txt
Patch libgeis-rename.patch does not apply (enforce with -f)
dh_quilt_patch: quilt --quiltrc /dev/null push -a || test $? = 2 returned exit code 1
make[1]: *** [override_dh_quilt_patch] Error 1
make[1]: Leaving directory `/tmp/buildd/unity-6.0.0+bzr2530ubuntu0+744'
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2
E: Failed autobuilding of package
W: execute priv not set on file C09shell, not executing.
I: unmounting /var/cache/pbuilder/quantal-unity-team--staging filesystem
I: unmounting /var/cache/pbuilder/ccache filesystem
I: unmounting dev/pts filesystem
I: unmounting proc filesystem
I: cleaning the build env
I: removing directory /var/cache/pbuilder/build//12957 and its subdirectories
Build step 'Execute shell' marked build as failure
Build was marked for publishing on https://jenkins.qa.ubuntu.com/
Finished: FAILURE
-----------------------------snip-----------------------------------

The build is still waiting for being published on jenkins.qa.ubuntu.com that is why you are getting the 404. I'll send you an e-mail with the IP address where you can see this before it gets published..

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:2520
http://jenkins.qa.ubuntu.com/job/unity-ci/128/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/128/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/128/console

review: Needs Fixing (continuous-integration)

[Łukasz Zemczak (sil2100)]

Ah, thanks! Well, I think I need to talk to Chase about this libgeist rename patch. Since he submitted it without our knowledge, and it seems to be breaking a lot of things right now.

[Francis Ginther (fginther)]

Review was claimed by accident, please ignore.

review: Abstain

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in unity-shared/IconRenderer.cpp

[Sam Spilsbury (smspillaz)]

Obsolete

review: Disapprove

Unmerged revisions

2520. By Sam Spilsbury on 2012-07-25

Initialize variables

=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp	2012-07-22 23:12:28 +0000
+++ unity-shared/IconRenderer.cpp	2012-08-01 04:15:42 +0000
@@ -757,9 +757,9 @@
   CHECKGL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0));
   CHECKGL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0));
 
-  int TextureObjectLocation;
-  int VertexLocation;
-  int TextureCoord0Location;
+  int TextureObjectLocation = 0;
+  int VertexLocation = 0;
+  int TextureCoord0Location = 0;
   int FragmentColor = 0;
   int ColorifyColor = 0;
   int DesatFactor = 0;