Date: Wed, 12 Mar 2014 18:32:16 -0400 From: Thomas Hoffmann <trh411@gmail.com> To: svn-ports-all@freebsd.org, ports-committers@freebsd.org, svn-ports-head@freebsd.org Cc: Thierry Thomas <thierry@freebsd.org> Subject: Re: svn commit: r348011 - in head/x11/rxvt-unicode: . files Message-ID: <CAB7-odkr_VyYPKec2iUTY_AOaezT4ys7XQkdBiY1tyK1DLHE8g@mail.gmail.com> In-Reply-To: <201403122157.s2CLv55V021389@svn.freebsd.org> References: <201403122157.s2CLv55V021389@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Mar 12, 2014 at 5:57 PM, Thierry Thomas <thierry@freebsd.org> wrote: > Author: thierry > Date: Wed Mar 12 21:57:05 2014 > New Revision: 348011 > URL: http://svnweb.freebsd.org/changeset/ports/348011 > QAT: https://qat.redports.org/buildarchive/r348011/ > > Log: > Do not require GCC anymore: mousewheel is now supported with clang! > > Since I'm there, do some cleaning and follow the new rules. > > PR: ports/187462 > Submitted by: Christophe Juniet <c.juniet (at) gmail.com> > > Added: > head/x11/rxvt-unicode/files/patch-src_rxvt.h (contents, props changed) > Modified: > head/x11/rxvt-unicode/Makefile > > Modified: head/x11/rxvt-unicode/Makefile > > ============================================================================== > --- head/x11/rxvt-unicode/Makefile Wed Mar 12 21:51:28 2014 > (r348010) > +++ head/x11/rxvt-unicode/Makefile Wed Mar 12 21:57:05 2014 > (r348011) > @@ -3,7 +3,7 @@ > > PORTNAME= rxvt-unicode > PORTVERSION= 9.19 > -PORTREVISION= 1 > +PORTREVISION= 2 > CATEGORIES= x11 > MASTER_SITES= http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/ > MASTER_SITE_SUBDIR= . Attic > @@ -18,14 +18,13 @@ BUILD_DEPENDS= tic:${PORTSDIR}/devel/ncu > RUN_DEPENDS= ${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig > \ > > ${LOCALBASE}/share/misc/terminfo.db:${PORTSDIR}/devel/ncurses > > -USES= pkgconfig shebangfix > +USES= pkgconfig shebangfix tar:bzip2 > USE_XORG= xpm xft xrender > GNU_CONFIGURE= yes > CPPFLAGS+= -I${LOCALBASE}/include > CONFIGURE_ENV= LIBS="-lstdc++ -lutil" TIC=${LOCALBASE}/bin/tic > CONFIGURE_ARGS= --enable-everything --with-term=rxvt \ > --with-terminfo=${LOCALBASE}/share/misc/terminfo.db > -USE_BZIP2= yes > > OPTIONS_DEFINE= PERL XIM UNICODE3 ISO14755 COMBINING > RXVT_SCROLLBAR \ > NEXT_SCROLLBAR XTERM_SCROLLBAR BACKSPACE_KEY DELETE_KEY \ > @@ -129,8 +128,6 @@ CONFIGURE_ARGS+= --disable-delete-key > # enable scrolling via mouse wheel or buttons 4 & 5 > .if !${PORT_OPTIONS:MMOUSEWHEEL} > CONFIGURE_ARGS+= --disable-mousewheel > -.else > -USE_GCC= yes # segfaults when trying to scroll with the > mouse wheel if clang > .endif > > # enable smart resize > @@ -153,7 +150,7 @@ CONFIGURE_ARGS+= --enable-pixbuf > CONFIGURE_ARGS+= --disable-startup-notification > .else > CONFIGURE_ARGS+= --enable-startup-notification > -LIB_DEPENDS+= > startup-notification-1:${PORTSDIR}/x11/startup-notification > +LIB_DEPENDS+= > libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification > .endif > > # enable support for 256 colors > > Added: head/x11/rxvt-unicode/files/patch-src_rxvt.h > > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/x11/rxvt-unicode/files/patch-src_rxvt.h Wed Mar 12 > 21:57:05 2014 (r348011) > @@ -0,0 +1,11 @@ > +--- src/rxvt.h.orig 2013-10-03 01:05:18.000000000 +0200 > ++++ src/rxvt.h 2014-03-12 22:52:58.000000000 +0100 > +@@ -1540,7 +1540,7 @@ > + bool scr_page (int nlines) NOTHROW; > + bool scr_page (enum page_dirn direction, int nlines) NOTHROW > + { > +- scr_page (direction * nlines); > ++ return scr_page (direction * nlines); > + } > + bool scr_changeview (int new_view_start) NOTHROW; > + void scr_bell () NOTHROW; > _______________________________________________ > Glad to see the requirement for gcc go away, but this does not build for me on -CURRENT r263062 amd64. I get: --- rxvtperl.o --- c++ -I.. -I. -I. -I./../libev -I./../libptytty/src -DHAVE_CONFIG_H -I/usr/local/include -D_THREAD_SAFE -I/usr/local/include -D_THREAD_SAFE -I/usr/local/include -I/usr/local/include/freetype2 -I/usr/local/include -I/usr/local/include/freetype2 -O2 -pipe -fno-strict-aliasing -w -I/usr/local/include -I/usr/local/include/gdk-pixbuf-2.0 -pthread -I/usr/local/include/glib-2.0 -I/usr/local/include -I/usr/local/include/libpng15 -DAPPLLIB_EXP="/usr/local/lib/perl5/5.16/BSDPAN" -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H -fno-strict-aliasing -pipe -fstack-protector -I/usr/local/include -I/usr/local/lib/perl5/5.16/mach/CORE -DLIBDIR="\"/usr/local/lib/urxvt\"" -c rxvtperl.C --- rxvtc --- c++ -o rxvtc rxvtc.o rxvtdaemon.o fdpass_wrapper.o -lstdc++ -lutil -lm --- rxvtperl.o --- ./rxvtperl.c:5493:5: error: declaration of 'Perl___notused' has a different language linkage dVAR; dXSARGS; ^ /usr/local/lib/perl5/5.16/mach/CORE/perl.h:174:17: note: expanded from macro 'dVAR' # define dVAR dNOOP ^ /usr/local/lib/perl5/5.16/mach/CORE/perl.h:362:26: note: expanded from macro 'dNOOP' #define dNOOP extern int Perl___notused(void) ^ ./rxvtperl.c:925:5: note: previous declaration is here dVAR; dXSARGS; ^ /usr/local/lib/perl5/5.16/mach/CORE/perl.h:174:17: note: expanded from macro 'dVAR' # define dVAR dNOOP ^ /usr/local/lib/perl5/5.16/mach/CORE/perl.h:362:26: note: expanded from macro 'dNOOP' #define dNOOP extern int Perl___notused(void) ^ 1 error generated. *** [rxvtperl.o] Error code 1 make[3]: stopped in /usr/ports/x11/rxvt-unicode/work/rxvt-unicode-9.19/src 1 error My last successful build was 9.19_1 on 3/10/2014. Thanks. -Tom
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAB7-odkr_VyYPKec2iUTY_AOaezT4ys7XQkdBiY1tyK1DLHE8g>