Menu
▾
▴
#4846 unbreak xemacs
This is a partial fix for xemacs as fink still needs to be modified to report back the actual Xquartz release from....
i system-xfree86 2:7.2-2 [placeholder for user installed x11]
i system-xfree86-dev 2:7.2-2 [placeholder for user installed x11 development tools]
i system-xfree86-manual-install 2:7.2-2 Manually installed X11 components
i system-xfree86-shlibs 2:7.2-2 [placeholder for user installed x11 shared libraries]
so a 'BuildDepends:system-xfree86-shlibs (>= 2.7.9)' and 'Depends: system-xfree86-dev (>= 2.7.9)' are possible. The remaining changes to unbreak xemacs are....
Index: libxaw3dxft.info =================================================================== RCS file: /cvsroot/fink/dists/10.9-libcxx/stable/main/finkinfo/x11/libxaw3dxft.info,v retrieving revision 1.5 diff -u -r1.5 libxaw3dxft.info --- libxaw3dxft.info 29 Oct 2016 03:08:23 -0000 1.5 +++ libxaw3dxft.info 20 Nov 2016 18:41:54 -0000 @@ -9,7 +9,7 @@ BuildDepends: << x11-dev, - fink-package-precedence (>=0.31-1), + fink-package-precedence (>= 0.34-1), fontconfig2-dev, freetype219, xft2-dev, @@ -18,10 +18,10 @@ automake1.15, autoconf2.6 (>= 2.69-5), libtool2, - libxt, util-macros << -Depends: x11, x11-shlibs, libxt-shlibs, %n-shlibs (= %v-%r) +BuildConflicts: libxt, libxt-flat +Depends: x11, x11-shlibs, %n-shlibs (= %v-%r) Conflicts: xaw3d-static, xaw3d Replaces: xaw3d-static, xaw3d @@ -55,9 +55,7 @@ Depends: << x11, fontconfig2-shlibs, - freetype219-shlibs, - libxt-shlibs, - xft2-shlibs + freetype219-shlibs << Files: lib/libXaw3d.*.dylib Shlibs: %p/lib/libXaw3d.8.dylib 9.0.0 %n (>= 1.6.2-1) @@ -75,9 +73,6 @@ Use autoconf2.6 (>= 2.69-5) to get X11 paths which don't rely on the X11 convenience symlinks in /usr/X11R6 and /usr/X11 on OS X versions where these aren't present. - -Use fink-package-precedence (>=0.31-1) to avoid the new otool on Xcode 8 and to verify -the use of Fink's libXt. << DescDetail: << Updated Xaw3D from the xpaint project at Sourceforge. @@ -88,8 +83,8 @@ of libxaw3dxft <= 1.3.3). << DescPort: << -Use libxt-twolevel-namespace-shlibs to insure that libXaw3d.8.dylib is -linked against a two-level namespace copy of libXt, regardless of the Xquartz version. +Use Xquartz libXt.6.dylib to insure that libXaw3d.8.dylib and libXmu are linked uniformally +regardless of the Xquartz version. << DescUsage: << The main parameter to be set is Xaw3dXftEncoding. By default
and
Index: xemacs.info =================================================================== RCS file: /cvsroot/fink/dists/10.9-libcxx/stable/main/finkinfo/editors/xemacs.info,v retrieving revision 1.7 diff -u -r1.7 xemacs.info --- xemacs.info 15 Nov 2016 03:07:13 -0000 1.7 +++ xemacs.info 20 Nov 2016 18:42:18 -0000 @@ -1,6 +1,6 @@ Package: xemacs Version: 21.4.22 -Revision: 8 +Revision: 9 Epoch: 1 Source: mirror:custom:stable/%n-%v.tar.bz2 Source-MD5: 060bf7565cb3233c6e7071354e9a23a4 @@ -32,9 +32,10 @@ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=327655 perl -pi -e 's/x_direct_test_library=Xt/x_direct_test_library=X11/' configure << +BuildConflicts: libxt, libxt-flat BuildDepends: << compface-dev, - fink-package-precedence, + fink-package-precedence (>= 0.34-1). fontconfig2-dev (>= 2.10.0-1), freetype219 (>= 2.6-1), gdbm4, @@ -43,7 +44,6 @@ libpng16, libtiff5, libxaw3dxft, - libxt, x11-dev, xft2-dev (>= 2.2.0-1) << @@ -55,7 +55,6 @@ libpng16-shlibs, libtiff5-shlibs, libxaw3dxft-shlibs, - libxt-shlibs, ncurses (>= 5.4-20041023-1006), x11, xemacs-base-pkg,
Tested on 10.11 with 'fink -m' under Xquartz 2.7.11.
Opps. forgot revision bump and restore xft2-shlibs dependency.
Last edit: Jack Howarth 2016-11-20
Info file for libxaw3dxft-1.6.2-7
Info file for xemacs- 21.4.22-9
Fink already reports a version. I did that last week.
Fionna-4:shells hansen$ fink -V
Package manager version: 0.41.1
Distribution version: selfupdate-cvs Sat Nov 19 14:11:32 2016, 10.12, x86_64
Trees: local/main stable/main stable/crypto local/injected
Copyright (c) 2001 Christoph Pfisterer
Copyright (c) 2001-2016 The Fink Package Manager Team
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Fionna-4:shells hansen$ fink list system-xfree86
Information about 9962 packages read in 3 seconds.
i system-xfree86 3:2.7.112-3 [placeholder for user installed x11]
i system-xfree86- 3:2.7.112-3 [placeholder for user installed x11 devel...
i system-xfree86- 3:2.7.112-3 Manually installed X11 components
i system-xfree86- 3:2.7.112-3 [placeholder for user installed x11 share...
Ticket moved from /p/fink/package-submissions/4845/
Ticket moved from /p/fink/bugs/1655/
Whoops, didn't see the .info files in the mass of diffs here.
I already have packaging for these and more in https://github.com/akhansen/Fink-experimental/tree/master/libXt which also include versioned dependencies on libxaw3dxft so that people don't build against a flat-namespace-linked libxaw3dxft library.