Include upstream patch for missing #include <sys/select.h>. Fix crash with 32bit kernel and time_t being 64bit.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 149 insertions, 7 deletions

diff --git a/x11-libs/startup-notification/ChangeLog b/x11-libs/startup-notification/ChangeLog
index e0f1e2df5c98..3dc050982a53 100644
--- a/x11-libs/startup-notification/ChangeLog
+++ b/x11-libs/startup-notification/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/startup-notification
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/startup-notification/ChangeLog,v 1.88 2013/02/23 02:49:45 zmedico Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/startup-notification/ChangeLog,v 1.89 2014/02/19 03:40:55 ssuominen Exp $
+
+*startup-notification-0.12-r1 (19 Feb 2014)
+
+  19 Feb 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/startup-notification-0.12-sys-select_h.patch,
+  +files/startup-notification-0.12-time_t-crash-with-32bit.patch,
+  +startup-notification-0.12-r1.ebuild:
+  Include upstream patch for missing #include <sys/select.h>. Fix crash with
+  32bit kernel and time_t being 64bit.
 
   23 Feb 2013; Zac Medico <zmedico@gentoo.org> startup-notification-0.12.ebuild:
   Add ~arm-linux keyword.
diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
index 491955d189d3..f972cf6644bc 100644
--- a/x11-libs/startup-notification/Manifest
+++ b/x11-libs/startup-notification/Manifest
@@ -2,16 +2,23 @@
 Hash: SHA256
 
 AUX startup-notification-0.10-tests.patch 408 SHA256 379caf2a12757163179d5a490c6d1fe346f70a8db4f9b9af609aba28db1b8452 SHA512 863ab2d5beffcb61dd056a3626610841bee99a88b52c477ce723b4c1203d36bfb1c592400e60042c01b8e3de257336cea30bf9b6bc9f8150e4e9d903878b60aa WHIRLPOOL 9de9ca39d876eeb39793758ffc7c1f36e84229e0c37aa1834a4ed0e3e08ef4eb937197b6863395f1b8f4b20e1739ade445c6f4c6929f9a3ad618b203c58eec2f
+AUX startup-notification-0.12-sys-select_h.patch 928 SHA256 82cf80d37b25c4f2aefba9d2acd781e08f23c233d236f24680f80a63b5e40782 SHA512 5f89b2747a2e5d633229b2e858380919121bdfd8f5788898824115fe5c4f60ffb51d0303830b7896657a96f4c2468de0ada0a72782a48cb990d614a1805e91cd WHIRLPOOL 6f286f81670fe60c72f130ffefb1044998e5710027b2f5d9d4ad67eaf3df04b7056830f85c8da3dd61568653509356c31d1b3f75c33f6e9b23b34bc107f7b515
+AUX startup-notification-0.12-time_t-crash-with-32bit.patch 3377 SHA256 1e2054e5de412c377a985fada277814a15d494096605a6e574ba508f1e26e97f SHA512 b1bbef28012a08e265e19296f6f6b1adf4bf82efa2d585680f06a352258deee6f2d8b2f842a8f27febe78f23048afe5f39fe80bd555b826aec927d14a289928d WHIRLPOOL f81bc30c92cc8c2351c9ed0ae64f31b518f465fd454bd14a31e54a01f729dc21513381061849c71c614391ab25d36d8f1f4f94006b2891492f2f2c9ce1d6769b
 DIST startup-notification-0.10.tar.gz 328787 SHA256 64bbeb5c28619721fc19d6920ad2b8bf6c0dc3a0e96a1b0bc26f480fbc525459
 DIST startup-notification-0.12.tar.gz 355285 SHA256 3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a SHA512 ea1246acdb50dafd9ced9914ec3c8f0d499c0ca3cfd447b43a444c768a6e9ea7135e5c42d9ca0089354698ac235bd86d42f12c70a3a17c9c79f998c07461f7ab WHIRLPOOL 3ce5fa69c618785443837df43261a5ed7edb9f0b3c13bf19638b1b7db90814957780099014bd61af51562874dd2c1fafea9134fe0af11521dfbc864d1abc9b88
 EBUILD startup-notification-0.10.ebuild 1219 SHA256 f4c0c0566e65c7d5a0b318e7950ac9eafb40de2c39ea6e71b381228ac148c73e SHA512 553051fcd530aa784de7fdc94f541a286f202fe656b0ba1fdd6454e8b26f86fd6a2748f21d719a63e7c2ba4b6b3765a887ec9bd241b9f64f72782e520fdc4067 WHIRLPOOL 71c8ea0bf29bec086b5010ba56f5c32fff85f1e99d2ccf48c6b1466b33eded36e2fa924a17f1cbcc0f2de749a35e6308fd23568483a150cb0a1d868066a944a8
