Add gnome-flashback-git

4 files changed, 31 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf1f72d22029..5c08a40f43b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,31 @@
 pkgbase = gnome-flashback-git
-	pkgdesc = GNOME Flashback session (development version)
-	pkgver = 3.17.2.r57.gc375d0f
+	pkgdesc = GNOME Flashback session (git version)
+	pkgver = 3.20.1.r39.ga130f67
 	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/GnomeFlashback
-	install = gnome-flashback.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
-	makedepends = gnome-common
+	makedepends = autoconf-archive
 	makedepends = intltool
-	depends = gnome-desktop
-	depends = libcanberra
-	depends = libpulse
-	depends = upower
+	makedepends = python2
+	depends = gnome-bluetooth
 	depends = gnome-panel
-	depends = gnome-screensaver
 	depends = gnome-session
 	depends = gnome-settings-daemon
+	depends = gnome-themes-standard
+	depends = libibus
 	depends = metacity
 	depends = nautilus
-	depends = notification-daemon
-	depends = polkit-gnome
-	optdepends = compiz: required for the GNOME Flashback (Compiz) session
+	optdepends = gnome-backgrounds: Default background
+	optdepends = gnome-control-center: System settings
+	optdepends = gnome-screensaver: Lock screen
+	optdepends = network-manager-applet: Network management
 	provides = gnome-flashback
 	conflicts = gnome-flashback
 	source = git://git.gnome.org/gnome-flashback
-	source = session-components.patch
 	sha256sums = SKIP
-	sha256sums = 046121b5fbb185c4736a62b909e74985f52c0f0ff4b8a17c5a26d84576bfa4c0
 
 pkgname = gnome-flashback-git
 
diff --git a/PKGBUILD b/PKGBUILD
index d6aa03c56b36..64a0e3531da2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,37 @@
-# Maintainer: Charles Bos <charlesbos1 AT gmail>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gnome-flashback-git
-_gitname=gnome-flashback
-pkgver=3.17.2.r57.gc375d0f
+_pkgname=gnome-flashback
+pkgver=3.20.1.r39.ga130f67
 pkgrel=1
+pkgdesc="GNOME Flashback session (git version)"
 arch=('i686' 'x86_64')
-license=('GPL')
-pkgdesc="GNOME Flashback session (development version)"
 url="https://wiki.gnome.org/Projects/GnomeFlashback"
-# Note: Dependencies from gnome-panel onwards are flashback session dependencies and are not required for building the flashback module
-depends=('gnome-desktop' 'libcanberra' 'libpulse' 'upower' 'gnome-panel' 'gnome-screensaver' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'nautilus' 'notification-daemon' 'polkit-gnome')
-optdepends=('compiz: required for the GNOME Flashback (Compiz) session')
-makedepends=('git' 'gnome-common' 'intltool')
-provides=('gnome-flashback')
-conflicts=('gnome-flashback')
-install=$_gitname.install
-source=(git://git.gnome.org/gnome-flashback
-        session-components.patch)
-sha256sums=('SKIP'
-            '046121b5fbb185c4736a62b909e74985f52c0f0ff4b8a17c5a26d84576bfa4c0')
+license=('GPL')
+depends=('gnome-bluetooth' 'gnome-panel' 'gnome-session' 'gnome-settings-daemon' 'gnome-themes-standard' 'libibus' 'metacity' 'nautilus')
+makedepends=('git' 'autoconf-archive' 'intltool' 'python2')
+optdepends=('gnome-backgrounds: Default background'
+            'gnome-control-center: System settings'
+            'gnome-screensaver: Lock screen'
+            'network-manager-applet: Network management')
+conflicts=($_pkgname)
+provides=($_pkgname)
+source=(git://git.gnome.org/$_pkgname)
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$_gitname"
+  cd $_pkgname
   git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
 }
 
-prepare() {
-  cd "$srcdir/$_gitname"
-
-  # Add extra components to the Flashback sessions
-  patch -Np1 -i "$srcdir/session-components.patch"
-}
-
 build() {
-  cd "$srcdir/$_gitname"
-
-  # Disable Werror
-  export CFLAGS="-Wno-error"
-
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/"$_gitname"
+  cd $_pkgname
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$_pkgname \
+               --disable-schemas-compile --disable-Werror
   make
 }
 
 package() {
-  cd "$srcdir/$_gitname"
+  cd $_pkgname
   make DESTDIR="$pkgdir" install
 }
-
diff --git a/gnome-flashback.install b/gnome-flashback.install
deleted file mode 100644
index c19349f7230c..000000000000
--- a/gnome-flashback.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/session-components.patch b/session-components.patch
deleted file mode 100644
index 792a075bb0fa..000000000000
--- a/session-components.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur original/data/gnome-flashback-compiz.session.in modified/data/gnome-flashback-compiz.session.in
---- original/data/gnome-flashback-compiz.session.in	2014-10-18 10:34:42.789009081 +0100
-+++ modified/data/gnome-flashback-compiz.session.in	2014-10-18 10:37:31.023080204 +0100
-@@ -1,3 +1,3 @@
- [GNOME Session]
- _Name=GNOME Flashback (Compiz)
--RequiredComponents=gnome-flashback-init;gnome-flashback;gnome-panel;compiz;gnome-settings-daemon;
-+RequiredComponents=gnome-flashback-init;gnome-flashback;gnome-panel;compiz;gnome-settings-daemon;polkit-gnome-authentication-agent-1;nautilus-classic;
-diff -Naur original/data/gnome-flashback-metacity.session.in modified/data/gnome-flashback-metacity.session.in
---- original/data/gnome-flashback-metacity.session.in	2014-10-18 10:34:42.789009081 +0100
-+++ modified/data/gnome-flashback-metacity.session.in	2014-10-18 10:38:05.066399469 +0100
-@@ -1,3 +1,3 @@
- [GNOME Session]
- _Name=GNOME Flashback (Metacity)
--RequiredComponents=gnome-flashback-init;gnome-flashback;gnome-panel;metacity;gnome-settings-daemon;
-+RequiredComponents=gnome-flashback-init;gnome-flashback;gnome-panel;metacity;gnome-settings-daemon;polkit-gnome-authentication-agent-1;nautilus-classic;