Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
5f97cf0
Add info about GNOME3.8
Mar 27, 2013
12e115d
Update GNOME3.8 info again because I am an idiot
Mar 27, 2013
84f94d6
Add gnome-unstable info
Mar 27, 2013
3b57223
s/extra/core/
Mar 27, 2013
1197240
[gtk3-ubuntu] Update to version 3.8.0 with PPA version 3.7.12 and rel…
Mar 27, 2013
42b9b51
Remove leftover libsoup PKGBUILD
Mar 27, 2013
1b53472
Merge branch 'master' into GNOME-3.8
Mar 27, 2013
7805fcb
[hud]: Drop 0002_No_GLib_2.35.patch: We have glib 2.36 now
Mar 27, 2013
a640a8a
[indicator-application] Drop revert_r239.patch: We have glib 2.36 now
Mar 27, 2013
767346e
[indicator-appmenu] Drop 0002_False_GLib_Requirement.patch: we have g…
Mar 27, 2013
fc5c295
[indicator-messages] Drop revert_r335.patch: we have glib 2.36 now
Mar 27, 2013
1a7a19f
[indicator-power] Drop revert_r161.patch: we have glib 2.36 now
Mar 27, 2013
d6b1ea0
[indicator-session] Drop revert_r382.patch: we have glib 2.36 now
Mar 27, 2013
c825ef0
[libappindicator] Drop 0001_g_type_init.patch: we have glib 2.36 now
Mar 27, 2013
5e7a62b
[libdbusmenu] Drop revert_r438.patch: we have glib 2.36 now
Mar 27, 2013
4826c23
[gnome-settings-daemon-ubuntu] Update to version 3.8.0 with PPA versi…
Mar 27, 2013
ad8c125
[gnome-session-ubuntu] Update to version 3.8.0 with PPA version 3.7.9…
Mar 27, 2013
28ccae1
[gnome-control-center-ubuntu] Update to version 3.8.0 with PPA versio…
Mar 28, 2013
7f60443
[gtk3-ubuntu] Update version comparison script
Mar 28, 2013
f186fd8
[libunity] gee-1.0 -> gee-0.8: Still does not build though
Mar 28, 2013
917faf5
[libgee1] Added
Mar 29, 2013
f278445
[vala0.18] Added
Mar 29, 2013
0fa3ffc
[libunity] Use vala0.18 and add workaround for tests
Mar 29, 2013
4d624f1
[nautilus-ubuntu] Update to version 3.8.0 with PPA version 3.7.92 and…
Mar 29, 2013
4a45eb2
[gnome-control-center-unity] Rebuild for new gnome-desktop
Mar 29, 2013
51b8c2d
[gnome-screensaver-ubuntu] Rebuild for new gnome-desktop
Mar 29, 2013
fcdbef3
[gsettings-desktop-schemas-ubuntu] Added
Mar 29, 2013
9ff88e5
[gnome-settings-daemon-ubuntu] gsettings-desktop-schemas-ubuntu is re…
Mar 29, 2013
e372c8a
[gnome-session-ubuntu] Fix patches
Mar 29, 2013
48fd37a
[gnome-control-center-ubuntu] Update to version 3.8.0 with PPA releas…
Apr 1, 2013
ab51990
[indicator-datetime] Drop revert_r201.patch: we have glib 2.36
Apr 1, 2013
cebd66d
Merge branch 'master' into GNOME-3.8
Apr 1, 2013
23838af
[indicator-datetime] Forgot to remove revert_r201.patch
Apr 1, 2013
a11d48c
[gnome-settings-daemon-ubuntu] Update to version 3.8.0 with PPA versi…
Apr 1, 2013
31f5a01
Merge branch 'master' into GNOME-3.8
Apr 1, 2013
1fdbb5b
Merge branch 'master' into GNOME-3.8
brainpower Apr 22, 2013
d26d79c
[gtk3-ubuntu] Updated to 3.8.0 with ppa_rel 0ubuntu1~build1
brainpower Apr 22, 2013
f8ce3f9
[libdbusmenu] Fix patch lost by merge
brainpower Apr 22, 2013
c519792
[libappindicator] Fix patch lost by merge
brainpower Apr 22, 2013
db132e2
[libunity] Fixed dependency of libgee1 to libgee
brainpower Apr 22, 2013
a15564e
[indicator-messages] Fixed wrongly merged checksum
brainpower Apr 22, 2013
0e17c86
[gsettings-desktop-schemas-ubuntu] Update to 3.8.0 with ppa_rel 0ubun…
brainpower Apr 22, 2013
db6255d
[gnome-settings-daemon-ubuntu] Remove obsolete patch from PKGBUILD
brainpower Apr 22, 2013
90737b1
[gnome-session-ubuntu] Updating to 3.8.0 with ppa_rel 0ubuntu1~raring1
brainpower Apr 22, 2013
254cffd
[gnome-control-center-ubuntu] Update to 3.8.1 with ppa_rel 0ubuntu1~r…
brainpower Apr 22, 2013
7ea05d3
[indicator-application] Fixed patch lost by merge
brainpower Apr 22, 2013
761bf1f
[indicator-appmenu] Fixed wrong checksums
brainpower Apr 22, 2013
3e3fb9a
[indicator-datetime] Fix patch lost by merge, still not building though
brainpower Apr 22, 2013
d4b869b
[indicator-power] Add lost patch again
brainpower Apr 22, 2013
e18078c
[indicator-session] Readd lost patch
brainpower Apr 22, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions AAA_PLEASE_READ_GNOME3.8.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
1. Add to /etc/pacman.conf above [core]

