Thanks, I've applied it to trunk.On Sun, May 11, 2014 at 01:55:50AM -0400, Daniel Macks wrote:
> On Sat, 10 May 2014 19:11:45 -0700, Bryce Harrington
> <bryce@...961...> wrote:
> Download it at:
> >
> > https://sourceforge.net/projects/inkscape/files/inkscape/0.91pre0/
>
> src/Makefile.am has a fragile AM_CPPFLAGS order: various
> -I$(top_srcdir)/* are after various $(*_CFLAGS), so a header file
> supplied by some other installed package on the system could mask
> the intended one in the dist itself. Best to put all local flags
> before globals. Fink noticed and patched it for the past few
> versions, but we forgot to send it upstream:( See attached patch.
> [0;34mdiff -Nurd -x'*~' inkscape-0.91pre0.orig/src/Makefile.am inkscape-0.91pre0/src/Makefile.am [0;0m
> [0;32m--- inkscape-0.91pre0.orig/src/Makefile.am 2014-04-28 17:48:34.000000000 -0400 [0;0m
> [1;32m+++ inkscape-0.91pre0/src/Makefile.am 2014-05-11 01:52:18.000000000 -0400 [0;0m
> [1;34m@@ -64,6 +64,8 @@ [0;0m
> [0;0m EXTRA_DIST = [0;0m
> [0;0m [0;0m
> [0;0m AM_CPPFLAGS = \ [0;0m
> [1;32m+ -I$(top_srcdir)/cxxtest \ [0;0m
> [1;32m+ -I$(builddir)/extension/dbus \ [0;0m
> [0;0m $(EXIF_CFLAGS) \ [0;0m
> [0;0m $(FREETYPE_CFLAGS) \ [0;0m
> [0;0m $(GNOME_PRINT_CFLAGS) \ [0;0m
> [1;34m@@ -80,9 +82,7 @@ [0;0m
> [0;0m $(POPPLER_GLIB_CFLAGS) \ [0;0m
> [0;0m -DPOTRACE=\"potrace\" \ [0;0m
> [0;0m $(INKSCAPE_CFLAGS) \ [0;0m
> [0;32m- -I$(top_srcdir)/cxxtest \ [0;0m
> [0;0m $(WIN32_CFLAGS) \ [0;0m
> [0;32m- -I$(builddir)/extension/dbus \ [0;0m
> [0;0m $(X11_CFLAGS) [0;0m
> [0;0m [0;0m
> [0;0m CXXTEST_TEMPLATE = $(srcdir)/cxxtest-template.tpl [0;0m
> ------------------------------------------------------------------------------
> Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
> • 3 signs your SCM is hindering your productivity
> • Requirements for releasing software faster
> • Expert tips and advice for migrating your SCM now
> http://p.sf.net/sfu/perforce
> _______________________________________________
> Inkscape-devel mailing list
> Inkscape-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/inkscape-devel
------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
• 3 signs your SCM is hindering your productivity
• Requirements for releasing software faster
• Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
Inkscape-devel mailing list
Inkscape-devel@...1794...s.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/inkscape-devel