On Thu, 15 Aug 2013, Christian Weisgerber wrote:
> x11/i3/patches/patch-src_startup_c
Is this ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 Makefile
--- Makefile 13 Aug 2013 10:01:54 -0000 1.68
+++ Makefile 16 Aug 2013 11:23:06 -0000
@@ -3,6 +3,7 @@
COMMENT = improved dynamic tiling window manager
DISTNAME = i3-4.6
+REVISION = 0
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
Index: patches/patch-src_startup_c
===================================================================
RCS file: /cvs/ports/x11/i3/patches/patch-src_startup_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_startup_c
--- patches/patch-src_startup_c 13 Dec 2012 12:10:14 -0000 1.2
+++ patches/patch-src_startup_c 16 Aug 2013 11:23:06 -0000
@@ -1,24 +1,28 @@
$OpenBSD: patch-src_startup_c,v 1.2 2012/12/13 12:10:14 dcoppa Exp $
-On OpenBSD, time_t is an int.
+On OpenBSD, time_t is long long.
---- src/startup.c.orig Thu Dec 13 10:27:52 2012
-+++ src/startup.c Thu Dec 13 10:28:36 2012
-@@ -104,7 +104,7 @@ static int _prune_startup_sequences(void) {
+--- src/startup.c.orig Wed Aug 7 20:50:24 2013
++++ src/startup.c Fri Aug 16 13:18:23 2013
+@@ -104,8 +104,8 @@ static int _prune_startup_sequences(void) {
*/
void startup_sequence_delete(struct Startup_Sequence *sequence) {
assert(sequence != NULL);
- DLOG("Deleting startup sequence %s, delete_at = %ld, current_time =
%ld\n",
-+ DLOG("Deleting startup sequence %s, delete_at = %d, current_time = %d\n",
- sequence->id, sequence->delete_at, time(NULL));
+- sequence->id, sequence->delete_at, time(NULL));
++ DLOG("Deleting startup sequence %s, delete_at = %lld, current_time =
%lld\n",
++ sequence->id, (long long)sequence->delete_at, (long long)time(NULL));
/* Unref the context, will be free()d */
-@@ -246,7 +246,7 @@ void startup_monitor_event(SnMonitorEvent *event, void
+ sn_launcher_context_unref(sequence->context);
+@@ -246,8 +246,8 @@ void startup_monitor_event(SnMonitorEvent *event, void
/* Mark the given sequence for deletion in 30 seconds. */
time_t current_time = time(NULL);
sequence->delete_at = current_time + 30;
- DLOG("Will delete startup sequence %s at timestamp %ld\n",
-+ DLOG("Will delete startup sequence %s at timestamp %d\n",
- sequence->id, sequence->delete_at);
+- sequence->id, sequence->delete_at);
++ DLOG("Will delete startup sequence %s at timestamp %lld\n",
++ sequence->id, (long long)sequence->delete_at);
if (_prune_startup_sequences() == 0) {
+ DLOG("No more startup sequences running, changing root window
cursor to default pointer.\n");
