March 2012 - openSUSE Commits - openSUSE Mailing Lists

commit oxygen-gtk3 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package oxygen-gtk3 for openSUSE:Factory checked in at 2012-03-01 17:21:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk3 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oxygen-gtk3", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk3/oxygen-gtk3.changes 2012-01-30 12:27:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk3.new/oxygen-gtk3.changes 2012-03-01 17:21:58.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Feb 17 21:03:29 UTC 2012 - asterios.dramis(a)gmail.com + +- Update to 1.0.1: + Fixes include: + * Email list in evolution. + * Warnings when parsing CSS style sheet. + * Icon background with gtk3.3. + * High memory allocation for cached pixmaps. +- Split the package into gtk3-engine-oxygen and gtk3-theme-oxygen subpackages + for consistency with other gtk engines and themes (bnc#747107). + +------------------------------------------------------------------- Old: ---- oxygen-gtk3-1.0.0.tar.bz2 New: ---- oxygen-gtk3-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk3.spec ++++++ --- /var/tmp/diff_new_pack.JRX6Gt/_old 2012-03-01 17:21:59.000000000 +0100 +++ /var/tmp/diff_new_pack.JRX6Gt/_new 2012-03-01 17:21:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: oxygen-gtk3 -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 3.x License: LGPL-2.1+ @@ -45,6 +45,48 @@ widget appearance via hard coded pixmaps, which otherwise breaks everytime some setting is changed in KDE. +%package -n gtk3-engine-oxygen +Summary: Oxygen GTK 3.x Theme Engine +Group: System/GUI/Other + +%description -n gtk3-engine-oxygen +Oxygen-Gtk3 is a port of the default KDE widget theme (Oxygen), to gtk 3.x. + +It's primary goal is to ensure visual consistency between gtk-based and qt-based +applications running under KDE. A secondary objective is to also have a +stand-alone nice looking gtk theme that would behave well on other Desktop +Environments. + +Unlike other attempts made to port the KDE oxygen theme to gtk, this attempt does +not depend on Qt (via some Qt to Gtk conversion engine), nor does render the +widget appearance via hard coded pixmaps, which otherwise breaks everytime some +setting is changed in KDE. + +This package contains the Oxygen gtk 3.x theme engine. + +%package -n gtk3-theme-oxygen +Summary: Oxygen GTK 3.x Theme +Group: System/GUI/Other +Requires: gtk3-engine-oxygen = %{version} +# oxygen-gtk3 was last used at version 1.0.0 in K:D:F +Provides: oxygen-gtk3 = %{version} +Obsoletes: oxygen-gtk3 < %{version} + +%description -n gtk3-theme-oxygen +Oxygen-Gtk3 is a port of the default KDE widget theme (Oxygen), to gtk 3.x. + +It's primary goal is to ensure visual consistency between gtk-based and qt-based +applications running under KDE. A secondary objective is to also have a +stand-alone nice looking gtk theme that would behave well on other Desktop +Environments. + +Unlike other attempts made to port the KDE oxygen theme to gtk, this attempt does +not depend on Qt (via some Qt to Gtk conversion engine), nor does render the +widget appearance via hard coded pixmaps, which otherwise breaks everytime some +setting is changed in KDE. + +This package contains the Oxygen gtk 3.x theme. + %prep %setup -q @@ -68,11 +110,15 @@ %make_install popd -%files +%files -n gtk3-engine-oxygen %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO -%{_bindir}/oxygen-gtk3-demo %{_libdir}/gtk-3.0/3.0.0/theming-engines/liboxygen-gtk.so + +%files -n gtk3-theme-oxygen +%defattr(-,root,root,-) +%doc AUTHORS COPYING README TODO +%{_bindir}/oxygen-gtk3-demo %dir %{_datadir}/themes/oxygen-gtk %{_datadir}/themes/oxygen-gtk/gtk-3.0/ ++++++ oxygen-gtk3-1.0.0.tar.bz2 -> oxygen-gtk3-1.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/CMakeLists.txt new/oxygen-gtk3-1.0.1/CMakeLists.txt --- old/oxygen-gtk3-1.0.0/CMakeLists.txt 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/CMakeLists.txt 2012-02-15 10:38:23.000000000 +0100 @@ -9,11 +9,11 @@ set( CPACK_PACKAGE_NAME "oxygen-gtk3" ) set( CPACK_SOURCE_PACKAGE_NAME "oxygen-gtk3" ) set( CPACK_SOURCE_GENERATOR TBZ2 ) -set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Oxygen Gtk theme" ) +set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Oxygen Gtk2 theme" ) set( CPACK_PACKAGE_VENDOR "hugo(a)oxygen-icons.org" ) set( CPACK_PACKAGE_VERSION_MAJOR "1" ) set( CPACK_PACKAGE_VERSION_MINOR "0" ) -set( CPACK_PACKAGE_VERSION_PATCH "0" ) +set( CPACK_PACKAGE_VERSION_PATCH "1" ) set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" ) ################################## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/metacity.patch new/oxygen-gtk3-1.0.1/metacity.patch --- old/oxygen-gtk3-1.0.0/metacity.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/metacity.patch 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,21 @@ +diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp +index 4ed5401..9422996 100644 +--- a/src/oxygenqtsettings.cpp ++++ b/src/oxygenqtsettings.cpp +@@ -449,8 +449,14 @@ namespace Oxygen + gchar** gtkSearchPath; + int nElements; + gtk_icon_theme_get_search_path( gtk_icon_theme_get_default(), &gtkSearchPath, &nElements ); +- for( int i=0; i<nElements; i++ ) { searchPath.insert( gtkSearchPath[i] ); } +- g_free( gtkSearchPath ); ++ for( int i=0; i<nElements; i++ ) ++ { ++ if( gtkSearchPath[i] ) ++ { searchPath.insert( gtkSearchPath[i] ); } ++ } ++ ++ // free ++ g_strfreev( gtkSearchPath ); + + // add kde's path. Loop is reversed because added path must be prepended. + for( PathList::const_reverse_iterator iter = _kdeIconPathList.rbegin(); iter != _kdeIconPathList.rend(); ++iter ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/oxygen-gtk.diff new/oxygen-gtk3-1.0.1/oxygen-gtk.diff --- old/oxygen-gtk3-1.0.0/oxygen-gtk.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/oxygen-gtk.diff 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,17 @@ +diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp +index 4ed5401..35af7c1 100644 +--- a/src/oxygenqtsettings.cpp ++++ b/src/oxygenqtsettings.cpp +@@ -447,9 +447,10 @@ namespace Oxygen + // put existing default path in a set + PathSet searchPath; + gchar** gtkSearchPath; +- int nElements; ++ int nElements(0); + gtk_icon_theme_get_search_path( gtk_icon_theme_get_default(), &gtkSearchPath, &nElements ); +- for( int i=0; i<nElements; i++ ) { searchPath.insert( gtkSearchPath[i] ); } ++ for( int i=0; i<nElements; i++ ) ++ { if( gtkSearchPath[i] ) searchPath.insert( gtkSearchPath[i] ); } + g_free( gtkSearchPath ); + + // add kde's path. Loop is reversed because added path must be prepended. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/rc/argb-apps.conf new/oxygen-gtk3-1.0.1/rc/argb-apps.conf --- old/oxygen-gtk3-1.0.0/rc/argb-apps.conf 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/rc/argb-apps.conf 2012-02-15 10:38:23.000000000 +0100 @@ -48,3 +48,4 @@ ############################################################ # The list of disabled applications is now empty, because the way argb is handled should now be safe for all applications # if you have non-empty user argb-apps.conf file, it is recommanded to try empty it. +disable:xfrun4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/rc/gtk.css new/oxygen-gtk3-1.0.1/rc/gtk.css --- old/oxygen-gtk3-1.0.0/rc/gtk.css 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/rc/gtk.css 2012-02-15 10:38:23.000000000 +0100 @@ -28,49 +28,49 @@ */ * { - -GtkPaned-handle-size: 3; - -GtkButton-child_displacement_x: 0; - -GtkButton-child_displacement_y: 0; + -GtkPaned-handle-size: 3px; + -GtkButton-child_displacement_x: 0px; + -GtkButton-child_displacement_y: 0px; - -GtkButton-default_border: 0; - -GtkButton-default_outside_border: 0; - -GtkButton-inner-border: 1 2 0; + -GtkButton-default_border: 0px; + -GtkButton-default_outside_border: 0px; + -GtkButton-inner-border: 1px 2px 0px; - -GtkCalendar-inner-border: 0; - -GtkCalendar-horizontal-separation: 0; - -GtkComboBox-appears-as-list: 1; + -GtkCalendar-inner-border: 0px; + -GtkCalendar-horizontal-separation: 0px; + -GtkComboBox-appears-as-list: 1px; - -GtkMenu-horizontal-padding: 3; - -GtkMenu-vertical-padding: 5; - -GtkMenu-horizontal-offset: -7; - -GtkMenuBar-internal-padding: 0; + -GtkMenu-horizontal-padding: 3px; + -GtkMenu-vertical-padding: 5px; + -GtkMenu-horizontal-offset: -7px; + -GtkMenuBar-internal-padding: 0px; - -GtkScrolledWindow-scrollbar-spacing:1; + -GtkScrolledWindow-scrollbar-spacing: 1px; - -GtkCheckButton-indicator-size: 18; - -GtkCheckMenuItem-indicator-size: 16; - -GtkExpander-expander-size: 15; - -GtkTreeView-expander-size: 15; + -GtkCheckButton-indicator-size: 18px; + -GtkCheckMenuItem-indicator-size: 16px; + -GtkExpander-expander-size: 15px; + -GtkTreeView-expander-size: 15px; - -GtkTreeView-allow-rules: 1; + -GtkTreeView-allow-rules: 1px; -GtkStatusbar-shadow-type: GTK_SHADOW_NONE; - -GtkWindow-resize-grip-height: 0; - -GtkWindow-resize-grip-width: 0; + -GtkWindow-resize-grip-height: 0px; + -GtkWindow-resize-grip-width: 0px; /* Apparently the following have become obsolete - -GtkTreeView-row-ending-details: 1; + -GtkTreeView-row-ending-details: 1px; -GtkStatusbar-has-resize-grip: false; - -GtkEntry-honors-transparent-bg-hint: 1; + -GtkEntry-honors-transparent-bg-hint: 1px; */ engine: oxygen-gtk; } -GtkScrolledWindow { border-width: 1; } +GtkScrolledWindow { border-width: 1px; } /* customize border styles */ .toolbar { border-style: none; } @@ -84,61 +84,61 @@ */ /* specialization of default widgets style properties */ -GtkToggleButton { -GtkButton-inner-border: 1 0 0; } +GtkToggleButton { -GtkButton-inner-border: 1px 0px 0px; } GtkScale { - -GtkRange-slider-width: 23; - -GtkScale-slider-length: 21; + -GtkRange-slider-width: 23px; + -GtkScale-slider-length: 21px; } GtkScrollbar { - -GtkRange-stepper-size:12; - -GtkRange-trough-border:0; + -GtkRange-stepper-size: 12px; + -GtkRange-trough-border: 0px; } /* entries */ /* do not change unless also changing Entry_SideMargin in OxygenStyle.h */ GtkEntry { - padding: 2 5; + padding: 2px 5px; } /* menuitems padding */ GtkMenuBar { - padding: 1; - border-width: 0; + padding: 1px; + border-width: 0px; } -GtkMenuBar>GtkMenuItem { padding: 2 5; } -GtkMenu>GtkMenuItem { padding: 5 1; } -GtkMenu>GtkSeparatorMenuItem { padding: 1 1; } +GtkMenuBar>GtkMenuItem { padding: 2px 5px; } +GtkMenu>GtkMenuItem { padding: 5px 1px; } +GtkMenu>GtkSeparatorMenuItem { padding: 1px 1px; } /* menu toolbutton */ GtkMenuToolButton, GtkMenuToolButton * { - border-width: 0; - -GtkButton-focus-padding: 0; - -GtkWidget-focus-line-width: 0; + border-width: 0px; + -GtkButton-focus-padding: 0px; + -GtkWidget-focus-line-width: 0px; } /* notebooks */ -GtkNotebook { padding: 4; } +GtkNotebook { padding: 4px; } /* option menu */ -GtkOptionMenu { padding: 0 4; } +GtkOptionMenu { padding: 0px 4px; } /* separators */ -GtkSeparator { border-width: 3; } +GtkSeparator { border-width: 3px; } /* frames */ -GtkFrame { padding: 1; } -GtkScrolledWindow { padding: 1; } -GtkViewport { padding: 1; } -GtkProgressBar { padding: 0; } +GtkFrame { padding: 1px; } +GtkScrolledWindow { padding: 1px; } +GtkViewport { padding: 1px; } +GtkProgressBar { padding: 0px; } /* combo boxes */ -GtkComboBox { padding: 1 0; } -GtkComboBox>GtkFrame { padding: 4; } +GtkComboBox { padding: 1px 0px; } +GtkComboBox>GtkFrame { padding: 4px; } GtkComboBox>GtkEntry { - padding: 2 5; + padding: 2px 5px; } /* headers */ -GtkTreeView>GtkButton { border-width: 0 2; } -GtkList>GtkButton { border-width: 0 2; } +GtkTreeView>GtkButton { border-width: 0px 2px; } +GtkList>GtkButton { border-width: 0px 2px; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/CMakeLists.txt new/oxygen-gtk3-1.0.1/src/CMakeLists.txt --- old/oxygen-gtk3-1.0.0/src/CMakeLists.txt 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/CMakeLists.txt 2012-02-15 10:38:23.000000000 +0100 @@ -47,6 +47,8 @@ oxygengtktypenames.cpp oxygengtkutils.cpp oxygenloghandler.cpp + oxygenobjectcounter.cpp + oxygenobjectcountermap.cpp oxygenoptionmap.cpp oxygenpalette.cpp oxygenpathlist.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygeninnershadowdata.cpp new/oxygen-gtk3-1.0.1/src/animations/oxygeninnershadowdata.cpp --- old/oxygen-gtk3-1.0.0/src/animations/oxygeninnershadowdata.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygeninnershadowdata.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -107,7 +107,8 @@ // check window window && gdk_window_get_window_type( window ) == GDK_WINDOW_CHILD && - gdk_display_supports_composite( gtk_widget_get_display( widget ) ) ) + gdk_display_supports_composite( gtk_widget_get_display( widget ) ) && + G_OBJECT_TYPE_NAME(widget) != std::string("MessageList") ) // TODO: implement proper blacklist if there appear too many bad widgets/apps { data.initiallyComposited=gdk_window_get_composited(window); gdk_window_set_composited(window,TRUE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentabwidgetdata.cpp new/oxygen-gtk3-1.0.1/src/animations/oxygentabwidgetdata.cpp --- old/oxygen-gtk3-1.0.0/src/animations/oxygentabwidgetdata.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentabwidgetdata.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -136,6 +136,18 @@ } //________________________________________________________________________________ + bool TabWidgetData::isInTab( int x, int y ) const + { + + // loop over tab rectangles and check. + for( RectangleList::const_iterator iter = _tabRects.begin(); iter != _tabRects.end(); ++iter ) + { if( Gtk::gdk_rectangle_contains( &(*iter), x, y ) ) return true; } + + return false; + + } + + //________________________________________________________________________________ void TabWidgetData::setHoveredTab( GtkWidget* widget, int index ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentabwidgetdata.h new/oxygen-gtk3-1.0.1/src/animations/oxygentabwidgetdata.h --- old/oxygen-gtk3-1.0.0/src/animations/oxygentabwidgetdata.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentabwidgetdata.h 2012-02-15 10:38:23.000000000 +0100 @@ -91,6 +91,9 @@ bool isDirty( void ) const { return _dirty; } + //! returns true if provided point is in one tab of the widget + bool isInTab( int x, int y ) const; + //@] protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentabwidgetengine.h new/oxygen-gtk3-1.0.1/src/animations/oxygentabwidgetengine.h --- old/oxygen-gtk3-1.0.0/src/animations/oxygentabwidgetengine.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentabwidgetengine.h 2012-02-15 10:38:23.000000000 +0100 @@ -90,6 +90,10 @@ int hoveredTab( GtkWidget* widget ) { return data().value( widget ).hoveredTab(); } + //! returns true if provided point is in one tab of the widget + bool isInTab( GtkWidget* widget, int x, int y ) + { return data().value( widget ).isInTab( x, y ); } + //! true when drag is in progress bool dragInProgress( GtkWidget* widget ) { return data().value( widget ).dragInProgress(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentimeline.cpp new/oxygen-gtk3-1.0.1/src/animations/oxygentimeline.cpp --- old/oxygen-gtk3-1.0.0/src/animations/oxygentimeline.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentimeline.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -27,6 +27,9 @@ { //_________________________________________________ + int TimeLine::_steps = 0; + + //_________________________________________________ TimeLine::TimeLine( int duration ): _duration( duration ), _enabled( true ), @@ -131,9 +134,13 @@ assert( _time < _duration ); assert( _time <= elapsed ); - _value = ( _value*double(_duration - elapsed) + end*double(elapsed - _time) )/double(_duration - _time); + double oldValue( _value ); + _value = digitize( ( _value*double(_duration - elapsed) + end*double(elapsed - _time) )/double(_duration - _time) ); _time = elapsed; - trigger(); + + // trigger callback if value is actually changed + if( _value != oldValue ) trigger(); + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentimeline.h new/oxygen-gtk3-1.0.1/src/animations/oxygentimeline.h --- old/oxygen-gtk3-1.0.0/src/animations/oxygentimeline.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentimeline.h 2012-02-15 10:38:23.000000000 +0100 @@ -23,6 +23,7 @@ #include <glib.h> #include <cassert> +#include <cmath> namespace Oxygen { @@ -114,12 +115,24 @@ //@} + //! steps + static void setSteps( int value ) + { _steps = value; } + protected: //! run callback void trigger( void ) const { if( _func ) (_func)(_data); } + //! digitize value, based on steps + double digitize( const double& value ) const + { + if( _steps > 0 ) return std::floor( value*_steps )/_steps; + else return value; + } + + private: //! duration @@ -149,6 +162,9 @@ //! data gpointer _data; + //! steps + static int _steps; + }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentreeviewdata.cpp new/oxygen-gtk3-1.0.1/src/animations/oxygentreeviewdata.cpp --- old/oxygen-gtk3-1.0.0/src/animations/oxygentreeviewdata.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentreeviewdata.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -256,18 +256,6 @@ } //________________________________________________________________________________ - void TreeViewData::columnsChanged( GtkTreeView*, gpointer data ) - { - - #if OXYGEN_DEBUG - std::cerr << "Oxygen::TreeViewData::columnsChanged" << std::endl; - #endif - - static_cast<TreeViewData*>(data)->updateColumnsCursor(); - return; - } - - //________________________________________________________________________________ gboolean TreeViewData::motionNotifyEvent(GtkWidget* widget, GdkEventMotion* event, gpointer data ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/animations/oxygentreeviewdata.h new/oxygen-gtk3-1.0.1/src/animations/oxygentreeviewdata.h --- old/oxygen-gtk3-1.0.0/src/animations/oxygentreeviewdata.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/animations/oxygentreeviewdata.h 2012-02-15 10:38:23.000000000 +0100 @@ -87,9 +87,6 @@ //! set mouse over state virtual bool setHovered( GtkWidget* widget, bool value ); - //! update columns cursor - void updateColumnsCursor( void ) const; - //! update hovered cell based on pointer position void updatePosition( GtkWidget*, int x, int y ); @@ -136,7 +133,6 @@ //@{ static gboolean childDestroyNotifyEvent( GtkWidget*, gpointer ); static void childValueChanged( GtkRange*, gpointer ); - static void columnsChanged( GtkTreeView*, gpointer ); static gboolean motionNotifyEvent( GtkWidget*, GdkEventMotion*, gpointer ); //@} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/log new/oxygen-gtk3-1.0.1/src/log --- old/oxygen-gtk3-1.0.0/src/log 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/log 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,141 @@ + + +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,32,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar/GtkImageMenuItem +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8918778 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8917000 rect: ( -4,-6,172,177) path: /GtkWindow/GtkMenu +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,172,177) path: /GtkWindow/GtkMenu +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x891fc10 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920360 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920a10 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,32,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar/GtkImageMenuItem +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,28,31) path: /GtkWindow/GtkVBox/GtkHBox/GtkHBox/GtkButton +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8925420 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8924748 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygencairosurfacecache.h new/oxygen-gtk3-1.0.1/src/oxygencairosurfacecache.h --- old/oxygen-gtk3-1.0.0/src/oxygencairosurfacecache.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygencairosurfacecache.h 2012-02-15 10:38:23.000000000 +0100 @@ -37,7 +37,8 @@ public: //! constructor - CairoSurfaceCache( void ) + CairoSurfaceCache( size_t size = 100 ): + Cache<T, Cairo::Surface>( size ) {} //! destructor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenobjectcounter.cpp new/oxygen-gtk3-1.0.1/src/oxygenobjectcounter.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenobjectcounter.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenobjectcounter.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,51 @@ +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* This library 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 of the License, or(at your option ) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +* MA 02110-1301, USA. +*/ + +#include "oxygenobjectcounter.h" +#include "oxygenobjectcountermap.h" + +namespace Oxygen +{ + //____________________________________________________________ + ObjectCounter::ObjectCounter( const std::string& name ): + count_( 0 ) + { + count_ = ObjectCounterMap::get().counter( name ); + ObjectCounterMap::get().increment( *count_ ); + return; + } + + //____________________________________________________________ + ObjectCounter::ObjectCounter( const ObjectCounter& counter ): + count_( counter.count_ ) + { + ObjectCounterMap::get().increment( *count_ ); + return; + } + + //____________________________________________________________ + ObjectCounter::~ObjectCounter( void ) + { if( count_ ) ObjectCounterMap::get().decrement( *count_ ); } + + //____________________________________________________________ + int ObjectCounter::count( void ) const + { return (count_) ? *count_:0; } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenobjectcounter.h new/oxygen-gtk3-1.0.1/src/oxygenobjectcounter.h --- old/oxygen-gtk3-1.0.0/src/oxygenobjectcounter.h 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenobjectcounter.h 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,61 @@ +#ifndef Counter_h +#define Counter_h + +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* This library 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 of the License, or(at your option ) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +* MA 02110-1301, USA. +*/ + + +#include <string> +#include <map> + + +namespace Oxygen +{ + + class ObjectCounter + { + + public: + + //! counter name and counts pair + typedef std::pair<std::string, int> Pair; + + //! constructor + ObjectCounter( const std::string& name ); + + //! constructor + ObjectCounter( const ObjectCounter& counter ); + + //! destructor + virtual ~ObjectCounter( void ); + + //! retrieves counter count + int count( void ) const; + + private: + + //! pointer to integer counter + int* count_; + + }; + +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenobjectcountermap.cpp new/oxygen-gtk3-1.0.1/src/oxygenobjectcountermap.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenobjectcountermap.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenobjectcountermap.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,33 @@ +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* This library 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 of the License, or(at your option ) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +* MA 02110-1301, USA. +*/ + +#include "oxygenobjectcountermap.h" + +namespace Oxygen +{ + + //___________________________________________________ + ObjectCounterMap& ObjectCounterMap::get( void ) + { + static ObjectCounterMap singleton; + return singleton; + } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenobjectcountermap.h new/oxygen-gtk3-1.0.1/src/oxygenobjectcountermap.h --- old/oxygen-gtk3-1.0.0/src/oxygenobjectcountermap.h 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenobjectcountermap.h 2012-02-15 10:38:23.000000000 +0100 @@ -0,0 +1,68 @@ +#ifndef ObjectCounterMap_h +#define ObjectCounterMap_h + +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* This library 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 of the License, or(at your option ) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +* MA 02110-1301, USA. +*/ + +#include <map> +#include <string> + +//! thread-safe Object counter storage map +namespace Oxygen +{ + class ObjectCounterMap: public std::map<std::string, int> + { + + public: + + //! singleton + static ObjectCounterMap& get( void ); + + //! get counter for a given name + /*! + if the name is found, returns adress of the existing counter + creates new counter otherwise and returns adress + */ + int* counter( const std::string& name ) + { + iterator iter = find( name ); + if( iter == end() ) return &(insert( std::make_pair( name, 0 ) ).first->second); + else return &(iter->second); + } + + //! increment + void increment( int& counter ) + { counter++; } + + //! increment + void decrement( int& counter ) + { counter--; } + + private: + + //! constructor + ObjectCounterMap( void ) + {} + + }; + +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenqtsettings.cpp new/oxygen-gtk3-1.0.1/src/oxygenqtsettings.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenqtsettings.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenqtsettings.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -23,6 +23,7 @@ #include "oxygencoloreffect.h" #include "oxygencolorutils.h" #include "oxygenfontinfo.h" +#include "oxygentimeline.h" #include "config.h" #include <gtk/gtk.h> @@ -193,11 +194,11 @@ if( gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL ) { - _css.addToCurrentSection( " -GtkButton-inner-border: 1 0 0 10;" ); + _css.addToCurrentSection( " -GtkButton-inner-border: 1px 0px 0px 10px;" ); } else { - _css.addToCurrentSection( " -GtkButton-inner-border: 1 10 0 0;" ); + _css.addToCurrentSection( " -GtkButton-inner-border: 1px 10px 0px 0px;" ); } @@ -667,7 +668,7 @@ // tooltips _css.addSection( "GtkWindow#gtk-tooltip" ); _css.addToCurrentSection( Gtk::CSSOption<std::string>( GTK_STYLE_PROPERTY_BACKGROUND_COLOR, _palette.color( Palette::Tooltip ) ) ); - _css.addToCurrentSection( Gtk::CSSOption<int>( "padding", 3 ) ); + _css.addToCurrentSection( " padding: 3px;" ); _css.addSection( "GtkWindow#gtk-tooltip GtkLabel" ); _css.addToCurrentSection( Gtk::CSSOption<std::string>( GTK_STYLE_PROPERTY_COLOR, _palette.color( Palette::TooltipText ) ) ); @@ -899,6 +900,9 @@ _menuFollowMouseAnimationsDuration = oxygen.getOption( "[Style]", "MenuFollowMouseAnimationsDuration" ).toVariant<int>(40); _toolBarAnimationsDuration = oxygen.getOption( "[Style]", "ToolBarAnimationsDuration" ).toVariant<int>(50); + // animation steps + TimeLine::setSteps( oxygen.getOption( "[Style]", "AnimationSteps" ).toVariant<int>( 10 ) ); + // window decoration button size std::string buttonSize( oxygen.getValue( "[Windeco]", "ButtonSize", "Normal") ); if( buttonSize == "Small" ) _buttonSize = ButtonSmall; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenshadowhelper.cpp new/oxygen-gtk3-1.0.1/src/oxygenshadowhelper.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenshadowhelper.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenshadowhelper.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -365,6 +365,9 @@ << std::endl; #endif + // check widget + if( !GTK_IS_WIDGET( widget ) ) return; + // make sure handles and atom are defined createPixmapHandles(); @@ -408,7 +411,7 @@ void ShadowHelper::uninstallX11Shadows( GtkWidget* widget ) const { - if( !widget ) return; + if( !GTK_IS_WIDGET( widget ) ) return; GdkWindow *window = gtk_widget_get_window( widget ); GdkDisplay *display = gtk_widget_get_display( widget ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenthemingengine.cpp new/oxygen-gtk3-1.0.1/src/oxygenthemingengine.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenthemingengine.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenthemingengine.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -446,6 +446,7 @@ gtk_widget_path_is_type( path, GTK_TYPE_INFO_BAR ) || gtk_widget_path_is_type( path, GTK_TYPE_BUTTON ) || gtk_widget_path_is_type( path, GTK_TYPE_MENU_ITEM ) || + gtk_widget_path_is_type( path, GTK_TYPE_IMAGE ) || gtk_widget_path_is_type( path, GTK_TYPE_EXPANDER ) ) { @@ -624,6 +625,10 @@ gtk_theming_engine_get_background_color( engine, state, &background ); Style::instance().renderInfoBar( widget, context, x, y, w, h, Gtk::gdk_get_color( background ) ); + } else if( Gtk::gtk_widget_path_has_type( path, GTK_TYPE_STATUSBAR ) && borderStyle == GTK_BORDER_STYLE_INSET ) { + + return; + } else if( gtk_theming_engine_has_class( engine, GTK_STYLE_CLASS_TOOLTIP ) ) { // do nothing for tooltips diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygentileset.cpp new/oxygen-gtk3-1.0.1/src/oxygentileset.cpp --- old/oxygen-gtk3-1.0.0/src/oxygentileset.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygentileset.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -95,37 +95,6 @@ } //______________________________________________________________ - TileSet::TileSet( const TileSet& other ): - _surfaces( other._surfaces ), - _w1( other._w1 ), - _h1( other._h1 ), - _w3( other._w3 ), - _h3( other._h3 ) - { - - // increase ref counter - for( SurfaceList::iterator iter = _surfaces.begin(); iter != _surfaces.end(); ++iter ) - { cairo_surface_reference( *iter ); } - - } - - //______________________________________________________________ - TileSet& TileSet::operator = ( const TileSet& other ) - { - - _w1 = other._w1; - _h1 = other._h1; - _w3 = other._w3; - _h3 = other._h3; - - // copy pixmap list - _surfaces = other._surfaces; - - return *this; - - } - - //______________________________________________________________ TileSet::~TileSet( void ) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygentileset.h new/oxygen-gtk3-1.0.1/src/oxygentileset.h --- old/oxygen-gtk3-1.0.0/src/oxygentileset.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygentileset.h 2012-02-15 10:38:23.000000000 +0100 @@ -74,12 +74,6 @@ //! destructor virtual ~TileSet(); - //! copy constructor - TileSet( const TileSet& ); - - //! assignment operator - TileSet& operator = ( const TileSet& ); - /*! Flags specifying what sides to draw in ::render. Corners are drawn when the sides forming that corner are drawn, e.g. Top|Left draws the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygentilesetcache.h new/oxygen-gtk3-1.0.1/src/oxygentilesetcache.h --- old/oxygen-gtk3-1.0.0/src/oxygentilesetcache.h 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygentilesetcache.h 2012-02-15 10:38:23.000000000 +0100 @@ -36,7 +36,8 @@ public: //! constructor - TileSetCache( size_t size = 100 ) + TileSetCache( size_t size = 100 ): + Cache<T, TileSet>( size ) {} //! destructor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenwidgetlookup.cpp new/oxygen-gtk3-1.0.1/src/oxygenwidgetlookup.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenwidgetlookup.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenwidgetlookup.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -121,12 +121,14 @@ } } + #if OXYGEN_DEBUG std::cerr << "Oxygen::WidgetLookup::find -" << " context: " << context << " type: " << g_type_name( type ) << " - no match found" << std::endl; + #endif return 0L; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk3-1.0.0/src/oxygenwindowmanager.cpp new/oxygen-gtk3-1.0.1/src/oxygenwindowmanager.cpp --- old/oxygen-gtk3-1.0.0/src/oxygenwindowmanager.cpp 2012-01-16 09:46:33.000000000 +0100 +++ new/oxygen-gtk3-1.0.1/src/oxygenwindowmanager.cpp 2012-02-15 10:38:23.000000000 +0100 @@ -384,6 +384,7 @@ //_________________________________________________ bool WindowManager::isWindowDragWidget( GtkWidget* widget, GdkEventButton* event ) { + if( _mode == Disabled ) return false; else if( (!_drag) && withinWidget(widget, event ) && useEvent( widget, event ) ) { @@ -442,8 +443,14 @@ const GtkAllocation local( Gtk::gtk_widget_get_allocation( widget ) ); Gtk::gtk_notebook_get_tabbar_rect( GTK_NOTEBOOK( widget ), &allocation ); - allocation.x += wx - local.x; - allocation.y += wy - local.y; + + const int xLocal = int(event->x_root) - wx + local.x; + const int yLocal = int(event->y_root) - wy + local.y; + + // compare to event root position + if( !Gtk::gdk_rectangle_contains( &allocation, xLocal, yLocal ) ) return false; + else if( !Style::instance().animations().tabWidgetEngine().contains( widget ) ) return false; + else return !Style::instance().animations().tabWidgetEngine().isInTab( widget, xLocal, yLocal ); } else { @@ -451,10 +458,10 @@ allocation.x = wx; allocation.y = wy; - } + // compare to event root position + return Gtk::gdk_rectangle_contains( &allocation, int(event->x_root), int(event->y_root) ); - // compare to event root position - return Gtk::gdk_rectangle_contains( &allocation, int(event->x_root), int(event->y_root) ); + } } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit oxygen-gtk2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory checked in at 2012-03-01 17:21:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk2 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "oxygen-gtk2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk2/oxygen-gtk2.changes 2012-01-19 16:56:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new/oxygen-gtk2.changes 2012-03-01 17:21:54.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Feb 17 20:44:42 UTC 2012 - asterios.dramis(a)gmail.com + +- Update to 1.2.1: + Fixes include: + * Crash in metacity. + * Display issue for widgets with custom background. + * High memory allocation for cached pixmaps. + * Navigation between tabs in some application. +- Split the package into gtk2-engine-oxygen and gtk2-theme-oxygen subpackages + for consistency with other gtk engines and themes (bnc#747107). + +------------------------------------------------------------------- Old: ---- oxygen-gtk2-1.2.0.tar.bz2 New: ---- oxygen-gtk2-1.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.sbAVll/_old 2012-03-01 17:21:55.000000000 +0100 +++ /var/tmp/diff_new_pack.sbAVll/_new 2012-03-01 17:21:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: oxygen-gtk2 -Version: 1.2.0 +Version: 1.2.1 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 2.x License: LGPL-2.1+ @@ -30,12 +30,52 @@ BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gtk+-2.0) +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Oxygen-Gtk2 is a port of the default KDE widget theme (Oxygen), to gtk 2.x. + +It's primary goal is to ensure visual consistency between gtk-based and qt-based +applications running under KDE. A secondary objective is to also have a +stand-alone nice looking gtk theme that would behave well on other Desktop +Environments. + +Unlike other attempts made to port the KDE oxygen theme to gtk, this attempt does +not depend on Qt (via some Qt to Gtk conversion engine), nor does render the +widget appearance via hard coded pixmaps, which otherwise breaks everytime some +setting is changed in KDE. + +%package -n gtk2-engine-oxygen +Summary: Oxygen GTK 2.x Theme Engine +Group: System/GUI/Other + +%description -n gtk2-engine-oxygen +Oxygen-Gtk2 is a port of the default KDE widget theme (Oxygen), to gtk 2.x. + +It's primary goal is to ensure visual consistency between gtk-based and qt-based +applications running under KDE. A secondary objective is to also have a +stand-alone nice looking gtk theme that would behave well on other Desktop +Environments. + +Unlike other attempts made to port the KDE oxygen theme to gtk, this attempt does +not depend on Qt (via some Qt to Gtk conversion engine), nor does render the +widget appearance via hard coded pixmaps, which otherwise breaks everytime some +setting is changed in KDE. + +This package contains the Oxygen gtk 2.x theme engine. + +%package -n gtk2-theme-oxygen +Summary: Oxygen GTK 2.x Theme +Group: System/GUI/Other +Requires: gtk2-engine-oxygen = %{version} # oxygen-gtk was last used at version 1.1.6 in openSUSE 12.1 Provides: oxygen-gtk = %{version} Obsoletes: oxygen-gtk < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# oxygen-gtk2 was last used at version 1.2.0 in K:D:F +Provides: oxygen-gtk2 = %{version} +Obsoletes: oxygen-gtk2 < %{version} -%description +%description -n gtk2-theme-oxygen Oxygen-Gtk2 is a port of the default KDE widget theme (Oxygen), to gtk 2.x. It's primary goal is to ensure visual consistency between gtk-based and qt-based @@ -48,6 +88,8 @@ widget appearance via hard coded pixmaps, which otherwise breaks everytime some setting is changed in KDE. +This package contains the Oxygen gtk 2.x theme. + %prep %setup -q @@ -71,12 +113,16 @@ %make_install popd -%files +%files -n gtk2-engine-oxygen +%defattr(-,root,root,-) +%doc AUTHORS COPYING README TODO +%{_libdir}/gtk-2.0/2.10.0/engines/liboxygen-gtk.so + +%files -n gtk2-theme-oxygen %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO %{_bindir}/oxygen-gtk-deco %{_bindir}/oxygen-gtk-demo -%{_libdir}/gtk-2.0/2.10.0/engines/liboxygen-gtk.so %dir %{_datadir}/themes/oxygen-gtk %{_datadir}/themes/oxygen-gtk/gtk-2.0/ ++++++ oxygen-gtk2-1.2.0.tar.bz2 -> oxygen-gtk2-1.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/CMakeLists.txt new/oxygen-gtk2-1.2.1/CMakeLists.txt --- old/oxygen-gtk2-1.2.0/CMakeLists.txt 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/CMakeLists.txt 2012-02-15 10:22:29.000000000 +0100 @@ -13,7 +13,7 @@ set( CPACK_PACKAGE_VENDOR "hugo(a)oxygen-icons.org" ) set( CPACK_PACKAGE_VERSION_MAJOR "1" ) set( CPACK_PACKAGE_VERSION_MINOR "2" ) -set( CPACK_PACKAGE_VERSION_PATCH "0" ) +set( CPACK_PACKAGE_VERSION_PATCH "1" ) set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" ) ################################## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/metacity.patch new/oxygen-gtk2-1.2.1/metacity.patch --- old/oxygen-gtk2-1.2.0/metacity.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/metacity.patch 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,21 @@ +diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp +index 4ed5401..9422996 100644 +--- a/src/oxygenqtsettings.cpp ++++ b/src/oxygenqtsettings.cpp +@@ -449,8 +449,14 @@ namespace Oxygen + gchar** gtkSearchPath; + int nElements; + gtk_icon_theme_get_search_path( gtk_icon_theme_get_default(), &gtkSearchPath, &nElements ); +- for( int i=0; i<nElements; i++ ) { searchPath.insert( gtkSearchPath[i] ); } +- g_free( gtkSearchPath ); ++ for( int i=0; i<nElements; i++ ) ++ { ++ if( gtkSearchPath[i] ) ++ { searchPath.insert( gtkSearchPath[i] ); } ++ } ++ ++ // free ++ g_strfreev( gtkSearchPath ); + + // add kde's path. Loop is reversed because added path must be prepended. + for( PathList::const_reverse_iterator iter = _kdeIconPathList.rbegin(); iter != _kdeIconPathList.rend(); ++iter ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/oxygen-gtk.diff new/oxygen-gtk2-1.2.1/oxygen-gtk.diff --- old/oxygen-gtk2-1.2.0/oxygen-gtk.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/oxygen-gtk.diff 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,17 @@ +diff --git a/src/oxygenqtsettings.cpp b/src/oxygenqtsettings.cpp +index 4ed5401..35af7c1 100644 +--- a/src/oxygenqtsettings.cpp ++++ b/src/oxygenqtsettings.cpp +@@ -447,9 +447,10 @@ namespace Oxygen + // put existing default path in a set + PathSet searchPath; + gchar** gtkSearchPath; +- int nElements; ++ int nElements(0); + gtk_icon_theme_get_search_path( gtk_icon_theme_get_default(), &gtkSearchPath, &nElements ); +- for( int i=0; i<nElements; i++ ) { searchPath.insert( gtkSearchPath[i] ); } ++ for( int i=0; i<nElements; i++ ) ++ { if( gtkSearchPath[i] ) searchPath.insert( gtkSearchPath[i] ); } + g_free( gtkSearchPath ); + + // add kde's path. Loop is reversed because added path must be prepended. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/rc/argb-apps.conf new/oxygen-gtk2-1.2.1/rc/argb-apps.conf --- old/oxygen-gtk2-1.2.0/rc/argb-apps.conf 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/rc/argb-apps.conf 2012-02-15 10:22:29.000000000 +0100 @@ -48,3 +48,4 @@ ############################################################ # The list of disabled applications is now empty, because the way argb is handled should now be safe for all applications # if you have non-empty user argb-apps.conf file, it is recommanded to try empty it. +disable:xfrun4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/CMakeLists.txt new/oxygen-gtk2-1.2.1/src/CMakeLists.txt --- old/oxygen-gtk2-1.2.0/src/CMakeLists.txt 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/CMakeLists.txt 2012-02-15 10:22:29.000000000 +0100 @@ -11,6 +11,7 @@ animations/oxygencomboboxdata.cpp animations/oxygencomboboxentrydata.cpp animations/oxygendialogengine.cpp + animations/oxygenflatwidgetengine.cpp animations/oxygenfollowmousedata.cpp animations/oxygenhook.cpp animations/oxygenhoverdata.cpp @@ -48,6 +49,8 @@ oxygengtktypenames.cpp oxygengtkutils.cpp oxygenloghandler.cpp + oxygenobjectcounter.cpp + oxygenobjectcountermap.cpp oxygenoptionmap.cpp oxygenpalette.cpp oxygenpathlist.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygenanimations.cpp new/oxygen-gtk2-1.2.1/src/animations/oxygenanimations.cpp --- old/oxygen-gtk2-1.2.0/src/animations/oxygenanimations.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygenanimations.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -41,6 +41,7 @@ registerEngine( _comboBoxEngine = new ComboBoxEngine( this ) ); registerEngine( _comboBoxEntryEngine = new ComboBoxEntryEngine( this ) ); registerEngine( _dialogEngine = new DialogEngine( this ) ); + registerEngine( _flatWidgetEngine = new FlatWidgetEngine( this ) ); registerEngine( _groupBoxEngine = new GroupBoxEngine( this ) ); registerEngine( _groupBoxLabelEngine = new GroupBoxLabelEngine( this ) ); registerEngine( _hoverEngine = new HoverEngine( this ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygenanimations.h new/oxygen-gtk2-1.2.1/src/animations/oxygenanimations.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygenanimations.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygenanimations.h 2012-02-15 10:22:29.000000000 +0100 @@ -28,6 +28,7 @@ #include "oxygencomboboxengine.h" #include "oxygencomboboxentryengine.h" #include "oxygendialogengine.h" +#include "oxygenflatwidgetengine.h" #include "oxygengroupboxengine.h" #include "oxygengroupboxlabelengine.h" #include "oxygenhook.h" @@ -110,6 +111,10 @@ DialogEngine& dialogEngine( void ) const { return *_dialogEngine; } + //! flat widget + FlatWidgetEngine& flatWidgetEngine( void ) const + { return *_flatWidgetEngine; } + //! groupbox engine GroupBoxEngine& groupBoxEngine( void ) const { return *_groupBoxEngine; } @@ -236,6 +241,9 @@ //! dialog engine DialogEngine* _dialogEngine; + //! flat widget + FlatWidgetEngine* _flatWidgetEngine; + //! groupbox engine GroupBoxEngine* _groupBoxEngine; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygenflatwidgetengine.cpp new/oxygen-gtk2-1.2.1/src/animations/oxygenflatwidgetengine.cpp --- old/oxygen-gtk2-1.2.0/src/animations/oxygenflatwidgetengine.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygenflatwidgetengine.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,49 @@ +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2010 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* This library 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 of the License, or(at your option ) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +* MA 02110-1301, USA. +*/ + +#include "oxygenflatwidgetengine.h" +#include "../oxygengtktypenames.h" +#include "../oxygengtkutils.h" +#include "../config.h" + +#include <string> + +namespace Oxygen +{ + //_________________________________________________________ + bool FlatWidgetEngine::registerWidget( GtkWidget* widget ) + { + if( contains( widget ) ) return false; + _data.insert( widget ); + BaseEngine::registerWidget( widget ); + return true; + } + + //_________________________________________________________ + GtkWidget* FlatWidgetEngine::flatParent( GtkWidget* widget ) + { + + for( GtkWidget* parent = widget; parent; parent = gtk_widget_get_parent( parent ) ) + { if( contains( parent ) ) return parent; } + + return 0L; + } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygenflatwidgetengine.h new/oxygen-gtk2-1.2.1/src/animations/oxygenflatwidgetengine.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygenflatwidgetengine.h 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygenflatwidgetengine.h 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,71 @@ +#ifndef oxygenflatwidgetengine_h +#define oxygenflatwidgetengine_h +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2010 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* This library 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 of the License, or(at your option ) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +* MA 02110-1301, USA. +*/ + +#include "oxygenbaseengine.h" + +#include <gtk/gtk.h> +#include <set> + +namespace Oxygen +{ + //! forward declaration + class Animations; + + //! associates widgets with some type of data + class FlatWidgetEngine: public BaseEngine + { + + public: + + //! constructor + FlatWidgetEngine( Animations* widget ): + BaseEngine( widget ) + {} + + //! destructor + virtual ~FlatWidgetEngine( void ) + {} + + //! register widget + virtual bool registerWidget( GtkWidget* ); + + //! unregister widget + virtual void unregisterWidget( GtkWidget* widget ) + { _data.erase( widget ); } + + //! true if widget is included + virtual bool contains( GtkWidget* widget ) + { return _data.find( widget ) != _data.end(); } + + //! true if one of widgets parent is included + virtual GtkWidget* flatParent( GtkWidget* ); + + private: + + //! store registered widgets + std::set<GtkWidget*> _data; + + }; + +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentabwidgetdata.cpp new/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetdata.cpp --- old/oxygen-gtk2-1.2.0/src/animations/oxygentabwidgetdata.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetdata.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -130,6 +130,18 @@ } //________________________________________________________________________________ + bool TabWidgetData::isInTab( int x, int y ) const + { + + // loop over tab rectangles and check. + for( RectangleList::const_iterator iter = _tabRects.begin(); iter != _tabRects.end(); ++iter ) + { if( Gtk::gdk_rectangle_contains( &(*iter), x, y ) ) return true; } + + return false; + + } + + //________________________________________________________________________________ void TabWidgetData::setHoveredTab( GtkWidget* widget, int index ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentabwidgetdata.h new/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetdata.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygentabwidgetdata.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetdata.h 2012-02-15 10:22:29.000000000 +0100 @@ -91,6 +91,9 @@ bool isDirty( void ) const { return _dirty; } + //! returns true if provided point is in one tab of the widget + bool isInTab( int x, int y ) const; + //@] protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentabwidgetengine.h new/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetengine.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygentabwidgetengine.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentabwidgetengine.h 2012-02-15 10:22:29.000000000 +0100 @@ -90,6 +90,10 @@ int hoveredTab( GtkWidget* widget ) { return data().value( widget ).hoveredTab(); } + //! returns true if provided point is in one tab of the widget + bool isInTab( GtkWidget* widget, int x, int y ) + { return data().value( widget ).isInTab( x, y ); } + //! true when drag is in progress bool dragInProgress( GtkWidget* widget ) { return data().value( widget ).dragInProgress(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentimeline.cpp new/oxygen-gtk2-1.2.1/src/animations/oxygentimeline.cpp --- old/oxygen-gtk2-1.2.0/src/animations/oxygentimeline.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentimeline.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -27,6 +27,9 @@ { //_________________________________________________ + int TimeLine::_steps = 0; + + //_________________________________________________ TimeLine::TimeLine( int duration ): _duration( duration ), _enabled( true ), @@ -131,9 +134,13 @@ assert( _time < _duration ); assert( _time <= elapsed ); - _value = ( _value*double(_duration - elapsed) + end*double(elapsed - _time) )/double(_duration - _time); + double oldValue( _value ); + _value = digitize( ( _value*double(_duration - elapsed) + end*double(elapsed - _time) )/double(_duration - _time) ); _time = elapsed; - trigger(); + + // trigger callback if value is actually changed + if( _value != oldValue ) trigger(); + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentimeline.h new/oxygen-gtk2-1.2.1/src/animations/oxygentimeline.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygentimeline.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentimeline.h 2012-02-15 10:22:29.000000000 +0100 @@ -23,6 +23,7 @@ #include <glib.h> #include <cassert> +#include <cmath> namespace Oxygen { @@ -114,12 +115,24 @@ //@} + //! steps + static void setSteps( int value ) + { _steps = value; } + protected: //! run callback void trigger( void ) const { if( _func ) (_func)(_data); } + //! digitize value, based on steps + double digitize( const double& value ) const + { + if( _steps > 0 ) return std::floor( value*_steps )/_steps; + else return value; + } + + private: //! duration @@ -149,6 +162,9 @@ //! data gpointer _data; + //! steps + static int _steps; + }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentoolbarstatedata.cpp new/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstatedata.cpp --- old/oxygen-gtk2-1.2.0/src/animations/oxygentoolbarstatedata.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstatedata.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -325,6 +325,7 @@ if( data._target ) { + data.setDirty( true ); const GdkRectangle rect( data.dirtyRect() ); Gtk::gtk_widget_queue_draw( data._target, &rect ); } @@ -344,6 +345,7 @@ data.updateAnimatedRect(); + data.setDirty( true ); GdkRectangle rect( data.dirtyRect() ); Gtk::gtk_widget_queue_draw( data._target, &rect ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentoolbarstatedata.h new/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstatedata.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygentoolbarstatedata.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstatedata.h 2012-02-15 10:22:29.000000000 +0100 @@ -41,7 +41,8 @@ //! constructor ToolBarStateData( void ): _target( 0L ), - _dirtyRect( Gtk::gdk_rectangle() ) + _dirtyRect( Gtk::gdk_rectangle() ), + _dirty( false ) {} //! destructor @@ -83,6 +84,10 @@ _previous._timeLine.setDuration( value ); } + //! dirty state + void setDirty( bool value ) + { _dirty = value; } + //@} //!@name accessors @@ -117,6 +122,10 @@ bool isLocked( void ) const { return _timer.isRunning(); } + //! dirty state + bool isDirty( void ) const + { return _dirty; } + //@} protected: @@ -241,7 +250,13 @@ //! additional dirty rect GdkRectangle _dirtyRect; + //! dirty state + bool _dirty; + + //! previous button animation data Data _previous; + + //! current button animation data Data _current; //@} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/animations/oxygentoolbarstateengine.h new/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstateengine.h --- old/oxygen-gtk2-1.2.0/src/animations/oxygentoolbarstateengine.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/animations/oxygentoolbarstateengine.h 2012-02-15 10:22:29.000000000 +0100 @@ -122,6 +122,10 @@ return true; } + //! dirty state + void setDirty( GtkWidget* widget, bool value ) + { data().value( widget ).setDirty( value ); } + //@} //!@name accessors @@ -168,6 +172,10 @@ bool isLocked( GtkWidget* widget ) { return data().value( widget ).isLocked(); } + //! dirty state + bool isDirty( GtkWidget* widget ) + { return data().value( widget ).isDirty(); } + //@} private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/log new/oxygen-gtk2-1.2.1/src/log --- old/oxygen-gtk2-1.2.0/src/log 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/log 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,141 @@ + + +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,32,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar/GtkImageMenuItem +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8918778 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8918778 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8917000 rect: ( -4,-6,172,177) path: /GtkWindow/GtkMenu +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,172,177) path: /GtkWindow/GtkMenu +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x891fc10 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x891fc10 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920360 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920360 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8920a10 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8920a10 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,32,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar/GtkImageMenuItem +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,28,31) path: /GtkWindow/GtkVBox/GtkHBox/GtkHBox/GtkButton +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,17) path: /GtkWindow/GtkVBox/GtkHBox/GtkMenuBar +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8925420 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8925420 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,14,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,181,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,188,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,193,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,10,20) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView/GtkButton +Oxygen::render_background - context: 0x8924748 rect: ( 0,42,596,187) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 0,0,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 14,0,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 195,0,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 383,0,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 576,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 586,0,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 0,21,14,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 14,21,181,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 195,21,188,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 383,21,193,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 576,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8924748 rect: ( 586,21,10,21) path: /GtkWindow/GtkVBox/GtkHBox/GtkAlignment/GtkNotebook/GtkScrolledWindow/GtkTreeView +Oxygen::render_background - context: 0x8917000 rect: ( 0,0,600,400) path: /GtkWindow diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygencairosurfacecache.h new/oxygen-gtk2-1.2.1/src/oxygencairosurfacecache.h --- old/oxygen-gtk2-1.2.0/src/oxygencairosurfacecache.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygencairosurfacecache.h 2012-02-15 10:22:29.000000000 +0100 @@ -37,7 +37,8 @@ public: //! constructor - CairoSurfaceCache( void ) + CairoSurfaceCache( size_t size = 100 ): + Cache<T, Cairo::Surface>( size ) {} //! destructor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygengtkutils.cpp new/oxygen-gtk2-1.2.1/src/oxygengtkutils.cpp --- old/oxygen-gtk2-1.2.0/src/oxygengtkutils.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygengtkutils.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -34,6 +34,7 @@ namespace Oxygen { + GQuark Gtk::Quarks::_rcStyle = 0L; //____________________________________________________________ void Gtk::gtk_container_adjust_buttons_state(GtkContainer* container,gpointer data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygengtkutils.h new/oxygen-gtk2-1.2.1/src/oxygengtkutils.h --- old/oxygen-gtk2-1.2.0/src/oxygengtkutils.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygengtkutils.h 2012-02-15 10:22:29.000000000 +0100 @@ -415,6 +415,44 @@ //! returns a widget which has response_id as response id for dialog GtkWidget* gtk_dialog_find_button( GtkDialog*, gint ); + + //! store quarks + class Quarks + { + public: + + //! parent class + inline static GQuark rcStyle( void ) + { + + // try initialize + if( !_rcStyle ) + { _rcStyle = g_quark_try_string( "gtk-rc-style" ); } + + return _rcStyle; + + } + + + private: + + //! RC style quark + /*! + used to check whether an RCStyle was installed on a given widget or not. + See gtkwidet::gtk_widget_get_modifier_style() + */ + static GQuark _rcStyle; + + }; + + //! returns true if widget style color is modified + inline bool gtk_widget_style_is_modified( GtkWidget* widget, GtkStateType state, GtkRcFlags flag ) + { + const bool hasRCStyle( g_object_get_qdata (G_OBJECT (widget), Quarks::rcStyle() ) ); + return ( hasRCStyle && gtk_widget_get_modifier_style(widget)->color_flags[state]&flag ); + } + + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenobjectcounter.cpp new/oxygen-gtk2-1.2.1/src/oxygenobjectcounter.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenobjectcounter.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenobjectcounter.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,51 @@ +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* This library 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 of the License, or(at your option ) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +* MA 02110-1301, USA. +*/ + +#include "oxygenobjectcounter.h" +#include "oxygenobjectcountermap.h" + +namespace Oxygen +{ + //____________________________________________________________ + ObjectCounter::ObjectCounter( const std::string& name ): + count_( 0 ) + { + count_ = ObjectCounterMap::get().counter( name ); + ObjectCounterMap::get().increment( *count_ ); + return; + } + + //____________________________________________________________ + ObjectCounter::ObjectCounter( const ObjectCounter& counter ): + count_( counter.count_ ) + { + ObjectCounterMap::get().increment( *count_ ); + return; + } + + //____________________________________________________________ + ObjectCounter::~ObjectCounter( void ) + { if( count_ ) ObjectCounterMap::get().decrement( *count_ ); } + + //____________________________________________________________ + int ObjectCounter::count( void ) const + { return (count_) ? *count_:0; } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenobjectcounter.h new/oxygen-gtk2-1.2.1/src/oxygenobjectcounter.h --- old/oxygen-gtk2-1.2.0/src/oxygenobjectcounter.h 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenobjectcounter.h 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,61 @@ +#ifndef Counter_h +#define Counter_h + +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* This library 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 of the License, or(at your option ) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +* MA 02110-1301, USA. +*/ + + +#include <string> +#include <map> + + +namespace Oxygen +{ + + class ObjectCounter + { + + public: + + //! counter name and counts pair + typedef std::pair<std::string, int> Pair; + + //! constructor + ObjectCounter( const std::string& name ); + + //! constructor + ObjectCounter( const ObjectCounter& counter ); + + //! destructor + virtual ~ObjectCounter( void ); + + //! retrieves counter count + int count( void ) const; + + private: + + //! pointer to integer counter + int* count_; + + }; + +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenobjectcountermap.cpp new/oxygen-gtk2-1.2.1/src/oxygenobjectcountermap.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenobjectcountermap.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenobjectcountermap.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,33 @@ +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* This library 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 of the License, or(at your option ) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +* MA 02110-1301, USA. +*/ + +#include "oxygenobjectcountermap.h" + +namespace Oxygen +{ + + //___________________________________________________ + ObjectCounterMap& ObjectCounterMap::get( void ) + { + static ObjectCounterMap singleton; + return singleton; + } + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenobjectcountermap.h new/oxygen-gtk2-1.2.1/src/oxygenobjectcountermap.h --- old/oxygen-gtk2-1.2.0/src/oxygenobjectcountermap.h 1970-01-01 01:00:00.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenobjectcountermap.h 2012-02-15 10:22:29.000000000 +0100 @@ -0,0 +1,68 @@ +#ifndef ObjectCounterMap_h +#define ObjectCounterMap_h + +/* +* this file is part of the oxygen gtk engine +* Copyright (c) 2012 Hugo Pereira Da Costa <hugo(a)oxygen-icons.org> +* +* This library 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 of the License, or(at your option ) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, +* MA 02110-1301, USA. +*/ + +#include <map> +#include <string> + +//! thread-safe Object counter storage map +namespace Oxygen +{ + class ObjectCounterMap: public std::map<std::string, int> + { + + public: + + //! singleton + static ObjectCounterMap& get( void ); + + //! get counter for a given name + /*! + if the name is found, returns adress of the existing counter + creates new counter otherwise and returns adress + */ + int* counter( const std::string& name ) + { + iterator iter = find( name ); + if( iter == end() ) return &(insert( std::make_pair( name, 0 ) ).first->second); + else return &(iter->second); + } + + //! increment + void increment( int& counter ) + { counter++; } + + //! increment + void decrement( int& counter ) + { counter--; } + + private: + + //! constructor + ObjectCounterMap( void ) + {} + + }; + +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenqtsettings.cpp new/oxygen-gtk2-1.2.1/src/oxygenqtsettings.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenqtsettings.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenqtsettings.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -25,6 +25,7 @@ #include "oxygenfontinfo.h" #include "oxygengtkicons.h" #include "oxygengtkrc.h" +#include "oxygentimeline.h" #include "config.h" #include <gtk/gtk.h> @@ -444,12 +445,7 @@ // update icon search path // put existing default path in a set - PathSet searchPath; - gchar** gtkSearchPath; - int nElements; - gtk_icon_theme_get_search_path( gtk_icon_theme_get_default(), &gtkSearchPath, &nElements ); - for( int i=0; i<nElements; i++ ) { searchPath.insert( gtkSearchPath[i] ); } - g_free( gtkSearchPath ); + PathSet searchPath( defaultIconSearchPath() ); // add kde's path. Loop is reversed because added path must be prepended. for( PathList::const_reverse_iterator iter = _kdeIconPathList.rbegin(); iter != _kdeIconPathList.rend(); ++iter ) @@ -465,12 +461,6 @@ { gtk_icon_theme_prepend_search_path(gtk_icon_theme_get_default(), path.c_str() ); } } - #if OXYGEN_DEBUG - gtk_icon_theme_get_search_path( gtk_icon_theme_get_default(), &gtkSearchPath, &nElements ); - for( int i=0; i<nElements; i++ ) - { std::cerr << "Oxygen::QtSettings::loadKdeIcons - icon theme search path: " << gtkSearchPath[i] << std::endl; } - #endif - // load icon theme and path to gtk _iconThemes.clear(); _kdeIconTheme = _kdeGlobals.getValue( "[Icons]", "Theme", "oxygen" ); @@ -513,6 +503,29 @@ } //_________________________________________________________ + PathSet QtSettings::defaultIconSearchPath( void ) const + { + PathSet searchPath; + + // load icon theme + GtkIconTheme* theme( gtk_icon_theme_get_default() ); + if( !GTK_IS_ICON_THEME( theme ) ) return searchPath; + + // get default + gchar** gtkSearchPath; + int nElements; + + gtk_icon_theme_get_search_path( theme, &gtkSearchPath, &nElements ); + for( int i=0; i<nElements; i++ ) + { searchPath.insert( gtkSearchPath[i] ); } + + // free + g_strfreev( gtkSearchPath ); + + return searchPath; + } + + //_________________________________________________________ void QtSettings::loadKdePalette( bool forced ) { @@ -918,6 +931,9 @@ _menuFollowMouseAnimationsDuration = oxygen.getOption( "[Style]", "MenuFollowMouseAnimationsDuration" ).toVariant<int>(40); _toolBarAnimationsDuration = oxygen.getOption( "[Style]", "ToolBarAnimationsDuration" ).toVariant<int>(50); + // animation steps + TimeLine::setSteps( oxygen.getOption( "[Style]", "AnimationSteps" ).toVariant<int>( 10 ) ); + // window decoration button size std::string buttonSize( oxygen.getValue( "[Windeco]", "ButtonSize", "Normal") ); if( buttonSize == "Small" ) _buttonSize = ButtonSmall; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenqtsettings.h new/oxygen-gtk2-1.2.1/src/oxygenqtsettings.h --- old/oxygen-gtk2-1.2.0/src/oxygenqtsettings.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenqtsettings.h 2012-02-15 10:22:29.000000000 +0100 @@ -341,6 +341,9 @@ //! load kde icons void loadKdeIcons( void ); + //! default icon search path + PathSet defaultIconSearchPath( void ) const; + //! load palette from kdeglobals void loadKdePalette( bool forced = false ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenshadowhelper.cpp new/oxygen-gtk2-1.2.1/src/oxygenshadowhelper.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenshadowhelper.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenshadowhelper.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -354,6 +354,9 @@ << std::endl; #endif + // check widget + if( !GTK_IS_WIDGET( widget ) ) return; + // make sure handles and atom are defined createPixmapHandles(); @@ -410,7 +413,7 @@ void ShadowHelper::uninstallX11Shadows( GtkWidget* widget ) const { - if( !widget ) return; + if( !GTK_IS_WIDGET( widget ) ) return; GdkWindow *window = gtk_widget_get_window( widget ); GdkDisplay *display = gtk_widget_get_display( widget ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenstyle.cpp new/oxygen-gtk2-1.2.1/src/oxygenstyle.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenstyle.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenstyle.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -754,22 +754,36 @@ // do nothing if not enough room if( w < 14 || h < 14 ) return; - // test for flatness + // add hole mask + Cairo::Context context( window, clipRect ); + renderHoleMask( context, x, y, w, h, tiles, sideMargin ); + if( (options&Flat) || Style::instance().settings().applicationName().useFlatBackground( widget ) ) { // create a rounded-rect antimask for renderHoleBackground - Cairo::Context context( window, clipRect ); - renderHoleMask( context, x, y, w, h, tiles, sideMargin ); cairo_set_source( context, settings().palette().color( Palette::Window ) ); cairo_rectangle( context, x, y, w, h ); cairo_fill( context ); - } else { + } else if( GtkWidget* parent = animations().flatWidgetEngine().flatParent( widget ) ) { + + // get background color and fill + if( Gtk::gtk_widget_style_is_modified( parent, GTK_STATE_NORMAL, GTK_RC_BG ) ) + { + + cairo_set_source( context, Gtk::gdk_get_color( gtk_widget_get_modifier_style( parent )->bg[GTK_STATE_NORMAL] ) ); + + } else { + + cairo_set_source( context, settings().palette().color( Palette::Window ) ); - // add hole if required (this can be done before translating the context) - Cairo::Context context( window, clipRect ); - renderHoleMask( context, x, y, w, h, tiles, sideMargin ); + } + + cairo_rectangle( context, x, y, w, h ); + cairo_fill( context ); + + } else { // normal window background renderWindowBackground( context, window, 0L, clipRect, x, y, w, h, options, tiles); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenstylewrapper.cpp new/oxygen-gtk2-1.2.1/src/oxygenstylewrapper.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenstylewrapper.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenstylewrapper.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -50,7 +50,6 @@ GtkStyleClass* StyleWrapper::_parentClass = 0L; GTypeInfo StyleWrapper::_typeInfo; GType StyleWrapper::_type = 0L; - GQuark StyleWrapper::_quarkRCStyle = 0L; XulInfo StyleWrapper::_xulInfo = XulInfo(); //___________________________________________________________________________________________________________ @@ -69,7 +68,7 @@ ToolBarStateEngine& engine( Style::instance().animations().toolBarStateEngine() ); engine.registerWidget(widget); - + engine.setDirty( widget, false ); if( engine.animatedRectangleIsValid( widget ) ) { @@ -154,9 +153,9 @@ - register the widgets to the relevant engines as below - pass the modified color to renderWindowBackground */ - const bool hasRCStyle( g_object_get_qdata (G_OBJECT (widget), StyleWrapper::quarkRCStyle() ) ); - if( hasRCStyle && gtk_widget_get_modifier_style(widget)->color_flags[state]&GTK_RC_BG ) + if( Gtk::gtk_widget_style_is_modified( widget, state, GTK_RC_BG ) ) { + Style::instance().animations().flatWidgetEngine().registerWidget( widget ); Style::instance().fill( window, clipRect, x, y, w, h, Gtk::gdk_get_color( style->bg[state] ) ); return; } @@ -179,7 +178,9 @@ { Style::instance().animations().dialogEngine().registerWidget( toplevel ); } // render background gradient - const bool success( Style::instance().renderWindowBackground( window, clipRect, x, y, w, h ) ); + StyleOptions options; + options._customColors.insert( Palette::Window, Gtk::gdk_get_color( style->bg[state] ) ); + const bool success( Style::instance().renderWindowBackground( window, clipRect, x, y, w, h, options ) ); // register to window manager if( success && @@ -194,7 +195,10 @@ // possible groupbox background if( d.isEventBox() && Gtk::gtk_parent_groupbox( widget ) ) - { Style::instance().renderGroupBoxBackground( window, widget, clipRect, x, y, w, h, Blend ); } + { + options |= Blend; + Style::instance().renderGroupBoxBackground( window, widget, clipRect, x, y, w, h, options ); + } // also draw possible animated tool button draw_animated_button( window, clipRect, widget ); @@ -207,8 +211,7 @@ if( Gtk::gtk_widget_is_applet( widget ) ) return; // for modified bg, fill with flat custom color - const bool hasRCStyle( g_object_get_qdata (G_OBJECT (widget), StyleWrapper::quarkRCStyle() ) ); - if( hasRCStyle && gtk_widget_get_modifier_style(widget)->color_flags[state]&GTK_RC_BG ) + if( Gtk::gtk_widget_style_is_modified( widget, state, GTK_RC_BG ) ) { Style::instance().fill( window, clipRect, x, y, w, h, Gtk::gdk_get_color( style->bg[state] ) ); @@ -309,8 +312,7 @@ bool drawTreeLines( true ); ColorUtils::Rgba background; - const bool hasRCStyle( g_object_get_qdata (G_OBJECT (widget), StyleWrapper::quarkRCStyle() ) ); - if( hasRCStyle && gtk_widget_get_modifier_style(widget)->color_flags[GTK_STATE_NORMAL]&GTK_RC_BASE ) + if( Gtk::gtk_widget_style_is_modified( widget, GTK_STATE_NORMAL, GTK_RC_BASE ) ) { /* @@ -1041,7 +1043,7 @@ toolPalette=Gtk::gtk_widget_find_parent( widget, GTK_TYPE_TOOL_PALETTE ); #endif - if( !toolPalette && (parent = engine.findParent( widget ) ) ) + if( !toolPalette && (parent = engine.findParent( widget ) ) && !engine.isDirty( parent ) ) { // register child @@ -3527,6 +3529,15 @@ pango_cairo_show_layout( context, layout ); + } else if( GtkWidget* parent = Gtk::gtk_parent_button( widget ) ) { + + // for flat buttons, do not use PRELIGHT color, since there is no PRELIGHT background rendered. + if( Gtk::gtk_button_is_flat( parent ) && ( state == GTK_STATE_PRELIGHT || state == GTK_STATE_ACTIVE ) ) state = GTK_STATE_NORMAL; + StyleWrapper::parentClass()->draw_layout( + style, window, state, use_text, + clipRect, widget, detail, x, y, layout ); + + } else { // in all other cases, fallback on default rendering, for now diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenstylewrapper.h new/oxygen-gtk2-1.2.1/src/oxygenstylewrapper.h --- old/oxygen-gtk2-1.2.0/src/oxygenstylewrapper.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenstylewrapper.h 2012-02-15 10:22:29.000000000 +0100 @@ -51,18 +51,6 @@ inline static GtkStyleClass* parentClass( void ) { return _parentClass; } - //! parent class - inline static GQuark quarkRCStyle( void ) - { - - // try initialize - if( !_quarkRCStyle ) - { _quarkRCStyle = g_quark_try_string( "gtk-rc-style" ); } - - return _quarkRCStyle; - - } - //! xul info inline static XulInfo& xulInfo( void ) { return _xulInfo; } @@ -86,13 +74,6 @@ //! registered type static GType _type; - //! RC style quark - /*! - used to check whether an RCStyle was installed on a given widget or not. - See gtkwidet::gtk_widget_get_modifier_style() - */ - static GQuark _quarkRCStyle; - //! xul info, needed to properly render focus in checkboxes and radio buttons static XulInfo _xulInfo; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygentileset.cpp new/oxygen-gtk2-1.2.1/src/oxygentileset.cpp --- old/oxygen-gtk2-1.2.0/src/oxygentileset.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygentileset.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -95,37 +95,6 @@ } //______________________________________________________________ - TileSet::TileSet( const TileSet& other ): - _surfaces( other._surfaces ), - _w1( other._w1 ), - _h1( other._h1 ), - _w3( other._w3 ), - _h3( other._h3 ) - { - - // increase ref counter - for( SurfaceList::iterator iter = _surfaces.begin(); iter != _surfaces.end(); ++iter ) - { cairo_surface_reference( *iter ); } - - } - - //______________________________________________________________ - TileSet& TileSet::operator = ( const TileSet& other ) - { - - _w1 = other._w1; - _h1 = other._h1; - _w3 = other._w3; - _h3 = other._h3; - - // copy pixmap list - _surfaces = other._surfaces; - - return *this; - - } - - //______________________________________________________________ TileSet::~TileSet( void ) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygentileset.h new/oxygen-gtk2-1.2.1/src/oxygentileset.h --- old/oxygen-gtk2-1.2.0/src/oxygentileset.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygentileset.h 2012-02-15 10:22:29.000000000 +0100 @@ -74,12 +74,6 @@ //! destructor virtual ~TileSet(); - //! copy constructor - TileSet( const TileSet& ); - - //! assignment operator - TileSet& operator = ( const TileSet& ); - /*! Flags specifying what sides to draw in ::render. Corners are drawn when the sides forming that corner are drawn, e.g. Top|Left draws the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygentilesetcache.h new/oxygen-gtk2-1.2.1/src/oxygentilesetcache.h --- old/oxygen-gtk2-1.2.0/src/oxygentilesetcache.h 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygentilesetcache.h 2012-02-15 10:22:29.000000000 +0100 @@ -36,7 +36,8 @@ public: //! constructor - TileSetCache( size_t size = 100 ) + TileSetCache( size_t size = 100 ): + Cache<T, TileSet>( size ) {} //! destructor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.2.0/src/oxygenwindowmanager.cpp new/oxygen-gtk2-1.2.1/src/oxygenwindowmanager.cpp --- old/oxygen-gtk2-1.2.0/src/oxygenwindowmanager.cpp 2012-01-16 09:39:27.000000000 +0100 +++ new/oxygen-gtk2-1.2.1/src/oxygenwindowmanager.cpp 2012-02-15 10:22:29.000000000 +0100 @@ -376,6 +376,7 @@ //_________________________________________________ bool WindowManager::isWindowDragWidget( GtkWidget* widget, GdkEventButton* event ) { + if( _mode == Disabled ) return false; else if( (!_drag) && withinWidget(widget, event ) && useEvent( widget, event ) ) { @@ -434,8 +435,14 @@ const GtkAllocation local( Gtk::gtk_widget_get_allocation( widget ) ); Gtk::gtk_notebook_get_tabbar_rect( GTK_NOTEBOOK( widget ), &allocation ); - allocation.x += wx - local.x; - allocation.y += wy - local.y; + + const int xLocal = int(event->x_root) - wx + local.x; + const int yLocal = int(event->y_root) - wy + local.y; + + // compare to event root position + if( !Gtk::gdk_rectangle_contains( &allocation, xLocal, yLocal ) ) return false; + else if( !Style::instance().animations().tabWidgetEngine().contains( widget ) ) return false; + else return !Style::instance().animations().tabWidgetEngine().isInTab( widget, xLocal, yLocal ); } else { @@ -443,10 +450,10 @@ allocation.x = wx; allocation.y = wy; - } + // compare to event root position + return Gtk::gdk_rectangle_contains( &allocation, int(event->x_root), int(event->y_root) ); - // compare to event root position - return Gtk::gdk_rectangle_contains( &allocation, int(event->x_root), int(event->y_root) ); + } } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit obs-service-tar_scm for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package obs-service-tar_scm for openSUSE:Factory checked in at 2012-03-01 17:21:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old) and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-tar_scm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes 2012-02-17 12:18:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new/obs-service-tar_scm.changes 2012-03-01 17:21:40.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 29 18:32:12 GMT 2012 - aspiers(a)suse.com + +- Remove accidental reference to keep-source parameter + which was never pushed upstream (obsoleted by new cache). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tar_scm.service ++++++ --- /var/tmp/diff_new_pack.0DDKgi/_old 2012-03-01 17:21:42.000000000 +0100 +++ /var/tmp/diff_new_pack.0DDKgi/_new 2012-03-01 17:21:42.000000000 +0100 @@ -17,7 +17,7 @@ <description>package just a sub directory</description> </parameter> <parameter name="version"> - <description>Specify version to be used in tarball. Defaults to automatically detected value formatted by versionformat parameter. If using keep-source, you should set this to a fixed constant which will be used to name the checked out directory.</description> + <description>Specify version to be used in tarball. Defaults to automatically detected value formatted by versionformat parameter.</description> </parameter> <parameter name="versionformat"> <description>Auto-generate version from checked out source using this format string. For git, value is passed via git show --pretty=format:... (default '%at'); for hg, via hg log --template=... (default '{rev}'); for bzr and svn, %r is revision (default '%r'). Overrides tarball name defined by version parameter.</description> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nbd for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package nbd for openSUSE:Factory checked in at 2012-03-01 17:21:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nbd (Old) and /work/SRC/openSUSE:Factory/.nbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nbd", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/nbd/nbd.changes 2012-01-09 16:01:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nbd.new/nbd.changes 2012-03-01 17:21:19.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Feb 29 15:51:37 UTC 2012 - tabraham(a)novell.com + +- Update to nbd-3.0 + * minor bug fixes + +- removed obsolete nbd-2.9.25-have_falloc_ph.diff +- compile with -fno-strict-aliasing to prevent breakage with new gcc + +------------------------------------------------------------------- Old: ---- nbd-2.9.25-have_falloc_ph.diff nbd-2.9.25.tar.bz2 New: ---- nbd-3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nbd.spec ++++++ --- /var/tmp/diff_new_pack.svGCWM/_old 2012-03-01 17:21:20.000000000 +0100 +++ /var/tmp/diff_new_pack.svGCWM/_new 2012-03-01 17:21:20.000000000 +0100 @@ -21,7 +21,7 @@ Name: nbd BuildRequires: doxygen glib2-devel >= 2.26.0 PreReq: %insserv_prereq coreutils -Version: 2.9.25 +Version: 3.0 Release: 1 License: GPL-2.0+ Group: Productivity/Networking/Other @@ -30,7 +30,6 @@ Source2: init.nbd-server Patch2: nbd-2.9.25-close.diff Patch3: nbd-2.9.25-doxyfile.diff -Patch4: nbd-2.9.25-have_falloc_ph.diff Summary: Network Block Device Server and Client Utilities Url: http://nbd.sourceforge.net/ Prefix: /usr @@ -98,10 +97,9 @@ %setup %patch2 -p1 %patch3 -p1 -%patch4 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS -fstack-protector" +export CFLAGS="$RPM_OPT_FLAGS -fstack-protector -fno-strict-aliasing" ./configure --with-gnu-ld --prefix=/usr --mandir=%{_mandir} \ --infodir=%{_infodir} --libdir=%{_libdir} --libexecdir=%{_libdir} \ --program-prefix="" --sysconfdir=/etc --build=%{_target_cpu}-suse-linux ++++++ nbd-2.9.25.tar.bz2 -> nbd-3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/Makefile.in new/nbd-3.0/Makefile.in --- old/nbd-2.9.25/Makefile.in 2011-11-29 08:38:51.000000000 +0100 +++ new/nbd-3.0/Makefile.in 2012-02-10 11:23:23.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -111,9 +111,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi am__relativize = \ dir0=`pwd`; \ sed_first='s,^$[^/]*$/.*$$,\1,'; \ @@ -142,6 +144,8 @@ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -268,7 +272,7 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -304,10 +308,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -398,19 +400,19 @@ clean-sbinPROGRAMS: -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) -make-integrityhuge$(EXEEXT): $(make_integrityhuge_OBJECTS) $(make_integrityhuge_DEPENDENCIES) +make-integrityhuge$(EXEEXT): $(make_integrityhuge_OBJECTS) $(make_integrityhuge_DEPENDENCIES) $(EXTRA_make_integrityhuge_DEPENDENCIES) @rm -f make-integrityhuge$(EXEEXT) $(LINK) $(make_integrityhuge_OBJECTS) $(make_integrityhuge_LDADD) $(LIBS) -nbd-client$(EXEEXT): $(nbd_client_OBJECTS) $(nbd_client_DEPENDENCIES) +nbd-client$(EXEEXT): $(nbd_client_OBJECTS) $(nbd_client_DEPENDENCIES) $(EXTRA_nbd_client_DEPENDENCIES) @rm -f nbd-client$(EXEEXT) $(LINK) $(nbd_client_OBJECTS) $(nbd_client_LDADD) $(LIBS) -nbd-server$(EXEEXT): $(nbd_server_OBJECTS) $(nbd_server_DEPENDENCIES) +nbd-server$(EXEEXT): $(nbd_server_OBJECTS) $(nbd_server_DEPENDENCIES) $(EXTRA_nbd_server_DEPENDENCIES) @rm -f nbd-server$(EXEEXT) $(nbd_server_LINK) $(nbd_server_OBJECTS) $(nbd_server_LDADD) $(LIBS) -nbd-tester-client$(EXEEXT): $(nbd_tester_client_OBJECTS) $(nbd_tester_client_DEPENDENCIES) +nbd-tester-client$(EXEEXT): $(nbd_tester_client_OBJECTS) $(nbd_tester_client_DEPENDENCIES) $(EXTRA_nbd_tester_client_DEPENDENCIES) @rm -f nbd-tester-client$(EXEEXT) $(nbd_tester_client_LINK) $(nbd_tester_client_OBJECTS) $(nbd_tester_client_LDADD) $(LIBS) -nbd-trdump$(EXEEXT): $(nbd_trdump_OBJECTS) $(nbd_trdump_DEPENDENCIES) +nbd-trdump$(EXEEXT): $(nbd_trdump_OBJECTS) $(nbd_trdump_DEPENDENCIES) $(EXTRA_nbd_trdump_DEPENDENCIES) @rm -f nbd-trdump$(EXEEXT) $(nbd_trdump_LINK) $(nbd_trdump_OBJECTS) $(nbd_trdump_LDADD) $(LIBS) @@ -698,14 +700,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -783,7 +786,11 @@ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir @@ -791,7 +798,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -809,7 +816,7 @@ dist dist-all: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -823,6 +830,8 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -842,6 +851,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -870,8 +880,16 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -907,10 +925,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -1002,20 +1025,21 @@ all all-am am--refresh check check-TESTS check-am clean \ clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ clean-sbinPROGRAMS ctags ctags-recursive dist dist-all \ - dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-hdr distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-binPROGRAMS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-sbinPROGRAMS install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-sbinPROGRAMS + dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-sbinPROGRAMS install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-sbinPROGRAMS dist-hook: rm -Rf `find $(distdir) -name '.svn' -type d -print` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/aclocal.m4 new/nbd-3.0/aclocal.m4 --- old/nbd-2.9.25/aclocal.m4 2011-11-29 08:38:50.000000000 +0100 +++ new/nbd-3.0/aclocal.m4 2012-02-10 11:23:21.000000000 +0100 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -391,12 +392,15 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -406,7 +410,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -422,19 +426,21 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -516,14 +522,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -563,6 +569,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -627,7 +634,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -692,10 +699,13 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -917,12 +927,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -962,8 +975,8 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, +# 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -983,7 +996,7 @@ [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -1094,12 +1107,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -1122,13 +1138,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -1136,13 +1153,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -1218,12 +1235,14 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -1246,13 +1265,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1261,13 +1280,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1289,10 +1308,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/configure new/nbd-3.0/configure --- old/nbd-2.9.25/configure 2011-11-29 08:38:50.000000000 +0100 +++ new/nbd-3.0/configure 2012-02-10 11:23:22.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for nbd 2.9.25. +# Generated by GNU Autoconf 2.68 for nbd 3.0. # # Report bugs to <wouter(a)debian.org>. # @@ -560,8 +560,8 @@ # Identity of this package. PACKAGE_NAME='nbd' PACKAGE_TARNAME='nbd' -PACKAGE_VERSION='2.9.25' -PACKAGE_STRING='nbd 2.9.25' +PACKAGE_VERSION='3.0' +PACKAGE_STRING='nbd 3.0' PACKAGE_BUGREPORT='wouter(a)debian.org' PACKAGE_URL='' @@ -629,6 +629,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -1271,7 +1272,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nbd 2.9.25 to adapt to many kinds of systems. +\`configure' configures nbd 3.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1341,7 +1342,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nbd 2.9.25:";; + short | recursive ) echo "Configuration of nbd 3.0:";; esac cat <<\_ACEOF @@ -1443,7 +1444,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nbd configure 2.9.25 +nbd configure 3.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2090,7 +2091,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nbd $as_me 2.9.25, which was +It was created by nbd $as_me 3.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2905,7 +2906,7 @@ # Define the identity of the package. PACKAGE='nbd' - VERSION='2.9.25' + VERSION='3.0' cat >>confdefs.h <<_ACEOF @@ -2935,11 +2936,11 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3125,6 +3126,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3938,6 +3940,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3997,7 +4000,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -6647,7 +6650,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nbd $as_me 2.9.25, which was +This file was extended by nbd $as_me 3.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6713,7 +6716,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -nbd config.status 2.9.25 +nbd config.status 3.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/configure.ac new/nbd-3.0/configure.ac --- old/nbd-2.9.25/configure.ac 2011-11-29 08:37:13.000000000 +0100 +++ new/nbd-3.0/configure.ac 2012-02-21 11:04:29.000000000 +0100 @@ -1,7 +1,7 @@ dnl Configure script for NBD system dnl (c) 1998 Martin Mares <mj(a)ucw.cz>, (c) 2000 Pavel Machek <pavel(a)ucw.cz>, dnl (c) 2003-2006 Wouter Verhelst <wouter(a)debian.org> -AC_INIT([nbd],[2.9.25],[wouter(a)debian.org]) +AC_INIT([nbd],[3.0],[wouter(a)debian.org]) AM_INIT_AUTOMAKE(foreign dist-bzip2) AM_MAINTAINER_MODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/lfs.h new/nbd-3.0/lfs.h --- old/nbd-2.9.25/lfs.h 2011-10-01 12:28:58.000000000 +0200 +++ new/nbd-3.0/lfs.h 2012-02-21 11:04:29.000000000 +0100 @@ -3,17 +3,17 @@ #include "config.h" #if NBD_LFS -#define _FILE_OFFSET_BITS 64 -#ifndef _LARGEFILE_SOURCE -#define _LARGEFILE_SOURCE -#define PARAM_OFFT PARAM_INT64 +# define _FILE_OFFSET_BITS 64 +# ifndef _LARGEFILE_SOURCE +# define _LARGEFILE_SOURCE +# endif +# define PARAM_OFFT PARAM_INT64 #else -#define PARAM_OFFT PARAM_INT -#endif +# define PARAM_OFFT PARAM_INT +#endif /* NBD_LFS */ #ifdef HAVE_SYNC_FILE_RANGE -#define USE_SYNC_FILE_RANGE -#define _GNU_SOURCE +# define USE_SYNC_FILE_RANGE +# define _GNU_SOURCE #endif /* HAVE_SYNC_FILE_RANGE */ -#endif /* NBD_LFS */ #endif /* LFS_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/man/Makefile.in new/nbd-3.0/man/Makefile.in --- old/nbd-2.9.25/man/Makefile.in 2011-11-29 08:38:51.000000000 +0100 +++ new/nbd-3.0/man/Makefile.in 2012-02-10 11:23:23.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -69,6 +69,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ "$(DESTDIR)$(man8dir)" @@ -263,9 +269,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-man5: $(man_MANS) @$(NORMAL_INSTALL) test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" @@ -301,9 +305,7 @@ sed -n '/\.5[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man5dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir) install-man8: $(man_MANS) @$(NORMAL_INSTALL) test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" @@ -339,9 +341,7 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -409,10 +409,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/nbd-client.c new/nbd-3.0/nbd-client.c --- old/nbd-2.9.25/nbd-client.c 2011-10-01 12:28:58.000000000 +0200 +++ new/nbd-3.0/nbd-client.c 2012-02-21 11:03:32.000000000 +0100 @@ -453,7 +453,7 @@ #endif do { #ifndef NOFORK - if (fork()) { + if (!fork()) { /* Due to a race, the kernel NBD driver cannot * call for a reread of the partition table * in the handling of the NBD_DO_IT ioctl(). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-2.9.25/nbd-server.c new/nbd-3.0/nbd-server.c --- old/nbd-2.9.25/nbd-server.c 2011-11-29 08:32:28.000000000 +0100 +++ new/nbd-3.0/nbd-server.c 2012-02-21 11:04:29.000000000 +0100 @@ -83,7 +83,7 @@ #include <stdlib.h> #include <string.h> #include <fcntl.h> -#ifdef HAVE_FALLOC_PH +#if HAVE_FALLOC_PH #include <linux/falloc.h> #endif #include <arpa/inet.h> @@ -324,7 +324,7 @@ inet_aton(opts->clientname, &client); while (fgets(line,LINELEN,f)!=NULL) { - if((tmp=index(line, '/'))) { + if((tmp=strchr(line, '/'))) { if(strlen(line)<=tmp-line) { msg4(LOG_CRIT, ERRMSG, line, opts->server->authname); return 0; @@ -1461,7 +1461,7 @@ * file to resparsify stuff that isn't needed anymore (see NBD_CMD_TRIM) */ int exptrim(struct nbd_request* req, CLIENT* client) { -#ifdef HAVE_FALLOC_PH +#if HAVE_FALLOC_PH FILE_INFO prev = g_array_index(client->export, FILE_INFO, 0); FILE_INFO cur = prev; int i = 1; @@ -1498,6 +1498,7 @@ uint64_t magic; memset(zeros, '\0', sizeof(zeros)); + g_assert(((phase & NEG_INIT) && (phase & NEG_MODERN)) || client); if(phase & NEG_INIT) { /* common */ if (write(net, INIT_PASSWD, 8) < 0) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mysql-community-server for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package mysql-community-server for openSUSE:Factory checked in at 2012-03-01 17:21:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-community-server (Old) and /work/SRC/openSUSE:Factory/.mysql-community-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mysql-community-server", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.changes 2011-11-05 11:26:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.changes 2012-03-01 17:21:11.000000000 +0100 @@ -1,0 +2,32 @@ +Wed Feb 22 14:06:55 CET 2012 - mhrusecky(a)suse.cz + +- updated to 5.5.21, see + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-21.html + +------------------------------------------------------------------- +Wed Feb 15 10:54:25 UTC 2012 - cfarrell(a)suse.com + +- license update: SUSE-GPL-2.0-with-FLOSS-exception + +------------------------------------------------------------------- +Wed Feb 1 18:22:20 UTC 2012 - mhrusecky(a)suse.cz + +- updated to 5.5.20, see + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-20.html + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-19.html + +------------------------------------------------------------------- +Mon Jan 30 08:36:04 UTC 2012 - mhrusecky(a)suse.cz + +- adding /usr/share/aclocal to the files list +- renaming *-debug package to *-debug-version to avoid conflicts + +------------------------------------------------------------------- +Mon Dec 5 17:54:38 CET 2011 - mhrusecky(a)suse.cz + +- migrated to the common packaging +- updated to 5.5.18, see + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-18.html + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-17.html + +------------------------------------------------------------------- Old: ---- default_plugins.cnf mysql-5.5.15-arm.patch mysql-5.5.16.tar.bz2 old-ssl.series New: ---- configuration-tweaks.tar.bz2 mysql-5.5.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-community-server.spec ++++++ ++++ 688 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.spec ++++ and /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.spec ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.5VdYWm/_old 2012-03-01 17:21:15.000000000 +0100 +++ /var/tmp/diff_new_pack.5VdYWm/_new 2012-03-01 17:21:15.000000000 +0100 @@ -1,6 +1,2 @@ libmysqlclient18 libmysqlclient_r18 -libmysqlclient-devel - requires -libmysqlclient-<targettype> - requires "libmysqlclient18-<targettype> = <version>" - requires "libmysqlclient_r18-<targettype> = <version>" ++++++ build.inc ++++++ --- /var/tmp/diff_new_pack.5VdYWm/_old 2012-03-01 17:21:15.000000000 +0100 +++ /var/tmp/diff_new_pack.5VdYWm/_new 2012-03-01 17:21:15.000000000 +0100 @@ -3,7 +3,10 @@ %else %define socketpath /var/run/mysql %endif -export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS -fno-strict-aliasing -Wno-unused-parameter" +%if 0%{?suse_version} > 1140 +export WARN_DIS="$WARN_DIS -Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter " +%endif +export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS $WARN_DIS " export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" %if 0%{use_cmake} < 1 @@ -17,7 +20,7 @@ pushd _build$suffix ../configure \ --enable-assembler \ - --without-readline \ + --with-readline \ --infodir=%{_infodir} \ --libdir=%{_libdir} \ --libexecdir=/usr/sbin \ @@ -45,6 +48,7 @@ %endif --with-ssl=/usr \ --with-plugins=%{builtin_plugins} \ + --without-plugin-handlersocket \ HOSTNAME="/bin/hostname -f" \ "$@" # Add this for MyISAM RAID support: @@ -66,7 +70,11 @@ popd } # Build the client, extra tools, libraries +%if 0%{?prefered} > 0 BuildMySQL "" --with-embedded-server +%else +BuildMySQL "" --without-embedded-server +%endif # build mysqld-debug BuildMySQL "-debug" --with-debug --without-embedded-server @@ -109,5 +117,4 @@ BuildMySQL "" -DCMAKE_BUILD_TYPE=Release -DINSTALL_SQLBENCHDIR=share BuildMySQL "-debug" -DCMAKE_BUILD_TYPE=Debug - %endif ++++++ install.inc ++++++ --- /var/tmp/diff_new_pack.5VdYWm/_old 2012-03-01 17:21:15.000000000 +0100 +++ /var/tmp/diff_new_pack.5VdYWm/_new 2012-03-01 17:21:15.000000000 +0100 @@ -7,6 +7,10 @@ # install the client, extra tools, libraries and the standard server make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/ install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym +# remove handler socket client +rm -f %buildroot%_libdir/libhsclient* +rm -f %buildroot%_bindir/hsclient* +rm -f %buildroot%_libdir/mysql/plugin/handlersocket.so # remove most static libs (FIXME: don't build them at all...) rm -f %buildroot%_libdir/libmysqlclient*a rm -f %buildroot%_libdir/libmysqlservices*a @@ -15,7 +19,8 @@ # XXX: package these? The ndb tools are linked statically atm rm -f %buildroot%_libdir/mysql/libndbclient.* rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run -rm -f %{buildroot}/usr/share/mysql-test/mtr +rm -f %{buildroot}/usr/share/mysql-test/mtr +rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} @@ -46,12 +51,11 @@ filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files # all binaries that don't need to be in a "default" install (mysql.rpm + # mysql-client.rpm) -filelist msql2mysql mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded mysql_plugin >mysql-tools.files +filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded mytop hsclient >mysql-tools.files filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files filelist ndb_mgmd >mysql-ndb-management.files filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files -filelist ndb_{cpcd,delete_all,drop_index,drop_table} >mysql-ndb-extra.files -rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini +filelist ndb_{cpcd,delete_all,drop_index,index_stat,print_file,redo_log_reader,drop_table} ndbinfo_select_all memcached >mysql-ndb-extra.files ### files not installed by make install # Create directory structure DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini) @@ -114,17 +118,21 @@ rm -rf '%buildroot'/%_libdir/libmysqld.* rm -rf '%buildroot'/%_libdir/*.la rm -rf '%buildroot'/%_libdir/*.so -rm -rf '%buildroot'/%_libdir/*.a rm -rf '%buildroot'/%_includedir rm -rf '%buildroot'/%_datadir/man/*/mysql_config* rm -rf '%buildroot'/%_datadir/aclocal +rm -rf '%buildroot'/%_libdir/*.a %endif sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize +%if 0%{?cluster} > 1 +ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6.0 +ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6 +%endif if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then mv '%buildroot'/usr/bin/mysqlaccess.conf '%buildroot'/etc/mysqlaccess.conf fi mkdir -p '%buildroot'/etc/mysql -[ -z "`ls -1 %_sourcedir/*.cnf`" ] || cp %_sourcedir/*.cnf '%buildroot'/etc/mysql +bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/mysql -xvf - ++++++ mysql-5.5.16.tar.bz2 -> mysql-5.5.21.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mysql-community-server/mysql-5.5.16.tar.bz2 /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-5.5.21.tar.bz2 differ: char 11, line 1 ++++++ mysql-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.30-federated-workaround.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.30-federated-workaround.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.30-federated-workaround.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.30-federated-workaround.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -PATCH-P0-HACK-UPSTREAM: Make federated plugin to compile - -Really ugly way to force federated plugin to compile if it is choosed to be -dynamically loadable. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - ---- storage/federated/ha_federated.cc -+++ storage/federated/ha_federated.cc -@@ -385,6 +385,12 @@ - - #include <mysql/plugin.h> - -+ -+// Quick and ugly plugin workaround -+#ifdef MYSQL_DYNAMIC_PLUGIN -+#include "../../mysys/string.c" -+#endif -+ - /* Variables for federated share methods */ - static HASH federated_open_tables; // To track open tables - pthread_mutex_t federated_mutex; // To init the hash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Fix building in different directory -BUGS: upstream#45616 - -Makes it possible to run compilation somewhere else then source code is. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - ---- scripts/Makefile.am 2009-04-02 18:29:00.292563355 +0200 -+++ scripts/Makefile.am 2009-04-02 18:21:50.462559739 +0200 -@@ -110,7 +110,7 @@ - mysql_fix_privilege_tables.sql: mysql_system_tables.sql \ - mysql_system_tables_fix.sql - @echo "Building $@"; -- @cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@ -+ @cat $(top_srcdir)/scripts/mysql_system_tables.sql $(top_srcdir)/scripts/mysql_system_tables_fix.sql > $@ - - # - # Build mysql_fix_privilege_tables_sql.c from -@@ -123,7 +123,7 @@ - sleep 2 - $(top_builddir)/scripts/comp_sql$(EXEEXT) \ - mysql_fix_privilege_tables \ -- $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ -+ $(top_builddir)/scripts/mysql_fix_privilege_tables.sql $@ - - - SUFFIXES = .sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -PATCH-P0-HACK-UPSTREAM: Add lib64 dir to the library path - -On x86_64 systems openssl library is installed into /usr/lib64 directory and -MySQL couldn't find as it was searching only in /usr/lib. We can add it quite -safelly even on i586 as this directory wouldn't exist on them so no harm done. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - ---- config/ac-macros/ssl.m4 2009-04-10 14:05:07.000000000 +0200 -+++ config/ac-macros/ssl.m4 2009-04-10 14:15:15.000000000 +0200 -@@ -102,7 +102,7 @@ - # - # Try to link with openSSL libs in <location> - # -- openssl_libs="-L$location/lib/ -lssl -lcrypto" -+ openssl_libs="-L$location/lib -L$location/lib64 -lssl -lcrypto" - MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs]) - - if test "$mysql_ssl_found" == "no" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -PATCH-P0-FEATURE-UPSTREAM: Better handling of memcpy -BUGS: upstream#19975 - -Standard memcpy should behave better then self made one. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: mysys/mf_keycache.c -=================================================================== ---- mysys/mf_keycache.c.orig -+++ mysys/mf_keycache.c -@@ -2646,10 +2646,7 @@ uchar *key_cache_read(KEY_CACHE *keycach - #endif - - /* Copy data from the cache buffer */ -- if (!(read_length & 511)) -- bmove512(buff, block->buffer+offset, read_length); -- else -- memcpy(buff, block->buffer+offset, (size_t) read_length); -+ memcpy(buff, block->buffer+offset, (size_t) read_length); - - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_lock(&keycache->cache_lock); -@@ -2857,10 +2854,7 @@ int key_cache_insert(KEY_CACHE *keycache - #endif - - /* Copy data from buff */ -- if (!(read_length & 511)) -- bmove512(block->buffer+offset, buff, read_length); -- else -- memcpy(block->buffer+offset, buff, (size_t) read_length); -+ memcpy(block->buffer+offset, buff, (size_t) read_length); - - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_lock(&keycache->cache_lock); -@@ -3164,10 +3158,7 @@ int key_cache_write(KEY_CACHE *keycache, - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_unlock(&keycache->cache_lock); - #endif -- if (!(read_length & 511)) -- bmove512(block->buffer+offset, buff, read_length); -- else -- memcpy(block->buffer+offset, buff, (size_t) read_length); -+ memcpy(block->buffer+offset, buff, (size_t) read_length); - - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_lock(&keycache->cache_lock); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-cnf.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-cnf.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-cnf.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-cnf.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,96 +0,0 @@ -PATCH-P0-FIX-SUSE: Tweak default configuration - -This patch adds log file locations and socket location as they should be in -SuSE to the default configuration files. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: support-files/my-huge.cnf.sh -=================================================================== ---- support-files/my-huge.cnf.sh.orig -+++ support-files/my-huge.cnf.sh -@@ -131,7 +131,15 @@ server-id = 1 - #innodb_flush_log_at_trx_commit = 1 - #innodb_lock_wait_timeout = 50 - -+# The safe_mysqld script -+[safe_mysqld] -+log-error=/var/log/mysql/mysqld.log -+socket = @MYSQL_UNIX_ADDR@ -+ -+!include_dir /etc/mysql -+ - [mysqldump] -+socket = @MYSQL_UNIX_ADDR@ - quick - max_allowed_packet = 16M - -Index: support-files/my-large.cnf.sh -=================================================================== ---- support-files/my-large.cnf.sh.orig -+++ support-files/my-large.cnf.sh -@@ -131,7 +131,15 @@ server-id = 1 - #innodb_flush_log_at_trx_commit = 1 - #innodb_lock_wait_timeout = 50 - -+# The safe_mysqld script -+[safe_mysqld] -+log-error=/var/log/mysql/mysqld.log -+socket = @MYSQL_UNIX_ADDR@ -+ -+!include_dir /etc/mysql -+ - [mysqldump] -+socket = @MYSQL_UNIX_ADDR@ - quick - max_allowed_packet = 16M - -Index: support-files/my-medium.cnf.sh -=================================================================== ---- support-files/my-medium.cnf.sh.orig -+++ support-files/my-medium.cnf.sh -@@ -26,6 +26,8 @@ socket = @MYSQL_UNIX_ADDR@ - [mysqld] - port = @MYSQL_TCP_PORT@ - socket = @MYSQL_UNIX_ADDR@ -+# Change following line if you want to store your database elsewhere -+datadir = /var/lib/mysql - skip-locking - key_buffer_size = 16M - max_allowed_packet = 1M -@@ -129,7 +131,15 @@ server-id = 1 - #innodb_flush_log_at_trx_commit = 1 - #innodb_lock_wait_timeout = 50 - -+# The safe_mysqld script -+[safe_mysqld] -+log-error = /var/log/mysql/mysqld.log -+socket = @MYSQL_UNIX_ADDR@ -+ -+!include_dir /etc/mysql -+ - [mysqldump] -+socket = @MYSQL_UNIX_ADDR@ - quick - max_allowed_packet = 16M - -Index: support-files/my-small.cnf.sh -=================================================================== ---- support-files/my-small.cnf.sh.orig -+++ support-files/my-small.cnf.sh -@@ -65,7 +65,15 @@ server-id = 1 - #innodb_flush_log_at_trx_commit = 1 - #innodb_lock_wait_timeout = 50 - -+# The safe_mysqld script -+[safe_mysqld] -+log-error = /var/log/mysql/mysqld.log -+socket = @MYSQL_UNIX_ADDR@ -+ -+!include_dir /etc/mysql -+ - [mysqldump] -+socket = @MYSQL_UNIX_ADDR@ - quick - max_allowed_packet = 16M - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-group.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-group.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-group.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-group.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,155 +0,0 @@ -PATCH-P0-FEATURE-UPSTREAM: Adds group option - -This patch let's you specify not only user to use but also group that MySQL -should use. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -793,6 +793,14 @@ AC_ARG_WITH(mysqld-user, - [ MYSQLD_USER=mysql ] - ) - AC_SUBST(MYSQLD_USER) -+AC_ARG_WITH(mysqld-group, -+ [ --with-mysqld-group=groupname -+ What group the mysqld daemon shall be run as.], -+ [ MYSQLD_GROUP=$withval ], -+ [ MYSQLD_GROUP=mysql ] -+ ) -+AC_SUBST(MYSQLD_GROUP) -+ - - # If we should allow LOAD DATA LOCAL - AC_MSG_CHECKING(If we should should enable LOAD DATA LOCAL by default) -Index: scripts/Makefile.am -=================================================================== ---- scripts/Makefile.am.orig -+++ scripts/Makefile.am -@@ -185,6 +185,7 @@ SUFFIXES = .sh - -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \ - -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \ - -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ -+ -e 's!@''MYSQLD_GROUP''@!@MYSQLD_GROUP@!' \ - -e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \ - -e 's!@''NON_THREADED_LIBS''@!@NON_THREADED_LIBS@!' \ - -e 's!@''ZLIB_DEPS''@!@ZLIB_DEPS@!' \ -Index: scripts/mysqld_safe.sh -=================================================================== ---- scripts/mysqld_safe.sh.orig -+++ scripts/mysqld_safe.sh -@@ -19,6 +19,7 @@ logging=init - want_syslog=0 - syslog_tag= - user='@MYSQLD_USER@' -+group='@MYSQLD_GROUP@' - pid_file= - err_log= - -@@ -162,6 +163,7 @@ parse_arguments() { - --datadir=*) DATADIR="$val" ;; - --pid-file=*) pid_file="$val" ;; - --user=*) user="$val"; SET_USER=1 ;; -+ --group=*) group="$val"; SET_USER=1 ;; - - # these might have been set in a [mysqld_safe] section of my.cnf - # they are added to mysqld command line to override settings from my.cnf -@@ -388,11 +390,17 @@ then - if test "$user" != "root" -o $SET_USER = 1 - then - USER_OPTION="--user=$user" -+ GROUP_OPTION="--group=$group" - fi - # Change the err log to the right user, if it is in use - if [ $want_syslog -eq 0 ]; then - touch "$err_log" -- chown $user "$err_log" -+ if [ "$user" -a "$group" ]; then -+ chown $user:$group $err_log -+ else -+ [ "$user" ] && chown $user $err_log -+ [ "$group" ] && chgrp $group $err_log -+ fi - fi - if test -n "$open_files" - then -@@ -407,7 +415,12 @@ mysql_unix_port_dir=`dirname $safe_mysql - if [ ! -d $mysql_unix_port_dir ] - then - mkdir $mysql_unix_port_dir -- chown $user $mysql_unix_port_dir -+ if [ "$user" -a "$group" ]; then -+ chown $user:$group $mysql_unix_port_dir -+ else -+ [ "$user" ] && chown $user $mysql_unix_port_dir -+ [ "$group" ] && chgrp $group $mysql_unix_port_dir -+ fi - chmod 755 $mysql_unix_port_dir - fi - -Index: scripts/mysql_install_db.sh -=================================================================== ---- scripts/mysql_install_db.sh.orig -+++ scripts/mysql_install_db.sh -@@ -28,6 +28,7 @@ args="" - defaults="" - mysqld_opt="" - user="" -+group="" - - force=0 - in_rpm=0 -@@ -63,6 +64,11 @@ Usage: $0 [OPTIONS] - user. You must be root to use this option. By default - mysqld runs using your current login name and files and - directories that it creates will be owned by you. -+ --group=group_name The login group to use for running mysqld. Files and -+ directories created by mysqld will be owned by this -+ group. You must be root to use this option. By default -+ mysqld runs using your current group and files and -+ directories that it creates will be owned by you. - - All other options are passed to the mysqld program - -@@ -103,11 +109,11 @@ parse_arguments() - --builddir=*) builddir=`parse_arg "$arg"` ;; - --srcdir=*) srcdir=`parse_arg "$arg"` ;; - --ldata=*|--datadir=*) ldata=`parse_arg "$arg"` ;; -- --user=*) - # Note that the user will be passed to mysqld so that it runs - # as 'user' (crucial e.g. if log-bin=/some_other_path/ - # where a chown of datadir won't help) -- user=`parse_arg "$arg"` ;; -+ --user=*) user=`parse_arg "$arg"` ;; -+ --group=*) group=`parse_arg "$arg"` ;; - --skip-name-resolve) ip_only=1 ;; - --verbose) verbose=1 ;; # Obsolete - --rpm) in_rpm=1 ;; -@@ -360,7 +366,12 @@ do - fi - if test -w / -a ! -z "$user" - then -- chown $user $dir -+ if test -z "$group" -+ then -+ chown $user $dir -+ else -+ chown $user:$group $dir -+ fi - fi - done - -@@ -369,6 +380,11 @@ then - args="$args --user=$user" - fi - -+if test -n "$group" -+then -+ args="$args --group=$group" -+fi -+ - # When doing a "cross bootstrap" install, no reference to the current - # host should be added to the system tables. So we filter out any - # lines which contain the current host name. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-safe-process-in-bin.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-safe-process-in-bin.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-safe-process-in-bin.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-safe-process-in-bin.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -PATCH-P0-FEATURE-SUSE: Moving SafeProcess to /usr/bin - -We prefer to have this script somewhere else, so we moved it out of -the mysql-test directory. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: mysql-test/lib/My/SafeProcess.pm -=================================================================== ---- mysql-test/lib/My/SafeProcess.pm.orig -+++ mysql-test/lib/My/SafeProcess.pm -@@ -89,7 +89,7 @@ sub find_bin { - if (IS_WIN32PERL or IS_CYGWIN) - { - # Use my_safe_process.exe -- my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"], -+ my $exe= my_find_bin(".", ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], - "my_safe_process"); - push(@safe_process_cmd, $exe); - -@@ -99,7 +99,7 @@ sub find_bin { - else - { - # Use my_safe_process -- my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"], -+ my $exe= my_find_bin(".", ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], - "my_safe_process"); - push(@safe_process_cmd, $exe); - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.50-strncat-overflow.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.50-strncat-overflow.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.50-strncat-overflow.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.50-strncat-overflow.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Fix possible buffer overflow - -strncat function is used with n not depending on current length of string we -are appending to. Result might be buffer overflow. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: mysys/mf_loadpath.c -=================================================================== ---- mysys/mf_loadpath.c.orig -+++ mysys/mf_loadpath.c -@@ -42,7 +42,7 @@ char * my_load_path(char * to, const cha - if (is_cur) - is_cur=2; /* Remove current dir */ - if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur),MYF(0))) -- VOID(strncat(buff, path+is_cur, FN_REFLEN-1)); -+ VOID(strncat(buff, path+is_cur, FN_REFLEN-strlen(buff)-1)); - else - VOID(strnmov(buff, path, FN_REFLEN)); /* Return org file name */ - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Use lib_LIBRARIES instead of pkglib_LIBRARIES - -Make more sense and is more intuitive when compiling. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: libmysql/Makefile.shared -=================================================================== ---- libmysql/Makefile.shared.orig -+++ libmysql/Makefile.shared -@@ -26,7 +26,7 @@ MYSQLBASEdir= $(prefix) - ## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded - ## until someone complains that they need separate options. - LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target) --pkglib_LTLIBRARIES = $(target) -+lib_LTLIBRARIES = $(target) - - noinst_PROGRAMS = conf_to_src - -Index: libmysqld/Makefile.am -=================================================================== ---- libmysqld/Makefile.am.orig -+++ libmysqld/Makefile.am -@@ -37,7 +37,7 @@ INCLUDES= -I$(top_builddir)/include -I$ - @condition_dependent_plugin_includes@ - - noinst_LIBRARIES = libmysqld_int.a --pkglib_LIBRARIES = libmysqld.a -+lib_LIBRARIES = libmysqld.a - SUBDIRS = . examples - libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc - libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-myslq-test.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-myslq-test.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-myslq-test.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-myslq-test.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -PATCH-P0-FEATURE-SUSE: Tests in $(datadir) - -By default tests would get installed to /usr and as we want it LSB compilant, -we install them into /usr/share. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: mysql-test/Makefile.am -=================================================================== ---- mysql-test/Makefile.am.orig -+++ mysql-test/Makefile.am -@@ -17,7 +17,7 @@ - - ## Process this file with automake to create Makefile.in - --testroot = $(prefix) -+testroot = $(datadir) - testdir = $(testroot)/mysql-test - - test_SCRIPTS = mtr \ -Index: mysql-test/lib/My/SafeProcess/Makefile.am -=================================================================== ---- mysql-test/lib/My/SafeProcess/Makefile.am.orig -+++ mysql-test/lib/My/SafeProcess/Makefile.am -@@ -13,7 +13,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - --testroot = $(prefix) -+testroot = $(datadir) - safedir = $(testroot)/mysql-test/lib/My/SafeProcess - #nobase_bin_PROGRAMS = ... - safe_PROGRAMS = my_safe_process diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-plugins-avoid-version.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-plugins-avoid-version.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-plugins-avoid-version.patch 2010-12-23 16:15:03.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-plugins-avoid-version.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -PATCH-P0-FEATURE-DOWNSTREAM: Avoid version for all plugins - -Making all storage plugins unversioned. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: storage/blackhole/Makefile.am -=================================================================== ---- storage/blackhole/Makefile.am.orig -+++ storage/blackhole/Makefile.am -@@ -34,7 +34,7 @@ noinst_HEADERS = ha_blackhole.h - - EXTRA_LTLIBRARIES = ha_blackhole.la - pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@ --ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir) -+ha_blackhole_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir) - ha_blackhole_la_CXXFLAGS=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_blackhole_la_SOURCES=ha_blackhole.cc -Index: storage/archive/Makefile.am -=================================================================== ---- storage/archive/Makefile.am.orig -+++ storage/archive/Makefile.am -@@ -35,7 +35,7 @@ noinst_PROGRAMS = archive_test archive_r - - EXTRA_LTLIBRARIES = ha_archive.la - pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@ --ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) -+ha_archive_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) - ha_archive_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_archive_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_archive_la_SOURCES = ha_archive.cc azio.c -Index: storage/example/Makefile.am -=================================================================== ---- storage/example/Makefile.am.orig -+++ storage/example/Makefile.am -@@ -34,7 +34,7 @@ noinst_HEADERS = ha_example.h - - EXTRA_LTLIBRARIES = ha_example.la - pkgplugin_LTLIBRARIES = @plugin_example_shared_target@ --ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) -+ha_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) - ha_example_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_example_la_SOURCES = ha_example.cc -Index: storage/federated/Makefile.am -=================================================================== ---- storage/federated/Makefile.am.orig -+++ storage/federated/Makefile.am -@@ -34,7 +34,7 @@ noinst_HEADERS = ha_federated.h - - EXTRA_LTLIBRARIES = ha_federated.la - pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ --ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) -+ha_federated_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) - ha_federated_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_federated_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_federated_la_SOURCES = ha_federated.cc -Index: storage/innodb_plugin/Makefile.am -=================================================================== ---- storage/innodb_plugin/Makefile.am.orig -+++ storage/innodb_plugin/Makefile.am -@@ -331,7 +331,7 @@ libinnobase_a_CFLAGS= $(AM_CFLAGS) - EXTRA_LTLIBRARIES= ha_innodb_plugin.la - pkgplugin_LTLIBRARIES= @plugin_innodb_plugin_shared_target@ - --ha_innodb_plugin_la_LDFLAGS= -module -rpath $(pkgplugindir) -+ha_innodb_plugin_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir) - ha_innodb_plugin_la_CXXFLAGS= $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS) - ha_innodb_plugin_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) - ha_innodb_plugin_la_SOURCES= $(libinnobase_a_SOURCES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.52-utf8-test-results.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.52-utf8-test-results.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.52-utf8-test-results.patch 2010-12-23 16:09:10.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.52-utf8-test-results.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,103 +0,0 @@ -PATCH-P0-FIX-SUSE: Fix test results confused by utf-8 - -We are using utf-8 as a default charset during the compilation and it has some -effect on the test results. Correct sollution would be to make these results -charset independent, but easiest one is obviously to modify them to reflect our -default settings. - -Maintainer: Michal Hrusecky <Michal.Hrusecky(a)opensuse.org> - -Index: mysql-test/r/information_schema.result -=================================================================== ---- mysql-test/r/information_schema.result.orig -+++ mysql-test/r/information_schema.result -@@ -9,7 +9,7 @@ create user mysqltest_3@localhost; - create user mysqltest_3; - select * from information_schema.SCHEMATA where schema_name > 'm'; - CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH --NULL mtr latin1 latin1_swedish_ci NULL -+NULL mtr utf8 utf8_unicode_ci NULL - NULL mysql latin1 latin1_swedish_ci NULL - NULL test latin1 latin1_swedish_ci NULL - select schema_name from information_schema.schemata; -Index: mysql-test/r/mysql_comments.result -=================================================================== ---- mysql-test/r/mysql_comments.result.orig -+++ mysql-test/r/mysql_comments.result -@@ -13,23 +13,23 @@ drop trigger if exists t1_bi; - foofct("call 1") - call 1 - Function sql_mode Create Function character_set_client collation_connection Database Collation --foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n\n\n\nx latin1 latin1_swedish_ci latin1_swedish_ci -+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n\n\n\nx utf8 utf8_unicode_ci latin1_swedish_ci - foofct("call 2") - call 2 - Function sql_mode Create Function character_set_client collation_connection Database Collation --foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n \n \n \n\n \n\n \n return x;\nend latin1 latin1_swedish_ci latin1_swedish_ci -+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n \n \n \n\n \n\n \n return x;\nend utf8 utf8_unicode_ci latin1_swedish_ci - Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation --empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci -+empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci - id data - foo 42 - Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation --foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n\n\n\n\n \n\n \n values ("foo", 42) latin1 latin1_swedish_ci latin1_swedish_ci -+foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n\n\n\n\n \n\n \n values ("foo", 42) utf8 utf8_unicode_ci latin1_swedish_ci - Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation --nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n \n declare b int;\n declare c float;\n\n \n \n\n \nend latin1 latin1_swedish_ci latin1_swedish_ci -+nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n \n declare b int;\n declare c float;\n\n \n \n\n \nend utf8 utf8_unicode_ci latin1_swedish_ci - Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation --t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci -+t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci - Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation --t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n\n\n\n \n declare b int;\n declare c float;\n\n \n \n\n \n set NEW.data := 12;\nend latin1 latin1_swedish_ci latin1_swedish_ci -+t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n\n\n\n \n declare b int;\n declare c float;\n\n \n \n\n \n set NEW.data := 12;\nend utf8 utf8_unicode_ci latin1_swedish_ci - id data - trig 12 - "Pass 2 : --enable-comments" -@@ -40,23 +40,23 @@ trig 12 - foofct("call 1") - call 1 - Function sql_mode Create Function character_set_client collation_connection Database Collation --foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n-- comment 1a\n# comment 1b\n/* comment 1c */\nx # after body, on same line latin1 latin1_swedish_ci latin1_swedish_ci -+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n-- comment 1a\n# comment 1b\n/* comment 1c */\nx # after body, on same line utf8 utf8_unicode_ci latin1_swedish_ci - foofct("call 2") - call 2 - Function sql_mode Create Function character_set_client collation_connection Database Collation --foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n -- comment 1a\n # comment 1b\n /*\n comment 1c\n */\n\n -- empty line below\n\n -- empty line above\n return x;\nend latin1 latin1_swedish_ci latin1_swedish_ci -+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n -- comment 1a\n # comment 1b\n /*\n comment 1c\n */\n\n -- empty line below\n\n -- empty line above\n return x;\nend utf8 utf8_unicode_ci latin1_swedish_ci - Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation --empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci -+empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci - id data - foo 42 - Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation --foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n## These comments are part of the procedure body, and should be kept.\n# Comment 2a\n-- Comment 2b\n/* Comment 2c */\n -- empty line below\n\n -- empty line above\n values ("foo", 42) # comment 3, still part of the body latin1 latin1_swedish_ci latin1_swedish_ci -+foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n## These comments are part of the procedure body, and should be kept.\n# Comment 2a\n-- Comment 2b\n/* Comment 2c */\n -- empty line below\n\n -- empty line above\n values ("foo", 42) # comment 3, still part of the body utf8 utf8_unicode_ci latin1_swedish_ci - Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation --nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\nend latin1 latin1_swedish_ci latin1_swedish_ci -+nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\nend utf8 utf8_unicode_ci latin1_swedish_ci - Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation --t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci -+t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci - Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation --t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n# comment 1a\n-- comment 1b\n/*\n comment 1c\n*/\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\n set NEW.data := 12;\nend latin1 latin1_swedish_ci latin1_swedish_ci -+t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n# comment 1a\n-- comment 1b\n/*\n comment 1c\n*/\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\n set NEW.data := 12;\nend utf8 utf8_unicode_ci latin1_swedish_ci - id data - trig 12 - End of 5.0 tests -Index: mysql-test/r/mysql_upgrade.result -=================================================================== ---- mysql-test/r/mysql_upgrade.result.orig -+++ mysql-test/r/mysql_upgrade.result -@@ -166,8 +166,8 @@ mysql.time_zone_transition_type - mysql.user OK - CALL testproc(); - DROP PROCEDURE testproc; --WARNING: NULL values of the 'character_set_client' column ('mysql.proc' table) have been updated with a default value (latin1). Please verify if necessary. --WARNING: NULL values of the 'collation_connection' column ('mysql.proc' table) have been updated with a default value (latin1_swedish_ci). Please verify if necessary. -+WARNING: NULL values of the 'character_set_client' column ('mysql.proc' table) have been updated with a default value (utf8). Please verify if necessary. -+WARNING: NULL values of the 'collation_connection' column ('mysql.proc' table) have been updated with a default value (utf8_unicode_ci). Please verify if necessary. - WARNING: NULL values of the 'db_collation' column ('mysql.proc' table) have been updated with default values. Please verify if necessary. - # - # Bug #53613: mysql_upgrade incorrectly revokes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.56-compilation-fix.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.56-compilation-fix.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.56-compilation-fix.patch 2011-05-06 20:33:26.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.56-compilation-fix.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,174 +0,0 @@ -PATCH-P0-HACK-SUSE: Fixing few compilation problems - -Mostly minor things. Mostly just to make compiler happy as it can't determine -that everything is ok. But few things might actually worth reporting as they -could be handled better (mostly the write calls). - -Maintainer: Michal Hrusecky <mhrusecky(a)suse.cz> - -Index: client/readline.cc -=================================================================== ---- client/readline.cc.orig -+++ client/readline.cc -@@ -55,7 +55,7 @@ LINE_BUFFER *batch_readline_init(ulong m - char *batch_readline(LINE_BUFFER *line_buff) - { - char *pos; -- ulong out_length; -+ ulong out_length=0; - - if (!(pos=intern_read_line(line_buff, &out_length))) - return 0; -Index: storage/innobase/ut/ut0ut.c -=================================================================== ---- storage/innobase/ut/ut0ut.c.orig -+++ storage/innobase/ut/ut0ut.c -@@ -495,7 +495,9 @@ ut_print_namel( - trx ? trx->mysql_thd : NULL, - table_id); - -- fwrite(buf, 1, bufend - buf, f); -+ if(fwrite(buf, 1, bufend - buf, f) != (size_t)max(0,(bufend - buf))) { -+ fprintf(stderr, "fwrite failed in ut_print_namel!!!\n"); -+ } - } - - /************************************************************************** -@@ -516,7 +518,8 @@ ut_copy_file( - ? (size_t) len - : sizeof buf; - size_t size = fread(buf, 1, maxs, src); -- fwrite(buf, 1, size, dest); -+ if(fwrite(buf, size, 1, dest)<size) -+ break; - len -= (long) size; - if (size < maxs) { - break; -Index: storage/innodb_plugin/ut/ut0ut.c -=================================================================== ---- storage/innodb_plugin/ut/ut0ut.c.orig -+++ storage/innodb_plugin/ut/ut0ut.c -@@ -553,7 +553,9 @@ ut_print_namel( - trx ? trx->mysql_thd : NULL, - table_id); - -- fwrite(buf, 1, bufend - buf, f); -+ if(fwrite(buf, 1, bufend - buf, f) != (size_t)max(0,(bufend - buf))) { -+ fprintf(stderr, "fwrite failed in ut_print_namel!!!\n"); -+ } - } - - /**********************************************************************//** -@@ -574,7 +576,8 @@ ut_copy_file( - ? (size_t) len - : sizeof buf; - size_t size = fread(buf, 1, maxs, src); -- fwrite(buf, 1, size, dest); -+ if(fwrite(buf, size, 1, dest)<size) -+ break; - len -= (long) size; - if (size < maxs) { - break; -Index: storage/ndb/src/common/util/ndb_init.c -=================================================================== ---- storage/ndb/src/common/util/ndb_init.c.orig -+++ storage/ndb/src/common/util/ndb_init.c -@@ -31,7 +31,7 @@ ndb_init() - { - if (my_init()) { - const char* err = "my_init() failed - exit\n"; -- write(2, err, strlen(err)); -+ fprintf(stderr, err, strlen(err)); - exit(1); - } - ndb_init_internal(); -Index: sql/log.cc -=================================================================== ---- sql/log.cc.orig -+++ sql/log.cc -@@ -1854,7 +1854,7 @@ static void setup_windows_event_source() - - static int find_uniq_filename(char *name) - { -- long number; -+ long number=0; - uint i; - char buff[FN_REFLEN]; - struct st_my_dir *dir_info; -Index: sql/filesort.cc -=================================================================== ---- sql/filesort.cc.orig -+++ sql/filesort.cc -@@ -438,16 +438,20 @@ static void dbug_print_record(TABLE *tab - Field *field= *pfield; - - if (field->is_null()) -- fwrite("NULL", sizeof(char), 4, DBUG_FILE); -+ if(fwrite("NULL", sizeof(char), 4, DBUG_FILE) != sizeof(char) * 4) -+ break; - - if (field->type() == MYSQL_TYPE_BIT) - (void) field->val_int_as_str(&tmp, 1); - else - field->val_str(&tmp); - -- fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE); -+ if(fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE) != -+ sizeof(char) * tmp.length()) -+ break; - if (pfield[1]) -- fwrite(", ", sizeof(char), 2, DBUG_FILE); -+ if(fwrite(", ", sizeof(char), 2, DBUG_FILE) != sizeof(char) * 2) -+ break; - } - fprintf(DBUG_FILE, ")"); - if (print_rowid) -Index: sql/opt_range.cc -=================================================================== ---- sql/opt_range.cc.orig -+++ sql/opt_range.cc -@@ -11344,7 +11344,8 @@ print_key(KEY_PART *key_part, const ucha - { - if (*key) - { -- fwrite("NULL",sizeof(char),4,DBUG_FILE); -+ if(fwrite("NULL",sizeof(char),4,DBUG_FILE)!=4*sizeof(char)) -+ break; - continue; - } - key++; // Skip null byte -@@ -11355,7 +11356,8 @@ print_key(KEY_PART *key_part, const ucha - (void) field->val_int_as_str(&tmp, 1); - else - field->val_str(&tmp); -- fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE); -+ if(fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE)!=sizeof(char)*tmp.length()) -+ break; - if (key+store_length < key_end) - fputc('/',DBUG_FILE); - } -Index: sql/sql_table.cc -=================================================================== ---- sql/sql_table.cc.orig -+++ sql/sql_table.cc -@@ -6955,7 +6955,7 @@ view_err: - need_copy_table= ALTER_TABLE_DATA_CHANGED; - else - { -- enum_alter_table_change_level need_copy_table_res; -+ enum_alter_table_change_level need_copy_table_res = ALTER_TABLE_DATA_CHANGED; - /* Check how much the tables differ. */ - if (compare_tables(table, alter_info, - create_info, order_num, -Index: sql/debug_sync.cc -=================================================================== ---- sql/debug_sync.cc.orig -+++ sql/debug_sync.cc -@@ -1721,6 +1721,7 @@ static void debug_sync_execute(THD *thd, - const char *UNINIT_VAR(old_proc_info); - - action->execute--; -+ old_proc_info = NULL; - - /* - If we will be going to wait, set proc_info for the PROCESSLIST table. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/tools/apply-series.sh new/mysql-patches/tools/apply-series.sh --- old/mysql-patches/tools/apply-series.sh 2011-05-06 17:01:22.000000000 +0200 +++ new/mysql-patches/tools/apply-series.sh 2011-10-11 12:30:00.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ############################################################################## # # @@ -81,5 +81,5 @@ else echo " ! Patch \"$patch\" can't be applied !!!" exit 3 - fi + fi done < "$series" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mtpaint for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package mtpaint for openSUSE:Factory checked in at 2012-03-01 17:21:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mtpaint (Old) and /work/SRC/openSUSE:Factory/.mtpaint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mtpaint", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mtpaint/mtpaint.changes 2011-09-23 02:13:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mtpaint.new/mtpaint.changes 2012-03-01 17:21:06.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Feb 27 08:41:15 UTC 2012 - cfarrell(a)suse.com + +- license update: GPL-3.0+ + For the docs look at the COPYING (1.2 _not_ 1.3). For the main package + there is no indication that GPLv3 only is intended + +------------------------------------------------------------------- +Thu Jan 12 11:30:48 UTC 2012 - coolo(a)suse.com + +- change license to be in spdx.org format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mtpaint.spec ++++++ --- /var/tmp/diff_new_pack.B7NRyZ/_old 2012-03-01 17:21:07.000000000 +0100 +++ /var/tmp/diff_new_pack.B7NRyZ/_new 2012-03-01 17:21:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mtpaint # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,15 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Summary: Painting program for creating icons and pixel-based artwork +License: GPL-3.0+ +Group: Productivity/Graphics/Bitmap Editors Name: mtpaint Version: 3.31 -Release: 13 -License: GPLv3 -Group: Productivity/Graphics/Bitmap Editors +Release: 0 Url: http://mtpaint.sourceforge.net/ Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://downloads.sf.net/%{name}/%{name}_handbook-%{version}.tar.bz2 @@ -34,10 +32,16 @@ Patch4: %{name}-fix-no-add-needed.patch Patch5: %{name}-3.31-ld_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on -BuildRequires: gtk2-devel libpng-devel update-desktop-files zlib-devel -BuildRequires: giflib-devel libjpeg-devel libtiff-devel -BuildRequires: desktop-file-utils dos2unix gettext +BuildRequires: desktop-file-utils +BuildRequires: dos2unix +BuildRequires: gettext +BuildRequires: giflib-devel +BuildRequires: gtk2-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: update-desktop-files +BuildRequires: zlib-devel %description mtPaint is a simple painting program designed for creating icons and @@ -48,8 +52,8 @@ %package handbook Summary: Handbook for the mtpaint painting application +License: GFDL-1.2 Group: Productivity/Graphics/Bitmap Editors -License: GFDL Requires: %{name} = %{version} %if 0%{?suse_version} >= 1120 BuildArch: noarch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmspack for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package libmspack for openSUSE:Factory checked in at 2012-03-01 17:20:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmspack (Old) and /work/SRC/openSUSE:Factory/.libmspack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmspack", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libmspack/libmspack.changes 2011-11-21 15:47:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libmspack.new/libmspack.changes 2012-03-01 17:21:05.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Feb 27 15:14:56 UTC 2012 - cfarrell(a)suse.com + +- license update: LGPL-2.1+ + No indication of GPL-2.0+ code in the package + +------------------------------------------------------------------- +Mon Feb 13 10:48:55 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Sun Nov 20 20:44:56 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) +- Use %_smp_mflags for parallel building + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmspack.spec ++++++ --- /var/tmp/diff_new_pack.EfNENe/_old 2012-03-01 17:21:06.000000000 +0100 +++ /var/tmp/diff_new_pack.EfNENe/_new 2012-03-01 17:21:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libmspack # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,21 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define _version 0.2alpha Name: libmspack -License: GPLv2+ ; LGPLv2.1+ -Group: System/Libraries Version: 0.1.99_%{_version} -Release: 1 +Release: 0 Summary: Library That Implements Different Microsoft Compressions +License: LGPL-2.1+ +Group: System/Libraries Url: http://www.cabextract.org.uk/libmspack/ Source: %{name}-%{_version}.tar.bz2 Patch: %{name}-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libtool pkg-config +BuildRequires: libtool +BuildRequires: pkg-config %description The purpose of libmspack is to provide both compression and @@ -37,7 +37,6 @@ Currently the most common formats are implemented. %package -n libmspack0 -License: GPLv2+ ; LGPLv2.1+ Summary: Library That Implements Different Microsoft Compressions Group: System/Libraries # OpenSUSE <= 10.3, SLES <= 10: @@ -50,7 +49,6 @@ Currently the most common formats are implemented. %package devel -License: LGPLv2.1+ Summary: Static libraries, header files and documentation for libmspack Group: Development/Libraries/C and C++ Requires: libmspack0 = %{version} @@ -67,15 +65,12 @@ autoreconf -f -i %configure\ --disable-static -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %makeinstall rm $RPM_BUILD_ROOT%{_libdir}/*.*a -%clean -rm -rf $RPM_BUILD_ROOT - %post -n libmspack0 -p /sbin/ldconfig %postun -n libmspack0 -p /sbin/ldconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgit2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package libgit2 for openSUSE:Factory checked in at 2012-03-01 17:20:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgit2 (Old) and /work/SRC/openSUSE:Factory/.libgit2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgit2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libgit2/libgit2.changes 2011-10-27 19:23:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgit2.new/libgit2.changes 2012-03-01 17:20:55.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 31 17:12:58 UTC 2012 - jengelh(a)medozas.de + +- Provide pkgconfig symbols + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgit2.spec ++++++ --- /var/tmp/diff_new_pack.up8UZ0/_old 2012-03-01 17:20:57.000000000 +0100 +++ /var/tmp/diff_new_pack.up8UZ0/_new 2012-03-01 17:20:57.000000000 +0100 @@ -1,6 +1,7 @@ # # spec file for package libgit2 # +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011, Sascha Peilicke <saschpe(a)gmx.de> # # All modifications and additions to the file contributed by third parties @@ -12,15 +13,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Name: libgit2 Version: 0.15.0 Release: 0 -License: GPL-2.0 with linking Summary: C git library -Url: http://libgit2.github.com/ +License: GPL-2.0 with linking Group: Development/Libraries/C and C++ +Url: http://libgit2.github.com/ Source0: https://github.com/downloads/libgit2/libgit2/libgit2-%{version}.tar.gz BuildRequires: cmake +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} BuildRequires: openssl-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim3 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package kdepim3 for openSUSE:Factory checked in at 2012-03-01 17:20:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim3 (Old) and /work/SRC/openSUSE:Factory/.kdepim3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim3", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim3/kdepim3.changes 2011-12-13 11:48:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim3.new/kdepim3.changes 2012-03-01 17:20:48.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Feb 13 10:48:04 UTC 2012 - coolo(a)suse.com + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Tue Jan 31 14:48:08 UTC 2012 - anixx(a)opensuse.org + +- reverting back to gcc-4.3 due to another crash when starting kmail from kontact + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim3.spec ++++++ --- /var/tmp/diff_new_pack.GBGYIf/_old 2012-03-01 17:20:51.000000000 +0100 +++ /var/tmp/diff_new_pack.GBGYIf/_new 2012-03-01 17:20:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdepim3 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,20 +13,31 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Name: kdepim3 -BuildRequires: cyrus-sasl-devel flex kdelibs3-devel libassuan-devel libmal-devel python-devel fdupes +BuildRequires: cyrus-sasl-devel +BuildRequires: fdupes +BuildRequires: flex +BuildRequires: kdelibs3-devel +BuildRequires: libassuan-devel +BuildRequires: libmal-devel +BuildRequires: python-devel %if %suse_version < 1210 BuildRequires: hal-devel %endif -BuildRequires: gnokii-devel libopensync-devel pilot-link-devel -BuildRequires: gpgme-devel gpg2 +BuildRequires: gnokii-devel +BuildRequires: libopensync-devel +BuildRequires: pilot-link-devel +BuildRequires: gpg2 +BuildRequires: gpgme-devel +BuildRequires: gcc43-c++ +Summary: Personal Information Manager Software for KDE License: GPL-2.0 Group: System/GUI/KDE -Summary: Personal Information Manager Software for KDE Version: 3.5.10 -Release: 9 +Release: 0 Url: http://www.kde.org/ Requires: suse_help_viewer Requires: libkcal2 @@ -84,32 +95,32 @@ * Various wizards to connect to groupware servers %package -n libktnef1 -License: GPL-2.0 Summary: Library to read TNEF +License: GPL-2.0 Group: System/GUI/KDE %description -n libktnef1 This package contains a library to read the TNEF format. %package -n libkmime2 -License: GPL-2.0 Summary: Library to read MIME messages +License: GPL-2.0 Group: System/GUI/KDE %description -n libkmime2 This package contains a library to read MIME messages. %package -n libkmime-devel -License: GPL-2.0 Summary: Library to read MIME messages +License: GPL-2.0 Group: System/GUI/KDE %description -n libkmime-devel This package contains a library to read MIME messages. %package -n libktnef-devel -License: GPL-2.0 Summary: Library to read TNEF +License: GPL-2.0 Group: System/GUI/KDE Requires: libktnef1 @@ -117,8 +128,8 @@ This package contains a library to read the TNEF format. %package -n libkcal2 -License: GPL-2.0 Summary: Calendaring Classes +License: GPL-2.0 Group: System/GUI/KDE Requires: libkcal @@ -129,8 +140,8 @@ be GUI independent and suitable for writing command line applications. %package -n libkcal-devel -License: GPL-2.0 Summary: Calendering Classes +License: GPL-2.0 Group: System/GUI/KDE Requires: libkcal2 @@ -141,8 +152,8 @@ be GUI independent and suitable for writing command line applications. %package -n libkcal -License: GPL-2.0 Summary: Calendaring Classes +License: GPL-2.0 Group: System/GUI/KDE Requires: libkcal2 @@ -153,10 +164,10 @@ be GUI independent and suitable for writing command line applications. %package devel -License: GPL-2.0 Provides: kdenetwork3-devel = 3.2.1 Obsoletes: kdenetwork3-devel <= 3.2.1 Summary: Personal Information Manager software for KDE +License: GPL-2.0 Group: System/GUI/KDE Requires: %name = %version libktnef-devel libkmime-devel libkcal-devel @@ -164,10 +175,10 @@ This package contains tools for address and date organization. %package mobile -License: LGPL-2.0.1 or later # usesubdirs kandy kmobile Provides: kdepim3:/opt/kde3/bin/kandy Summary: Cell Phone Support +License: LGPL-2.1+ Group: Hardware/Mobile %description mobile @@ -179,10 +190,10 @@ cell phones) %package time-management -License: GPL-2.0 # usesubdirs karm konsolekalendar kalarm Provides: kdepim3:/opt/kde3/bin/karm Summary: Personal Information Manager +License: GPL-2.0 Group: System/GUI/KDE %description time-management @@ -190,9 +201,9 @@ %package kpilot -License: LGPL-2.0.1 or later # usesubdirs kpilot Summary: This Package allows Communication with the 3COM Palm Pilot +License: LGPL-2.1+ Group: Hardware/Mobile %description kpilot @@ -200,8 +211,8 @@ Pilot via the Palm Cradle. %package notes -License: GPL-2.0 Summary: Note taking application +License: GPL-2.0 Group: System/GUI/KDE Provides: kdepim3:/opt/kde3/bin/knotes Requires: kdepim3 @@ -210,8 +221,8 @@ This package contains the notes application KNotes. %package -n kitchensync -License: GPL-2.0; LGPL-2.0.1 or later Summary: KDE Synchronization application based on OpenSync +License: GPL-2.0 ; LGPL-2.1+ Group: Hardware/PDA Provides: kdepim3-sync Obsoletes: kdepim3-sync @@ -252,13 +263,13 @@ %patch130 -p1 %patch131 -p3 %patch132 -p1 -%patch133 -p1 - +#%patch133 -p1 . /etc/opt/kde3/common_options update_admin %build - +export CC=gcc-4.3 +export CXX=g++-4.3 . /etc/opt/kde3/common_options export CXXFLAGS="$CXXFLAGS -Wl,--add-needed" configopts="--disable-final" @@ -266,7 +277,7 @@ --without-arts --disable-final \ --enable-newdistrlists=no # may fail with higher number of jobs -do_make -j4 +do_make -j2 %install . /etc/opt/kde3/common_options @@ -320,7 +331,6 @@ %postun -n kitchensync -p /sbin/ldconfig - %files %defattr(-,root,root) %dir /opt/kde3/share/icons/hicolor/16x16 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde3-krecord for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '12

