On Mon Jul 04, 2016 at 06:58:17PM +0200, Landry Breuil wrote: > On Mon, Jul 04, 2016 at 05:46:36PM +0200, Rafael Sadowski wrote: > > On Mon Jul 04, 2016 at 09:43:34AM +0200, Landry Breuil wrote: > > > On Sun, Jul 03, 2016 at 09:03:26PM +0200, Rafael Sadowski wrote: > > > > Hi ports@ > > > > > > > > Masao Uebayashi sent me the following crash description: > > > > > > > > On Tue Jun 28, 2016 at 01:57:52PM +0900, Masao Uebayashi wrote: > > > > > On Mon, Jun 27, 2016 at 07:51:05PM +0900, Masao Uebayashi wrote: > > > > > > Could you help fixing another crash? > > > > > > > > > > > > 1) Create a grid and enable snapping > > > > > > 2) Enable v"Snap cusp nodes, incl. rectangle corners" > > > > > > 3) F4, and make a rectanble > > > > > > 4) F1, and duplicate it (Ctrl-D) > > > > > > 5) F1, then move a duplicated rectangle around > > > > > > > > > > Simpler: > > > > > > > > > > 1) Create a grid and enable snapping > > > > > 2) Enable "Snap cusp nodes, incl. rectangle corners" > > > > > 3) F2, and move around any snappable point > > > > > > > > I fixed the crash and he test and confirmed that the problem he had is > > > > gone. > > > > > > > > The diff below includes: > > > > > > > > - Makefile cleanup. > > > > - fix grid with snapping options. > > > > > > Please, dont mix 'real fixes' with 'stylistic changes in the Makefile' > > > ... > > > > > > Landry > > > > > > Patch without Makefile cleanup: > > Commited, thanks ! Can you push it upstream if it wasnt a backport ? > > Landry
Thanks Landry. Of course, all patches go upstream. OK for separate Makefile cleanup diff? Rafael Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/inkscape/Makefile,v retrieving revision 1.51 diff -u -p -u -p -r1.51 Makefile --- Makefile 4 Jul 2016 16:57:46 -0000 1.51 +++ Makefile 4 Jul 2016 17:28:24 -0000 @@ -1,21 +1,21 @@ # $OpenBSD: Makefile,v 1.51 2016/07/04 16:57:46 landry Exp $ # XXX check if still needed at next update -CXXFLAGS += -std=c++11 +CXXFLAGS += -std=c++11 -COMMENT= SVG vector drawing application +COMMENT = SVG vector drawing application -DISTNAME= inkscape-0.91 -CATEGORIES= graphics -REVISION= 9 +DISTNAME = inkscape-0.91 +CATEGORIES = graphics +REVISION = 9 MASTER_SITES = https://inkscape.org/en/gallery/item/3854/ -HOMEPAGE= http://www.inkscape.org/ +HOMEPAGE = http://www.inkscape.org/ MAINTAINER = Rafael Sadowski <raf...@sizeofvoid.org> # GPLv2 and LGPLv2.1 -PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_CDROM = Yes WANTLIB += ICE Magick++-6.Q16 MagickCore-6.Q16 MagickWand-6.Q16 WANTLIB += SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama @@ -35,9 +35,9 @@ MODULES= textproc/intltool \ lang/ruby # c++11 -MODULES += gcc4 -MODGCC4_ARCHS= * -MODGCC4_LANGS= c++ +MODULES += gcc4 +MODGCC4_ARCHS = * +MODGCC4_LANGS = c++ # We are just substituting paths at build time MODPY_BUILDDEP = No @@ -48,8 +48,9 @@ MODRUBY_BUILDDEP = No # Note that Python is already pulled in indirectly by py-lxml. MODRUBY_RUNDEP = No -BUILD_DEPENDS= devel/boost -LIB_DEPENDS= devel/boehm-gc \ +BUILD_DEPENDS = devel/boost + +LIB_DEPENDS = devel/boehm-gc \ devel/gsl \ devel/popt \ graphics/ImageMagick \ @@ -61,23 +62,25 @@ LIB_DEPENDS= devel/boehm-gc \ textproc/gtkspell \ textproc/libxslt \ x11/gtk2mm>=2.24.4 -RUN_DEPENDS= devel/desktop-file-utils \ + +RUN_DEPENDS = devel/desktop-file-utils \ textproc/py-lxml \ x11/gtk+3,-guic -USE_GMAKE= Yes -CONFIGURE_STYLE= gnu -#AUTOCONF_VERSION= 2.69 -CONFIGURE_ARGS= --without-gnome-vfs -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/ImageMagick \ +USE_GMAKE = Yes +CONFIGURE_STYLE = gnu +AUTOCONF_VERSION = 2.69 + +CONFIGURE_ARGS = -without-gnome-vfs +CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/ImageMagick \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -NO_TEST= Yes +NO_TEST = Yes # As discussed on the ports mailing list, remove internationalised manual # pages, as our mandoc implementation does not yet deal with them properly. -RM_MANS= man/el man/fr man/ja man/man1/inkscape.*.1 \ +RM_MANS = man/el man/fr man/ja man/man1/inkscape.*.1 \ man/sk man/zh_TW SUBST_VARS += RUBY MODRUBY_REV
