~ubuntu-branches/ubuntu/jaunty/kdebase-workspace/jaunty-updates

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_52_gtk2_engines_qtcurve_config.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas, Harald Sitter, Jonathan Thomas
  • Date: 2009-04-06 14:35:52 UTC
  • Revision ID: james.westby@ubuntu.com-20090406143552-155poypqqg801czf
Tags: 4:4.2.2-0ubuntu2
[ Harald Sitter ]
* Add kubuntu_13_startkde_set_country.diff to set KDE's country setting
  (based upon the locale value, so 'de_AT' would be 'at' as country) at
  login. If no LANG is set, or parsing results in an empty string, nothing
  will be done. (LP: #224461)
* Don't remove gtk-qt-engine cruft and .gtkrc-2.0-kde4 not only when
  qtcurve and kds are installed but also when gtk-qt-engine itself is
  installed. Otherwise the latter will be unapplied post-login (LP: #352946)

[ Jonathan Thomas ]
* Add kubuntu_75_fix_shellrunner_crash.diff, fixes KDE bug 186036, and can
  be removed in KDE 4.2.3 (LP: #340607)
* Add kubuntu_76_disable_dim_for_polkit.diff, the dim plugin breaks the
  policykit-kde dialog (LP: #350225)
* Add kubuntu_77_fix_autohide_glowbar_flicker.diff, unappliable in KDE 4.2.3
* Add kubuntu_78_kubuntu_78_krunner_history_combobox_palette.diff to fix an
  invisible scrollbar background in the combobox, unappliable in KDE 4.2.3
* Add kubuntu_79_fix_small_screensavers.diff to fix small OpenGL
  screensavers, can be unapplied in KDE 4.2.3 (LP: #211422)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
diff -Nur kdebase-workspace-4.2.1a/startkde.cmake kdebase-workspace-4.2.1a.new/startkde.cmake
2
 
--- kdebase-workspace-4.2.1a/startkde.cmake     2009-02-27 13:42:15.000000000 +0100
3
 
+++ kdebase-workspace-4.2.1a.new/startkde.cmake 2009-03-18 02:34:28.000000000 +0100
4
 
@@ -190,6 +190,39 @@
5
 
   unset KLOCALE_LANGUAGES
 
1
Index: kdebase-workspace-4.2.2/startkde.cmake
 
2
===================================================================
 
3
--- kdebase-workspace-4.2.2.orig/startkde.cmake 2009-04-02 15:50:40.000000000 +0200
 
4
+++ kdebase-workspace-4.2.2/startkde.cmake      2009-04-02 15:54:32.000000000 +0200
 
5
@@ -216,6 +216,39 @@
 
6
   fi
6
7
 fi
7
8
 
8
9
+# configuration of the gtk2-engines-qtcurve if not already set
9
10
+
10
11
+# First we need to remove previous gtk-qt-engines config if any
11
 
+if [ -e $kdehome/env/gtk-qt-engine.rc.sh ] ; then
 
12
+if [ -e $kdehome/env/gtk-qt-engine.rc.sh ] && [ ! -e /var/lib/dpkg/info/gtk-qt-engine.list ] ; then
12
13
+  rm -f $kdehome/env/gtk-qt-engine.rc.sh
13
14
+  # We also have to remove .gtkrc-2.0-kde4 since it'll have gtk-qt-engines config in it
14
15
+  if [ -e $HOME/.gtkrc-2.0-kde4 ] ; then
33
34
+    rm -f $kdehome/env/gtk2-engines-qtcurve.rc.sh
34
35
+  fi
35
36
+
36
 
+  if [ -e $HOME/.gtkrc-2.0-kde4 ] ; then
 
37
+  if [ -e $HOME/.gtkrc-2.0-kde4 ] && [ ! -e /var/lib/dpkg/info/gtk-qt-engine.list ] ; then
37
38
+    rm -f $HOME/.gtkrc-2.0-kde4
38
39
+  fi
39
40
+fi