Hello community, here is the log from the commit of package kcm_gtk for openSUSE:Factory checked in at Wed May 5 23:30:14 CEST 2010. -------- --- KDE/kcm_gtk/kcm_gtk.changes 2009-04-28 13:36:51.000000000 +0200 +++ kcm_gtk/kcm_gtk.changes 2010-04-30 15:49:02.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 30 12:51:47 UTC 2010 - llunak@novell.com + +- make the default gtk style work out of the box +- make Oxygen-molecule the default gtk style + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gtkrc-2.0-kde4.template kcm_gtk.suse.sh work-by-default.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm_gtk.spec ++++++ --- /var/tmp/diff_new_pack.8kDCQg/_old 2010-05-05 23:28:51.000000000 +0200 +++ /var/tmp/diff_new_pack.8kDCQg/_new 2010-05-05 23:28:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kcm_gtk (Version 1.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -23,17 +23,20 @@ %if %suse_version == 1100 BuildRequires: kdesdk4-scripts %endif -License: GPL v2 or later +License: GPLv2+ Url: http://www.freedesktop.org/Software/gtk-qt Group: System/GUI/KDE BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE control module for switching GTK+ style Version: 1.1 -Release: 2 +Release: 3 Source: gtk-qt-engine-%{version}.tar.bz2 +Source2: kcm_gtk.suse.sh +Source3: gtkrc-2.0-kde4.template Patch: build-only-kcm.diff Patch1: icon-location.diff Patch2: insertCatalog.diff +Patch3: work-by-default.diff Provides: kde4-kcm_gtk = 1.1 Obsoletes: kde4-kcm_gtk <= 1.1 @@ -52,6 +55,7 @@ %patch %patch1 %patch2 +%patch3 %build %cmake_kde4 @@ -63,6 +67,10 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/services mv $RPM_BUILD_ROOT/usr/share/applications/kde4/kcmgtk4.desktop $RPM_BUILD_ROOT/usr/share/kde4/services/ %suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/kde4/services/kcmgtk4.desktop + mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/env + install -D -m 0755 %SOURCE2 $RPM_BUILD_ROOT/usr/share/kde4/env/ + mkdir -p $RPM_BUILD_ROOT/usr/share/kde4/apps/kcm_gtk/ + install -D -m 0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/kde4/apps/kcm_gtk/ %post -p /sbin/ldconfig @@ -77,5 +85,8 @@ %_kde4_modules/kcm_gtk4.so %_kde_share_dir/services/kcmgtk4.desktop /usr/share/icons/hicolor/48x48/apps/kcmgtk.png +%dir /usr/share/kde4/env +/usr/share/kde4/env/kcm_gtk.suse.sh +/usr/share/kde4/apps/kcm_gtk %changelog ++++++ gtkrc-2.0-kde4.template ++++++ # This file was written by KDE # You can edit it in the KDE control center, under "GTK Styles and Fonts" include "/usr/share/themes/@@THEME_NAME@@/gtk-2.0/gtkrc" include "/etc/gtk-2.0/gtkrc" style "user-font" { font_name="Sans Serif" } widget_class "*" style "user-font" gtk-theme-name="@@THEME_NAME@@" gtk-font-name="Sans Serif 9" ++++++ kcm_gtk.suse.sh ++++++ #!/bin/bash # Defaults for openSUSE 10.3 GTK2_SYSCONFDIR=/etc GTK2_DATADIR=/usr/share/themes/ # file used by kcm_gtk GTK2_THEME_RC="$HOME/.gtkrc-2.0-kde4" # GTK2 # NOTE: ~/.gtkrc-2.0-kde is added later (in latest KDE only) if [ "$GTK2_RC_FILES" ]; then export GTK2_RC_FILES="$GTK2_RC_FILES:$GTK2_THEME_RC:$HOME/.gtkrc-2.0-qtengine:$HOME/.gtkrc-2.0" else export GTK2_RC_FILES="$GTK2_SYSCONFDIR/gtk-2.0/gtkrc:$GTK2_THEME_RC:$HOME/.gtkrc-2.0-qtengine:$HOME/.gtkrc-2.0" fi # create the file if it doesn't exit if [ ! -e "$GTK2_THEME_RC" ]; then # oxygen-molecule, the default if [ -e "$GTK2_DATADIR/Oxygen-Molecule/gtk-2.0/gtkrc" ] ; then THEME="Oxygen-Molecule" elif [ -e "$GTK2_DATADIR/QtCurve/gtk-2.0/gtkrc" ] ; then # use QtCurve engine THEME="QtCurve" elif [ -e "$GTK2_DATADIR/Qt/gtk-2.0/gtkrc" ] ; then # use general gtk-qt-engine THEME="Qt" fi if [ -n "$THEME" ]; then cp -f /usr/share/kde4/apps/kcm_gtk/gtkrc-2.0-kde4.template "$GTK2_THEME_RC" sed -i -e "s,@@THEME_NAME@@,$THEME," "$GTK2_THEME_RC" fi fi ++++++ work-by-default.diff ++++++ Subject: Make the selected style work by default From: Lubos Lunak Patch-upstream: no Relates: kcm_gtk.suse.sh, gtkrc-2.0-kde4.template In order to make the selected Gtk theme work by default we have system-wide kcm_gtk.suse.sh instead of using kcm_gtk's gtk-qt-engine.rc.sh that kcm_gtk would otherwise install after first configuration save. Our script creates ~/.gtkrc-2.0-kde4 with proper defaults if not existing and does the Gtk theming setup that used to be in startkde.suse.sh. --- kcm_gtk/kcmgtk.cpp.sav 2008-03-11 02:30:19.000000000 +0100 +++ kcm_gtk/kcmgtk.cpp 2010-04-30 14:45:28.520928763 +0200 @@ -115,6 +115,9 @@ void KcmGtk::save() // Write ~/.gtkrc-2.0-kde4 m_gtkRc->save(); + if( !QFile::exists( "/usr/share/kde4/env/kcm_gtk.suse.sh")) + { + // Write ~/.kde/env/gtk-qt-engine.rc.sh bool envFileDidNotExist = !QFile::exists(k_envFileName); @@ -137,6 +140,8 @@ void KcmGtk::save() if (envFileDidNotExist) QMessageBox::information(this, "Restart KDE", "Your changes have been saved, but you will have to restart KDE for them to take effect.", QMessageBox::Ok); + } // end of /usr/share/kde4/env/... + // Write the KDE paths to a config file that gets picked up by the theme engine // It used to popen kde-config, but that broke sometimes and seemed ugly QSettings settings("gtk-qt-engine", "gtk-qt-engine"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org