Hi ports, > http://build-failures.rhaalovely.net//powerpc/2018-12-14/x11/xscreensaver.log > http://build-failures.rhaalovely.net//sparc64/2018-12-19/x11/xscreensaver.log
What i'm proposing here is simply let ports-gcc build it on ports-gcc archs, instead of using base-gcc. This reduces the patchwork that would be needed as well. It has been tested successfully with: - macppc+ports-gcc4.9 [0] - macppc+ports-gcc8.2 [1] - i have tested on amd64 just to be sure ;) Any comments or feedback? Charlène. [0] https://clbin.com/1g5xz [1] https://bsd.network/@julianaito/101460234765727687 Index: Makefile =================================================================== RCS file: /cvs/ports/x11/xscreensaver/Makefile,v retrieving revision 1.101 diff -u -p -r1.101 Makefile --- Makefile 19 Jan 2019 15:02:39 -0000 1.101 +++ Makefile 22 Jan 2019 20:36:35 -0000 @@ -5,6 +5,8 @@ COMMENT= screen saver and locker for th # XXX x11/kde4/artwork plist may need regen if an update adds a new hack. DISTNAME= xscreensaver-5.42 +REVISION= 0 + CATEGORIES= x11 HOMEPAGE= http://www.jwz.org/xscreensaver/ @@ -21,6 +23,8 @@ WANTLIB += jpeg m pango-1.0 pangocairo-1 WANTLIB += util xml2 z MASTER_SITES= ${HOMEPAGE} + +COMPILER= base-clang ports-gcc MODULES= textproc/intltool Index: patches/patch-hacks_fontglide_c =================================================================== RCS file: patches/patch-hacks_fontglide_c diff -N patches/patch-hacks_fontglide_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-hacks_fontglide_c 22 Jan 2019 20:36:35 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ +Change C++ styled comments to C ones, unbreak the build with ports-gcc +Index: hacks/fontglide.c +--- hacks/fontglide.c.orig ++++ hacks/fontglide.c +@@ -2421,8 +2421,9 @@ fontglide_free (Display *dpy, Window window, void *clo + + textclient_close (s->tc); + +-// if (s->b && s->b != s->window) XFreePixmap (dpy, s->b); +-// if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba); ++/* if (s->b && s->b != s->window) XFreePixmap (dpy, s->b); ++ if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba); ++*/ + XFreeGC (dpy, s->bg_gc); + if (s->charset) free (s->charset); + if (s->font_override) free (s->font_override);
