Bug#874018: compiz: FTBFS on x32 (time_t vs long confusion)

[Adam Borowski]

Package: compiz
Version: 1:0.9.13.0+16.10.20160818.2-5.1
Severity: normal
Tags: patch

Hi!
Here's a patch that fixes FTBFS on x32.  Compiz's code provides *time_t
while libstartup-notification wants *long.

This will happen a lot more in the future as the y2038 team wants to
redefine time_t as 64-bit on old 32-bit archs too.


Meow!
-- System Information:
Debian Release: buster/sid
  APT prefers unreleased
  APT policy: (500, 'unreleased'), (500, 'unstable')
Architecture: x32 (x86_64)
Foreign Architectures: amd64

Kernel: Linux 4.12.0-1-amd64 (SMP w/6 CPU cores)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en 
(charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)

Versions of packages compiz depends on:
ii  compiz-core             1:0.9.13.0+16.10.20160818.2-5.1+x32
ii  compiz-gnome            1:0.9.13.0+16.10.20160818.2-5.1+x32
ii  compiz-plugins-default  1:0.9.13.0+16.10.20160818.2-5.1+x32

compiz recommends no packages.

compiz suggests no packages.

-- no debconf information

--- compiz-0.9.13.0+16.10.20160818.2.orig/src/screen.cpp
+++ compiz-0.9.13.0+16.10.20160818.2/src/screen.cpp
@@ -2163,19 +2163,20 @@
 bool
 cps::StartupSequence::handleStartupSequenceTimeout ()
 {
-    struct timeval     now, active;
+    struct timeval     now;
     double             elapsed;
 
     gettimeofday (&now, NULL);
 
     foreach (CompStartupSequence *s, startupSequences)
     {
+       long active_sec, active_usec;
        sn_startup_sequence_get_last_active_time (s->sequence,
-                                                 &active.tv_sec,
-                                                 &active.tv_usec);
+                                                 &active_sec,
+                                                 &active_usec);
 
-       elapsed = ((((double) now.tv_sec - active.tv_sec) * 1000000.0 +
-                   (now.tv_usec - active.tv_usec))) / 1000.0;
+       elapsed = ((((double) now.tv_sec - active_sec) * 1000000.0 +
+                   (now.tv_usec - active_usec))) / 1000.0;
 
        if (elapsed > STARTUP_TIMEOUT_DELAY)
            sn_startup_sequence_complete (s->sequence);