Attachment #131518 for bug #175596

View | Details | Raw Unified | Return to bug 175596
Collapse All | Expand All




PORTVERSION=	1.2
PORTREVISION=	2
CATEGORIES=	x11
MASTER_SITES=	XCONTRIB/../R5contrib
DISTNAME=	${PORTNAME}
EXTRACT_SUFX=	.tar.Z

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Find colour values by graphical colour mixing

USE_IMAKE=	yes
USE_XORG=	ice sm x11 xaw xext xmu xpm xt
USE_IMAKE=	yes
MAKE_JOBS_SAFE=	yes

MANCOMPRESSED=	yes
MAN1=		xcoloredit.1
PLIST_FILES=	bin/xcoloredit

.include <bsd.port.mk>




--- xcoloredit.c.orig	Wed May 30 22:10:09 2007
+++ xcoloredit.c	Wed May 30 22:10:57 2007
@@ -38,6 +38,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <X11/Xatom.h>
 #include <X11/X.h>
 #include <X11/Intrinsic.h>
@@ -50,6 +51,7 @@
 #include <X11/Xaw/Form.h>
 #include <X11/Xaw/Box.h>
 #include <X11/Xmu/Atoms.h>
+#include <X11/Xmu/StdSel.h>
 #include "Xcoloredit.h"
 #include "color.h"
 
@@ -85,6 +87,7 @@
 static void move_scroll();
 static void change_text_colour();
 

 
 #define MEMORY_OFFSET	8
 #define NUM_MEMORIES	36
@@ -182,8 +185,8 @@
 #undef offset
 
 
-void main(argc, argv)
-unsigned int argc;
+int main(argc, argv)
+int argc;
 char **argv;
 {
 	Status ok;
@@ -696,7 +699,7 @@
 								(float)0.025);
 	XawScrollbarSetThumb(valScroll, (float)(1.0 - hsv_values.v),
 								(float)0.025);
-#endif SOLID_THUMB
+#endif /* SOLID_THUMB */
 }
 
 
@@ -878,7 +881,7 @@
 	XawScrollbarSetThumb(w, top, (float)(1.0 - top));
 #else
 	XawScrollbarSetThumb(w, top, (float)0.025);
-#endif SOLID_THUMB
+#endif /* SOLID_THUMB */
 
 	do_change = FALSE;
 	pass_value = 1.0 - rgb_values.r/65536.0;
@@ -941,7 +944,7 @@
 	XawScrollbarSetThumb(w, top, (float)(1.0 - top));
 #else
 	XawScrollbarSetThumb(w, top, (float)0.025);
-#endif SOLID_THUMB
+#endif /* SOLID_THUMB */
 	move_lock();
 }
 
@@ -960,7 +963,7 @@
 						(float)(1.0 - locked_top));
 #else
 	XawScrollbarSetThumb(lockedScroll, locked_top, (float)0.025);
-#endif SOLID_THUMB
+#endif /* SOLID_THUMB */
 }
 
 