+EBUILD startup-notification-0.12-r1.ebuild 1064 SHA256 da538238d183178a0e9044384f51119e40e204166399a45df31b1ef7b2930a29 SHA512 4723566b948d2f968e5d5594ac31f1060436b8bdbede9d2c6d499ef3de820259e157c6efb98574b02c399a60c951d4ad93fe5656fb7fca55c72c09e311aa9267 WHIRLPOOL 8579a5b2c1af7df5cbb43c367a433fbafc2f907ec403fde13afb49464cf04674768c3f25a66184167f763b4f866438f4560d2a51876e6e024e4816dc39ad1caf
 EBUILD startup-notification-0.12.ebuild 923 SHA256 56220b753819c13f1fced78d11892e3569fa4c51247d113246d18f54a22dc12d SHA512 9bc72507090f058827ac684efa507070f43f226ffb0df330ffe7dec27e085373c0d4e8d6a7e94606ab33a4bed505683a7bfd7563aaf7c527928df5dbcdbb8c0b WHIRLPOOL 1b1fe3d35678e4fdd39eb610b6d33b114a2491fbcfb9a24882148b33aeaff08afd1ed88ba33c572885400755a1d0334879f8e5c6c44c7a82ff1006425e6eb870
-MISC ChangeLog 9976 SHA256 57a9e25959093b3d44c8d1b0f1f918d97d1f339116dcd3c1a1ceb19b91573aa2 SHA512 ffc09beadf01f93369fc931b8b7cb87b25b655c336c71102136ccfe0f677ccbff2c3b76af50cf181f40d53fcb29fa1b028189637e9027f571f51fa61229b182c WHIRLPOOL 1e640ad0c484efba034335cc0e21f92a3e336045e6089122f9fb2f1d948350d13ddec80887a3a48fe246d8ed071f11d2843cec9d845d1490f50d6970e1b4862a
+MISC ChangeLog 10355 SHA256 6af4addff3bd04f571e2f8d0a1b78921ddb3a60ef558d437e6113a37e29b3c36 SHA512 0a8fcc0d70de67d58eb0b3c142ec6d7410656b92c0d99fbd9de0b2c3a81ca81ad2ed554aa9efeff7ea734814077f35d35a148ed07511c1c9552a0b90a7bbb19d WHIRLPOOL 016ddf928f2a439da40f1d4ef2be141f687df5c698dd39ea3889cfa60fe47ac5a01bc565f9a8d5d77116733a958ac77a4e87ca8d81087c668d9493f79c7eab0e
 MISC metadata.xml 234 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 SHA512 eed880663c66280f6688f896bd6b82d600cac0063eb79da7b1be0fe3bf866e7289edb389a505dfbf45bd9c7e5282748dadd7bf3477759788c1024300796545c3 WHIRLPOOL 79028c7efb93b6255351aebe7f35d1587d07ec1405e8fbee4fd874e42e57e6d10368b0f4ab60c89e115493a094f36af8be1bc2fe79fc2d34daae83dc0f8d7b16
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlEoLksACgkQ/ejvha5XGaPFlACeK5h2tQk72JmkYuk+8jLnmnaX
-2ToAnipzpxO/CjuwXihGVex5FuxC3BPT
-=82q5
+iQEcBAEBCAAGBQJTBCdWAAoJEEdUh39IaPFNrnEH/icKCVHIUyqhC7FBzCphVisC
+JswZ3npqBcMntf84qv/TJKhzSbF+YnvwISqBg4aZ0OyxTKyo6QXqGy9XFmNUOPBV
+94A+UG+GQ1Vs9TWnZDpouggOxYzguf1MZCGjny3dURXM9nrQutCnsxWkfFke7Mf+
+3RVRa4AAK1biCXeJOEU3QtrsAgLnloWv1LVeNpYJUz4pECO8E4BjV37lyJ0ZKYRB
+S7PIThzmRPPODkJdNNYJwAHO2pclLrtcKr8mEDCjzROG0t96d+URO7wY4OkrzAm/
+6n/okt8/au/WB7fEkRQLDzcb+2XV4iOzh0KcfZsaZaH/iSZYmokYMz6s2GvQrjo=
+=QWAH
 -----END PGP SIGNATURE-----
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 <walters@verbum.org>
+Date: Mon, 17 Feb 2014 19:37:09 +0000
+Subject: Add include of <sys/select.h> for previous patch
+
+Unfortunately while the standard says that <sys/types.h> 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, <sys/select.h>
+will give us an unconditional define.
+
+Signed-off-by: Julien Danjou <julien@danjou.info>
+---
+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 <libsn/sn-common.h>
++#include <sys/select.h>
+ 
+ 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 <fgsch@openbsd.org>
+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 <julien@danjou.info>
+---
+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
diff --git a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
new file mode 100644
index 000000000000..76ba82df3fe7
--- /dev/null
+++ b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild,v 1.1 2014/02/19 03:40:55 ssuominen Exp $
+
+EAPI=5
+inherit eutils xorg-2
+
+DESCRIPTION="Application startup notification and feedback library"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/startup-notification"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.4.3
+	>x11-libs/libxcb-1.6
+	>=x11-libs/xcb-util-0.3.8"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+DOCS=( AUTHORS ChangeLog NEWS doc/${PN}.txt )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-sys-select_h.patch \
+		"${FILESDIR}"/${P}-time_t-crash-with-32bit.patch
+	elibtoolize
+}