diff -u unity-5.12/plugins/unityshell/src/unityshell.cpp unity-5.12/plugins/unityshell/src/unityshell.cpp --- unity-5.12/plugins/unityshell/src/unityshell.cpp +++ unity-5.12/plugins/unityshell/src/unityshell.cpp @@ -621,7 +621,6 @@ } glPopMatrix(); #else -#warning Panel shadow not properly implemented for GLES2 return; if (relayoutSourceId > 0) diff -u unity-5.12/debian/rules unity-5.12/debian/rules --- unity-5.12/debian/rules +++ unity-5.12/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) -gles2_architectures := armel armhf +gles2_architectures := foo DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') @@ -52,9 +52,6 @@ override_dh_gencontrol: dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION) -Vnuxabiversion=$(NUX_ABIVERSION) - # override netbook-launcher on i386 to get an epoch - rm -f debian/netbook-launcher/DEBIAN/control - dh_gencontrol -pnetbook-launcher -- -Vcoreabiversion=$(CORE_ABIVERSION) -Vnuxabiversion=$(NUX_ABIVERSION) -v2:$(DEB_VERSION) override_dh_makeshlibs: dh_makeshlibs -plibunity-core-5.0-5 -V 'libunity-core-5.0-5 (>= 4.14.2)' @@ -66 +63 @@ - dh $@ --with translations,quilt + dh $@ --with translations,quilt --parallel diff -u unity-5.12/debian/changelog unity-5.12/debian/changelog --- unity-5.12/debian/changelog +++ unity-5.12/debian/changelog @@ -1,3 +1,21 @@ +unity (5.12-0ubuntu4) quantal-proposed; urgency=low + + * debian/control: + - build on unversionned version of boost (to transition to 1.49 in quantal) + (LP: #1008219) + - build-dep on latest compiz-dev version for ABI break + - Vcs-Bzr: move to canonical branch + - remove netbook-launcher transitional package and other unsupported + transition cruft + * debian/rules: + - build in parallel + * Cherry-pick some upstream fixes for the newer g-c-c making previous upload + FTBFS in quantal + * as armel/armhf is temporary build with opengl now, build-dep on nux + 2.12.0-0ubuntu2 + + -- Didier Roche Thu, 31 May 2012 10:21:46 +0200 + unity (5.12-0ubuntu3) quantal; urgency=low * Build with gcc-4.6 temporarily while upstream works diff -u unity-5.12/debian/control unity-5.12/debian/control --- unity-5.12/debian/control +++ unity-5.12/debian/control @@ -25,12 +25,12 @@ libunity-misc-dev (>= 4.0.4), libutouch-grail-dev (>= 1.0.20), libxcb-icccm4-dev, - libnux-2.0-dev (>= 2.10.0), - compiz-dev (>= 1:0.9.7.2), - libcompizconfig0-dev (>= 0.9.7.0~bzr428-0ubuntu6~), + libnux-2.0-dev (>= 2.12.0-0ubuntu2), + compiz-dev (>= 1:0.9.8), + libcompizconfig0-dev (>= 0.9.8), xsltproc, - libboost1.46-dev, - libboost-serialization1.46-dev, + libboost-dev, + libboost-serialization-dev, libnotify-dev, libstartup-notification0-dev, libatk1.0-dev, @@ -41,10 +41,10 @@ libunity-dev (>= 5.2.0), libxfixes-dev (>= 1:5.0-4ubuntu4), gcc-4.6, - g++-4.6 + g++-4.6, Standards-Version: 3.9.3 Homepage: https://launchpad.net/unity -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/unity/ubuntu +Vcs-Bzr: https://code.launchpad.net/+branch/ubuntu/unity Package: unity Architecture: any @@ -61,11 +61,7 @@ python-gconf, nux-tools, unity-asset-pool (>= 0.8.18) -Provides: indicator-renderer, - netbook-launcher -Conflicts: netbook-launcher (<< 1:2.1.18-0ubuntu2) -Replaces: netbook-launcher (<< 1:2.1.18-0ubuntu2), - unity-common (<< 4.0.1-0ubuntu2~) +Provides: indicator-renderer Recommends: unity-lens-applications, unity-lens-files, unity-lens-music, @@ -78,8 +74,6 @@ indicator-printers, indicator-power, indicator-session, -Breaks: compiz-core (<< 1:0.9.4+bzr20110606-0ubuntu5), - bamf (<< 0.2.76), Description: Interface designed for efficiency of space and interaction. Unity is a desktop experience that sings. Designed by Canonical and the Ayatana community, Unity is all about the combination of familiarity and the future. We @@ -92,8 +86,6 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, -Replaces: unity (<< 4.0.1-0ubuntu1~), - unity-common (<< 4.0.1-0ubuntu2~), Description: Services for the Unity interface Unity is a desktop experience that sings. Designed by Canonical and the Ayatana community, Unity is all about the combination of familiarity and the future. We @@ -108,8 +100,6 @@ Architecture: all Depends: ${misc:Depends}, python, -Replaces: unity (<< 4.0.1-0ubuntu1~) -Conflicts: unity (<< 3.2.2-0ubuntu3) Description: Common files for the Unity interface. Unity is a desktop experience that sings. Designed by Canonical and the Ayatana community, Unity is all about the combination of familiarity and the future. We @@ -160,9 +149,0 @@ -Package: netbook-launcher -Section: oldlibs -Priority: extra -Architecture: all -Depends: unity, ${misc:Depends} -Description: transitional package - unity supersedes netbook-launcher. This package ensures a clean upgrade path, - and can be safely removed after the upgrade. - only in patch2: unchanged: --- unity-5.12.orig/plugins/unityshell/src/transientfor.h +++ unity-5.12/plugins/unityshell/src/transientfor.h @@ -38,7 +38,7 @@ public: X11TransientForReader (Display *dpy, Window xid); - ~X11TransientForReader (); + virtual ~X11TransientForReader (); bool isTransientFor (unsigned int ancestor); bool isGroupTransientFor (unsigned int clientLeader); only in patch2: unchanged: --- unity-5.12.orig/plugins/unityshell/src/compizminimizedwindowhandler.h +++ unity-5.12/plugins/unityshell/src/compizminimizedwindowhandler.h @@ -115,13 +115,11 @@ for (CompWindow *w : screen->windows()) { - compiz::CompTransientForReader *reader = new compiz::CompTransientForReader (w); + compiz::CompTransientForReader reader (w); - if (reader->isTransientFor (priv->mWindow->id()) || - reader->isGroupTransientFor (priv->mWindow->id())) + if (reader.isTransientFor (priv->mWindow->id()) || + reader.isGroupTransientFor (priv->mWindow->id())) transients.push_back (w->id()); - - delete reader; } return transients; only in patch2: unchanged: --- unity-5.12.orig/plugins/unityshell/src/SwitcherModel.h +++ unity-5.12/plugins/unityshell/src/SwitcherModel.h @@ -81,7 +81,7 @@ void PrevDetail(); void Select(launcher::AbstractLauncherIcon::Ptr selection); - void Select(int index); + void Select(unsigned int index); sigc::signal selection_changed; only in patch2: unchanged: --- unity-5.12.orig/plugins/unityshell/src/comptransientfor.h +++ unity-5.12/plugins/unityshell/src/comptransientfor.h @@ -38,13 +38,13 @@ public: CompTransientForReader (CompWindow *w); - ~CompTransientForReader (); + virtual ~CompTransientForReader (); bool isTransientFor (unsigned int transient); bool isGroupTransientFor (unsigned int transient); protected: - virtual unsigned int getAncestor (); + unsigned int getAncestor (); private: only in patch2: unchanged: --- unity-5.12.orig/plugins/unityshell/src/PanelIndicatorsView.h +++ unity-5.12/plugins/unityshell/src/PanelIndicatorsView.h @@ -69,8 +69,6 @@ void SetMaximumEntriesWidth(int max_width); void GetGeometryForSync(indicator::EntryLocationMap& locations); - virtual void QueueDraw(); - sigc::signal on_indicator_updated; protected: only in patch2: unchanged: --- unity-5.12.orig/plugins/unityshell/src/IconRenderer.cpp +++ unity-5.12/plugins/unityshell/src/IconRenderer.cpp @@ -104,7 +104,7 @@ tex.t = tex.t/varyTexCoord0.w; \n\ \n\ vec4 texel = color0 * SampleTexture(TextureObject0, tex); \n\ - vec4 desat = vec4 ("LUMIN_RED"*texel.r + "LUMIN_GREEN"*texel.g + "LUMIN_BLUE"*texel.b); \n\ + vec4 desat = vec4 (" LUMIN_RED "*texel.r + " LUMIN_GREEN "*texel.g + " LUMIN_BLUE "*texel.b); \n\ vec4 final_color = (vec4 (1.0, 1.0, 1.0, 1.0) - desat_factor) * desat + desat_factor * texel; \n\ final_color = colorify_color * final_color; \n\ final_color.a = texel.a; \n\ @@ -134,7 +134,7 @@ PARAM color0 = program.local[0]; \n\ PARAM factor = program.local[1]; \n\ PARAM colorify_color = program.local[2]; \n\ -PARAM luma = {"LUMIN_RED", "LUMIN_GREEN", "LUMIN_BLUE", 0.0}; \n\ +PARAM luma = {" LUMIN_RED ", " LUMIN_GREEN ", " LUMIN_BLUE ", 0.0}; \n\ TEMP temp; \n\ TEMP pcoord; \n\ TEMP tex0; \n\ @@ -156,7 +156,7 @@ PARAM color0 = program.local[0]; \n\ PARAM factor = program.local[1]; \n\ PARAM colorify_color = program.local[2]; \n\ -PARAM luma = {"LUMIN_RED", "LUMIN_GREEN", "LUMIN_BLUE", 0.0}; \n\ +PARAM luma = {" LUMIN_RED ", " LUMIN_GREEN ", " LUMIN_BLUE ", 0.0}; \n\ TEMP temp; \n\ TEMP pcoord; \n\ TEMP tex0; \n\ only in patch2: unchanged: --- unity-5.12.orig/plugins/unityshell/src/PanelIndicatorsView.cpp +++ unity-5.12/plugins/unityshell/src/PanelIndicatorsView.cpp @@ -122,15 +122,6 @@ } void -PanelIndicatorsView::QueueDraw() -{ - nux::View::QueueDraw(); - - for (auto entry : entries_) - entry.second->QueueDraw(); -} - -void PanelIndicatorsView::SetMaximumEntriesWidth(int max_width) { unsigned int n_entries = 0; only in patch2: unchanged: --- unity-5.12.orig/plugins/unityshell/src/SwitcherModel.cpp +++ unity-5.12/plugins/unityshell/src/SwitcherModel.cpp @@ -250,7 +250,7 @@ } void -SwitcherModel::Select(int index) +SwitcherModel::Select(unsigned int index) { unsigned int target = CLAMP(index, 0, _inner.size() - 1); only in patch2: unchanged: --- unity-5.12.orig/UnityCore/GLibSignal-inl.h +++ unity-5.12/UnityCore/GLibSignal-inl.h @@ -218,7 +218,7 @@ template Signal::Signal(G object, std::string const& signal_name, SignalCallback callback) { - Connect(object, signal_name, callback); + this->Connect(object, signal_name, callback); } template @@ -228,7 +228,7 @@ template Signal::Signal(G object, std::string const& signal_name, SignalCallback callback) { - Connect(object, signal_name, callback); + this->Connect(object, signal_name, callback); } template @@ -240,7 +240,7 @@ std::string const& signal_name, SignalCallback callback) { - Connect(object, signal_name, callback); + this->Connect(object, signal_name, callback); } template @@ -252,7 +252,7 @@ std::string const& signal_name, SignalCallback callback) { - Connect(object, signal_name, callback); + this->Connect(object, signal_name, callback); } template @@ -264,7 +264,7 @@ std::string const& signal_name, SignalCallback callback) { - Connect(object, signal_name, callback); + this->Connect(object, signal_name, callback); } template < typename R, typename G, typename T1, typename T2, typename T3, typename T4, @@ -278,7 +278,7 @@ std::string const& signal_name, SignalCallback callback) { - Connect(object, signal_name, callback); + this->Connect(object, signal_name, callback); } template < typename R, typename G, typename T1, typename T2, typename T3, typename T4, @@ -292,7 +292,7 @@ std::string const& signal_name, SignalCallback callback) { - Connect(object, signal_name, callback); + this->Connect(object, signal_name, callback); } }