[gnome-unstable]
SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist

2. sudo pacman -Sy gnome-unstable/libsoup

3. sudo pacman -Syu
85 changes: 44 additions & 41 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -17,47 +17,50 @@ Order to compile/install:
07: libindicate-qt -> Qt bindings for libindicate
08: libappindicator -> Library to export menu bar to Unity
09: appmenu-gtk -> Application menu module for GTK+
10: libunity -> Library for integrating Unity
11: libunity-misc -> Differently licensed stuff for Unity
12: indicator-messages -> Collects messages that need a response
13: libunity-webapps -> Library for integrating WebApps into Unity
14: bamf -> Application matching framework
15: sni-qt -> Turns Qt tray icons into appindicators
16: ido -> Widgets and objects used for indicators
17: gnome-settings-daemon-ubuntu -> Daemon handling the GNOME session settings
18: gnome-session-ubuntu -> GNOME Session Manager
19: gnome-screensaver-ubuntu -> GNOME screen saver and locker
20: gnome-control-center-ubuntu -> Utilities to configure the GNOME desktop
21: gnome-control-center-unity -> Change some Unity settings with GCC
22: credentials-preferences-ubuntu -> Ubuntu Online Accounts Settings Panel
23: metacity-ubuntu -> Window manager for GNOME
24: indicator-applet -> GNOME panel indicator applet
25: indicator-application -> Takes menus and puts then in the panel
26: indicator-appmenu -> An indicator to host the menus from apps
27: indicator-bluetooth -> Indicator for bluetooth status
28: indicator-datetime -> A very, very simple clock
29: indicator-power -> Indicator to show battery information
30: indicator-printers -> Indicator showing active print jobs
31: indicator-session -> Indicator for session management
32: indicator-sound -> Indicator displaying a unified sound menu
33: hud -> Backend for the Unity HUD
34: network-manager-applet-ubuntu -> NetworkManager applet w/indicator support
35: overlay-scrollbar * -> Overlay scrollbars for GTK 2 and GTK 3
36: evemu -> Linux Evdev Event Emulation Library
37: frame -> Open Input Framework Frame Library
38: grail -> Gesture recognition and instantiation lib.
39: geis -> Implementation of the GEIS interface
40: nux -> An OpenGL toolkit
41: unity-asset-pool -> Design assets for Unity
42: nautilus-ubuntu -> File manager and graphics shell for GNOME
43: libcolumbus -> Small, fast, error tolerant matcher
44: unity-lens-applications -> Unity applications lens
45: unity-lens-files -> Unity files lens
46: unity-lens-music -> Unity music lens
47: unity-lens-photos -> Unity photo lens
48: unity-lens-video -> Unity video lens
49: compiz-ubuntu -> Compiz compositing window manager
50: unity -> Desktop shell designed for efficiency
10: libgee1 -> GObject collection library
11: vala0.18 -> Compiler for the GObject type system
12: libunity -> Library for integrating Unity
13: libunity-misc -> Differently licensed stuff for Unity
14: indicator-messages -> Collects messages that need a response
15: libunity-webapps -> Library for integrating WebApps into Unity
16: bamf -> Application matching framework
17: sni-qt -> Turns Qt tray icons into appindicators
18: ido -> Widgets and objects used for indicators
19: gsettings-desktop-schemas-ubuntu -> Shared GSettings schemas for the desktop
20: gnome-settings-daemon-ubuntu -> Daemon handling the GNOME session settings
21: gnome-session-ubuntu -> GNOME Session Manager
22: gnome-screensaver-ubuntu -> GNOME screen saver and locker
23: gnome-control-center-ubuntu -> Utilities to configure the GNOME desktop
24: gnome-control-center-unity -> Change some Unity settings with GCC
25: credentials-preferences-ubuntu -> Ubuntu Online Accounts Settings Panel
26: metacity-ubuntu -> Window manager for GNOME
27: indicator-applet -> GNOME panel indicator applet
28: indicator-application -> Takes menus and puts then in the panel
29: indicator-appmenu -> An indicator to host the menus from apps
30: indicator-bluetooth -> Indicator for bluetooth status
31: indicator-datetime -> A very, very simple clock
32: indicator-power -> Indicator to show battery information
33: indicator-printers -> Indicator showing active print jobs
34: indicator-session -> Indicator for session management
35: indicator-sound -> Indicator displaying a unified sound menu
36: hud -> Backend for the Unity HUD
37: network-manager-applet-ubuntu -> NetworkManager applet w/indicator support
38: overlay-scrollbar * -> Overlay scrollbars for GTK 2 and GTK 3
39: evemu -> Linux Evdev Event Emulation Library
40: frame -> Open Input Framework Frame Library
41: grail -> Gesture recognition and instantiation lib.
42: geis -> Implementation of the GEIS interface
43: nux -> An OpenGL toolkit
44: unity-asset-pool -> Design assets for Unity
45: nautilus-ubuntu -> File manager and graphics shell for GNOME
46: libcolumbus -> Small, fast, error tolerant matcher
47: unity-lens-applications -> Unity applications lens
48: unity-lens-files -> Unity files lens
49: unity-lens-music -> Unity music lens
50: unity-lens-photos -> Unity photo lens
51: unity-lens-video -> Unity video lens
52: compiz-ubuntu -> Compiz compositing window manager
53: unity -> Desktop shell designed for efficiency

