[arch-commits] Commit in openbox/trunk (PKGBUILD openbox-3.5.0-gnome-session.patch)

[Balló György]

    Date: Wednesday, October 9, 2013 @ 10:18:10
  Author: bgyorgy
Revision: 98380

upgpkg: openbox 3.5.2-5

Remove GNOME/Openbox session, because GNOME Panel is no longer available in the official repositories

Modified:
  openbox/trunk/PKGBUILD
Deleted:
  openbox/trunk/openbox-3.5.0-gnome-session.patch

-----------------------------------+
 PKGBUILD                          |   23 +++++++++--------------
 openbox-3.5.0-gnome-session.patch |   14 --------------
 2 files changed, 9 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-09 07:52:21 UTC (rev 98379)
+++ PKGBUILD	2013-10-09 08:18:10 UTC (rev 98380)
@@ -6,7 +6,7 @@
 
 pkgname=openbox
 pkgver=3.5.2
-pkgrel=4
+pkgrel=5
 pkgdesc='Highly configurable and lightweight X11 window manager'
 arch=('i686' 'x86_64')
 url='http://openbox.org'
@@ -13,8 +13,7 @@
 license=('GPL')
 depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
          'libxcursor' 'pango' 'imlib2' 'librsvg')
-optdepends=('gnome-flashback-session: for the GNOME/Openbox xsession'
-            'kdebase-workspace: for the KDE/Openbox xsession'
+optdepends=('kdebase-workspace: for the KDE/Openbox xsession'
             'python2-xdg: for the openbox-xdg-autostart script')
 groups=('lxde')
 options=('!libtool')
@@ -22,12 +21,10 @@
         'etc/xdg/openbox/autostart' 'etc/xdg/openbox/environment')
 source=(http://www.icculus.org/openbox/releases/$pkgname-$pkgver.tar.gz
         openbox-3.5.0-title-matching.patch
-        openbox-3.5.0-which-2.20.patch
-        openbox-3.5.0-gnome-session.patch)
+        openbox-3.5.0-which-2.20.patch)
 md5sums=('93df606606053b7e8578a5c116afb8ec'
          '0a11d7149da210a31ef88f8a9c717711'
-         '7ca3b5244bb092d46f5bcf1e2bdf4a18'
-         '47fb1a16af05b6aba3b07051e6027f93')
+         '7ca3b5244bb092d46f5bcf1e2bdf4a18')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -35,9 +32,6 @@
   patch -Np1 -i "$srcdir"/openbox-3.5.0-title-matching.patch  # OB#5277
   patch -Np1 -i "$srcdir"/openbox-3.5.0-which-2.20.patch # FS#11455
 
-  # Fix GNOME/Openbox xsession with GNOME 3.8
-  patch -Np1 -i "$srcdir"/openbox-3.5.0-gnome-session.patch
-
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
     data/autostart/openbox-xdg-autostart
 }
@@ -56,11 +50,12 @@
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
-  rm "$pkgdir"/usr/bin/gdm-control \
-    "$pkgdir"/usr/share/gnome-session/sessions/openbox-gnome-fallback.session
+  # GNOME Panel is no longer available in the official repositories
+  rm -r "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control,openbox-gnome-session} \
+    "$pkgdir"/usr/share/gnome{,-session} \
+    "$pkgdir"/usr/share/man/man1/openbox-gnome-session.1 \
+    "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop
 
   sed -i 's:startkde:/usr/bin/\0:' \
     "$pkgdir"/usr/share/xsessions/openbox-kde.desktop
-  sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \
-    "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop
 }

Deleted: openbox-3.5.0-gnome-session.patch
===================================================================
--- openbox-3.5.0-gnome-session.patch	2013-10-09 07:52:21 UTC (rev 98379)
+++ openbox-3.5.0-gnome-session.patch	2013-10-09 08:18:10 UTC (rev 98380)
@@ -1,14 +0,0 @@
-diff -Naur openbox-3.5.2.orig/data/gnome-session/openbox-gnome.session openbox-3.5.2/data/gnome-session/openbox-gnome.session
---- openbox-3.5.2.orig/data/gnome-session/openbox-gnome.session	2013-09-02 16:06:03.076984284 +0000
-+++ openbox-3.5.2/data/gnome-session/openbox-gnome.session	2013-09-02 16:07:32.696385427 +0000
-@@ -1,9 +1,3 @@
- [GNOME Session]
- Name=GNOME/Openbox
--RequiredComponents=gnome-settings-daemon;
--# Try load with the gnome-panel and use the fallback if we can't load a panel
--RequiredProviders=windowmanager;panel
--DefaultProvider-windowmanager=openbox
--DefaultProvider-panel=gnome-panel
--FallbackSession=openbox-gnome-fallback
--DesktopName=GNOME
-+RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;openbox;notification-daemon;polkit-gnome-authentication-agent-1;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;