Hello community,
here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory
checked in at 2013-06-05 13:06:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/oxygen-gtk2 (Old)
and /work/SRC/openSUSE:Factory/.oxygen-gtk2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen-gtk2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/oxygen-gtk2/oxygen-gtk2.changes 2013-04-24
16:07:13.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new/oxygen-gtk2.changes
2013-06-05 13:06:29.000000000 +0200
@@ -1,0 +2,12 @@
+Fri May 31 17:13:01 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Update to version 1.3.4
+ * Use popen instead of g_spawn_command_line_sync() (kde#318891)
+ * Make sure that 'runCommand' reads the full output of the command
+ (kde#318891)
+ * Fix command output reading for multi-read case
+ * Re-added x2 size increment in case of overflow
+ * Check event mask for all GtkWindow and GtkViewport before
+ enabling window drag
+
+-------------------------------------------------------------------
Old:
----
oxygen-gtk2-1.3.3.tar.bz2
New:
----
oxygen-gtk2-1.3.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ oxygen-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.gWtHHy/_old 2013-06-05 13:06:29.000000000 +0200
+++ /var/tmp/diff_new_pack.gWtHHy/_new 2013-06-05 13:06:29.000000000 +0200
@@ -17,7 +17,7 @@
Name: oxygen-gtk2
-Version: 1.3.3
+Version: 1.3.4
Release: 0
Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 2.x
License: LGPL-2.1+
++++++ oxygen-gtk2-1.3.3.tar.bz2 -> oxygen-gtk2-1.3.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oxygen-gtk2-1.3.3/CMakeLists.txt
new/oxygen-gtk2-1.3.4/CMakeLists.txt
--- old/oxygen-gtk2-1.3.3/CMakeLists.txt 2013-04-22 20:26:21.000000000
+0200
+++ new/oxygen-gtk2-1.3.4/CMakeLists.txt 2013-05-31 12:57:39.000000000
+0200
@@ -13,7 +13,7 @@
set( CPACK_PACKAGE_VENDOR "h...@oxygen-icons.org" )
set( CPACK_PACKAGE_VERSION_MAJOR "1" )
set( CPACK_PACKAGE_VERSION_MINOR "3" )
-set( CPACK_PACKAGE_VERSION_PATCH "3" )
+set( CPACK_PACKAGE_VERSION_PATCH "4" )
set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" )
##################################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oxygen-gtk2-1.3.3/empty_areas.patch
new/oxygen-gtk2-1.3.4/empty_areas.patch
--- old/oxygen-gtk2-1.3.3/empty_areas.patch 1970-01-01 01:00:00.000000000
+0100
+++ new/oxygen-gtk2-1.3.4/empty_areas.patch 2013-05-02 16:34:22.000000000
+0200
@@ -0,0 +1,17 @@
+diff --git a/src/oxygenwindowmanager.cpp b/src/oxygenwindowmanager.cpp
+index 3c669b7..a3764f2 100644
+--- a/src/oxygenwindowmanager.cpp
++++ b/src/oxygenwindowmanager.cpp
+@@ -124,9 +124,9 @@ namespace Oxygen
+ in which case we should not use them for grabbing
+ */
+ if(
+- std::string( G_OBJECT_TYPE_NAME( widget ) ) == "GtkWindow" &&
+- (gtk_widget_get_events ( widget ) &
+- (GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK) ) )
++ ( GTK_IS_WINDOW( widget ) || GTK_IS_VIEWPORT( widget ) ) &&
++ ( gtk_widget_get_events ( widget ) &
++ ( GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK ) ) )
+ {
+ registerBlackListWidget( widget );
+ return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oxygen-gtk2-1.3.3/src/oxygenqtsettings.cpp
new/oxygen-gtk2-1.3.4/src/oxygenqtsettings.cpp
--- old/oxygen-gtk2-1.3.3/src/oxygenqtsettings.cpp 2013-04-22
20:26:21.000000000 +0200
+++ new/oxygen-gtk2-1.3.4/src/oxygenqtsettings.cpp 2013-05-31
12:53:29.000000000 +0200
@@ -209,6 +209,33 @@
}
//_________________________________________________________
+ bool QtSettings::runCommand( const std::string& command, char*& result )
const
+ {
+
+ if( FILE* fp = popen( command.c_str(), "r" ) )
+ {
+
+ // read command output. Make sure that the buffer is large enough
to read the entire
+ // output, by multiplying its initial size by two as long as the
last character is not '\n'
+ // note that the allocated string must be freed by the calling
method
+ gulong bufSize=512;
+ size_t currentOffset=0;
+ result= static_cast<char*>(g_malloc(bufSize));
+ while( fgets( result+currentOffset, bufSize-currentOffset, fp ) &&
result[strlen(result)-1] != '\n' )
+ {
+ currentOffset = bufSize-1;
+ bufSize *= 2;
+ result = static_cast<char*>( g_realloc( result, bufSize ) );
+ }
+
+ pclose(fp);
+ return true;
+
+ } else return false;
+
+ }
+
+ //_________________________________________________________
bool QtSettings::loadKdeGlobals( void )
{
@@ -268,7 +295,7 @@
// load icon install prefix
gchar* path = 0L;
- if( g_spawn_command_line_sync( "kde4-config --path config", &path, 0L,
0L, 0L ) && path )
+ if( runCommand( "kde4-config --path config", path ) && path )
{
out.split( path );
@@ -298,7 +325,7 @@
// load icon install prefix
PathList out;
char* path = 0L;
- if( g_spawn_command_line_sync( "kde4-config --path icon", &path, 0L,
0L, 0L ) && path )
+ if( runCommand( "kde4-config --path icon", path ) && path )
{
out.split( path );
g_free( path );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oxygen-gtk2-1.3.3/src/oxygenqtsettings.h
new/oxygen-gtk2-1.3.4/src/oxygenqtsettings.h
--- old/oxygen-gtk2-1.3.3/src/oxygenqtsettings.h 2013-04-22
20:26:21.000000000 +0200
+++ new/oxygen-gtk2-1.3.4/src/oxygenqtsettings.h 2013-05-31
12:53:29.000000000 +0200
@@ -348,6 +348,9 @@
protected:
+ //! read output from a command - replacement for not always working
g_spawn_command_line_sync()
+ bool runCommand( const std::string& command, char*& result ) const;
+
//! kdeglobals settings
/*! returns true if changed */
bool loadKdeGlobals( void );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/oxygen-gtk2-1.3.3/src/oxygenwindowmanager.cpp
new/oxygen-gtk2-1.3.4/src/oxygenwindowmanager.cpp
--- old/oxygen-gtk2-1.3.3/src/oxygenwindowmanager.cpp 2013-04-22
20:26:21.000000000 +0200
+++ new/oxygen-gtk2-1.3.4/src/oxygenwindowmanager.cpp 2013-05-29
21:25:34.000000000 +0200
@@ -124,9 +124,9 @@
in which case we should not use them for grabbing
*/
if(
- std::string( G_OBJECT_TYPE_NAME( widget ) ) == "GtkWindow" &&
- (gtk_widget_get_events ( widget ) &
- (GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK) ) )
+ ( GTK_IS_WINDOW( widget ) || GTK_IS_VIEWPORT( widget ) ) &&
+ ( gtk_widget_get_events ( widget ) &
+ ( GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK ) ) )
{
registerBlackListWidget( widget );
return false;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