@@ -986,8 +989,8 @@
 unsigned long *length;
 int *format;
 {
-	if (XmuConvertStandardSelection(w, selection, target, type, value,
-	    length, format))
+	if (XmuConvertStandardSelection(w, (Time)0, selection, target, type,
+	    (XPointer *)value, length, format))
 		return TRUE;
 
 	if (*target == XA_STRING) {

Return to bug 175596

Lines 9-25 Link Here

(-)x11/xcoloredit/Makefile (-3 / +5 lines)
9	PORTVERSION= 1.2	9	PORTVERSION= 1.2
10	PORTREVISION= 2	10	PORTREVISION= 2
11	CATEGORIES= x11	11	CATEGORIES= x11
12	MASTER_SITES= ftp://ftp.x.org/R5contrib/	12	MASTER_SITES= XCONTRIB/../R5contrib
13	DISTNAME= ${PORTNAME}	13	DISTNAME= ${PORTNAME}
14	EXTRACT_SUFX= .tar.Z	14	EXTRACT_SUFX= .tar.Z
15		15
16	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= ports@FreeBSD.org
17	COMMENT= Find colour values by graphical colour mixing	17	COMMENT= Find colour values by graphical colour mixing
18		18
19	USE_IMAKE= yes
20	USE_XORG= ice sm x11 xaw xext xmu xpm xt	19	USE_XORG= ice sm x11 xaw xext xmu xpm xt
21	MAN1= xcoloredit.1	20	USE_IMAKE= yes
		21	MAKE_JOBS_SAFE= yes
		22
22	MANCOMPRESSED= yes	23	MANCOMPRESSED= yes
		24	MAN1= xcoloredit.1
23	PLIST_FILES= bin/xcoloredit	25	PLIST_FILES= bin/xcoloredit
24		26
25	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)x11/xcoloredit/files/patch-xcoloredit.c (-1 / +75 lines)
1	--- xcoloredit.c.orig Wed May 30 22:10:09 2007	1	--- xcoloredit.c.orig Wed May 30 22:10:09 2007
2	+++ xcoloredit.c Wed May 30 22:10:57 2007	2	+++ xcoloredit.c Wed May 30 22:10:57 2007
3	@@ -85,6 +85,7 @@	3	@@ -38,6 +38,7 @@
		4	*/
		5
		6	#include <stdio.h>
		7	+#include <stdlib.h>
		8	#include <X11/Xatom.h>
		9	#include <X11/X.h>
		10	#include <X11/Intrinsic.h>
		11	@@ -50,6 +51,7 @@
		12	#include <X11/Xaw/Form.h>
		13	#include <X11/Xaw/Box.h>
		14	#include <X11/Xmu/Atoms.h>
		15	+#include <X11/Xmu/StdSel.h>
		16	#include "Xcoloredit.h"
		17	#include "color.h"
		18
		19	@@ -85,6 +87,7 @@
4	static void move_scroll();	20	static void move_scroll();
5	static void change_text_colour();	21	static void change_text_colour();
6		22
Lines 8-10 Link Here
8		24
9	#define MEMORY_OFFSET 8	25	#define MEMORY_OFFSET 8
10	#define NUM_MEMORIES 36	26	#define NUM_MEMORIES 36
		27	@@ -182,8 +185,8 @@
		28	#undef offset
		29
		30
		31	-void main(argc, argv)
		32	-unsigned int argc;
		33	+int main(argc, argv)
		34	+int argc;
		35	char **argv;
		36	{
		37	Status ok;
		38	@@ -696,7 +699,7 @@
		39	(float)0.025);
		40	XawScrollbarSetThumb(valScroll, (float)(1.0 - hsv_values.v),
		41	(float)0.025);
		42	-#endif SOLID_THUMB
		43	+#endif /* SOLID_THUMB */
		44	}
		45
		46
		47	@@ -878,7 +881,7 @@
		48	XawScrollbarSetThumb(w, top, (float)(1.0 - top));
		49	#else
		50	XawScrollbarSetThumb(w, top, (float)0.025);
		51	-#endif SOLID_THUMB
		52	+#endif /* SOLID_THUMB */
		53
		54	do_change = FALSE;
		55	pass_value = 1.0 - rgb_values.r/65536.0;
		56	@@ -941,7 +944,7 @@
		57	XawScrollbarSetThumb(w, top, (float)(1.0 - top));
		58	#else
		59	XawScrollbarSetThumb(w, top, (float)0.025);
		60	-#endif SOLID_THUMB
		61	+#endif /* SOLID_THUMB */
		62	move_lock();
		63	}
		64
		65	@@ -960,7 +963,7 @@
		66	(float)(1.0 - locked_top));
		67	#else
		68	XawScrollbarSetThumb(lockedScroll, locked_top, (float)0.025);
		69	-#endif SOLID_THUMB
		70	+#endif /* SOLID_THUMB */
		71	}
		72
		73
		74	@@ -986,8 +989,8 @@
		75	unsigned long *length;
		76	int *format;
		77	{
		78	- if (XmuConvertStandardSelection(w, selection, target, type, value,
		79	- length, format))
		80	+ if (XmuConvertStandardSelection(w, (Time)0, selection, target, type,
		81	+ (XPointer *)value, length, format))
		82	return TRUE;
		83
		84	if (*target == XA_STRING) {