[arch-commits] Commit in activity-log-manager/trunk (PKGBUILD gee-0.8.patch)

[Balló György]

    Date: Tuesday, August 12, 2014 @ 02:34:09
  Author: bgyorgy
Revision: 117215

upgpkg: activity-log-manager 0.9.7-3

Port to gee-0.8, update translations

Added:
  activity-log-manager/trunk/gee-0.8.patch
Modified:
  activity-log-manager/trunk/PKGBUILD

---------------+
 PKGBUILD      |   18 ++++++++++++------
 gee-0.8.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-12 00:18:21 UTC (rev 117214)
+++ PKGBUILD	2014-08-12 00:34:09 UTC (rev 117215)
@@ -4,20 +4,22 @@
 
 pkgname=activity-log-manager
 pkgver=0.9.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/activity-log-manager"
 license=('GPL2')
-depends=('gtk3' 'libgee06' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils')
+depends=('gtk3' 'libgee' 'zeitgeist')
 makedepends=('vala' 'intltool')
 install=$pkgname.install
 source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
-        http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20130725.tar.gz
-        fix-build.patch)
+        http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20140812.tar.gz
+        fix-build.patch
+        gee-0.8.patch)
 md5sums=('d886be32db0fa351aaf0eb59912ee377'
-         'f7a284bca152011500cb845aebad8d14'
-         '243c71b429e12172691dcb748055247d')
+         'a7ddf1d853f4942ebf701256d9e5a38f'
+         '243c71b429e12172691dcb748055247d'
+         'c3598a22822462d03083b3999748530d')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -32,10 +34,14 @@
 
   # Fix build
   patch -Np1 -i ../fix-build.patch
+
+  # Port to gee-0.8
+  patch -Np1 -i ../gee-0.8.patch
 }
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }

Added: gee-0.8.patch
===================================================================
--- gee-0.8.patch	                        (rev 0)
+++ gee-0.8.patch	2014-08-12 00:34:09 UTC (rev 117215)
@@ -0,0 +1,45 @@
+diff -Naur activity-log-manager-0.9.7.orig/configure.ac activity-log-manager-0.9.7/configure.ac
+--- activity-log-manager-0.9.7.orig/configure.ac	2013-07-10 08:28:23.000000000 +0200
++++ activity-log-manager-0.9.7/configure.ac	2014-08-11 15:16:37.573942945 +0200
+@@ -43,7 +43,7 @@
+ 
+ PKG_CHECK_MODULES(ZEITGEIST, zeitgeist-2.0, [HAVE_LIBZG=yes])
+ PKG_CHECK_MODULES(GTK, gtk+-3.0, [HAVE_GTK=yes])
+-PKG_CHECK_MODULES(GEE, gee-1.0, [HAVE_GEE=yes])
++PKG_CHECK_MODULES(GEE, gee-0.8, [HAVE_GEE=yes])
+ PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0, [HAVE_GIO_UNIX=yes])
+ PKG_CHECK_MODULES(POLKIT, polkit-gobject-1, [HAVE_POLKIT=yes], [HAVE_POLKIT=no])
+ PKG_CHECK_MODULES(LIBWHOOPSIE, libwhoopsie, [HAVE_LIBWHOOPSIE=yes], [HAVE_LIBWHOOPSIE=no])
+diff -Naur activity-log-manager-0.9.7.orig/src/Makefile.am activity-log-manager-0.9.7/src/Makefile.am
+--- activity-log-manager-0.9.7.orig/src/Makefile.am	2013-07-10 08:28:23.000000000 +0200
++++ activity-log-manager-0.9.7/src/Makefile.am	2014-08-11 15:35:14.909210489 +0200
+@@ -2,7 +2,7 @@
+ 	--pkg zeitgeist-2.0 \
+ 	--pkg glib-2.0 \
+ 	--pkg gtk+-3.0 \
+-	--pkg gee-1.0  \
++	--pkg gee-0.8  \
+ 	--target-glib=2.26 \
+ 	--pkg gio-unix-2.0 \
+ 	config.vapi
+diff -Naur activity-log-manager-0.9.7.orig/src/unified-privacy.vala activity-log-manager-0.9.7/src/unified-privacy.vala
+--- activity-log-manager-0.9.7.orig/src/unified-privacy.vala	2014-08-11 15:15:53.586144000 +0200
++++ activity-log-manager-0.9.7/src/unified-privacy.vala	2014-08-12 01:27:54.292926227 +0200
+@@ -114,7 +114,7 @@
+ 				remove_folder_from_view(folder);
+ 			});
+ 			
+-			mime_dict = new HashMap<string, string>(str_hash, str_equal);
++			mime_dict = new HashMap<string, string>();
+ 			mime_dict.set(_("Music"), NFO.AUDIO);
+ 			mime_dict.set(_("Videos"), NFO.VIDEO);
+ 			mime_dict.set(_("Pictures"), NFO.IMAGE);
+@@ -213,7 +213,7 @@
+ 			// Checkbox Box
+ 			var checkbox_hbox = new Box(Orientation.VERTICAL, 0);
+ 
+-			CompareFunc<string> mime_compare = (s1, s2) => {
++			CompareDataFunc<string> mime_compare = (s1, s2) => {
+ 				return s1.collate(s2);
+ 			};
+ 			Gee.ArrayList<string> keys = new Gee.ArrayList<string>();