Date: Sun, 12 Dec 2004 17:45:53 -0500 From: Serge Gagnon <ser_gagnon@sympatico.ca> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/75000: Patch port: audio/wsoundprefs unbroke port Message-ID: <E1CdcTR-0006fP-7X@quenix1.dyndns.org> Resent-Message-ID: <200412122250.iBCMoGci053434@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75000
>Category: ports
>Synopsis: Patch port: audio/wsoundprefs unbroke port
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 12 22:50:16 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Serge Gagnon
>Release: FreeBSD 4.10-STABLE i386
>Organization:
me
>Environment:
System: FreeBSD quenix1.dyndns.org 4.10-STABLE FreeBSD 4.10-STABLE #0: Thu Dec 2 14:23:49 EST 2004 root@quenix1.dyndns.org:/usr/obj/usr/src/sys/OCEAN i386
>Description:
Unbroke this port:
o this port need libXft to link now (patch-Imakefile)
o function WMCreateNormalFont disapear somewhere between version
1.50 and 1.21 of WINGs/wfont.c on the wmaker cvs (patch-WSoundPrefs.c)
o function RDestroyImage is now renamed RReleaseImage (patch-main.c)
Replace file/patch-ab by patch-Imakefile
New file: file/patch-Imakefile
file/patch-WSoundPrefs.c
file/patch-main.c
>How-To-Repeat:
>Fix:
--- patch-Makefile.diff begins here ---
--- Makefile.orig Sun Dec 12 15:53:44 2004
+++ Makefile Sun Dec 12 15:54:06 2004
@@ -15,8 +15,6 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= A utility for configuring sounds to play for Window Maker events
-BROKEN= "Does not build with new version of windowmaker"
-
BUILD_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker
LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \
wsound.1:${PORTSDIR}/audio/wsoundserver
--- patch-Makefile.diff ends here ---
--- patch-Imakefile begins here ---
--- src/Imakefile.orig Mon Oct 18 04:35:58 1999
+++ src/Imakefile Sun Dec 12 16:48:09 2004
@@ -5,9 +5,9 @@
ICONS = WSoundPrefs.xpm WSoundPrefs.tiff
-CC = gcc
+XCOMM CC = gcc
-BINDIR = /Apps/WSoundPrefs.app
+BINDIR = /GNUstep/Apps/WSoundPrefs.app
XCOMM EFENCELIB = -lefence
EFENCELIB =
@@ -18,9 +18,9 @@
WRASTERCFLAGS = `get-wraster-flags --cflags`
WRASTERLFLAGS = `get-wraster-flags --lflags`
WRASTERLIBS = `get-wraster-flags --libs`
-WINGSLIBS = -lWINGs -lPropList
-
-STD_INCLUDES = $(WRASTERCFLAGS) $(WSOUNDCFLAGS)
+WINGSLIBS = -lWINGs -lXft -L/$(LOCALBASE)/lib -lPropList
+
+STD_INCLUDES = $(WRASTERCFLAGS) -I${LOCALBASE}/include -I${X11BASE}/include -I${X11BASE}/include/WINGs
DEPLIBS = $(DEPXLIB)
LOCAL_LIBRARIES = $(XLIB) $(WINGSLIBS) $(WSOUNDLFLAGS) $(WSOUNDLIBS) $(WRASTERLFLAGS) $(WRASTERLIBS) $(EFENCELIB)
@@ -30,7 +30,7 @@
SRCS = PLFunctions.c SoundEvents.c SoundPaths.c SystemInfo.c WSoundPrefs.c main.c
OBJS = PLFunctions.o SoundEvents.o SoundPaths.o SystemInfo.o WSoundPrefs.o main.o
-ComplexProgramTarget(WSoundPrefs)
+ComplexProgramTargetNoMan(WSoundPrefs)
InstallMultiple($(ICONS),$(BINDIR))
--- patch-Imakefile ends here ---
--- patch-WSoundPrefs.c begins here ---
--- src/WSoundPrefs.c.orig Sun Dec 12 17:17:37 2004
+++ src/WSoundPrefs.c Sun Dec 12 17:24:29 2004
@@ -407,7 +407,7 @@
WMResizeWidget(panel->copyrightL, 448, 20);
WMMoveWidget(panel->copyrightL, 8, 178);
WMSetLabelTextAlignment(panel->copyrightL, WACenter);
- font = WMCreateNormalFont(scr, "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*");
+ font = WMCreateFont(scr, "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*");
if (font)
WMSetLabelText(panel->copyrightL, "Copyright \xa9 1999 The Az\xe5rg-r\xfbh");
else {
--- patch-WSoundPrefs.c ends here ---
--- patch-main.c begins here ---
--- src/main.c.orig Sun Dec 12 16:46:36 2004
+++ src/main.c Sun Dec 12 16:46:57 2004
@@ -109,7 +109,7 @@
wwarning(_("could not load image file %s:%s"), path, RMessageForError(RErrorCode));
else {
icon = WMCreatePixmapFromRImage(scr, tmp, 0);
- RDestroyImage(tmp);
+ RReleaseImage(tmp);
if (icon) {
WMSetApplicationIconImage(scr, icon);
WMReleasePixmap(icon);
--- patch-main.c ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1CdcTR-0006fP-7X>