* Optional packages

Expand Down
60 changes: 29 additions & 31 deletions gnome-control-center-ubuntu/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,36 @@
# Contributor: thn81 <root@scrat>

pkgname=gnome-control-center-ubuntu
_ubuntu_rel=0ubuntu24
_actual_ver=3.6.3
_translations=20130418
pkgver=${_actual_ver}.${_ubuntu_rel}
_ppa_rel=0ubuntu1~raring2
pkgver=3.8.1
pkgrel=101
_translations=20130418
pkgdesc="The Control Center for GNOME with Ubuntu's patches"
arch=('i686' 'x86_64')
groups=('gnome')
url="http://www.gnome.org"
license=('GPL')
depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'gnome-online-accounts' 'gnome-settings-daemon-ubuntu' 'gsettings-desktop-schemas' 'gtk3-ubuntu' 'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' 'libpwquality' 'libsystemd' 'archlinux-artwork' 'webkitgtk3' 'ibus' 'system-config-printer')
depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'gnome-online-accounts' 'gnome-settings-daemon-ubuntu' 'gsettings-desktop-schemas' 'gtk3-ubuntu' 'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' 'libpwquality' 'libsystemd' 'archlinux-artwork' 'webkitgtk3' 'ibus' 'system-config-printer' 'colord-gtk')
makedepends=('gnome-common' 'gnome-doc-utils' 'intltool' 'docbook-xsl' 'patchutils')
optdepends=('mesa-demos: provides glxinfo for graphics information'
'gnome-color-manager: for color management tasks')
provides=("gnome-control-center=${_actual_ver}" 'FEATURE-libgnome-control-center')
provides=("gnome-control-center=${pkgver}" 'FEATURE-libgnome-control-center')
conflicts=('gnome-control-center')
options=('!libtool' '!emptydirs')
install=gnome-control-center.install
source=("http://download.gnome.org/sources/${pkgname%-*}/${_actual_ver%.*}/${pkgname%-*}-${_actual_ver}.tar.xz"
"https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname%-*}_${_actual_ver}-${_ubuntu_rel}.debian.tar.gz"
"https://dl.dropboxusercontent.com/u/486665/Translations/translations-${_translations}-gnome-control-center.tar.gz"
'pulse3.0.patch')
sha512sums=('77cd68349dc7f58714fbd121a34ec73a5c3e67c7a42a08c20a8dfdcfc9cefdec47af0f09130b7e3f0407cb7a786234b2619fdb76462c3bdb2bbc548294bfd444'
'8ec9d02d8a77ab4df85f5a4480542c08fe1abcb271c4ba55abf55ab2b71a0dd5b293ba0f907d655eb00ed58bd15c7aa6cf210a1c42eed55e4d2b06b0e25c0cc9'
'f08d00d02170d55b9908ae8aef2a13f9cbd393168bc70b28e31e8f35ab690903992ba380afbf7ef935d13ce81d3c3bec9b9db2711e2bbc7d1a245e700df5bdbc'
'5f10412037bf9c81dec9e14259fee50955c355183c72623b399b92766e57c5411198db2b0fe5e007a6ca167da33f3fd72a73281f72b41e524eb65909f5231192')
source=("http://download.gnome.org/sources/${pkgname%-*}/${pkgver%.*}/${pkgname%-*}-${pkgver}.tar.xz"
"http://ppa.launchpad.net/gnome3-team/gnome3-staging/ubuntu/pool/main/g/gnome-control-center/gnome-control-center_${pkgver}-${_ppa_rel}.debian.tar.gz"
"https://dl.dropboxusercontent.com/u/486665/Translations/translations-${_translations}-gnome-control-center.tar.gz")
sha512sums=('edbe41bacd82f4b8ba06dcf5c6660fe695239175b062a9590327b7c05506ab25b6671d222f18fa80b012c35a91669ef73a36f559caed36bcac1aa1b7481a759e'
'7773818a6959c495a349a80e2dbe3b1d5f94756b637d0fbd7dd423e53af9471679ebe172aa220e9163775c9bc8feb6d4c965a1f57e10ddbe63fbd91e366f5c70'
'f08d00d02170d55b9908ae8aef2a13f9cbd393168bc70b28e31e8f35ab690903992ba380afbf7ef935d13ce81d3c3bec9b9db2711e2bbc7d1a245e700df5bdbc')

