Hello community,
here is the log from the commit of package oxygen-gtk for openSUSE:Factory
checked in at Tue Apr 19 09:25:28 CEST 2011.
--------
--- KDE/oxygen-gtk/oxygen-gtk.changes 2011-03-13 16:54:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/oxygen-gtk/oxygen-gtk.changes 2011-04-18 14:26:14.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Apr 18 14:23:00 UTC 2011 - idoenmez@novell.com
+
+- Add oxygen-gtk-bug-263182.patch, fixes problem with Emacs
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
oxygen-gtk-bug-263182.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ oxygen-gtk.spec ++++++
--- /var/tmp/diff_new_pack.PonSUG/_old 2011-04-19 09:24:31.000000000 +0200
+++ /var/tmp/diff_new_pack.PonSUG/_new 2011-04-19 09:24:31.000000000 +0200
@@ -19,13 +19,15 @@
Name: oxygen-gtk
Version: 1.0.3
-Release: 1
+Release: 3
License: GNU LGPL v2 or later
Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK
Url: https://projects.kde.org/projects/playground/artwork/oxygen-gtk
Group: System/GUI/KDE
Source: http://download.kde.org/download.php?url=stable/oxygen-gtk/%{version}/src/%{name}-%{version}.tar.bz2
Source1: baselibs.conf
+# PATCH-FIX-UPSTREAM oxygen-gtk-bug-263182.patch bko#263182
+Patch1: oxygen-gtk-bug-263182.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: gtk2-devel
@@ -46,6 +48,7 @@
%prep
%setup -q
+%patch1 -p1
%build
++++++ oxygen-gtk-bug-263182.patch ++++++
commit b0e33d143c68a1737c8f283c457aea898a4c6766
Author: Hugo Pereira Da Costa
Date: Tue Mar 22 12:23:14 2011 +0100
Removed check on _type value when registering new type in StyleWrapper::registerType and RCStyle::registerType
CCBUG: 263182
diff --git a/src/oxygenrcstyle.cpp b/src/oxygenrcstyle.cpp
index 47ab28a..4dab8c4 100644
--- a/src/oxygenrcstyle.cpp
+++ b/src/oxygenrcstyle.cpp
@@ -92,30 +92,27 @@ namespace Oxygen
void RCStyle::registerType( GTypeModule *module )
{
- if( !_type )
+ #if OXYGEN_DEBUG
+ std::cerr << "Oxygen::RCStyle::registerType" << std::endl;
+ #endif
+
+ const GTypeInfo info =
{
+ (guint16)sizeof(OxygenRcStyleClass ),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) classInit,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ (guint16)sizeof( OxygenRcStyle ),
+ 0,
+ (GInstanceInitFunc) NULL,
+ NULL
+ };
+
+ _typeInfo = info;
+ _type = g_type_module_register_type( module, GTK_TYPE_RC_STYLE, "OxygenRcStyle", &_typeInfo, GTypeFlags(0 ) );
- #if OXYGEN_DEBUG
- std::cerr << "Oxygen::RCStyle::registerType" << std::endl;
- #endif
-
- const GTypeInfo info =
- {
- (guint16)sizeof(OxygenRcStyleClass ),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) classInit,
- (GClassFinalizeFunc) NULL,
- NULL,
- (guint16)sizeof( OxygenRcStyle ),
- 0,
- (GInstanceInitFunc) NULL,
- NULL
- };
-
- _typeInfo = info;
- _type = g_type_module_register_type( module, GTK_TYPE_RC_STYLE, "OxygenRcStyle", &_typeInfo, GTypeFlags(0 ) );
- }
}
//______________________________________________________________________
diff --git a/src/oxygenstylewrapper.cpp b/src/oxygenstylewrapper.cpp
index 47b5e26..d56fa74 100644
--- a/src/oxygenstylewrapper.cpp
+++ b/src/oxygenstylewrapper.cpp
@@ -2991,30 +2991,28 @@ namespace Oxygen
//_______________________________________________________________________________________________________________
void StyleWrapper::registerType( GTypeModule* module )
{
- if( !_type )
- {
- #if OXYGEN_DEBUG
- std::cerr << "Oxygen::StyleWrapper::registerType" << std::endl;
- #endif
+ #if OXYGEN_DEBUG
+ std::cerr << "Oxygen::StyleWrapper::registerType" << std::endl;
+ #endif
+
+ const GTypeInfo info =
+ {
+ (guint16)sizeof( OxygenStyleClass ),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) classInit,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ (guint16)sizeof( OxygenStyle ),
+ 0,
+ (GInstanceInitFunc) instanceInit,
+ NULL
+ };
+
+ _typeInfo = info;
+ _type = g_type_module_register_type( module, GTK_TYPE_STYLE, "OxygenStyle", &_typeInfo, GTypeFlags(0 ) );
- const GTypeInfo info =
- {
- (guint16)sizeof( OxygenStyleClass ),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) classInit,
- (GClassFinalizeFunc) NULL,
- NULL,
- (guint16)sizeof( OxygenStyle ),
- 0,
- (GInstanceInitFunc) instanceInit,
- NULL
- };
-
- _typeInfo = info;
- _type = g_type_module_register_type( module, GTK_TYPE_STYLE, "OxygenStyle", &_typeInfo, GTypeFlags(0 ) );
- }
}
//_______________________________________________________________________________________________________________
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org