01 Mar '12

Hello community, here is the log from the commit of package kde3-krecord for openSUSE:Factory checked in at 2012-03-01 17:20:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde3-krecord (Old) and /work/SRC/openSUSE:Factory/.kde3-krecord.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kde3-krecord", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kde3-krecord/kde3-krecord.changes 2012-02-24 12:05:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kde3-krecord.new/kde3-krecord.changes 2012-03-01 17:20:40.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Feb 25 08:42:05 UTC 2012 - coolo(a)suse.com + +- sync spec file name with package name + +------------------------------------------------------------------- Old: ---- krecord.spec New: ---- kde3-krecord.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde3-krecord.spec ++++++ # # spec file for package kde3-krecord # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: kde3-krecord BuildRequires: kdelibs3-devel Url: http://linux.bytesex.org/misc/krecord.html Summary: A Sound Recorder License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Utilities Version: 1.16 Release: 0 Source: krecord-%{version}.tar.bz2 Source1: krecord.png Patch: krecord.diff Patch2: updated-hu-translation.diff Patch3: krecord-ld_fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: krecord = %{version} Obsoletes: krecord %description This program records sound from your sound card and saves it to WAV files. %prep %setup -q -n krecord-%{version} %patch %patch2 %patch3 %build export QTDIR=/usr/lib/qt3 export KDEDIR=/opt/kde3 sed -i 's|-Wall|-Wall -Wl,--add-needed|g' mk/Variables.mk export LDFLAGS="$LDLAGS -Wl,--add-needed" make %install export QTDIR=/usr/lib/qt3 export KDEDIR=/opt/kde3 make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/32x32/apps/ install -m 0644 %SOURCE1 \ $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/32x32/apps/ %suse_update_desktop_file -G "Sound Recorder" krecord AudioVideo Recorder %find_lang krecord %files -f krecord.lang %defattr(-,root,root) %doc README /opt/kde3/bin/krecord /opt/kde3/share/appl*/*/krecord.desktop /opt/kde3/share/apps/krecord /opt/kde3/share/icons/hicolor/32x32/apps/*.png %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0