From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../startup-notification-0.12-sys-select_h.patch | 30 ++++++++++ ...notification-0.12-time_t-crash-with-32bit.patch | 66 ++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch create mode 100644 x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch (limited to 'x11-libs/startup-notification/files') diff --git a/x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch b/x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch new file mode 100644 index 000000000000..8c579a71522f --- /dev/null +++ b/x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch @@ -0,0 +1,30 @@ +From ea9f7e4cc6fd8c08d175ed7774ed2c5bd11c8ef0 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 17 Feb 2014 19:37:09 +0000 +Subject: Add include of for previous patch + +Unfortunately while the standard says that is the +correct header to get suseconds_t, at least with glibc, that requires +-DXOPEN_SOURCE. Which is problematic for a public header, because +then all *users* of startup-notification will be required to define +that. + +Poking around a bit, it looks like at least with glibc, +will give us an unconditional define. + +Signed-off-by: Julien Danjou +--- +diff --git a/libsn/sn-monitor.h b/libsn/sn-monitor.h +index 2f639df..cea4e12 100644 +--- a/libsn/sn-monitor.h ++++ b/libsn/sn-monitor.h +@@ -28,6 +28,7 @@ + #define __SN_MONITOR_H__ + + #include ++#include + + SN_BEGIN_DECLS + +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch b/x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch new file mode 100644 index 000000000000..710d29e93976 --- /dev/null +++ b/x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch @@ -0,0 +1,66 @@ +From a7e49fefde18ea8d5bada8096d32f23bcfb5a6dc Mon Sep 17 00:00:00 2001 +From: Federico G. Schwindt +Date: Mon, 17 Feb 2014 14:48:12 +0000 +Subject: Fix crash on 32bit architectures where time_t is 64 bit + +This is an ABI change on platforms where sizeof(time_t) doesn't equal +sizeof(long). For most platforms this change shouldn't make a difference +at present. OpenBSD recently switched to 64bit time_t on all architectures +to avoid time_t overflow in 2038 on 32bit machines. + +This fix extends to consumers of startup-notification, for instance +the window manager of XFCE, which is how I got involved in this. +See http://mail.xfce.org/pipermail/xfce4-dev/2014-February/030611.html +and follow-ups. The XFCE devs pointed out that my patch to fix a +crash in XFCE's window manager depends on this startup-notification patch. + +Signed-off-by: Julien Danjou +--- +diff --git a/libsn/sn-monitor.c b/libsn/sn-monitor.c +index 2a9ad16..f419bc1 100644 +--- a/libsn/sn-monitor.c ++++ b/libsn/sn-monitor.c +@@ -364,8 +364,8 @@ sn_startup_sequence_get_screen (SnStartupSequence *sequence) + **/ + void + sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence, +- long *tv_sec, +- long *tv_usec) ++ time_t *tv_sec, ++ suseconds_t *tv_usec) + { + if (tv_sec) + *tv_sec = sequence->initiation_time.tv_sec; +@@ -386,8 +386,8 @@ sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence, + **/ + void + sn_startup_sequence_get_last_active_time (SnStartupSequence *sequence, +- long *tv_sec, +- long *tv_usec) ++ time_t *tv_sec, ++ suseconds_t *tv_usec) + { + /* for now the same as get_initiated_time */ + if (tv_sec) +diff --git a/libsn/sn-monitor.h b/libsn/sn-monitor.h +index b58581f..2f639df 100644 +--- a/libsn/sn-monitor.h ++++ b/libsn/sn-monitor.h +@@ -77,11 +77,11 @@ const char* sn_startup_sequence_get_application_id (SnStartupSequence *se + int sn_startup_sequence_get_screen (SnStartupSequence *sequence); + + void sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence, +- long *tv_sec, +- long *tv_usec); ++ time_t *tv_sec, ++ suseconds_t *tv_usec); + void sn_startup_sequence_get_last_active_time (SnStartupSequence *sequence, +- long *tv_sec, +- long *tv_usec); ++ time_t *tv_sec, ++ suseconds_t *tv_usec); + + void sn_startup_sequence_complete (SnStartupSequence *sequence); + +-- +cgit v0.9.0.2-2-gbebe -- cgit v1.2.3