--- nux-0.9.48.orig/NuxGraphics/Events.cpp +++ nux-0.9.48/NuxGraphics/Events.cpp @@ -68,8 +68,8 @@ e_key_modifiers = 0; e_key_repeat_count = 0; e_mouse_state = 0; - e_x = 0; - e_y = 0; + e_x = -1; + e_y = -1; e_x_root = 0; e_y_root = 0; e_dx = 0; --- nux-0.9.48.orig/NuxCore/ObjectPtr.h +++ nux-0.9.48/NuxCore/ObjectPtr.h @@ -398,7 +398,8 @@ } // Decrease the number of strong reference on the hosted pointer. - _objectptr_count->Decrement (); + if(_objectptr_count) + _objectptr_count->Decrement (); bool delete_warning = (_reference_count->GetValue() == 1) && (_weak_reference_count->GetValue() == 1); --- nux-0.9.48.orig/NuxCore/Object.cpp +++ nux-0.9.48/NuxCore/Object.cpp @@ -397,7 +397,7 @@ nuxAssert (_reference_count->GetValue() == 0); - if ( (_reference_count->GetValue() == 0) && (_weak_reference_count->GetValue() == 0) ) + if ((_reference_count->GetValue() == 0) && (_weak_reference_count->GetValue() == 0) && (_objectptr_count->GetValue() == 0)) { delete _reference_count; delete _weak_reference_count; @@ -408,7 +408,7 @@ } else { - if (_weak_reference_count == NULL) + if((_weak_reference_count == NULL) && (_objectptr_count->GetValue() == 0)) { nuxDebugMsg (TEXT ("[Object::Destroy] Error on object allocated at %s [%d]:") , _allocation_file_name.GetTCharPtr () @@ -416,7 +416,7 @@ nuxAssertMsg (0, TEXT("[Object::Destroy] Invalid pointer for the weak reference count.")); } - if (_weak_reference_count->GetValue() == 0) + if((_weak_reference_count->GetValue() == 0) && (_objectptr_count->GetValue() == 0)) { nuxDebugMsg (TEXT ("[Object::Destroy] Error on object allocated at %s [%d]:") , _allocation_file_name.GetTCharPtr () --- nux-0.9.48.orig/Nux/Theme.cpp +++ nux-0.9.48/Nux/Theme.cpp @@ -321,7 +321,11 @@ NBitmapData *BitmapData = LoadImageFile (filename); if (BitmapData) + { texture2D->Update (BitmapData); + delete BitmapData; + } + return texture2D; } --- nux-0.9.48.orig/Nux/TextEntry.cpp +++ nux-0.9.48/Nux/TextEntry.cpp @@ -229,6 +229,14 @@ } + void TextEntry::GeometryChanged () + { + + update_canvas_ = true; + View::GeometryChanged(); + + } + long TextEntry::ProcessEvent (IEvent& event, long traverseInfo, long processEventInfo) --- nux-0.9.48.orig/Nux/TextEntry.h +++ nux-0.9.48/Nux/TextEntry.h @@ -177,6 +177,8 @@ protected: virtual void DoSetFocused (bool focused); bool _block_focus; // used to selectively ignore focus keyevents + + virtual void GeometryChanged (); private: /** --- nux-0.9.48.orig/debian/watch +++ nux-0.9.48/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/nux/+download .*/nux-([0-9.]+)\.tar\.gz --- nux-0.9.48.orig/debian/nux-tools.install +++ nux-0.9.48/debian/nux-tools.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/nux/unity_support_test --- nux-0.9.48.orig/debian/rules +++ nux-0.9.48/debian/rules @@ -0,0 +1,22 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@ + +# build documentation as I didn't find a proper way to avoid make clean to not +# remove doc/ +override_dh_auto_configure: + dh_auto_configure -- --enable-documentation=yes + +override_dh_install: + rm debian/tmp/usr/lib/*la + dh_install --fail-missing + +override_dh_auto_test: + +override_dh_makeshlibs: + dh_makeshlibs -V 'libnux-0.9-0 (>= 0.9.42)' --- nux-0.9.48.orig/debian/libnux-0.9-0.install +++ nux-0.9.48/debian/libnux-0.9-0.install @@ -0,0 +1 @@ +usr/lib/lib*.so.* --- nux-0.9.48.orig/debian/control +++ nux-0.9.48/debian/control @@ -0,0 +1,93 @@ +Source: nux +Priority: optional +Maintainer: Didier Roche +Build-Depends: debhelper (>= 7.0.50~), + autotools-dev, + doxygen, + libglib2.0-dev (>= 2.25.14), + libgdk-pixbuf2.0-dev, + libcairo2-dev (>= 1.9.14), + libpng12-dev (>= 1.2.44), + libglew1.5-dev, + libglewmx1.5-dev, + libxxf86vm-dev, + libgl1-mesa-dev (>= 7.9~git20100924-0ubuntu3), + libsigc++-2.0-dev, + libpango1.0-dev, + libx11-dev, + libpcre3-dev, + libpci-dev, +Standards-Version: 3.9.1 +Section: libs +Homepage: http://launchpad.net/nux +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/nux/ubuntu + +Package: libnux-0.9-0 +Section: libs +Architecture: any +Depends: libnux-0.9-common (= ${source:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Breaks: unity (<< 3.8.6) +Description: Visual rendering toolkit for real-time applications - shared lib + Nux is a graphical user interface toolkit for applications that mixes opengl + hardware acceleration with high quality visual rendering. + . + This package contains shared libraries to be used by applications. + +Package: nux-tools +Section: x11 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Visual rendering toolkit for real-time applications - tools + Nux is a graphical user interface toolkit for applications that mixes opengl + hardware acceleration with high quality visual rendering. + . + This package contains various tools for nux + +Package: libnux-0.9-dev +Section: libdevel +Architecture: any +Depends: libnux-0.9-0 (= ${binary:Version}), + libglib2.0-dev (>= 2.25.14), + libgdk-pixbuf2.0-dev, + libcairo2-dev (>= 1.9.14), + libpng12-dev (>= 1.2.44), + libglew1.5-dev, + libglewmx1.5-dev, + libxxf86vm-dev, + libgl1-mesa-dev, + libsigc++-2.0-dev, + libpango1.0-dev, + libpcre3-dev, + ${misc:Depends} +Description: Visual rendering toolkit for real-time applications - dev files + Nux is a graphical user interface toolkit for applications that mixes opengl + hardware acceleration with high quality visual rendering. + . + This package contains files that are needed to build applications. + +Package: libnux-0.9-common +Section: libs +Architecture: all +Depends: ${misc:Depends} +Description: Visual rendering toolkit for real-time applications - common files + Nux is a graphical user interface toolkit for applications that mixes opengl + hardware acceleration with high quality visual rendering. + . + This package contains common architecture files used by the library. + +Package: libnux-0.9-doc +Section: doc +Architecture: all +Depends: ${misc:Depends}, + ${misc:Depends} +Suggests: libnux-0.9-dev, + doxygen +Description: Visual rendering toolkit for real-time applications - documentation + Nux is a graphical user interface toolkit for applications that mixes opengl + hardware acceleration with high quality visual rendering. + . + This package contains the documentation and some examples to try the toolkit. + --- nux-0.9.48.orig/debian/libnux-0.9-doc.install +++ nux-0.9.48/debian/libnux-0.9-doc.install @@ -0,0 +1,2 @@ +doc/* usr/share/libnux-0.9-doc/html +debian/tmp/usr/share/nux/gputests usr/share/libnux-0.9-doc/ --- nux-0.9.48.orig/debian/changelog +++ nux-0.9.48/debian/changelog @@ -0,0 +1,347 @@ +nux (0.9.48-0ubuntu1.1) natty-proposed; urgency=low + + * Cherry-pick fixes: + - for launcher sometimes doesn't hide when there are + windows beneath it (LP: #772185) + - input characters become invisible on switching dash to fullscreen mode + (LP: #758248) + - Fixed memory leak. Related to bug (LP: #758248) + - Fix compiz crashed with SIGSEGV in nux::NThreadSafeCounter::Decrement() + (LP: #763225) + + -- Didier Roche Thu, 26 May 2011 15:17:53 +0200 + +nux (0.9.48-0ubuntu1) natty-proposed; urgency=low + + * New upstream release. + - fix compiz crashed with SIGSEGV in nux::IOpenGLShaderProgram::Begin() + (LP: #768178) + - launcher loses focus (LP: #763883) + + -- Didier Roche Wed, 27 Apr 2011 09:32:26 +0200 + +nux (0.9.46-0ubuntu4) natty; urgency=low + + * Cherry-pick one fix to avoid wrong MouseMove event triggering false + wrong Launcher intellhide behavior (LP: #767250) + + -- Didier Roche Wed, 20 Apr 2011 20:07:01 +0200 + +nux (0.9.46-0ubuntu3) natty; urgency=low + + * Cherry-pick blacklisting additional driver + UNITY_FORCE_START env variable + to bypass unity/compiz testing: + - Partial screen corruption and poor performance on GeForce 6150 + (LP: #764379) + - [nvidia, 7300, 7400] display freeze when using unity desktop + (LP: #728745) + + -- Didier Roche Wed, 20 Apr 2011 18:08:40 +0200 + +nux (0.9.46-0ubuntu2) natty; urgency=low + + * Cherry-pick: + - fix for "does not display icons until hovered" on old ATI hardware + (LP: #726033) + + -- Didier Roche Wed, 20 Apr 2011 10:06:03 +0200 + +nux (0.9.46-0ubuntu1) natty; urgency=low + + * New upstream release. + - ensure text entry size is updated with different font size + - fix some missing nux events sent (LP: #763275, #750122) + + -- Didier Roche Tue, 19 Apr 2011 19:26:25 +0200 + +nux (0.9.44-0ubuntu2) natty; urgency=low + + * Cherry-pick a fix for black text is on a black background when item is + selected in dash search filter combobox (LP: #761201) + + -- Didier Roche Fri, 15 Apr 2011 12:46:01 +0200 + +nux (0.9.44-0ubuntu1) natty; urgency=low + + * New upstream release. + - compiz crashed with SIGSEGV in nux::WindowCompositor::RenderTopViews() + (LP: #754461) + - compiz crashed with SIGSEGV in nux::Area::InitiateResizeLayout() + (LP: #757709) + - Add ATI Radeon Mobility 7500 to compiz blacklist (LP: #760687) + - Letters cut off at the end in the applications window (LP: #753083) + + -- Didier Roche Thu, 14 Apr 2011 22:02:48 +0200 + +nux (0.9.42-0ubuntu1) natty; urgency=low + + * New upstream release. + - compiz crashed with SIGSEGV in nux::XInputWindow::NativeHandleList() + (LP: #753110) + - compiz crashed with SIGSEGV in nux::WindowCompositor::ProcessEvent() + (LP: #753005) + - compiz crashed with SIGSEGV in nux::WindowCompositor::RenderTopViews() + (LP: #754461) + * Breaks on current unity: + - debian/control: update breaks statement + - debian/rules: bump the shlib + + -- Didier Roche Mon, 11 Apr 2011 12:41:58 +0200 + +nux (0.9.40-0ubuntu1) natty; urgency=low + + * New upstream release. + - [fglrx] compiz crashed with SIGSEGV in nux::IOpenGLSurface::UnlockRect() + (LP: #685682) + - compiz crashed with SIGSEGV in + nux::WindowCompositor::ViewWindowPreEventCycle() (LP: #741952) + - Missing icons in app launcher (LP: #728393) + - compiz crashed with SIGSEGV in malloc_consolidate() (LP: #743738) + - compiz crashed with SIGSEGV in nux::BaseWindow::IsModal() (LP: #749675) + - compiz crashed with SIGSEGV in + nux::GpuRenderStates::SubmitChangeStates() (LP: #722391) + - compiz crashed with SIGSEGV in nux::InputArea::StartDragAsSource() + (LP: #737519) + - unity_support_test crashed with SIGSEGV in + nux::IOpenGLAsmVertexShader::IOpenGLAsmVertexShader() (LP: #734519) + - compiz crashed with SIGSEGV in nux::WindowCompositor::RenderTopViews() + (LP: #747486) + * debian/copyright: + - licence is now LGPL2.1+ + * ABI break, add Breaks: unity (<< 3.8.4) + * debian/rules: + - bump the shlib + + -- Didier Roche Thu, 07 Apr 2011 18:26:13 +0200 + +nux (0.9.38-0ubuntu1) natty; urgency=low + + * New upstream release. + - compiz crashed with SIGSEGV in std::_List_node_base::_M_hook() + (LP: #711916) + - compiz crashed with SIGSEGV in nux::View::PostProcessEvent2() + (LP: #712498) + - compiz crashed with SIGSEGV in sigc::internal::signal_emit0::emit() (LP: #729715) + - compiz crashed with SIGSEGV in brw_validate_state() (LP: #730707) + - Finish Nux detection tool support (LP: #722089) + - compiz crashed with SIGABRT in raise() (LP: #741942) + - compiz crashed with SIGSEGV in PanelMenuView::ProcessEvent() + (LP: #742139) + - compiz crashed with SIGSEGV in operator->() (LP: #741961) + - Graphics hardware capability detection (LP: #685208) + - compiz crashed with SIGSEGV in nux::GraphicsDisplay::GrabPointer() + (LP: #740784) + - compiz crashed with SIGSEGV in nux::Area::InitiateResizeLayout() + (LP: #741977) + - compiz crashed with SIGSEGV in nux::GraphicsDisplay::GrabKeyboard() + (LP: #742233) + - Missing child addition signals on nux::Layout and nux::View + (LP: #734803) + - compiz crashed with SIGSEGV in + nux::GpuRenderStates::SubmitChangeStates() (LP: #735908) + - unity_support_test crashed with SIGSEGV (LP: #743848) + * debian/control: + - adding libpci-dev build-dep for the new lighter unity_support_tool + + -- Didier Roche Fri, 01 Apr 2011 11:15:39 +0200 + +nux (0.9.36-0ubuntu1) natty; urgency=low + + * New upstream release. + - compiz crashed with SIGSEGV in nux::BaseTexture::GetDeviceTexture() + (LP: #692823) + - compiz crashed with SIGSEGV in nux::Focusable::SetFocused() + (LP: #737716) + - compiz crashed with SIGSEGV in nux::Memcpy() (LP: #738225) + * debian/rules: + - bump shlibs + + -- Didier Roche Thu, 24 Mar 2011 04:54:54 +0100 + +nux (0.9.34-0ubuntu1) natty; urgency=low + + * New upstream release. + - compiz crashed with SIGSEGV in nux::WindowCompositor::ResetDnDArea() + (LP: #728785) + - unity_support_test crashed with SIGSEGV in + nux::GpuDevice::GetOpenGLMajorVersion() (LP: #709222) + * debian/source_nux.py, debian/libnux-0.9-common.install: + - install an apport hook (mainly for the unity_support_test tool) reporting + xorg info + * debian/rules: + - bump shlibs + + -- Didier Roche Thu, 17 Mar 2011 17:55:17 +0100 + +nux (0.9.32-0ubuntu1) natty; urgency=low + + * New upstream release. + - compiz crashed with SIGSEGV in std::basic_string, std::allocator >::assign() (LP: #729412) + - Unity interface not resized properly when external monitor is used + (LP: #691772) + - unity_support_test crashed with SIGSEGV in + nux::IOpenGLAsmVertexShader::IOpenGLAsmVertexShader() (LP: #709649) + - compiz crashed with SIGSEGV in + nux::GpuRenderStates::SubmitChangeStates() (LP: #719156) + - compiz crashed with SIGSEGV in + nux::GpuRenderStates::SubmitChangeStates() (LP: #724903) + - unity_support_test crashed with SIGSEGV in + nux::IOpenGLAsmVertexShader::IOpenGLAsmVertexShader() (LP: #723531) + - unity_support_test crashed with SIGSEGV in + nux::IOpenGLAsmVertexShader::IOpenGLAsmVertexShader() (LP: #723158) + - unity_support_test crashed with SIGSEGV in + nux::IOpenGLAsmVertexShader::IOpenGLAsmVertexShader() (LP: #727895) + * debian/rules: + - bump shlib + + -- Didier Roche Thu, 10 Mar 2011 19:51:23 +0100 + +nux (0.9.30-0ubuntu1) natty; urgency=low + + * New upstream release: + - compiz crashed with SIGSEGV in g_signal_connect_data@plt() (LP: #725827) + - compiz crashed with SIGSEGV in nux::View::PostProcessEvent2() + (LP: #726253) + - Unity FTBFS on armel due to Nux (LP: #721118) + * debian/rules: + - bump shlib + + -- Didier Roche Tue, 01 Mar 2011 14:20:24 +0100 + +nux (0.9.28-0ubuntu1) natty; urgency=low + + * New upstream release: + - BaseWindow should notify change on the visible state (LP: #702702) + * Cherry-picked: + - Unity FTBFS on armel due to Nux (LP: #721118) + * debian/rules: + - bump shlib + + -- Didier Roche Thu, 24 Feb 2011 20:16:04 +0100 + +nux (0.9.26-0ubuntu1) natty; urgency=low + + * New upstream release. + - unity_support_test crashed with SIGSEGV in + nux::IOpenGLAsmVertexShader::IOpenGLAsmVertexShader() (LP: #711021) + - cherry-pick additional upstream commit to fix build issues + * debian/rules: + - bump shlib + + -- Didier Roche Thu, 17 Feb 2011 20:37:21 +0100 + +nux (0.9.22-0ubuntu1) natty; urgency=low + + * New upstream release. + * debian/rules: + - bump shlib + * debian/libnux-0.9-doc.install: + - don't install examples, they are not shipped anymore + + -- Didier Roche Thu, 10 Feb 2011 20:45:14 +0100 + +nux (0.9.18-0ubuntu1) natty; urgency=low + + * New upstream release. + * debian/rules: + - bump shlib + + -- Didier Roche Thu, 27 Jan 2011 14:31:24 +0100 + +nux (0.9.16-0ubuntu1) natty; urgency=low + + * New upstream release. + * debian/rules: + - bump shlib + + -- Didier Roche Thu, 20 Jan 2011 19:02:56 +0100 + +nux (0.9.14-0ubuntu2) natty; urgency=low + + * debian/control: + - make the -dev package depends on libpcre3-dev as well + * fix in trunk to add it to the .pc file and merge to the packaging branch + + -- Didier Roche Fri, 14 Jan 2011 21:28:40 +0100 + +nux (0.9.14-0ubuntu1) natty; urgency=low + + * New upstream release. + * debian/control: + - add libpcre3-dev + * debian/rules: + - bump shlib + + -- Didier Roche Fri, 14 Jan 2011 20:45:57 +0100 + +nux (0.9.12-0ubuntu1) natty; urgency=low + + * New upstream release: + - "compiz crashed with SIGSEGV in nux::IOpenGLSurface::UnlockRect()" + is fixed (lp: #686698) + * debian/rules: + - updated the shlibs + * debian/libnux-0.9-doc.install: + - install the gputests examples there + + -- Sebastien Bacher Fri, 17 Dec 2010 13:59:57 +0100 + +nux (0.9.10-0ubuntu2) natty; urgency=low + + * debian/control: + - force -common to be in sync with nux + - add Vcs-Bzr + + -- Didier Roche Mon, 13 Dec 2010 12:39:21 +0100 + +nux (0.9.10-0ubuntu1) natty; urgency=low + + * New upstream release. + - Fix SEGSEGV in nux::ResourceData::GetResourceIndex() const () + (LP: #682345) + - Add detection test software + * debian/rules: + - bump shlibs for new release + * debian/nux-tools.install, debian/control: + - add nux-tools to ship the detection test software + + -- Didier Roche Thu, 09 Dec 2010 19:56:53 +0100 + +nux (0.9.8-0ubuntu1) natty; urgency=low + + * New upstream release + cherry pick latest commit: + - don't ship .bmp files but rather .png (LP: #678460) + - Clicks outside of Quicklist don't close it (LP: #683079) + * debian/rules: + - bump shlibs for new release + + -- Didier Roche Tue, 30 Nov 2010 17:32:33 +0100 + +nux (0.9.6-0ubuntu1) natty; urgency=low + + * New upstream release. + - nux::Timeline + tests (LP: #676059) + * debian/copyright: + - updated to be parsable + * debian/libnux-dev.install: + - leftover, removed + * debian/rules: + - tests doesn't pass this week, will be fixed next. + - bump shlibs + + -- Didier Roche Thu, 25 Nov 2010 19:46:27 +0100 + +nux (0.9.4-0ubuntu2) natty; urgency=low + + * removing debian/libnux-0.9-0.symbols and use a shlibs as there is no + ABI/API stability + nux doesn't export the same symbols on every arch. + + -- Didier Roche Fri, 19 Nov 2010 10:40:41 +0100 + +nux (0.9.4-0ubuntu1) natty; urgency=low + + * Initial packaging + + -- Didier Roche Thu, 18 Nov 2010 19:17:32 +0100 --- nux-0.9.48.orig/debian/source_nux.py +++ nux-0.9.48/debian/source_nux.py @@ -0,0 +1,6 @@ +import apport.packaging + +def add_info(report, ui): + # add all relevant info like xorg ones + report.add_hooks_info(ui, srcpackage='xorg') + --- nux-0.9.48.orig/debian/libnux-0.9-dev.install +++ nux-0.9.48/debian/libnux-0.9-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/include/Nux-0.9 +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/lib/lib*.so --- nux-0.9.48.orig/debian/libnux-0.9-common.install +++ nux-0.9.48/debian/libnux-0.9-common.install @@ -0,0 +1,2 @@ +debian/tmp/usr/share/nux/0.9 +debian/source_nux.py usr/share/apport/package-hooks --- nux-0.9.48.orig/debian/copyright +++ nux-0.9.48/debian/copyright @@ -0,0 +1,44 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: nux +Maintainer: Jay Taoko +Source: http://launchpad.net/nux + +Files: * +Copyright: 2010, Inalogic Inc +License: LGPL-2.1+ + +Files: examples/* +Copyright: 2010, Inalogic Inc +License: GPL-3 + +Files: debian/* +Copyright: 2010, Didier Roche +License: LGPL-2.1+ + +License: GPL-3 + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3, as published + by the Free Software Foundation. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranties of + MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more details. + . + On Debian systems, the complete text of the GNU General Public License + can be found in `/usr/share/common-licenses/GPL-3' + +License: LGPL-2.1+ + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License, as + published by the Free Software Foundation; either version 2.1 or 3.0 + of the License. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranties of + MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR + PURPOSE. See the applicable version of the GNU Lesser General Public + License for more details. + . + On Debian systems, the complete text of the GNU Lesser General Public + License can be found in `/usr/share/common-licenses/LGPL-2.1' --- nux-0.9.48.orig/debian/compat +++ nux-0.9.48/debian/compat @@ -0,0 +1 @@ +7