[arch-commits] Commit in activity-log-manager/trunk (PKGBUILD fix-build-2.patch)

[Balló György]

    Date: Monday, January 15, 2018 @ 20:46:20
  Author: bgyorgy
Revision: 282847

upgpkg: activity-log-manager 0.9.7-6

Fix build

Added:
  activity-log-manager/trunk/fix-build-2.patch
Modified:
  activity-log-manager/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   15 +++++++------
 fix-build-2.patch |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-15 20:00:52 UTC (rev 282846)
+++ PKGBUILD	2018-01-15 20:46:20 UTC (rev 282847)
@@ -4,7 +4,7 @@
 
 pkgname=activity-log-manager
 pkgver=0.9.7
-pkgrel=5
+pkgrel=6
 pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist"
 arch=('x86_64')
 url="https://launchpad.net/activity-log-manager"
@@ -14,13 +14,15 @@
 source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz{,.asc}
         https://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20140812.tar.gz
         fix-build.patch
+        fix-build-2.patch
         gee-0.8.patch)
 validpgpkeys=('EEE420E481E68B71594F192D361CC5EBA0BA909F') # Manish Sinha
-md5sums=('d886be32db0fa351aaf0eb59912ee377'
-         'SKIP'
-         'a7ddf1d853f4942ebf701256d9e5a38f'
-         '69de6af0fa2adc118f731f8230e6671d'
-         '7418197a6909d92ed8e9dab2c0096dbf')
+sha256sums=('53014a08056168171579c210a8e5cfd949a0efe3bd23f6d38cd0ce0b0168841f'
+            'SKIP'
+            '7c930632264720cd2975397ccdee07a09acaba77911dfb870009d47cc4dbd9b7'
+            'bc77831fe729e452753260c9ac120d68fed3535d01c370ff3bfcb5c1a6b57c59'
+            '93b595524dc6811e1ba1c05eebb0ad2373a3bc1bade63098966809c3f1530e5b'
+            '01c4672036e69bc2089398897ae91407d5d25661d450b2d3b62b0ff1670b4122')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -35,6 +37,7 @@
 
   # Fix build
   patch -Np1 -i ../fix-build.patch
+  patch -Np1 -i ../fix-build-2.patch
 
   # Port to gee-0.8
   patch -Np1 -i ../gee-0.8.patch

Added: fix-build-2.patch
===================================================================
--- fix-build-2.patch	                        (rev 0)
+++ fix-build-2.patch	2018-01-15 20:46:20 UTC (rev 282847)
@@ -0,0 +1,60 @@
+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	2018-01-15 21:41:36.620167000 +0100
++++ activity-log-manager-0.9.7/src/unified-privacy-applications.vala	2018-01-15 21:44:26.360957457 +0100
+@@ -263,7 +263,7 @@
+ 				string can_app = can_app_value.get_string();
+ 				if(app == can_app)
+ 				{
+-					this.store.remove(iter);
++					this.store.remove(ref iter);
+ 					break;
+ 				}
+ 				bool more_entires = model.iter_next(ref iter);
+@@ -282,7 +282,7 @@
+ 			if(selection.get_selected(out model, out iter))
+ 			{
+ 				model.get(iter, 2, out app);
+-				this.liststore.remove(iter);
++				this.liststore.remove(ref iter);
+ 			}
+ 
+ 			return app;
+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	2018-01-15 21:41:32.020056000 +0100
++++ activity-log-manager-0.9.7/src/unified-privacy.vala	2018-01-15 21:41:59.804064208 +0100
+@@ -376,7 +376,7 @@
+ 					model.get(iter, 0, out name, 3, out type);
+ 					if(name != null)
+ 					{
+-						exception_list_store.remove(iter);
++						exception_list_store.remove(ref iter);
+ 						if (type == ItemType.FILE)
+ 							this.path_blacklist.unblock(name);
+ 						else
+@@ -437,7 +437,7 @@
+ 				sel.get_selected(out model, out iter);
+ 				string app;
+ 				model.get(iter, 2, out app);
+-				this.app_dialog.liststore.remove (iter);
++				this.app_dialog.liststore.remove (ref iter);
+ 
+ 				// Add the App to View
+ 				app_change_recursive = true;
+@@ -505,7 +505,7 @@
+ 				string cand_folder = can_app_value.get_string();
+ 				if(folder == cand_folder)
+ 				{
+-					this.exception_list_store.remove(iter);
++					this.exception_list_store.remove(ref iter);
+ 					return true;
+ 				}
+ 				bool more_entires = model.iter_next(ref iter);
+@@ -550,7 +550,7 @@
+ 				string can_app = can_app_value.get_string();
+ 				if(app == can_app)
+ 				{
+-					this.exception_list_store.remove(iter);
++					this.exception_list_store.remove(ref iter);
+ 					break;
+ 				}
+ 				bool more_entires = model.iter_next(ref iter);