Date: Tue, 14 Dec 2004 10:06:01 -0500 From: Serge Gagnon <ser_gagnon@sympatico.ca> To: Kirill Ponomarew <krion@FreeBSD.org> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/75000: Patch port: audio/wsoundprefs unbroke port Message-ID: <20041214150348.PZFR1694.tomts36-srv.bellnexxia.net@quenix1.dyndns.org> In-Reply-To: Message from Thierry Thomas <thierry@FreeBSD.org> <20041214064852.GA12508@graf.pompo.net>
next in thread | previous in thread | raw e-mail | index | archive | help
>>>>> On Tue, 14 Dec 2004, >>>>> "Thierry" == Thierry Thomas wrote: Thierry> Le Mar 14 dc 04 0:33:30 +0100, Serge Gagnon <ser_gagnon@sympatico.ca> Thierry> crivait: +> > >>>> On Mon, 13 Dec 2004, +> > >>>> "Kirill" == Kirill Ponomarew wrote: Kirill> Synopsis: Patch port: audio/wsoundprefs unbroke port Kirill> State-Changed-From-To: open->feedback Kirill> State-Changed-By: krion Kirill> State-Changed-When: Mon Dec 13 10:36:35 GMT 2004 Kirill> State-Changed-Why: Kirill> Please submit patches relative to files/ directory. Kirill> http://www.freebsd.org/cgi/query-pr.cgi?pr=75000 +> Sorry, but I'm not sure about what exactly you want (I dont speak +> english) +> You want that I change the name of the file ex: +> patch-src::main.c ? Thierry> Hello Serge, Thierry> I don't speak a better english than yours ;-) , but I'm sure that Kirill Thierry> prefers a `diff -urN audio/wsoundprefs.orig audio/wsoundprefs'. Ahhh! I think that your english is better than the Kirill's one ;) Thank you! diff -urN audio/wsoundprefs.orig/Makefile audio/wsoundprefs/Makefile --- audio/wsoundprefs.orig/Makefile Tue Dec 14 10:00:36 2004 +++ audio/wsoundprefs/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 diff -urN audio/wsoundprefs.orig/files/patch-Imakefile audio/wsoundprefs/files/patch-Imakefile --- audio/wsoundprefs.orig/files/patch-Imakefile Wed Dec 31 19:00:00 1969 +++ audio/wsoundprefs/files/patch-Imakefile Sun Dec 12 17:28:34 2004 @@ -0,0 +1,36 @@ +--- 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)) + diff -urN audio/wsoundprefs.orig/files/patch-WSoundPrefs.c audio/wsoundprefs/files/patch-WSoundPrefs.c --- audio/wsoundprefs.orig/files/patch-WSoundPrefs.c Wed Dec 31 19:00:00 1969 +++ audio/wsoundprefs/files/patch-WSoundPrefs.c Sun Dec 12 17:25:01 2004 @@ -0,0 +1,11 @@ +--- 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 { diff -urN audio/wsoundprefs.orig/files/patch-ab audio/wsoundprefs/files/patch-ab --- audio/wsoundprefs.orig/files/patch-ab Tue Dec 14 10:00:36 2004 +++ audio/wsoundprefs/files/patch-ab Wed Dec 31 19:00:00 1969 @@ -1,36 +0,0 @@ ---- src/Imakefile.orig Mon Oct 18 17:35:58 1999 -+++ src/Imakefile Sun Dec 10 17:09:01 2000 -@@ -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 -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)) - diff -urN audio/wsoundprefs.orig/files/patch-main.c audio/wsoundprefs/files/patch-main.c --- audio/wsoundprefs.orig/files/patch-main.c Wed Dec 31 19:00:00 1969 +++ audio/wsoundprefs/files/patch-main.c Sun Dec 12 17:28:12 2004 @@ -0,0 +1,11 @@ +--- 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041214150348.PZFR1694.tomts36-srv.bellnexxia.net>