Hello community,

here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory 
checked in at 2015-08-10 09:16:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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  2014-11-07 
09:05:09.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new/oxygen-gtk2.changes     
2015-08-10 09:16:23.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Aug  4 11:43:23 UTC 2015 - sor.ale...@meowr.ru
+
+- Use %cmake marco.
+- Add qt-config-path.patch: search Qt (oxygen-qt5) config paths.
+- Switch to TS_PLAIN tabstyles as oxygen-qt5 did.
+- Prettify description.
+
+-------------------------------------------------------------------

New:
----
  qt-config-path.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ oxygen-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.xBinjb/_old  2015-08-10 09:16:24.000000000 +0200
+++ /var/tmp/diff_new_pack.xBinjb/_new  2015-08-10 09:16:24.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package oxygen-gtk2
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,112 +19,103 @@
 Name:           oxygen-gtk2
 Version:        1.4.6
 Release:        0
-Summary:        A Port of the default KDE Widget Theme (Oxygen), to GTK 2.x
+Summary:        A Port of the KDE Oxygen Widget Theme, to GTK 2.x
 License:        LGPL-2.1+
 Group:          System/GUI/KDE
-Url:            
https://projects.kde.org/projects/playground/artwork/oxygen-gtk/
-Source0:        
http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2
+Url:            https://projects.kde.org/projects/playground/artwork/oxygen-gtk
+Source:         
http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2
 Source100:      baselibs.conf
 # PATCH-FIX-OPENSUSE fix-menu-items-look.patch fi...@opensuse.org -- Vertical 
center text in menuitems.
 Patch0:         fix-menu-items-look.patch
+# PATCH-FIX-OPENSUSE qt-config-path.patch sor.ale...@meowr.ru -- Search in Qt 
(oxygen-qt5) config path.
+Patch1:         qt-config-path.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig(cairo)
 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.
+Oxygen-Gtk2 is a port of the KDE Oxygen widget theme 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.
+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.
+Oxygen-Gtk2 is a port of the KDE Oxygen widget theme 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.
+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.
+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}
 # oxygen-gtk2 was last used at version 1.2.0 in K:D:F
 Provides:       oxygen-gtk2 = %{version}
 Obsoletes:      oxygen-gtk2 < %{version}
 
 %description -n gtk2-theme-oxygen
-Oxygen-Gtk2 is a port of the default KDE widget theme (Oxygen), to gtk 2.x.
+Oxygen-Gtk2 is a port of the KDE Oxygen widget theme 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.
+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.
+This package contains the Oxygen Gtk 2.x theme.
 
 %prep
 %setup -q
 %patch0
+%patch1 -p1
+# Switch to the oxygen-qt5 default.
+sed -i 's/^\(TabStyle=\).*$/\1TS_PLAIN/' rc/oxygenrc
 
 %build
-mkdir -p build
-pushd build
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-cmake .. \
-        -DCMAKE_SKIP_RPATH=ON \
-        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-        %if "%{_lib}" == "lib64"
-                -DLIB_SUFFIX=64 \
-        %endif
-        -DCMAKE_BUILD_TYPE=release
-make %{?_smp_mflags} VERBOSE=1
-popd
+%cmake
+make %{?_smp_mflags}
 
 %install
-pushd build
-%make_install
-popd
+%cmake_install
 
 %files -n gtk2-engine-oxygen
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %doc AUTHORS COPYING README TODO
-%{_libdir}/gtk-2.0/2.10.0/engines/liboxygen-gtk.so
+%{_libdir}/gtk-2.0/*/engines/liboxygen-gtk.so
 
 %files -n gtk2-theme-oxygen
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %doc AUTHORS COPYING README TODO
 %{_bindir}/oxygen-gtk-demo
-%dir %{_datadir}/themes/oxygen-gtk
+%dir %{_datadir}/themes/oxygen-gtk/
 %{_datadir}/themes/oxygen-gtk/gtk-2.0/
 
 %changelog

++++++ qt-config-path.patch ++++++
--- a/src/oxygenqtsettings.cpp
+++ b/src/oxygenqtsettings.cpp
@@ -277,7 +277,11 @@
 
         // load icon install prefix
         gchar* path = 0L;
-        if( runCommand( "kde4-config --path config", path ) && path )
+        if( runCommand( "qtpaths --paths ConfigLocation", path ) && path )
+        {
+            out.split( path );
+            g_free( path );
+        } else if( runCommand( "kde4-config --path config", path ) && path )
         {
 
             out.split( path );

Reply via email to