Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gnome-session-12-compiz-by-default.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 16215 02109384b629
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
16215
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
     1
 
diff -urN -x'*.orig' gnome-session-2.27.5/data/gnome-session.schemas.in.in ../SUNWgnome-session-2.26.1.p12/gnome-session-2.27.5/data/gnome-session.schemas.in.in
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
     2
 
--- gnome-session-2.27.5/data/gnome-session.schemas.in.in	2009-08-06 18:08:43.102694513 +0100
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
     3
 
+++ ../SUNWgnome-session-2.26.1.p12/gnome-session-2.27.5/data/gnome-session.schemas.in.in	2009-08-06 18:23:14.799823821 +0100
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
     4
 
@@ -90,7 +90,7 @@
15005
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
     5
 
          <applyto>/desktop/gnome/session/required_components/windowmanager</applyto>
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
     6
 
          <owner>gnome</owner>
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
     7
 
          <type>string</type>
16215
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
     8
 
-         <default>@DEFAULT_WM@</default>
15005
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
     9
 
+         <default>compiz-by-default</default>
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    10
 
          <locale name="C">
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    11
 
             <short>Window Manager</short>
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    12
 
             <long>The window manager is the program that draws the title bar and borders around windows, and allows you to move and resize windows.</long>
16215
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
    13
 
diff -urN -x'*.orig' gnome-session-2.27.5/data/gnome-wm ../SUNWgnome-session-2.26.1.p12/gnome-session-2.27.5/data/gnome-wm
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
    14
 
--- gnome-session-2.27.5/data/gnome-wm	2009-07-29 01:36:07.000000000 +0100
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
    15
 
+++ ../SUNWgnome-session-2.26.1.p12/gnome-session-2.27.5/data/gnome-wm	2009-08-06 18:26:01.253531521 +0100
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
    16
 
@@ -73,7 +73,7 @@
15005
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    17
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    18
 
   KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm"
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    19
 
   if [ $IS_X_COMPOSITED -eq 0 ] ; then
16215
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
    20
 
-    KNOWN_WM="mutter compiz-manager compiz beryl $KNOWN_WM"
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
    21
 
+    KNOWN_WM="compiz-by-default mutter compiz-manager compiz beryl $KNOWN_WM"
15005
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    22
 
   fi
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    23
 
   # metacity is still the default wm in GNOME
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    24
 
   KNOWN_WM="metacity $KNOWN_WM"
16215
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
    25
 
@@ -131,6 +131,8 @@
15005
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    26
 
       OPT1=-i
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    27
 
       OPT2=$SMID
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    28
 
       ;;
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    29
 
+    compiz-by-default)
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    30
 
+      ;;
16215
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
    31
 
     compiz|compiz-manager)
15005
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    32
 
       OPT1=--sm-client-id
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    33
 
       OPT2=$SMID
16215
02109384b629 2009-08-06 Ghee Teo <[email protected]>
gheet
parents: 16077
diff changeset 
    34
 
@@ -144,6 +146,9 @@
15005
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    35
 
 fi
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    36
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    37
 
 case `basename $WINDOW_MANAGER` in
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    38
 
+  compiz-by-default)
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    39
 
+    export LIBGL_ALWAYS_INDIRECT=1
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    40
 
+    ;;
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    41
 
   compiz)
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    42
 
     export LIBGL_ALWAYS_INDIRECT=1
3cc095a2cc6a * base-specs/gnome-session.spec : Integrate compiz-by-default changes
mattman
parents:
diff changeset 
    43
 
     gtk-window-decorator &
upstream/oracle/spec-files