commit kde-gtk-config for openSUSE:Factory

31 Dec 2012

Hello community,

here is the log from the commit of package kde-gtk-config for openSUSE:Factory checked in at 2012-12-31 14:25:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kde-gtk-config (Old)
 and      /work/SRC/openSUSE:Factory/.kde-gtk-config.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kde-gtk-config", Maintainer is ""

Changes:
--------

--- /work/SRC/openSUSE:Factory/kde-gtk-config/kde-gtk-config.changes	2012-12-10 17:16:35.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kde-gtk-config.new/kde-gtk-config.changes	2012-12-31 14:25:53.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Dec 29 21:50:35 UTC 2012 - asterios.dramis@gmail.com
+
+- Added default templates for GTK2 and GTK3 settings. Updated the
+  kde_gtk_config.suse.sh startup script accordingly.
+- Added gtk2-theme-oxygen and gtk3-theme-oxygen Suggests: entries.
+
+-------------------------------------------------------------------

New:
----
  gtk3-settings.ini-kde4.template
  gtkrc-2.0-kde4.template

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

Other differences:
------------------
++++++ kde-gtk-config.spec ++++++
--- /var/tmp/diff_new_pack.0aQxyM/_old	2012-12-31 14:25:54.000000000 +0100
+++ /var/tmp/diff_new_pack.0aQxyM/_new	2012-12-31 14:25:54.000000000 +0100
@@ -25,6 +25,8 @@
 Url:            https://projects.kde.org/projects/playground/base/kde-gtk-config/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2
 Source1:        kde_gtk_config.suse.sh
+Source2:        gtkrc-2.0-kde4.template
+Source3:        gtk3-settings.ini-kde4.template
 BuildRequires:  atk-devel
 BuildRequires:  cairo-devel
 BuildRequires:  gdk-pixbuf-devel
@@ -34,6 +36,8 @@
 BuildRequires:  pango-devel
 %kde4_runtime_requires
 Recommends:     %{name}-lang = %{version}
+Suggests:       gtk2-theme-oxygen
+Suggests:       gtk3-theme-oxygen
 Obsoletes:      kcm_gtk
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -59,9 +63,10 @@
 
 %install
 %kde4_makeinstall -C build
-### Taken from kcm_gtk
-mkdir -p %{buildroot}%{_kde4_sharedir}/env
-install -D -m 0755 %{SOURCE1} %{buildroot}%{_kde4_sharedir}/env/
+
+install -Dpm 0755 %{SOURCE1} %{buildroot}%{_kde4_sharedir}/env/kde_gtk_config.suse.sh
+install -Dpm 0644 %{SOURCE2} %{buildroot}%{_kde4_appsdir}/%{name}/gtkrc-2.0-kde4.template
+install -Dpm 0644 %{SOURCE3} %{buildroot}%{_kde4_appsdir}/%{name}/gtk3-settings.ini-kde4.template
 
 %kde_post_install
 
@@ -71,6 +76,7 @@
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
 %{_kde4_appsdir}/kcm-gtk-module/
+%{_kde4_appsdir}/kde-gtk-config/
 %{_kde4_bindir}/gtk_preview
 %{_kde4_bindir}/gtk3_preview
 %{_kde4_bindir}/reload_gtk_apps

++++++ gtk3-settings.ini-kde4.template ++++++
[Settings]
gtk-font-name=Sans Serif 9
gtk-theme-name=@@THEME_NAME@@
gtk-icon-theme-name=oxygen
gtk-fallback-icon-theme=gnome
gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
gtk-menu-images=1
gtk-button-images=1
++++++ gtkrc-2.0-kde4.template ++++++
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-font-name="Sans Serif 9"
gtk-theme-name="@@THEME_NAME@@"
gtk-icon-theme-name="oxygen"
gtk-fallback-icon-theme="gnome"
gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
gtk-menu-images=1
gtk-button-images=1
++++++ kde_gtk_config.suse.sh ++++++
--- /var/tmp/diff_new_pack.0aQxyM/_old	2012-12-31 14:25:54.000000000 +0100
+++ /var/tmp/diff_new_pack.0aQxyM/_new	2012-12-31 14:25:54.000000000 +0100
@@ -1,35 +1,47 @@
 #!/bin/bash
 
-# Defaults for openSUSE 10.3
+# Defaults for openSUSE
 GTK2_SYSCONFDIR=/etc
 GTK2_DATADIR=/usr/share/themes/
+GTK3_HOME_CONFDIR="$HOME/.config/gtk-3.0"
+GTK3_DATADIR=/usr/share/themes/
 
-# file used by kcm_gtk
-GTK2_THEME_RC="$HOME/.gtkrc-2.0-kde4"
+# Files used by kde-gtk-config
+GTK2_THEME_RC="$HOME/.gtkrc-2.0"
+GTK3_THEME_RC="$HOME/.config/gtk-3.0/settings.ini"
 
 # 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"
+  export GTK2_RC_FILES="$GTK2_RC_FILES:$GTK2_THEME_RC"
 else
-  export GTK2_RC_FILES="$GTK2_SYSCONFDIR/gtk-2.0/gtkrc:$GTK2_THEME_RC:$HOME/.gtkrc-2.0-qtengine:$HOME/.gtkrc-2.0"
+  export GTK2_RC_FILES="$GTK2_SYSCONFDIR/gtk-2.0/gtkrc:$GTK2_THEME_RC"
 fi
 
-# create the file if it doesn't exit
+# Create the file if it doesn't exist
 if [ ! -e "$GTK2_THEME_RC" ]; then
   # oxygen-gtk, the default
   if [ -e "$GTK2_DATADIR/oxygen-gtk/gtk-2.0/gtkrc" ] ; then
     THEME="oxygen-gtk"
+  # else use QtCurve engine
   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"
+    cp -f /usr/share/kde4/apps/kde-gtk-config/gtkrc-2.0-kde4.template "$GTK2_THEME_RC"
     sed -i -e "s,@@THEME_NAME@@,$THEME," "$GTK2_THEME_RC"
   fi
 fi
 
+# GTK3
+# Create the file if it doesn't exist
+if [ ! -e "$GTK3_THEME_RC" ]; then
+  # oxygen-gtk, the default
+  if [ -e "$GTK3_DATADIR/oxygen-gtk/gtk-3.0/oxygenrc" ] ; then
+    THEME="oxygen-gtk"
+  fi
+  if [ -n "$THEME" ]; then
+    mkdir -p "$GTK3_HOME_CONFDIR"
+    cp -f /usr/share/kde4/apps/kde-gtk-config/gtk3-settings.ini-kde4.template "$GTK3_THEME_RC"
+    sed -i -e "s,@@THEME_NAME@@,$THEME," "$GTK3_THEME_RC"
+  fi
+fi

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)