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

Drop old patches.

Browse Source
This commit is contained in:
ajacoutot 2014-03-09 22:29:01 +00:00
parent 914d070206
commit 96ec126fa4
8 changed files with 18 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devel/startup-notification/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.23 2013/11/12 17:55:11 fgsch Exp $
# $OpenBSD: Makefile,v 1.24 2014/03/09 22:29:01 ajacoutot Exp $
COMMENT= library for tracking application startup
DISTNAME= startup-notification-0.12
CATEGORIES= devel x11
REVISION= 1
REVISION= 2
SHARED_LIBS += startup-notification-1 2.0 # .0.0
@ -21,13 +20,13 @@ MASTER_SITES= http://www.freedesktop.org/software/startup-notification/releases
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
# XXX libexecinfo is only needed for regression tests. We do not want to
# add -lexecinfo to LDFLAGS because the main startup-notification
# library does not use/need it, so we just define HAVE_BACKTRACE.
# (see patch-test_Makefile_in)
TEST_DEPENDS= devel/libexecinfo
TEST_DEPENDS= devel/libexecinfo
CFLAGS += -DHAVE_BACKTRACE
.include <bsd.port.mk>

21
devel/startup-notification/patches/patch-libsn_sn-launcher_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-libsn_sn-launcher_c,v 1.4 2011/05/23 12:06:10 ajacoutot Exp $
--- libsn/sn-launcher.c.orig Thu May 5 11:34:34 2011
+++ libsn/sn-launcher.c Mon May 23 08:18:52 2011
@@ -223,7 +223,7 @@ sn_launcher_context_initiate (SnLauncherContext *conte
++i;
names[i] = "SCREEN";
- sprintf (screenbuf, "%d", context->screen);
+ snprintf (screenbuf, sizeof(screenbuf), "%d", context->screen);
values[i] = screenbuf;
++i;
@@ -244,7 +244,7 @@ sn_launcher_context_initiate (SnLauncherContext *conte
if (context->workspace >= 0)
{
names[i] = "DESKTOP";
- sprintf (workspacebuf, "%d", context->workspace);
+ snprintf (workspacebuf, sizeof(workspacebuf), "%d", context->workspace);
values[i] = workspacebuf;
++i;
}

9
devel/startup-notification/patches/patch-libsn_sn-monitor_c
View File

@ -1,5 +1,10 @@
$OpenBSD: patch-libsn_sn-monitor_c,v 1.2 2014/02/18 11:05:33 stsp Exp $
http://cgit.freedesktop.org/startup-notification/commit/?id=a7e49fefde18ea8d5bada8096d32f23bcfb5a6dc
$OpenBSD: patch-libsn_sn-monitor_c,v 1.3 2014/03/09 22:29:01 ajacoutot Exp $
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
--- libsn/sn-monitor.c.orig Tue Nov 5 17:51:49 2013
+++ libsn/sn-monitor.c Tue Nov 5 17:52:50 2013
@@ -364,8 +364,8 @@ sn_startup_sequence_get_screen (SnStartupSequence *seq

9
devel/startup-notification/patches/patch-libsn_sn-monitor_h
View File

@ -1,5 +1,10 @@
$OpenBSD: patch-libsn_sn-monitor_h,v 1.2 2014/02/18 11:05:33 stsp Exp $
http://cgit.freedesktop.org/startup-notification/commit/?id=a7e49fefde18ea8d5bada8096d32f23bcfb5a6dc
$OpenBSD: patch-libsn_sn-monitor_h,v 1.3 2014/03/09 22:29:01 ajacoutot Exp $
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
--- libsn/sn-monitor.h.orig Tue Nov 5 17:53:25 2013
+++ libsn/sn-monitor.h Tue Nov 5 17:53:53 2013
@@ -77,11 +77,11 @@ const char* sn_startup_sequence_get_application_id

51
devel/startup-notification/patches/patch-test_test-launcher-xcb_c
View File

@ -1,51 +0,0 @@
$OpenBSD: patch-test_test-launcher-xcb_c,v 1.1 2009/12/25 21:36:22 phessler Exp $
--- test/test-launcher-xcb.c.orig Fri Dec 25 14:21:32 2009
+++ test/test-launcher-xcb.c Fri Dec 25 14:23:10 2009
@@ -45,15 +45,16 @@ slowly_obtain_timestamp (SnDisplay *display)
xcb_connection_t *xconnection;
xcb_generic_event_t *event;
xcb_screen_t *s;
+ uint32_t attrs[] = { 1, XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY };
+ char* name;
+ xcb_property_notify_event_t *ev;
+ xcb_timestamp_t timestamp;
xconnection = sn_display_get_x_connection (display);
s = xcb_aux_get_screen(xconnection, 0);
{
- uint32_t attrs[] = { 1, XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY };
- char* name;
-
xwindow = xcb_generate_id (xconnection);
xcb_create_window (xconnection, XCB_COPY_FROM_PARENT, xwindow,
@@ -70,8 +71,8 @@ slowly_obtain_timestamp (SnDisplay *display)
xcb_flush (xconnection);
event = xcb_wait_for_event (xconnection);
- xcb_property_notify_event_t *ev = (xcb_property_notify_event_t *) event;
- xcb_timestamp_t timestamp = ev->time;
+ ev = (xcb_property_notify_event_t *) event;
+ timestamp = ev->time;
free (ev);
xcb_destroy_window (xconnection, xwindow);
@@ -87,6 +88,7 @@ main (int argc, char **argv)
SnLauncherContext *context;
xcb_timestamp_t timestamp;
int screen;
+ xcb_generic_event_t *xevent;
if (argc < 2)
{
@@ -131,7 +133,7 @@ main (int argc, char **argv)
while (TRUE)
{
- xcb_generic_event_t *xevent = xcb_wait_for_event (xconnection);
+ xevent = xcb_wait_for_event (xconnection);
sn_xcb_display_process_event (display, xevent);

38
devel/startup-notification/patches/patch-test_test-monitor-xcb_c
View File

@ -1,38 +0,0 @@
$OpenBSD: patch-test_test-monitor-xcb_c,v 1.1 2009/12/25 21:36:22 phessler Exp $
--- test/test-monitor-xcb.c.orig Fri Dec 25 14:15:50 2009
+++ test/test-monitor-xcb.c Fri Dec 25 14:18:19 2009
@@ -36,6 +36,7 @@ monitor_event_func (SnMonitorEvent *event,
{
SnMonitorContext *context;
SnStartupSequence *sequence;
+ const char *s;
context = sn_monitor_event_get_context (event);
sequence = sn_monitor_event_get_startup_sequence (event);
@@ -45,7 +46,6 @@ monitor_event_func (SnMonitorEvent *event,
case SN_MONITOR_EVENT_INITIATED:
case SN_MONITOR_EVENT_CHANGED:
{
- const char *s;
if (sn_monitor_event_get_type (event) == SN_MONITOR_EVENT_INITIATED)
{
@@ -99,6 +99,8 @@ main (int argc, char **argv)
SnDisplay *display;
SnMonitorContext *context;
int screen;
+ xcb_screen_t *s;
+ const uint32_t select_input_val[] = { XCB_EVENT_MASK_PROPERTY_CHANGE };
xconnection = xcb_connect (NULL, &screen);
if (xconnection == NULL)
@@ -111,8 +113,7 @@ main (int argc, char **argv)
* root window (but not all as INITIATE messages go to
* all root windows)
*/
- xcb_screen_t *s = xcb_aux_get_screen (xconnection, screen);
- const uint32_t select_input_val[] = { XCB_EVENT_MASK_PROPERTY_CHANGE };
+ s = xcb_aux_get_screen (xconnection, screen);
xcb_change_window_attributes (xconnection, s->root, XCB_CW_EVENT_MASK,
select_input_val);

19
devel/startup-notification/patches/patch-test_test-send-xmessage-xcb_c
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-test_test-send-xmessage-xcb_c,v 1.1 2009/12/25 21:36:22 phessler Exp $
--- test/test-send-xmessage-xcb.c.orig Fri Dec 25 13:49:47 2009
+++ test/test-send-xmessage-xcb.c Fri Dec 25 13:50:16 2009
@@ -34,6 +34,7 @@ main (int argc, char **argv)
{
xcb_connection_t *xconnection;
SnDisplay *display;
+ int screen;
if (argc != 4)
{
@@ -41,7 +42,6 @@ main (int argc, char **argv)
return 1;
}
- int screen;
xconnection = xcb_connect (NULL, &screen);
if (xconnection == NULL)
{

41
devel/startup-notification/patches/patch-test_test-watch-xmessages-xcb_c
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-test_test-watch-xmessages-xcb_c,v 1.1 2009/12/25 21:36:22 phessler Exp $
--- test/test-watch-xmessages-xcb.c.orig Fri Dec 25 14:25:33 2009
+++ test/test-watch-xmessages-xcb.c Fri Dec 25 14:26:45 2009
@@ -75,6 +75,10 @@ main (int argc, char **argv)
{
xcb_connection_t *xconnection;
SnDisplay *display;
+ int screen;
+ xcb_screen_t *s;
+ const uint32_t select_input_val[] = { XCB_EVENT_MASK_PROPERTY_CHANGE };
+ xcb_generic_event_t *xevent;
if (argc != 3)
{
@@ -82,7 +86,6 @@ main (int argc, char **argv)
return 1;
}
- int screen;
xconnection = xcb_connect (NULL, &screen);
if (xconnection == NULL)
{
@@ -92,8 +95,7 @@ main (int argc, char **argv)
/* We have to select for property events on one root window
*/
- xcb_screen_t *s = xcb_aux_get_screen (xconnection, screen);
- const uint32_t select_input_val[] = { XCB_EVENT_MASK_PROPERTY_CHANGE };
+ s = xcb_aux_get_screen (xconnection, screen);
xcb_change_window_attributes (xconnection, s->root, XCB_CW_EVENT_MASK,
select_input_val);
@@ -106,7 +108,7 @@ main (int argc, char **argv)
while (TRUE)
{
- xcb_generic_event_t *xevent = xcb_wait_for_event (xconnection);
+ xevent = xcb_wait_for_event (xconnection);
sn_xcb_display_process_event (display, xevent);