cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge some patches from upstream to better deal with new glib2 and new vala.

Browse Source 
ok jasper@ (maintainer)
This commit is contained in:
ajacoutot 2014-04-06 12:09:14 +00:00
parent 6ce5c27c5f
commit 5a24cf3464
3 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
productivity/zeitgeist/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.21 2014/04/03 12:37:41 jasper Exp $
# $OpenBSD: Makefile,v 1.22 2014/04/06 12:09:14 ajacoutot Exp $
COMMENT = event logging framework
V = 0.9.14
DISTNAME = zeitgeist-${V}
EPOCH = 0
REVISION = 3
REVISION = 4
SHARED_LIBS += zeitgeist-2.0 0.0 # 0.0
@ -56,4 +56,12 @@ FAKE_FLAGS= zeitgeistdocdir="${PREFIX}/share/doc/zeitgeist/" \
CONFIGURE_STYLE = gnu
# http://cgit.freedesktop.org/zeitgeist/zeitgeist/patch/?id=d2c966faf4979b5745ea0df8062795fc82b9fcc1
pre-configure:
.for i in datahub/Makefile.in examples/vala/Makefile.in extensions/Makefile.in \
extensions/fts++/Makefile.in libzeitgeist/Makefile.in src/Makefile.in \
test/direct/Makefile.in
perl -pi -e 's,--target-glib=2.26,--target-glib=2.36,g' ${WRKSRC}/$i
.endfor
.include <bsd.port.mk>

22
productivity/zeitgeist/patches/patch-libzeitgeist_log_vala
View File

@ -1,12 +1,17 @@
$OpenBSD: patch-libzeitgeist_log_vala,v 1.4 2014/03/09 22:31:54 ajacoutot Exp $
$OpenBSD: patch-libzeitgeist_log_vala,v 1.5 2014/04/06 12:09:14 ajacoutot Exp $
From 3fe95cdb5a4c48d3b6606ffb1f60fae3e375fdff Mon Sep 17 00:00:00 2001
From: Seif Lotfy <seif@lotfy.com>
Date: Tue, 04 Mar 2014 19:55:53 +0000
Subject: Replace get_nprocs_conf with g_get_num_processors()
--- libzeitgeist/log.vala.orig Mon Jun 17 08:40:08 2013
+++ libzeitgeist/log.vala Thu Mar 6 09:01:29 2014
From d2c966faf4979b5745ea0df8062795fc82b9fcc1 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 17 Mar 2014 20:02:01 +0000
Subject: Require glib >= 2.35.4 according to the usage of g_get_num_processors()
--- libzeitgeist/log.vala.orig Sun Apr 6 13:39:13 2014
+++ libzeitgeist/log.vala Sun Apr 6 13:39:07 2014
@@ -40,6 +40,7 @@
* Zeitgeist also comes with a blacklist extension to make sure the user
* always stays in control of what information is logged.
@ -15,18 +20,17 @@ Subject: Replace get_nprocs_conf with g_get_num_processors()
namespace Zeitgeist
{
@@ -58,8 +59,8 @@ namespace Zeitgeist
@@ -58,9 +59,6 @@ namespace Zeitgeist
*/
public class Log : QueuedProxyWrapper
{
- [CCode (cheader_filename = "sys/sysinfo.h", cname = "get_nprocs_conf")]
- extern static int get_nprocs_conf ();
+ [CCode (cname = "g_get_num_processors")]
+ private extern static uint get_num_processors ();
-
class DbWorker
{
@@ -141,7 +142,7 @@ public class Log : QueuedProxyWrapper
private unowned ThreadFunc<void*> func;
@@ -141,7 +139,7 @@ public class Log : QueuedProxyWrapper
try {
threads = new ThreadPool<DbWorker>.with_owned_data ((worker) => {
worker.run ();
@ -35,7 +39,7 @@ Subject: Replace get_nprocs_conf with g_get_num_processors()
} catch (ThreadError err) {
warning ("%s", err.message);
threads = null;
@@ -637,4 +638,3 @@ public class Log : QueuedProxyWrapper
@@ -637,4 +635,3 @@ public class Log : QueuedProxyWrapper
}

21
productivity/zeitgeist/patches/patch-libzeitgeist_where-clause_vala Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-libzeitgeist_where-clause_vala,v 1.1 2014/04/06 12:09:14 ajacoutot Exp $
From 201bd67de450320520a12e2b0c465c8eb6818bd2 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 17 Mar 2014 19:57:49 +0000
Subject: WhereClause: Fix array-length to work with string.joinv of vala-0.24
--- libzeitgeist/where-clause.vala.orig Mon Jun 17 08:40:08 2013
+++ libzeitgeist/where-clause.vala Sun Apr 6 13:35:53 2014
@@ -211,7 +211,11 @@ namespace Zeitgeist
*/
private T[] generic_array_to_unowned_array<T> (GenericArray<T> gptrarr)
{
+#if VALA_0_24
+ long[] pointers = new long[gptrarr.length];
+#else
long[] pointers = new long[gptrarr.length + 1];
+#endif
Memory.copy(pointers, ((PtrArray *) gptrarr)->pdata,
(gptrarr.length) * sizeof (void *));
return (T[]) pointers;