Date: Friday, July 17, 2015 @ 04:45:39
Author: bgyorgy
Revision: 137034
upgpkg: activity-log-manager 0.9.7-4
Fix build and the gee-0.8 patch
Modified:
activity-log-manager/trunk/PKGBUILD
activity-log-manager/trunk/fix-build.patch
activity-log-manager/trunk/gee-0.8.patch
-----------------+
PKGBUILD | 12 ++--
fix-build.patch | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
gee-0.8.patch | 4 -
3 files changed, 136 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-07-17 02:44:31 UTC (rev 137033)
+++ PKGBUILD 2015-07-17 02:45:39 UTC (rev 137034)
@@ -4,7 +4,7 @@
pkgname=activity-log-manager
pkgver=0.9.7
-pkgrel=3
+pkgrel=4
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";
@@ -18,11 +18,11 @@
gee-0.8.patch)
md5sums=('d886be32db0fa351aaf0eb59912ee377'
'a7ddf1d853f4942ebf701256d9e5a38f'
- '243c71b429e12172691dcb748055247d'
- 'c3598a22822462d03083b3999748530d')
+ '69de6af0fa2adc118f731f8230e6671d'
+ '7418197a6909d92ed8e9dab2c0096dbf')
prepare() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
# Install language files
rename $pkgname- '' ../po/$pkgname-*.po
@@ -40,7 +40,7 @@
}
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
autoreconf -fi
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
make
@@ -47,6 +47,6 @@
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
Modified: fix-build.patch
===================================================================
--- fix-build.patch 2015-07-17 02:44:31 UTC (rev 137033)
+++ fix-build.patch 2015-07-17 02:45:39 UTC (rev 137034)
@@ -1,6 +1,132 @@
+diff -Naur activity-log-manager-0.9.7.orig/src/blacklist-dbus.vala
activity-log-manager-0.9.7/src/blacklist-dbus.vala
+--- activity-log-manager-0.9.7.orig/src/blacklist-dbus.vala 2015-07-17
02:38:04.290396888 +0000
++++ activity-log-manager-0.9.7/src/blacklist-dbus.vala 2015-07-17
02:38:33.883637191 +0000
+@@ -137,7 +137,7 @@
+ return false;
+ }
+
+- public async void find_events (string id, TreeIter iter,
ListStore store)
++ public async void find_events (string id, TreeIter iter,
Gtk.ListStore store)
+ {
+ Event event = new Event();
+ event.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
+@@ -165,7 +165,7 @@
+ store.set_value(iter, 5, counter);
+ }
+
+- public void get_count_for_app (string app_id, TreeIter iter,
ListStore store) {
++ public void get_count_for_app (string app_id, TreeIter iter,
Gtk.ListStore store) {
+ find_events(app_id, iter, store);
+ }
+
+diff -Naur activity-log-manager-0.9.7.orig/src/security-widget.vala
activity-log-manager-0.9.7/src/security-widget.vala
+--- activity-log-manager-0.9.7.orig/src/security-widget.vala 2015-07-17
02:38:04.290396888 +0000
++++ activity-log-manager-0.9.7/src/security-widget.vala 2015-07-17
02:38:33.950303649 +0000
+@@ -39,7 +39,7 @@
+
+ private void set_up_ui () {
+
+- var liststore_delay = new ListStore (2, typeof
(string), typeof (int));
++ var liststore_delay = new Gtk.ListStore (2, typeof
(string), typeof (int));
+ TreeIter iter;
+ liststore_delay.append (out iter);
+ liststore_delay.set (iter, 0, "1 second", 1, 0);
+diff -Naur
activity-log-manager-0.9.7.orig/src/unified-privacy-applications.vala
activity-log-manager-0.9.7/src/unified-privacy-applications.vala
+--- activity-log-manager-0.9.7.orig/src/unified-privacy-applications.vala
2015-07-17 02:38:04.290396888 +0000
++++ activity-log-manager-0.9.7/src/unified-privacy-applications.vala
2015-07-17 02:38:33.936970357 +0000
+@@ -60,7 +60,7 @@
+ }
+ }
+
+- public void get_count_for_app(string id, TreeIter iter,
ListStore store) {
++ public void get_count_for_app(string id, TreeIter iter,
Gtk.ListStore store) {
+ this.blacklist_interface.get_count_for_app(id, iter,
store);
+ }
+
+@@ -131,7 +131,7 @@
+ private class ApplicationsTreeView : Gtk.Box {
+
+ private ApplicationBlacklist app_blacklist;
+- private ListStore store;
++ private Gtk.ListStore store;
+ private TreeView treeview;
+
+ HashTable<string, AppChooseInfo> blocked_apps;
+@@ -145,7 +145,7 @@
+ N_COLS
+ }
+
+- public ListStore liststore {
++ public Gtk.ListStore liststore {
+ get {
+ return this.store;
+ }
+@@ -160,7 +160,7 @@
+ this.blocked_apps = blocked;
+ this.unblocked_apps = unblocked;
+
+- this.store = new ListStore (TreeViewCols.N_COLS,
++ this.store = new Gtk.ListStore (TreeViewCols.N_COLS,
+
typeof (string),
+
typeof (Gdk.Pixbuf),
+
typeof (string));
+@@ -292,7 +292,7 @@
+ private class AppSelectionTreeView : Gtk.Box {
+
+ private ApplicationBlacklist app_blacklist;
+- private ListStore store;
++ private Gtk.ListStore store;
+ private TreeView treeview;
+
+ enum TreeViewCols
+@@ -312,7 +312,7 @@
+ }
+ }
+
+- public ListStore liststore {
++ public Gtk.ListStore liststore {
+ get {
+ return store;
+ }
+@@ -323,7 +323,7 @@
+
+ this.app_blacklist = app_blacklist;
+
+- this.store = new ListStore (TreeViewCols.N_COLS,
++ this.store = new Gtk.ListStore (TreeViewCols.N_COLS,
+
typeof (string),
+
typeof (Gdk.Pixbuf),
+
typeof (string),
+@@ -426,7 +426,7 @@
+ }
+ }
+
+- public ListStore liststore {
++ public Gtk.ListStore liststore {
+ get {
+ return treeview.liststore;
+ }
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 2013-07-10
08:28:23.000000000 +0200
-+++ activity-log-manager-0.9.7/src/unified-privacy.vala 2014-05-13
15:15:51.042857849 +0200
+--- activity-log-manager-0.9.7.orig/src/unified-privacy.vala 2015-07-17
02:38:04.290396888 +0000
++++ activity-log-manager-0.9.7/src/unified-privacy.vala 2015-07-17
02:38:33.886970514 +0000
+@@ -55,7 +55,7 @@
+
+ //General stuffs
+ private TreeView exception_list;
+- private ListStore exception_list_store;
++ private Gtk.ListStore exception_list_store;
+
+ private Switch record_button;
+
+@@ -262,7 +262,7 @@
+ exception_vbox.pack_start (al2, false, false, 5);
+
+ // Exception TreeView
+- this.exception_list_store = new ListStore (4,
++ this.exception_list_store = new Gtk.ListStore (4,
+ typeof(string), // Full file path of
application desktop file.
+ typeof(Gdk.Pixbuf?), // Pixbuf
+ typeof(string), // File basename or
ApplicationName
@@ -291,7 +291,7 @@
// Add/Remove buttons
var exception_toolbar = new Toolbar();
Modified: gee-0.8.patch
===================================================================
--- gee-0.8.patch 2015-07-17 02:44:31 UTC (rev 137033)
+++ gee-0.8.patch 2015-07-17 02:45:39 UTC (rev 137034)
@@ -30,7 +30,7 @@
});
- mime_dict = new HashMap<string, string>(str_hash,
str_equal);
-+ mime_dict = new HashMap<string, string>();
++ mime_dict = new HashMap<string,
string>((Gee.HashDataFunc<string>) str_hash, (Gee.EqualDataFunc<string>)
str_equal);
mime_dict.set(_("Music"), NFO.AUDIO);
mime_dict.set(_("Videos"), NFO.VIDEO);
mime_dict.set(_("Pictures"), NFO.IMAGE);
@@ -39,7 +39,7 @@
var checkbox_hbox = new Box(Orientation.VERTICAL, 0);
- CompareFunc<string> mime_compare = (s1, s2) => {
-+ CompareDataFunc<string> mime_compare = (s1, s2) => {
++ GLib.CompareDataFunc<string> mime_compare = (s1, s2) =>
{
return s1.collate(s2);
};
Gee.ArrayList<string> keys = new
Gee.ArrayList<string>();
