Date: Thu, 17 Jan 2019 13:53:44 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490562 - in head/x11/metisse: . files Message-ID: <201901171353.x0HDriSw035090@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Thu Jan 17 13:53:43 2019 New Revision: 490562 URL: https://svnweb.freebsd.org/changeset/ports/490562 Log: Unbreak the build against modern compilers caused by some sloppy C++ coding. Modified: head/x11/metisse/Makefile head/x11/metisse/files/patch-FvwmCompositor_main_AScreen.cxx Modified: head/x11/metisse/Makefile ============================================================================== --- head/x11/metisse/Makefile Thu Jan 17 13:48:46 2019 (r490561) +++ head/x11/metisse/Makefile Thu Jan 17 13:53:43 2019 (r490562) @@ -13,8 +13,6 @@ COMMENT= Innovative X-based window system LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build - LIB_DEPENDS= libNucleo.so:x11-toolkits/nucleo \ libpng.so:graphics/png RUN_DEPENDS= xorg-fonts>0:x11-fonts/xorg-fonts @@ -75,6 +73,12 @@ GTK2_USE= GNOME=gtk20 GCONF_USE= GNOME=gconf2,libglade2 post-patch: + @${REINPLACE_CMD} -e '/foldable/s,false),0x0),' \ + ${WRKSRC}/FvwmCompositor/desktop/MetisseDesktop.cxx + @${REINPLACE_CMD} -e '1296s,opt ==,*&,' \ + ${WRKSRC}/FvwmCompositor/fvwmmodule/FvwmModule.cxx + @${REINPLACE_CMD} -e 's,1<<31,1l<<31,' \ + ${WRKSRC}/fvwm-insitu/libs/Module.h # Catch up with new <fribidi-types.h> header name @${REINPLACE_CMD} -e 's,fribidi_types\.h,fribidi-types.h,' \ ${WRKSRC}/fvwm-insitu/libs/FBidi.c Modified: head/x11/metisse/files/patch-FvwmCompositor_main_AScreen.cxx ============================================================================== --- head/x11/metisse/files/patch-FvwmCompositor_main_AScreen.cxx Thu Jan 17 13:48:46 2019 (r490561) +++ head/x11/metisse/files/patch-FvwmCompositor_main_AScreen.cxx Thu Jan 17 13:53:43 2019 (r490562) @@ -1,4 +1,4 @@ ---- FvwmCompositor/main/AScreen.cxx.orig 2008-11-25 10:22:45.000000000 +0000 +--- FvwmCompositor/main/AScreen.cxx.orig 2008-11-25 10:22:45 UTC +++ FvwmCompositor/main/AScreen.cxx @@ -10,6 +10,7 @@ * @@ -8,3 +8,12 @@ #ifdef HAVE_CONFIG_H #include "config-not-xserver.h" #endif +@@ -5159,7 +5160,7 @@ AScreen::AScreen(MetisseDesktop *metisseDesktop, bool + _clipOpWaitForCtrlReleased = false; + _clipAutoRepeatOff = false; + _miIn = false; +- _motionInterceptTk = false; ++ _motionInterceptTk = 0; + _miTkcount = 0; + _miFeed = 0; + _setupRightLongPressTimeOut();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901171353.x0HDriSw035090>