Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=f26ba7f1d08e1919fbd34ed5448168bb1937629b

commit f26ba7f1d08e1919fbd34ed5448168bb1937629b
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Tue Oct 12 19:29:04 2010 +0000

gnome-session-2.91.0-1-i686
*version bump
*enable mutter by default
*delete splash (deprecated)

diff --git a/source/gnome/gnome-session/FrugalBuild 
b/source/gnome/gnome-session/FrugalBuild
index 376cb17..4f749c9 100644
--- a/source/gnome/gnome-session/FrugalBuild
+++ b/source/gnome/gnome-session/FrugalBuild
@@ -1,14 +1,13 @@
# Compiling time: 0.38 SBU
# Maintainer: bouleetbil <bouleet...@frogdev.info>

-# kill_g_debug.patch should be disabled for stable releases of gnome
-
pkgname=gnome-session
-pkgver=2.32.0
-pkgrel=3
+pkgver=2.91.0
+pkgrel=1
pkgdesc="GNOME session manager"
-depends=('gnome-desktop>=2.32.0' 'polkit' 'upower' 'gconf-gtk'  'usermode' \
-       'dbus-glib>=0.76' 'gnome-control-center>=2.32.0' 'libnotify' 
'gnome-keyring>=2.32.0')
+depends=('gnome-desktop>=2.91.0' 'polkit' 'upower' 'gconf-gtk'  'usermode' \
+       'dbus-glib>=0.76' 'gnome-control-center>=2.91.0' 'libnotify' 
'gnome-keyring>=2.91.0' \
+       'mutter')
makedepends=('intltool' 'gnome-common')
rodepends=('consolekit-x11')
groups=('gnome' 'gnome-minimal')
@@ -17,23 +16,7 @@ _F_gnome_schemas=('/etc/gconf/schemas/gnome-session.schemas')
_F_gnome_iconcache="y"
_F_gnome_desktop="y"
Finclude gnome gnome-scriptlet
-source=(${source[@]} enable_splash.diff \
-       
http://ftp.frugalware.org/pub/other/artwork/gnome-theme/GNOME-Splash-1.4.png )
-sha1sums=('518a70695a8bdc76d179ff1bc36fadf7954579f5' \
-          '1c2b3b009b06be2c320dad87868f42c56166641e' \
-          '2b7333abd13aab895f3fdd79d526a649c4759cf8')
-
-build() {
-       Fpatchall
-       Fmake --disable-schemas-install --enable-splash
-       Fmakeinstall GCONF_DISABLE_SCHEMA_INSTALL=1
-       Fbuild_gnome_scriptlet
-
-       # Drop old splash screen
-       Frm usr/share/pixmaps/splash/gnome-splash.png
-
-       # Frugalware Splash screen
-       Ffile GNOME-Splash-1.4.png /usr/share/pixmaps/splash/gnome-splash.png
-}
+sha1sums=('71c24928d1e6b69c29712916d153f85eb25e9df5')
+Fconfopts="$Fconfopts --with-default-wm=mutter --with-gtk=3.0"

# optimization OK
diff --git a/source/gnome/gnome-session/enable_splash.diff 
b/source/gnome/gnome-session/enable_splash.diff
deleted file mode 100644
index 265f1dc..0000000
--- a/source/gnome/gnome-session/enable_splash.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-session-2.28.0/data/gnome-session.schemas.in.in~     2009-07-29 
02:36:07.000000000 +0200
-+++ gnome-session-2.28.0/data/gnome-session.schemas.in.in      2009-10-05 
11:02:17.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>
diff --git a/source/gnome/gnome-session/gnome-session-HEAD-shutdown.patch 
b/source/gnome/gnome-session/gnome-session-HEAD-shutdown.patch
deleted file mode 100644
index 932f508..0000000
--- a/source/gnome/gnome-session/gnome-session-HEAD-shutdown.patch
+++ /dev/null
@@ -1,76 +0,0 @@
----
- Straight forward fix to allow shutdown on systems not using policykit.
-
- If the system really don't have policykit, it will make things work
- as in 2.22.
-
- If pk is in gsm but not in ck, it'll still work as in 2.22.
-
- If pk is present in both, you just have to fix the logic to make
- gsm ask pk if the user has the permission to shutdown _before_ showing
- buttons and in case this is not possible, just damn fix pk.
-
---- gnome-session-2.24.2old/gnome-session/gsm-consolekit.c     2008-11-25 
19:59:18.000000000 +0100
-+++ gnome-session-2.24.2/gnome-session/gsm-consolekit.c        2008-12-01 
22:46:44.000000000 +0100
-@@ -528,7 +528,7 @@
-                 g_free (error_message);
-         }
- #else
--        g_assert_not_reached ();
-+        g_warning ("Failed to restart and Policykit support not enabled");
- #endif /* HAVE POLKIT */
- }
-
-@@ -568,7 +568,7 @@
-                 }
-         }
- #else
--        g_assert_not_reached ();
-+        g_warning ("Failed to restart and Policykit support not enabled");
- #endif /* HAVE POLKIT */
- }
-
-@@ -882,7 +882,6 @@
- gboolean
- gsm_consolekit_can_restart (GsmConsolekit *manager)
- {
--#ifdef HAVE_POLKIT_GNOME
-         gboolean res;
-         GError  *error;
-
-@@ -894,19 +893,13 @@
-                 g_error_free (error);
-                 return FALSE;
-         }
--
--        return gsm_consolekit_can_do_action (manager, 
"org.freedesktop.consolekit.system.restart") ||
--               gsm_consolekit_can_do_action (manager, 
"org.freedesktop.consolekit.system.restart-multiple-users");
--#else
--        g_debug ("GsmConsolekit: built without PolicyKit-gnome support - 
cannot restart system");
--        return FALSE;
--#endif
-+      return res;
- }
-
- gboolean
- gsm_consolekit_can_stop (GsmConsolekit *manager)
- {
--#ifdef HAVE_POLKIT_GNOME
-+
-         gboolean res;
-         GError  *error;
-         error = NULL;
-@@ -918,12 +911,7 @@
-                 return FALSE;
-         }
-
--        return gsm_consolekit_can_do_action (manager, 
"org.freedesktop.consolekit.system.stop") ||
--               gsm_consolekit_can_do_action (manager, 
"org.freedesktop.consolekit.system.stop-multiple-users");
--#else
--        g_debug ("GsmConsolekit: built without PolicyKit-gnome support - 
cannot stop system");
--        return FALSE;
--#endif
-+        return res;
- }
-
- GsmConsolekit *
diff --git a/source/gnome/gnome-session/kill_g_debug.patch 
b/source/gnome/gnome-session/kill_g_debug.patch
deleted file mode 100644
index cde2779..0000000
--- a/source/gnome/gnome-session/kill_g_debug.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nur gnome-session-2.13.90/gnome-session/main.c 
gnome-session-2.13.90.new/gnome-session/main.c
---- gnome-session-2.13.90/gnome-session/main.c 2006-01-10 01:48:20.000000000 
+0100
-+++ gnome-session-2.13.90.new/gnome-session/main.c     2006-01-28 
19:12:13.000000000 +0100
-@@ -344,6 +344,7 @@
-     gsm_set_verbose (TRUE);
-
-   /* Help eradicate the critical warnings in unstable releases of GNOME */
-+  /*
-   versions = g_strsplit (VERSION, ".", 3);
-   if (versions && versions [0] && versions [1])
-     {
-@@ -356,7 +357,7 @@
-       }
-     }
-   g_strfreev (versions);
--
-+  */
-   set_lang();
-   set_gtk1_theme_rcfile ();
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to