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

fix prototype clash and regen some patches

Browse Source
This commit is contained in:
naddy 2005-11-19 15:37:10 +00:00
parent 39217009b1
commit 03856a9aa5
5 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
audio/xcdplayer/patches/patch-button_setup_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-button_setup_c,v 1.1 2003/08/24 22:15:56 naddy Exp $
--- button_setup.c.orig 1993-01-12 19:59:47.000000000 +0100
+++ button_setup.c 2003-08-24 22:38:23.000000000 +0200
$OpenBSD: patch-button_setup_c,v 1.2 2005/11/19 15:37:10 naddy Exp $
--- button_setup.c.orig Tue Jan 12 11:59:47 1993
+++ button_setup.c Wed Nov 16 21:18:21 2005
@@ -20,6 +20,9 @@
# include <X11/Xaw/Toggle.h>
@ -35,10 +35,11 @@ $OpenBSD: patch-button_setup_c,v 1.1 2003/08/24 22:15:56 naddy Exp $
static Widget buttons_form_widget;
static Widget play_button_widget;
@@ -72,25 +92,6 @@ button_setup(parent_widget)
@@ -71,25 +91,6 @@ button_setup(parent_widget)
Widget parent_widget;
{
Arg args[1];
-
- extern void title_dialog_setup();
- extern void play_button_setup();
- extern void stop_button_setup();
@ -57,7 +58,6 @@ $OpenBSD: patch-button_setup_c,v 1.1 2003/08/24 22:15:56 naddy Exp $
- extern void pgm_button_setup();
- extern void buttons_reset();
-
-
buttons_form_widget = XtCreateManagedWidget("buttonsForm",
formWidgetClass,
parent_widget,

8
audio/xcdplayer/patches/patch-logo_setup_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-logo_setup_c,v 1.1 2003/08/24 22:15:56 naddy Exp $
--- logo_setup.c.orig 1993-01-12 19:59:46.000000000 +0100
+++ logo_setup.c 2003-08-24 23:14:57.000000000 +0200
$OpenBSD: patch-logo_setup_c,v 1.2 2005/11/19 15:37:10 naddy Exp $
--- logo_setup.c.orig Tue Jan 12 11:59:46 1993
+++ logo_setup.c Wed Nov 16 21:18:21 2005
@@ -28,6 +28,9 @@
# include <stdio.h>
@ -31,8 +31,8 @@ $OpenBSD: patch-logo_setup_c,v 1.1 2003/08/24 22:15:56 naddy Exp $
+static void volume_scroll_proc();
+static void popup_title_dialog();
+static void popdown_title_dialog();
+
+
void
logo_setup(parent_widget)
Widget parent_widget;

14
audio/xcdplayer/patches/patch-program_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-program_c,v 1.1 2003/08/24 22:15:56 naddy Exp $
--- program.c.orig 1993-01-12 19:59:49.000000000 +0100
+++ program.c 2003-08-24 23:24:20.000000000 +0200
$OpenBSD: patch-program_c,v 1.2 2005/11/19 15:37:10 naddy Exp $
--- program.c.orig Tue Jan 12 11:59:49 1993
+++ program.c Wed Nov 16 21:18:21 2005
@@ -27,10 +27,13 @@
# include <stdio.h>
@ -32,10 +32,11 @@ $OpenBSD: patch-program_c,v 1.1 2003/08/24 22:15:56 naddy Exp $
void
program_form_setup (parent_widget)
Widget parent_widget;
@@ -67,15 +79,6 @@ program_form_setup (parent_widget)
@@ -66,15 +78,6 @@ program_form_setup (parent_widget)
Widget cancel_button;
Widget save_button;
Widget all_button;
-
- extern void cb_move_program_ptr();
- extern void cb_clear_program();
- extern void cb_cancel_program();
@ -44,7 +45,6 @@ $OpenBSD: patch-program_c,v 1.1 2003/08/24 22:15:56 naddy Exp $
- extern void cb_add_10();
- extern void cb_new_track();
- extern void cb_program_all();
-
/*
* create program form as a non-managed widget, because this
* form "pops up" when requested, as part of the main form, and

13
audio/xcdplayer/patches/patch-shuffle_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-shuffle_c,v 1.1 2003/08/24 22:15:56 naddy Exp $
--- shuffle.c.orig 1993-01-12 19:59:38.000000000 +0100
+++ shuffle.c 2003-08-24 23:17:40.000000000 +0200
$OpenBSD: patch-shuffle_c,v 1.2 2005/11/19 15:37:10 naddy Exp $
--- shuffle.c.orig Tue Jan 12 11:59:38 1993
+++ shuffle.c Sat Nov 19 08:30:06 2005
@@ -18,6 +18,9 @@
# include "debug.h"
@ -11,7 +11,7 @@ $OpenBSD: patch-shuffle_c,v 1.1 2003/08/24 22:15:56 naddy Exp $
#ifdef sun
# include "cdrom_sun.h"
#endif
@@ -29,6 +32,8 @@
@@ -29,10 +32,12 @@
static unsigned char *random_tracks;
@ -20,6 +20,11 @@ $OpenBSD: patch-shuffle_c,v 1.1 2003/08/24 22:15:56 naddy Exp $
void
shuffle_setup() {
extern char *malloc();
-#ifdef sgi
+#if defined sgi || defined __OpenBSD__
extern time_t time(time_t *);
#else
extern long time();
@@ -97,7 +102,7 @@ shuffle_setup() {
random_tracks[i] = try;
}

13
audio/xcdplayer/patches/patch-top_setup_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-top_setup_c,v 1.1 2003/08/24 22:15:56 naddy Exp $
--- top_setup.c.orig 1993-01-12 19:59:40.000000000 +0100
+++ top_setup.c 2003-08-24 23:18:32.000000000 +0200
@@ -26,18 +26,8 @@
$OpenBSD: patch-top_setup_c,v 1.2 2005/11/19 15:37:10 naddy Exp $
--- top_setup.c.orig Tue Jan 12 11:59:40 1993
+++ top_setup.c Wed Nov 16 21:18:21 2005
@@ -26,19 +26,9 @@
# include "logo.xbm"
XtAppContext appc;
@ -17,11 +17,12 @@ $OpenBSD: patch-top_setup_c,v 1.1 2003/08/24 22:15:56 naddy Exp $
-float scanPauseInterval = .062;
-float pausePauseInterval = .500;
-char *cdInfoDir = NULL;
+
+AppData app_data;
+AppData app_data;
+
extern char *getenv();
static Widget top_shell;
@@ -55,36 +45,36 @@ static XrmOptionDescRec options[] = {
};