avoiding X11 convenience symlinks in g3dviewer-0.2.99.4-5 build

Jack,
      The following change avoids the X11 convenience symlinks during the
build of g3dviewer-0.2.99.4-5,,,

Index: g3dviewer.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome/g3dviewer.info
,v
retrieving revision 1.1
diff -r1.1 g3dviewer.info
5c5
< BuildDepends: pkgconfig (>= 0.9.0-1), gettext-tools, x11-dev, atk1 (>=
1.26.0-2), cairo (>= 1.8.6-3), glib2-dev (>= 2.20.3-1), glitz, gtk+2-dev
(>= 2.16.2-2), gtkglext1 (>= 1.0.6-1011), libg3d (>= 0.0.8-2),
libgettext8-dev, libglade2 (>= 2.6.4-2), libxml2 (>= 2.6.32-1),
pango1-xft2-ft219-dev (>= 1.24.2-1)
---
> BuildDepends: fink-buildenv-modules (>= 0.1.3-1), pkgconfig (>= 0.9.0-1),
gettext-tools, x11-dev, atk1 (>= 1.26.0-2), cairo (>= 1.8.6-3), glib2-dev
(>= 2.20.3-1), glitz, gtk+2-dev (>= 2.16.2-2), gtkglext1 (>= 1.0.6-1011),
libg3d (>= 0.0.8-2), libgettext8-dev, libglade2 (>= 2.6.4-2), libxml2 (>=
2.6.32-1), pango1-xft2-ft219-dev (>= 1.24.2-1)
8c8,11
< PatchScript: perl -pi -e "s,-ansi,,g" configure src/Makefile.in
thumbnailer/Makefile.in
---
> PatchScript: <<
> perl -pi -e "s,-ansi,,g" configure src/Makefile.in thumbnailer/Makefile.in
> perl -pi -e "s,\@X_LIBS\@ \@GL_LIBS\@ \@GTK_LIBS\@
\@LIBG3D_LIBS\@,\@X_LIBS\@ -lX11 \@GL_LIBS\@ \@GTK_LIBS\@ \@LIBG3D_LIBS\@,"
thumbnailer/Makefile.in
> <<
10,12c13,18
< SetCPPFLAGS: -I/usr/X11R6/include
< SetLDFLAGS: -L/usr/X11R6/lib -lX11
< ConfigureParams: --mandir=%p/share/man --with-extra-includes=%p/include
--with-extra-libs=%p/lib --disable-dependency-tracking
---
> ConfigureParams: --mandir=%p/share/man --with-extra-includes=%p/include
--with-extra-libs=%p/lib --disable-dependency-tracking
--x-includes=$X11_BASE_DIR/include --x-libraries=$X11_BASE_DIR/lib
> CompileScript: <<
> #!/bin/sh -ev
> . %p/sbin/fink-buildenv-helper.sh
> %{default_script}
> <<

Note that rather than jam -lX11 on LDFLAGS the appropriate fix is to perl
edit  thumbnailer/Makefile.in so that it is only applied on
g3d_thumbnailer_LDFLAGS.
               Jack

------------------------------------------------------------------------------

_______________________________________________
Fink-devel mailing list
[email protected]
List archive:
http://news.gmane.org/gmane.os.apple.fink.devel
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-devel