Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbilgnome224.git;a=commitdiff;h=986629d81398944a99d139bfb81e4ac0d8c22f92
commit 986629d81398944a99d139bfb81e4ac0d8c22f92 Author: bouleetbil <[EMAIL PROTECTED]> Date: Wed Oct 1 20:13:42 2008 +0200 gnome-session-2.24.0-3-i686 *delete useless patch *enable splash by default diff --git a/source/gnome/gnome-session/02-splash-disappear.patch b/source/gnome/gnome-session/02-splash-disappear.patch deleted file mode 100644 index a4c737a..0000000 --- a/source/gnome/gnome-session/02-splash-disappear.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugzilla.gnome.org/show_bug.cgi?id=116814 - -diff -Naur gnome-session-2.8.1.orig/gnome-session/manager.c gnome-session-2.8.1/gnome-session/manager.c ---- gnome-session-2.8.1.orig/gnome-session/manager.c 2004-10-01 12:13:23.000000000 +0200 -+++ gnome-session-2.8.1/gnome-session/manager.c 2005-01-20 20:03:24.000000000 +0100 -@@ -1362,8 +1362,6 @@ - if (pending_list) - { - Client* client = (Client*)pending_list->data; -- if (client->match_rule != MATCH_PROP) -- goto out; - } - - if (start_list) diff --git a/source/gnome/gnome-session/09_splash_hide.patch b/source/gnome/gnome-session/09_splash_hide.patch deleted file mode 100644 index c4d8592..0000000 --- a/source/gnome/gnome-session/09_splash_hide.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -PruN gnome-session-2.8.1.orig/gnome-session/manager.c gnome-session-2.8.1/gnome-session/manager.c ---- gnome-session-2.8.1.orig/gnome-session/manager.c 2004-10-01 12:13:23.000000000 +0200 -+++ gnome-session-2.8.1/gnome-session/manager.c 2004-11-23 15:20:28.000000000 +0100 -@@ -1381,6 +1381,7 @@ - runlevel = client->priority; - } - if (pending_list) -+ splash_hide (); - goto out; - } - save_state = MANAGER_IDLE; -diff -PruN gnome-session-2.8.1.orig/gnome-session/splash-widget.c gnome-session-2.8.1/gnome-session/splash-widget.c ---- gnome-session-2.8.1.orig/gnome-session/splash-widget.c 2004-09-24 18:35:38.000000000 +0200 -+++ gnome-session-2.8.1/gnome-session/splash-widget.c 2004-11-23 15:19:57.000000000 +0100 -@@ -605,3 +605,10 @@ - } - } - -+void -+splash_hide (void) -+{ -+ if (global_splash) { -+ gtk_widget_hide (GTK_WIDGET (global_splash)); -+ } -+} -diff -PruN gnome-session-2.8.1.orig/gnome-session/splash-widget.h gnome-session-2.8.1/gnome-session/splash-widget.h ---- gnome-session-2.8.1.orig/gnome-session/splash-widget.h 2003-02-13 23:29:57.000000000 +0100 -+++ gnome-session-2.8.1/gnome-session/splash-widget.h 2004-11-23 15:18:45.000000000 +0100 -@@ -79,5 +79,6 @@ - void splash_start (void); - void splash_update (const gchar *text); - void splash_stop (void); -+void splash_hide (void); - - #endif /* SPLASH_WIDGET_H */ diff --git a/source/gnome/gnome-session/12_shaped_splash.patch b/source/gnome/gnome-session/12_shaped_splash.patch deleted file mode 100644 index 2316e91..0000000 --- a/source/gnome/gnome-session/12_shaped_splash.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- gnome-session-2.12.0/gnome-session/splash-widget.h.shaped 2005-08-08 03:35:13.000000000 -0400 -+++ gnome-session-2.12.0/gnome-session/splash-widget.h 2006-01-12 02:19:59.000000000 -0500 -@@ -36,7 +36,6 @@ - GnomeIconTheme *icon_theme; - - GdkPixbuf *background; -- GdkPixmap *bg_pixmap; - GList *icons; - PangoLayout *layout; - PangoAttribute *font_size_attr; - ---- gnome-session-2.12.0/gnome-session/splash-widget.c.shaped 2006-01-12 02:19:59.000000000 -0500 -+++ gnome-session-2.12.0/gnome-session/splash-widget.c 2006-01-12 02:22:28.000000000 -0500 -@@ -137,16 +137,6 @@ - if (!GTK_WIDGET_DRAWABLE (widget)) - return FALSE; - -- if (gdk_rectangle_intersect ( -- &event->area, &sw->image_bounds, &exposed)) -- gdk_draw_drawable ( -- GDK_DRAWABLE (widget->window), -- widget->style->black_gc, -- GDK_DRAWABLE (sw->bg_pixmap), -- exposed.x, exposed.y, -- exposed.x, exposed.y, -- exposed.width, exposed.height); -- - for (l = sw->icons; l; l = l->next) { - SplashIcon *si = l->data; - -@@ -208,33 +218,42 @@ splash_widget_size_request (GtkWidget - static void - splash_widget_realize (GtkWidget *widget) - { -- GdkPixmap *pm; - SplashWidget *sw = (SplashWidget *) widget; - - GNOME_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); - - if (sw->background && widget->window) { -- int width, height; -+ GdkPixmap *pixmap; -+ GdkBitmap *mask; -+ GdkColormap *colormap; - -- width = gdk_pixbuf_get_width (sw->background); -- height = gdk_pixbuf_get_height (sw->background); -+ pixmap = NULL; -+ mask = NULL; - -- pm = gdk_pixmap_new ( -- widget->window, -- width, height, -- gdk_drawable_get_visual (widget->window)->depth); -+ colormap = gtk_widget_get_colormap (widget); -+ gdk_pixbuf_render_pixmap_and_mask_for_colormap (sw->background, -+ colormap, -+ &pixmap, &mask, -+ 125); - -- if (pm) { -- gdk_pixbuf_render_to_drawable ( -- sw->background, GDK_DRAWABLE (pm), -- widget->style->black_gc, -- 0, 0, 0, 0, width, height, -- GDK_RGB_DITHER_NORMAL, -- 0, 0); -- -- gdk_window_set_back_pixmap ( -- widget->window, pm, FALSE); -- sw->bg_pixmap = pm; -+ if (pixmap) { -+ GtkStyle *style; -+ -+ style = gtk_style_copy (widget->style); -+ style->bg_pixmap[GTK_STATE_NORMAL] = pixmap; -+ -+ gtk_widget_set_style (widget, style); -+ g_object_unref (style); -+ -+ if (mask) { -+ gdk_window_shape_combine_mask (widget->window, -+ mask, 0, 0); -+ -+ g_object_unref (mask); -+ } -+ -+ gtk_style_set_background (widget->style, widget->window, -+ GTK_STATE_NORMAL); - } - } - } -@@ -257,11 +256,6 @@ - { - SplashWidget *sw = (SplashWidget *) widget; - -- if (sw->bg_pixmap) { -- g_object_unref (sw->bg_pixmap); -- sw->bg_pixmap = NULL; -- } -- - GNOME_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget)); - } - diff --git a/source/gnome/gnome-session/19_gnome-wm-tweaking.patch b/source/gnome/gnome-session/19_gnome-wm-tweaking.patch deleted file mode 100644 index cde77b3..0000000 --- a/source/gnome/gnome-session/19_gnome-wm-tweaking.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur gnome-session-2.20.0.orig/gnome-session/gnome-wm gnome-session-2.20.0/gnome-session/gnome-wm ---- gnome-session-2.20.0.orig/gnome-session/gnome-wm 2007-09-24 19:55:59.000000000 +0200 -+++ gnome-session-2.20.0/gnome-session/gnome-wm 2007-09-24 19:59:19.000000000 +0200 -@@ -37,6 +37,11 @@ - esac - done - -+# Get previously set window manager in gconf -+if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then -+ DEFWM=`gconftool-2 -g /desktop/gnome/applications/window_manager/default 2>/dev/null` -+fi -+ - # WINDOW_MANAGER overrides all - - if [ -z "$WINDOW_MANAGER" ] ; then -@@ -128,6 +133,9 @@ - ;; - esac - -+# Store the selected WM with gconf -+gconftool-2 -t string -s /desktop/gnome/applications/window_manager/current "$WINDOW_MANAGER" -+ - exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4 - - echo "ERROR: No window manager could run!" diff --git a/source/gnome/gnome-session/21_dont_grab_when_composited.patch b/source/gnome/gnome-session/21_dont_grab_when_composited.patch deleted file mode 100644 index 37d6eea..0000000 --- a/source/gnome/gnome-session/21_dont_grab_when_composited.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ur gnome-session-2.16.0/gnome-session/logout.c gnome-session-2.16.0.patched/gnome-session/logout.c ---- gnome-session-2.16.0/gnome-session/logout.c 2006-09-29 18:30:17 +0100 -+++ gnome-session-2.16.0.patched/gnome-session/logout.c 2006-09-29 18:32:09 +0100 -@@ -796,8 +796,16 @@ - */ - if (!a11y_enabled && !getenv("LTSP_CLIENT")) - { -- XGrabServer (GDK_DISPLAY ()); -- gsm_foreach_screen (fadeout_screen); -+ Atom cmSnAtom; -+ Window currentCmSnOwner; -+ -+ cmSnAtom = XInternAtom (GDK_DISPLAY (), "_NET_WM_CM_S0", 0); -+ currentCmSnOwner = XGetSelectionOwner (GDK_DISPLAY (), cmSnAtom); -+ -+ if (currentCmSnOwner == None) { -+ XGrabServer (GDK_DISPLAY ()); -+ gsm_foreach_screen (fadeout_screen); -+ } - } - - gtk_widget_show_all (dialog->dialog); -@@ -823,8 +831,17 @@ - - if (!a11y_enabled && !getenv("LTSP_CLIENT")) - { -+ Atom cmSnAtom; -+ Window currentCmSnOwner; -+ - hide_fadeout_windows (); -- XUngrabServer (GDK_DISPLAY ()); -+ -+ cmSnAtom = XInternAtom (GDK_DISPLAY (), "_NET_WM_CM_S0", 0); -+ currentCmSnOwner = XGetSelectionOwner (GDK_DISPLAY (), cmSnAtom); -+ -+ if (currentCmSnOwner == None) { -+ XUngrabServer (GDK_DISPLAY ()); -+ } - - gdk_pointer_ungrab (GDK_CURRENT_TIME); - gdk_keyboard_ungrab (GDK_CURRENT_TIME); diff --git a/source/gnome/gnome-session/FrugalBuild b/source/gnome/gnome-session/FrugalBuild index 79eb231..1ac4395 100644 --- a/source/gnome/gnome-session/FrugalBuild +++ b/source/gnome/gnome-session/FrugalBuild @@ -5,7 +5,7 @@ pkgname=gnome-session pkgver=2.24.0 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME session manager" depends=('libgnomeui>=2.24.0' 'gnome-desktop>=2.24.0' \ 'dbus-glib>=0.76' 'gnome-control-center>=2.24.0.1' 'gnome-vfs>=2.24.0' 'libnotify' 'gnome-keyring>=2.24.0') @@ -16,18 +16,15 @@ _F_gnome_schemas=('/etc/gconf/schemas/gnome-session.schemas') _F_gnome_iconcache="y" _F_gnome_desktop="y" Finclude gnome gnome-scriptlet -source=([EMAIL PROTECTED] 02-splash-disappear.patch \ - $pkgname http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-1.0.png \ - 09_splash_hide.patch 19_gnome-wm-tweaking.patch) +source=([EMAIL PROTECTED] enable_splash.diff \ + $pkgname http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-1.0.png ) sha1sums=('5a4b329db62ae3518029982ae86fb1b138500c3e' \ - 'd45d51203dc7ad290b12bc70281d59844a79be75' \ + '5a63c81ad2ecd0d29aa33c73d2717dcd1774333e' \ '047ac00bb24d52986aac94e232b4b40fa122f582' \ - '222c9a2fd01872acc2fb69c17e9771cde2e1e5a2' \ - '97585abf9d468e532422af3daceb42b61d832a13' \ - 'a69fefc4ee7f11ee1be13f61a4f7c711f3390c80') + '222c9a2fd01872acc2fb69c17e9771cde2e1e5a2') build() { - #Fpatchall + Fpatchall Fmake --disable-schemas-install Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1 Fbuild_gnome_scriptlet diff --git a/source/gnome/gnome-session/enable_splash.diff b/source/gnome/gnome-session/enable_splash.diff new file mode 100644 index 0000000..d9c897e --- /dev/null +++ b/source/gnome/gnome-session/enable_splash.diff @@ -0,0 +1,11 @@ +--- gnome-session-2.24.0old/data/gnome-session.schemas.in 2008-09-22 23:21:08.000000000 +0200 ++++ gnome-session-2.24.0/data/gnome-session.schemas.in 2008-10-01 16:39:35.000000000 +0200 +@@ -7,7 +7,7 @@ + <applyto>/apps/gnome-session/options/show_splash_screen</applyto> + <owner>gnome</owner> + <type>bool</type> +- <default>false</default> ++ <default>true</default> + <locale name="C"> + <short>Show the splash screen</short> + <long>Show the splash screen when the session starts up</long> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
