Menu

#4545 sam-4.3-1003 NFC modifications to avoid X11 convenience symlinks

closed-out-of-date
editors (11)
5
2016-02-12
2015-06-24
No

Info and patch files for avoiding X11 convenience symlinks in sam-4.3-1003 (with the same revision because of no functional change) avoids the X11 convenience symlinks during the build. The changes to the info and patch files are...

Index: sam.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors/sam.info,v
retrieving revision 1.2
diff -r1.2 sam.info
6c6
< BuildDepends: fink (>= 0.24.12), ghostscript, x11-dev
---
> BuildDepends: fink-buildenv-modules (>= 0.1.3-1), fink (>= 0.24.12), ghostscript, x11-dev
11c11
< PatchFile-MD5: 6d25aa31b78deb47de389a6eca75e943
---
> PatchFile-MD5: d0a747ab3475add7d7c3c71462c476b1
12a13,14
> #!/bin/sh -ev
> . %p/sbin/fink-buildenv-helper.sh
18c20
< patch -p1 < %{PatchFile}
---
> sed "s|@X11_BASE_DIR@|$X11_BASE_DIR|g" < %{PatchFile} | patch -p1
20d21
< SetCPPFLAGS: -I/usr/X11/include
22a24,26
> #!/bin/sh -ev
> . %p/sbin/fink-buildenv-helper.sh
> export CPPFLAGS="-I%p/include -I$X11_BASE_DIR/include"
Index: sam.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors/sam.patch,v
retrieving revision 1.1
diff -r1.1 sam.patch
75c75
< +XLIBS=/usr/X11/lib/libXt.dylib /usr/X11/lib/libX11.dylib /usr/X11/lib/libSM.dylib /usr/X11/lib/libICE.dylib
---
> +XLIBS=@X11_BASE_DIR@/lib/libXt.dylib @X11_BASE_DIR@/lib/libX11.dylib @X11_BASE_DIR@/lib/libSM.dylib @X11_BASE_DIR@/lib/libICE.dylib

Tested with 'fink -m' on future os missing the X11 convenience symlinks due to rootless.

Discussion

  • Jack Howarth

    Jack Howarth - 2015-06-24

    Info file for avoiding X11 convenience symlinks in sam-4.3-1003

     
  • Jack Howarth

    Jack Howarth - 2015-06-24

    Patch file for avoiding X11 convenience symlinks in sam-4.3-1003

     
  • Hanspeter Niederstrasser

    • labels: --> editors
    • status: open --> closed-out-of-date
    • Group: Undergoing_Validation --> Rejected_(Already_in_Fink)
     
  • Hanspeter Niederstrasser

    Fixed in CVS in November.

     

Log in to post a comment.