prepare() {
cd "${srcdir}/${pkgname%-*}-${_actual_ver}"

cd "${srcdir}/${pkgname%-*}-${pkgver}"
# Apply Arch Linux's patches
# patch -p1 -i "${srcdir}/pulse3.0.patch"


# Apply Ubuntu's patches
# Disable patches
# Ubuntu is too lazy to port their patches to the latest version of IBus
Expand All @@ -57,19 +54,20 @@ prepare() {
msg "Applying ${i} ..."
if [ "x${i}" = "xunity_notice_info.patch" ]; then
cat "${srcdir}/debian/patches/${i}" | \
filterdiff --exclude gnome-control-center-3.6.3/configure.ac | patch -p1
filterdiff --exclude gnome-control-center-3.7.91/configure.ac | patch -p1
# Base 64 because the tabs will screw up bash's parser
cat << EOF | base64 -d | patch -p1
LS0tIGEvY29uZmlndXJlLmFjCisrKyBiL2NvbmZpZ3VyZS5hYwpAQCAtMTM3LDcgKzEzNyw3IEBA
CiAgICAgICAgICAgICAgICAgICBnZGstcGl4YnVmLTIuMCA+PSAkR0RLUElYQlVGX1JFUVVJUkVE
X1ZFUlNJT04pCiBQS0dfQ0hFQ0tfTU9EVUxFUyhESVNQTEFZX1BBTkVMLCAkQ09NTU9OX01PRFVM
RVMgZ25vbWUtZGVza3RvcC0zLjAgPj0gMy4xLjApCiBQS0dfQ0hFQ0tfTU9EVUxFUyhJTkZPX1BB
TkVMLCAkQ09NTU9OX01PRFVMRVMgbGliZ3RvcC0yLjAgZ2wgeDExCi0JCSAgcG9sa2l0LWdvYmpl
Y3QtMSA+PSAkUE9MS0lUX1JFUVVJUkVEX1ZFUlNJT04pCisJCSAgcG9sa2l0LWdvYmplY3QtMSA+
PSAkUE9MS0lUX1JFUVVJUkVEX1ZFUlNJT04gd2Via2l0Z3RrLTMuMCkKIFBLR19DSEVDS19NT0RV
TEVTKEtFWUJPQVJEX1BBTkVMLCAkQ09NTU9OX01PRFVMRVMKICAgICAgICAgICAgICAgICAgIGdu
b21lLWRlc2t0b3AtMy4wID49ICRHTk9NRV9ERVNLVE9QX1JFUVVJUkVEX1ZFUlNJT04KICAgICAg
ICAgICAgICAgICAgIHgxMSkK
cat << EOF | base64 -d | patch -p0
LS0tIGNvbmZpZ3VyZS5hYy5vcmlnCTIwMTMtMDQtMjIgMTg6MDQ6MzMuMzg3MjIyMjgwICswMjAw
CisrKyBjb25maWd1cmUuYWMJMjAxMy0wNC0yMiAxODowNzoxNy40NjM0OTg0NzQgKzAyMDAKQEAg
LTEzNyw3ICsxMzcsNyBAQAogICAgICAgICAgICAgICAgICAgZ2RrLXBpeGJ1Zi0yLjAgPj0gJEdE
S1BJWEJVRl9SRVFVSVJFRF9WRVJTSU9OKQogUEtHX0NIRUNLX01PRFVMRVMoRElTUExBWV9QQU5F
TCwgJENPTU1PTl9NT0RVTEVTIGdub21lLWRlc2t0b3AtMy4wID49IDMuMS4wKQogUEtHX0NIRUNL
X01PRFVMRVMoSU5GT19QQU5FTCwgJENPTU1PTl9NT0RVTEVTIGxpYmd0b3AtMi4wIGdsCi0JCSAg
cG9sa2l0LWdvYmplY3QtMSA+PSAkUE9MS0lUX1JFUVVJUkVEX1ZFUlNJT04pCisJCSAgcG9sa2l0
LWdvYmplY3QtMSA+PSAkUE9MS0lUX1JFUVVJUkVEX1ZFUlNJT04gd2Via2l0Z3RrLTMuMCkKIFBL
R19DSEVDS19NT0RVTEVTKEtFWUJPQVJEX1BBTkVMLCAkQ09NTU9OX01PRFVMRVMKICAgICAgICAg
ICAgICAgICAgIGdub21lLWRlc2t0b3AtMy4wID49ICRHTk9NRV9ERVNLVE9QX1JFUVVJUkVEX1ZF
UlNJT04KICAgICAgICAgICAgICAgICAgIHgxMSkK
EOF
else
patch -p1 -i "${srcdir}/debian/patches/${i}"
Expand All @@ -87,7 +85,7 @@ EOF
}

build() {
cd "${srcdir}/${pkgname%-*}-${_actual_ver}"
cd "${srcdir}/${pkgname%-*}-${pkgver}"

autoreconf -vfi

Expand All @@ -107,7 +105,7 @@ build() {
}

package() {
cd "${srcdir}/${pkgname%-*}-${_actual_ver}"
cd "${srcdir}/${pkgname%-*}-${pkgver}"

make DESTDIR="${pkgdir}" install

Expand All @@ -120,7 +118,7 @@ package() {
ln -s '/usr/share/applications/gnome-control-center.desktop' \
"${pkgdir}/usr/share/indicators/session/applications/gnome-control-center.desktop"

# Legal notice
# Install legal notice
install -m644 "${srcdir}/debian/searchingthedashlegalnotice.html" \
"${pkgdir}/usr/share/gnome-control-center/"
}
Expand Down
5 changes: 3 additions & 2 deletions gnome-control-center-ubuntu/compare_versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
source "$(dirname ${0})/PKGBUILD"
source "$(dirname ${0})/../version_checker.sh"

echo -e "PKGBUILD version: ${_actual_ver} ${_ubuntu_rel}"
echo -e "Upstream version: $(get_gnome_version ${pkgname%-*} 3.6)"
echo -e "PKGBUILD version: ${pkgver} ${_ppa_rel}"
echo -e "Upstream version: $(get_gnome_version ${pkgname%-*} 3.8)"
echo -e "Arch Linux version: $(get_archlinux_version ${pkgname%-*} extra x86_64)"
echo -e "Ubuntu version: $(get_ubuntu_version ${pkgname%-*} ${1:-raring})"
echo -e "PPA version: $(get_ppa_version ${pkgname%-*} ppa:gnome3-team/gnome3-staging)"
echo -e "Translations: ${_translations}"
25 changes: 0 additions & 25 deletions gnome-control-center-ubuntu/pulse3.0.patch

This file was deleted.

48 changes: 48 additions & 0 deletions gnome-session-ubuntu/50_ubuntu_sessions.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
--- a/data/gnome.desktop.in
+++ b/data/gnome.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=GNOME
_Comment=This session logs you into GNOME
-Exec=gnome-session
-TryExec=gnome-session
+Exec=gnome-session --session=gnome
+TryExec=gnome-shell
Icon=
Type=Application
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,7 +13,7 @@
hwcompat_DATA = hardware-compatibility

xsessiondir = $(datadir)/xsessions
-xsession_in_files = gnome.desktop.in
+xsession_in_files = gnome.desktop.in ubuntu.desktop.in

if BUILD_SESSION_SELECTOR
xsession_in_files += gnome-custom-session.desktop.in
@@ -26,7 +26,7 @@
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)

sessiondir = $(datadir)/gnome-session/sessions
-session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in
+session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in ubuntu.session.desktop.in.in
session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
session_DATA = $(session_in_files:.session.desktop.in=.session)

--- a/data/ubuntu.desktop.in
+++ b/data/ubuntu.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Ubuntu
+_Comment=This session logs you into Ubuntu
+Exec=gnome-session --session=ubuntu
+TryExec=unity
+Icon=
+Type=Application
--- a/data/ubuntu.session.desktop.in.in
+++ b/data/ubuntu.session.desktop.in.in
@@ -0,0 +1,3 @@
+[GNOME Session]
+_Name=Ubuntu
+RequiredComponents=gnome-settings-daemon;compiz;
58 changes: 58 additions & 0 deletions gnome-session-ubuntu/52_xdg_current_desktop.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
--- a/data/gnome.session.desktop.in.in
+++ b/data/gnome.session.desktop.in.in
@@ -1,3 +1,4 @@
[GNOME Session]
_Name=GNOME
RequiredComponents=gnome-shell;gnome-settings-daemon;
+DesktopName=GNOME
--- a/data/ubuntu.session.desktop.in.in
+++ b/data/ubuntu.session.desktop.in.in
@@ -1,3 +1,4 @@
[GNOME Session]
_Name=Ubuntu
RequiredComponents=gnome-settings-daemon;compiz;
+DesktopName=Unity
--- a/gnome-session/gsm-session-fill.c
+++ b/gnome-session/gsm-session-fill.c
@@ -31,6 +31,7 @@
#define GSM_KEYFILE_SESSION_GROUP "GNOME Session"
#define GSM_KEYFILE_RUNNABLE_KEY "IsRunnableHelper"
#define GSM_KEYFILE_FALLBACK_KEY "FallbackSession"
+#define GSM_KEYFILE_DESKTOP_NAME_KEY "DesktopName"
#define GSM_KEYFILE_REQUIRED_COMPONENTS_KEY "RequiredComponents"

/* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
@@ -314,6 +315,24 @@
return keyfile;
}

+static void
+set_xdg_current_desktop (GKeyFile *keyfile)
+{
+ char *value;
+
+ value = g_key_file_get_string (keyfile,
+ GSM_KEYFILE_SESSION_GROUP, GSM_KEYFILE_DESKTOP_NAME_KEY,
+ NULL);
+
+ if (!IS_STRING_EMPTY (value)) {
+ gsm_util_setenv ("XDG_CURRENT_DESKTOP", value);
+ }
+ else {
+ gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME");
+ }
+ g_free (value);
+}
+
gboolean
gsm_session_fill (GsmManager *manager,
const char *session)
@@ -331,6 +350,8 @@

g_free (actual_session);

+ set_xdg_current_desktop (keyfile);
+
load_standard_apps (manager, keyfile);

g_key_file_free (keyfile);
Loading