| 1 |
mrpouet 09/08/29 12:28:11 |
| 2 |
|
| 3 |
Modified: compiz-manager |
| 4 |
Added: compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch |
| 5 |
Log: |
| 6 |
Fix libGL.so.1.2 path in compiz-manager (bug #274762), update KDE4 dependencies (bug #277016), fix missing gconf flags in gnome plugin (bug #282807). Fix QA warnings, Drop old revisions. |
| 7 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 x11-wm/compiz/files/compiz-manager |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/files/compiz-manager?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/files/compiz-manager?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/files/compiz-manager?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: compiz-manager |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/compiz/files/compiz-manager,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- compiz-manager 31 Dec 2008 16:44:58 -0000 1.2 |
| 23 |
+++ compiz-manager 29 Aug 2009 12:28:11 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
#!/bin/sh |
| 26 |
# Compiz Manager wrapper script |
| 27 |
-# |
| 28 |
+# |
| 29 |
# Copyright (c) 2007 Kristian Lyngstøl <kristian@×××××××××.org> |
| 30 |
# |
| 31 |
# This program is free software; you can redistribute it and/or modify |
| 32 |
@@ -24,15 +24,15 @@ |
| 33 |
# Much of this code is based on Beryl code, also licensed under the GPL. |
| 34 |
# This script will detect what options we need to pass to compiz to get it |
| 35 |
# started, and start a default plugin and possibly window decorator. |
| 36 |
-# |
| 37 |
+# |
| 38 |
|
| 39 |
|
| 40 |
COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz |
| 41 |
-PLUGIN_PATH="/usr/lib/compiz/" |
| 42 |
+PLUGIN_PATH="/usr/lib/compiz/" |
| 43 |
GLXINFO="/usr/bin/glxinfo" |
| 44 |
KWIN="/usr/bin/kwin" |
| 45 |
METACITY="/usr/bin/metacity" |
| 46 |
-COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) |
| 47 |
+COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) |
| 48 |
|
| 49 |
# For Xgl LD_PRELOAD |
| 50 |
LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa" |
| 51 |
@@ -53,7 +53,7 @@ |
| 52 |
# Driver whitelist |
| 53 |
WHITELIST="nvidia intel ati radeon i810" |
| 54 |
|
| 55 |
-# blacklist based on the pci ids |
| 56 |
+# blacklist based on the pci ids |
| 57 |
# See http://wiki.compiz-fusion.org/Hardware/Blacklist for details |
| 58 |
T=" 1002:5954 1002:5854 1002:5955" # ati rs480 |
| 59 |
T="$T 1002:4153" # ATI Rv350 |
| 60 |
@@ -122,10 +122,10 @@ |
| 61 |
{ |
| 62 |
verbose "Checking for FBConfig: " |
| 63 |
if [ "$INDIRECT" = "yes" ]; then |
| 64 |
- $GLXINFO -i | grep -q GLX.*fbconfig |
| 65 |
+ $GLXINFO -i | grep -q GLX.*fbconfig |
| 66 |
FB=$? |
| 67 |
else |
| 68 |
- $GLXINFO | grep -q GLX.*fbconfig |
| 69 |
+ $GLXINFO | grep -q GLX.*fbconfig |
| 70 |
FB=$? |
| 71 |
fi |
| 72 |
|
| 73 |
@@ -250,7 +250,7 @@ |
| 74 |
fi |
| 75 |
for DRV in ${WHITELIST}; do |
| 76 |
if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG && |
| 77 |
- ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG; |
| 78 |
+ ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG; |
| 79 |
then |
| 80 |
return 0 |
| 81 |
fi |
| 82 |
@@ -341,7 +341,7 @@ |
| 83 |
if ! running_under_whitelisted_driver || have_blacklisted_pciid; then |
| 84 |
abort_with_fallback_wm |
| 85 |
fi |
| 86 |
- # check if we have the required bits to run compiz and if not, |
| 87 |
+ # check if we have the required bits to run compiz and if not, |
| 88 |
# fallback |
| 89 |
if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then |
| 90 |
abort_with_fallback_wm |
| 91 |
@@ -381,3 +381,4 @@ |
| 92 |
fi |
| 93 |
|
| 94 |
${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS |
| 95 |
+ |
| 96 |
|
| 97 |
|
| 98 |
|
| 99 |
1.1 x11-wm/compiz/files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch |
| 100 |
|
| 101 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch?rev=1.1&view=markup |
| 102 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch?rev=1.1&content-type=text/plain |
| 103 |
|
| 104 |
Index: compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch |
| 105 |
=================================================================== |
| 106 |
Author: Romain Perier <mrpouet@g.o> |
| 107 |
Subject: Missing gconf flags for gnome plugin, fix bug #282807 |
| 108 |
Date: 2009-08-29 12:25 |
| 109 |
|
| 110 |
--- |
| 111 |
gtk/gnome/Makefile.am | 7 ++++--- |
| 112 |
1 files changed, 4 insertions(+), 3 deletions(-) |
| 113 |
|
| 114 |
diff --git a/gtk/gnome/Makefile.am b/gtk/gnome/Makefile.am |
| 115 |
index 208318a..d0a7c54 100644 |
| 116 |
--- a/gtk/gnome/Makefile.am |
| 117 |
+++ b/gtk/gnome/Makefile.am |
| 118 |
@@ -2,7 +2,7 @@ moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings |
| 119 |
|
| 120 |
if USE_GNOME |
| 121 |
libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir) |
| 122 |
-libcompiz_la_LIBADD = @GNOME_WINDOW_SETTINGS_LIBS@ |
| 123 |
+libcompiz_la_LIBADD = @GNOME_WINDOW_SETTINGS_LIBS@ @GCONF_LIBS@ |
| 124 |
libcompiz_la_SOURCES = \ |
| 125 |
compiz-window-manager.c \ |
| 126 |
compiz-window-manager.h |
| 127 |
@@ -76,8 +76,9 @@ if USE_GNOME_KEYBINDINGS |
| 128 |
endif |
| 129 |
endif |
| 130 |
|
| 131 |
-INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@ \ |
| 132 |
- -DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \ |
| 133 |
+INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@ \ |
| 134 |
+ @GCONF_CFLAGS@ \ |
| 135 |
+ -DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \ |
| 136 |
-DLOCALEDIR="\"@datadir@/locale"\" |
| 137 |
|
| 138 |
noinst_LTLIBRARIES = \ |
Archives