pool/gnome-session
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=78

Browse Source
This commit is contained in:
OBS User unknown 2009-07-31 17:35:33 +00:00 committed by Git OBS Bridge
parent dc07c90f98
commit ba6cc6f61d
8 changed files with 142 additions and 1391 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-session-2.26.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:35e304ec42ed69a2b98377fd7cfac19fa00ca53bb5d6307094ebf077c00dbc32
size 835266

3
gnome-session-2.27.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9089a1959aae16eb7a9116d5d50e83b798495724e358e92ae2600c6a79575284
size 817564

40
gnome-session-bgo507101-tile-ui.patch
View File

@ -2,7 +2,7 @@ Index: gnome-session/gsm-manager.c
===================================================================
--- gnome-session/gsm-manager.c.orig
+++ gnome-session/gsm-manager.c
@@ -2363,7 +2363,8 @@ logout_dialog_response (GsmLogoutDialog
@@ -2748,7 +2748,8 @@ logout_dialog_response (GsmLogoutDialog
{
g_debug ("GsmManager: Logout dialog response: %d", response_id);
@ -12,7 +12,7 @@ Index: gnome-session/gsm-manager.c
/* In case of dialog cancel, switch user, hibernate and
* suspend, we just perform the respective action and return,
@@ -2373,6 +2374,10 @@ logout_dialog_response (GsmLogoutDialog
@@ -2758,6 +2759,10 @@ logout_dialog_response (GsmLogoutDialog
case GTK_RESPONSE_NONE:
case GTK_RESPONSE_DELETE_EVENT:
break;
@ -35,7 +35,7 @@ Index: gnome-session/gsm-util.c
#include <sys/types.h>
#include <unistd.h>
#include <sys/time.h>
@@ -292,3 +293,75 @@ gsm_util_setenv (const char *variable,
@@ -503,3 +504,75 @@ gsm_util_setenv (const char *variable,
g_error_free (bus_error);
}
}
@ -123,7 +123,7 @@ Index: gnome-session/gsm-util.h
G_BEGIN_DECLS
@@ -37,6 +38,9 @@ char * gsm_util_generate_startup_id
@@ -47,6 +48,9 @@ char * gsm_util_generate_startup_id
void gsm_util_setenv (const char *variable,
const char *value);
@ -142,14 +142,14 @@ Index: gnome-session/Makefile.am
-DDBUS_LAUNCH=\"dbus-launch\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
+ -DDATADIR=\""$(datadir)"\" \
-DGLADEDIR=\""$(pkgdatadir)"\" \
-DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \
-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \
-DGCONFTOOL_CMD=\"$(GCONFTOOL)\"
-DGCONFTOOL_CMD=\"$(GCONFTOOL)\" \
Index: gnome-session/gsm-logout-dialog.c
===================================================================
--- gnome-session/gsm-logout-dialog.c.orig
+++ gnome-session/gsm-logout-dialog.c
@@ -37,8 +37,13 @@
@@ -38,8 +38,13 @@
#define AUTOMATIC_ACTION_TIMEOUT 60
@ -165,13 +165,13 @@ Index: gnome-session/gsm-logout-dialog.c
typedef enum {
GSM_DIALOG_LOGOUT_TYPE_LOGOUT,
@@ -47,11 +52,12 @@ typedef enum {
@@ -48,11 +53,12 @@ typedef enum {
struct _GsmLogoutDialogPrivate
{
- GsmDialogLogoutType type;
-
GsmPowerManager *power_manager;
DkpClient *dkp_client;
GsmConsolekit *consolekit;
+ GtkWidget *info_label;
@ -180,7 +180,7 @@ Index: gnome-session/gsm-logout-dialog.c
int timeout;
unsigned int timeout_id;
@@ -60,7 +66,8 @@ struct _GsmLogoutDialogPrivate
@@ -61,7 +67,8 @@ struct _GsmLogoutDialogPrivate
static GsmLogoutDialog *current_dialog = NULL;
@ -190,7 +190,7 @@ Index: gnome-session/gsm-logout-dialog.c
static void gsm_logout_dialog_destroy (GsmLogoutDialog *logout_dialog,
gpointer data);
@@ -68,43 +75,10 @@ static void gsm_logout_dialog_destroy (
@@ -69,43 +76,10 @@ static void gsm_logout_dialog_destroy (
static void gsm_logout_dialog_show (GsmLogoutDialog *logout_dialog,
gpointer data);
@ -237,7 +237,7 @@ Index: gnome-session/gsm-logout-dialog.c
static void
gsm_logout_dialog_class_init (GsmLogoutDialogClass *klass)
@@ -113,18 +87,6 @@ gsm_logout_dialog_class_init (GsmLogoutD
@@ -114,18 +88,6 @@ gsm_logout_dialog_class_init (GsmLogoutD
gobject_class = G_OBJECT_CLASS (klass);
@ -256,7 +256,7 @@ Index: gnome-session/gsm-logout-dialog.c
g_type_class_add_private (klass, sizeof (GsmLogoutDialogPrivate));
}
@@ -146,11 +108,23 @@ gsm_logout_dialog_init (GsmLogoutDialog
@@ -137,11 +99,23 @@ gsm_logout_dialog_init (GsmLogoutDialog
logout_dialog->priv->timeout_id = 0;
logout_dialog->priv->timeout = 0;
logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL;
@ -278,10 +278,10 @@ Index: gnome-session/gsm-logout-dialog.c
+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+
logout_dialog->priv->power_manager = gsm_get_power_manager ();
logout_dialog->priv->dkp_client = dkp_client_new ();
logout_dialog->priv->consolekit = gsm_get_consolekit ();
@@ -247,40 +221,28 @@ gsm_logout_supports_shutdown (GsmLogoutD
@@ -237,40 +211,28 @@ gsm_logout_supports_shutdown (GsmLogoutD
}
static void
@ -339,7 +339,7 @@ Index: gnome-session/gsm-logout-dialog.c
seconds_warning = ngettext ("You will be automatically logged "
"out in %d second.",
"You will be automatically logged "
@@ -288,7 +250,7 @@ gsm_logout_dialog_timeout (gpointer data
@@ -278,7 +240,7 @@ gsm_logout_dialog_timeout (gpointer data
seconds_to_show);
break;
@ -348,7 +348,7 @@ Index: gnome-session/gsm-logout-dialog.c
seconds_warning = ngettext ("This system will be automatically "
"shut down in %d second.",
"This system will be automatically "
@@ -296,6 +258,10 @@ gsm_logout_dialog_timeout (gpointer data
@@ -286,6 +248,10 @@ gsm_logout_dialog_timeout (gpointer data
seconds_to_show);
break;
@ -359,7 +359,7 @@ Index: gnome-session/gsm-logout-dialog.c
default:
g_assert_not_reached ();
}
@@ -330,25 +296,50 @@ gsm_logout_dialog_timeout (gpointer data
@@ -320,25 +286,50 @@ gsm_logout_dialog_timeout (gpointer data
secondary_text = g_strdup (seconds_warning);
}
@ -421,7 +421,7 @@ Index: gnome-session/gsm-logout-dialog.c
if (logout_dialog->priv->timeout_id != 0) {
g_source_remove (logout_dialog->priv->timeout_id);
@@ -360,13 +351,118 @@ gsm_logout_dialog_set_timeout (GsmLogout
@@ -350,13 +341,118 @@ gsm_logout_dialog_set_timeout (GsmLogout
}
static GtkWidget *
@ -541,7 +541,7 @@ Index: gnome-session/gsm-logout-dialog.c
if (current_dialog != NULL) {
gtk_widget_destroy (GTK_WIDGET (current_dialog));
@@ -376,82 +472,119 @@ gsm_get_dialog (GsmDialogLogoutType type
@@ -366,82 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type
current_dialog = logout_dialog;

30
gnome-session-compiz-as-default-wm.patch
View File

@ -1,30 +0,0 @@
Index: data/gnome-wm
================================================================================
--- data/Makefile.am
+++ data/Makefile.am
@@ -25,7 +25,7 @@
bin_SCRIPTS = gnome-wm
settingsdir = $(datadir)/applications
-settings_in_files = session-properties.desktop.in
+settings_in_files = gnome-wm.desktop.in session-properties.desktop.in
settings_DATA = $(settings_in_files:.desktop.in=.desktop)
install-data-local:
--- data/gnome-wm
+++ data/gnome-wm
@@ -73,6 +73,14 @@
if [ -f "$COMPIZ_ENABLED_FILE" ] ; then
KNOWN_WM="compiz-manager $KNOWN_WM"
+ else
+ if [ ! -f "$HOME/.config/compiz/disable-compiz" ] ; then
+ # Check to see if hardware is supported by compiz, to have it as default WM if so
+ CM_DRY=yes compiz-manager > /dev/null 2>&1
+ if test $? -eq 0; then
+ KNOWN_WM="compiz-manager $KNOWN_WM"
+ fi
+ fi
fi
OLDIFS=$IFS

41
gnome-session-enable-disable-compiz.patch Normal file
View File

@ -0,0 +1,41 @@
Index: gnome-session-2.27.5/data/gnome-wm
===================================================================
--- gnome-session-2.27.5.orig/data/gnome-wm
+++ gnome-session-2.27.5/data/gnome-wm
@@ -68,8 +68,15 @@ if [ -z "$WINDOW_MANAGER" ] ; then
# Create a list of window manager we can handle, trying to only use the
# compositing ones when it makes sense
- xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null
- IS_X_COMPOSITED=$?
+ if [ "x$XDG_CONFIG_HOME" = "x" ]; then
+ COMPIZ_ENABLED_FILE="$HOME/.config/compiz/enable-compiz"
+ else
+ COMPIZ_ENABLED_FILE="$XDG_CONFIG_HOME/compiz/enable-compiz"
+ fi
+
+ #xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null
+ #IS_X_COMPOSITED=$?
+ IS_X_COMPOSITED=0
KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm"
if [ $IS_X_COMPOSITED -eq 0 ] ; then
@@ -78,6 +85,18 @@ if [ -z "$WINDOW_MANAGER" ] ; then
# metacity is still the default wm in GNOME
KNOWN_WM="metacity $KNOWN_WM"
+ if test -f "$COMPIZ_ENABLED_FILE" -a "$COMPIZ_ENABLED_FILE" -nt /etc/X11/xorg.conf; then
+ KNOWN_WM="compiz-manager $KNOWN_WM"
+ else
+ if [ ! -f "$HOME/.config/compiz/disable-compiz" ] ; then
+ # Check to see if hardware is supported by compiz, to have it as default WM if so
+ CM_DRY=yes compiz-manager > /dev/null 2>&1
+ if test $? -eq 0; then
+ KNOWN_WM="compiz-manager $KNOWN_WM"
+ fi
+ fi
+ fi
+
OLDIFS=$IFS
if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then

86
gnome-session-gnome-wm-compiz-manager.patch
View File

@ -1,86 +0,0 @@
Index: gnome-session-2.26.1/data/gnome-wm
===================================================================
--- gnome-session-2.26.1.orig/data/gnome-wm
+++ gnome-session-2.26.1/data/gnome-wm
@@ -51,22 +51,33 @@ if [ "x$WINDOW_MANAGER" = "xgnome-wm" ];
WINDOW_MANAGER=""
fi
+# Migrate compiz to compiz-manager
+if [ "x$WINDOW_MANAGER" = "xcompiz" ]; then
+ WINDOW_MANAGER="compiz-manager"
+fi
+if [ "x$DEFWM" = "xcompiz" ]; then
+ DEFWM="compiz-manager"
+fi
+
if [ -z "$WINDOW_MANAGER" ] ; then
# Create a list of window manager we can handle, trying to only use the
# compositing ones when it makes sense
- xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null
- IS_X_COMPOSITED=$?
+ if [ "x$XDG_CONFIG_HOME" = "x" ]; then
+ COMPIZ_ENABLED_FILE="$HOME/.config/compiz/enable-compiz"
+ else
+ COMPIZ_ENABLED_FILE="$XDG_CONFIG_HOME/compiz/enable-compiz"
+ fi
+
+ KNOWN_WM="metacity sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm"
- KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm"
- if [ $IS_X_COMPOSITED -eq 0 ] ; then
- KNOWN_WM="compiz beryl $KNOWN_WM"
+ if test -f "$COMPIZ_ENABLED_FILE" -a "$COMPIZ_ENABLED_FILE" -nt /etc/X11/xorg.conf; then
+ KNOWN_WM="compiz-manager $KNOWN_WM"
fi
- # metacity is still the default wm in GNOME
- KNOWN_WM="metacity $KNOWN_WM"
OLDIFS=$IFS
if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then
+
for wm in $KNOWN_WM ; do
IFS=":"
for dir in $PATH ; do
@@ -77,6 +88,7 @@ if [ -z "$WINDOW_MANAGER" ] ; then
done
IFS=$OLDIFS
done
+
else
WINDOW_MANAGER=$DEFWM
fi
@@ -116,11 +128,7 @@ if [ ! -z "$SMID" ] ; then
OPT1=-i
OPT2=$SMID
;;
- compiz)
- OPT1=--sm-client-id
- OPT2=$SMID
- ;;
- beryl)
+ compiz-manager)
OPT1=--sm-client-id
OPT2=$SMID
;;
@@ -128,18 +136,6 @@ if [ ! -z "$SMID" ] ; then
esac
fi
-case `basename $WINDOW_MANAGER` in
- compiz)
- export LIBGL_ALWAYS_INDIRECT=1
- gtk-window-decorator &
- OPT3=glib
- OPT4=gconf
- ;;
- beryl)
- emerald &
- ;;
-esac
-
-exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4
+exec $WINDOW_MANAGER $OPT1 $OPT2
echo "ERROR: No window manager could run!"

60
gnome-session.changes
View File

@ -1,3 +1,63 @@
-------------------------------------------------------------------
Wed Jul 29 12:21:04 CEST 2009 - vuntz@novell.com
- Update to version 2.27.5:
+ Prefer compiz-manager over compiz when available in gnome-wm
+ Add --with-default-wm configure option to let distributors
specify the default window manager they want to use (including
gnome-wm)
+ Use silent-rules with automake 1.11
+ Add --enable-splash configure option to build splash, and
disable splash build by default
+ Add Presence interface to the documentation
+ Do not exit when the system bus restarts
+ Port from gnome-power-manager to DeviceKit-power
DeviceKit-power is a new dependency.
+ Code cleanup
+ Updated translations.
- Add DeviceKit-power-devel BuildRequires.
- Pass --with-default-wm=gnome-wm to configure.
- Provides and Obsoletes branding package, and remove
branding-upstream package as we don't ship the splash anymore.
- Remove splash-related packaging.
- Respin gnome-session-bgo507101-tile-ui.patch.
- Remove gnome-session-gnome-wm-compiz-manager.patch and
gnome-session-compiz-as-default-wm.patch, and replace them with
gnome-session-enable-disable-compiz.patch.
-------------------------------------------------------------------
Mon Jul 20 11:50:15 CEST 2009 - vuntz@novell.com
- Update to version 2.27.4:
+ Reduce GConf roundtrips
+ Use shave to improve build log readability
+ Fix a crash on Solaris
+ Generate docs for the presence API
+ Rewrite a good part of the capplet. Some highlights:
- much cleaner code
- monitor autostart files
- autofill name field if needed
- add help button
- better handling of themed and non-themed application icons
- allow dragging from the application list
- make it more clear that applications are disabled
+ Port to GtkBuilder
+ Improve debug message
+ Load default apps after saved and autostart apps
+ Build fixes for BSD
+ Update eggsmclient code to fix crash
+ Add mutter support to gnome-wm
+ Make gnome-session exit properly on reboot/shutdown
+ Avoid pointless warnings
+ Honour the SmRestartNever SmRestartStyleHint
+ Default clients to RESTART_IF_RUNNING instead of NEVER
+ Code cleanups
+ Updated translations.
- Rebase gnome-session-bgo507101-tile-ui.patch.
- Rebase gnome-session-gnome-wm-compiz-manager.patch.
- Remove libglade2-devel BuildRequires.
- Use gnome-autogen.sh instead of autoreconf to make it work.
-------------------------------------------------------------------
Mon May 25 16:23:54 CEST 2009 - vuntz@novell.com

1266
gnome-session.spec
View File

File diff suppressed because it is too large Load Diff