Mercurial Mercurial > sustaining > oi_151a > xnv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6972736 broken links to libXfont.so and libXres.so from package pkg:/x11/library/libxfont
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Tue, 03 Aug 2010 20:42:27 -0700
changeset 992 9738f5ac74f1
parent 991 9870559383c6
child 993 76fc606af704
6972736 broken links to libXfont.so and libXres.so from package pkg:/x11/library/libxfont
open-src/lib/libXfont/Makefile file | annotate | diff | comparison | revisions
open-src/lib/libXres/Makefile file | annotate | diff | comparison | revisions
open-src/util/compat-links/Makefile file | annotate | diff | comparison | revisions
pkg/manifests/x11-compatibility-links-xorg.mf file | annotate | diff | comparison | revisions
pkg/manifests/x11-library-libxfont.mf file | annotate | diff | comparison | revisions
pkg/manifests/x11-library-libxres.mf file | annotate | diff | comparison | revisions 
--- a/open-src/lib/libXfont/Makefile	Mon Aug 02 12:18:55 2010 -0700
+++ b/open-src/lib/libXfont/Makefile	Tue Aug 03 20:42:27 2010 -0700
@@ -69,8 +69,5 @@
 # Link with version mapfile
 MODULE_LD_OPTIONS = -M $(PWD)/mapfile-vers
 
-# Compatibility links from /usr/X11/lib to /usr/lib
-MODULE_X11_LIBCOMPAT_LINKS = libXfont.so libXfont.so.1
-
 include ../Makefile.inc
 
--- a/open-src/lib/libXres/Makefile	Mon Aug 02 12:18:55 2010 -0700
+++ b/open-src/lib/libXres/Makefile	Tue Aug 03 20:42:27 2010 -0700
@@ -59,6 +59,6 @@
 FIX_PC_FILES=xres.pc.in
 
 # Compatibility links from /usr/X11/lib to /usr/lib
-MODULE_X11_LIBCOMPAT_LINKS = libXres.so libXres.so.1
+MODULE_X11_LIBCOMPAT_LINKS = libXRes.so libXRes.so.1
 
 include ../Makefile.inc
--- a/open-src/util/compat-links/Makefile	Mon Aug 02 12:18:55 2010 -0700
+++ b/open-src/util/compat-links/Makefile	Tue Aug 03 20:42:27 2010 -0700
@@ -80,6 +80,20 @@
 
 install_links: $(INSTALL_LINKS)
 
+# Link directory for Xserver private libraries and data files for 
+# compatibility with Xnewt binaries built for Solaris 10
+XSERVER_LIB_LINKDIR = $(DESTDIR)/usr/X11/lib/X11
+XSERVER_LIB_LINKPATH = $(XSERVER_LIB_LINKDIR)/xserver
+
+install_links: $(XSERVER_LIB_LINKPATH)
+
+$(XSERVER_LIB_LINKDIR): $(DESTDIR)/usr/X11
+	mkdir -p $@
+
+$(XSERVER_LIB_LINKPATH): $(XSERVER_LIB_LINKDIR)
+	@rm -f $@
+	ln -s ../../../lib/xorg $@
+
 # Font links so that Java fontconfig.properties can find the fonts they use
 # (see CR 6905518 & 6972032)
 
@@ -89,7 +103,7 @@
 
 install_links: $(FONT_LINKPATHS)
 
-$(FONT_LINKDIR): $(DESTDIR)/usr/X11
+$(FONT_LINKDIR): $(XSERVER_LIB_LINKDIR)
 	mkdir -p $@
 
 $(FONT_LINKDIR)/75dpi $(FONT_LINKDIR)/100dpi: $(FONT_LINKDIR)
--- a/pkg/manifests/x11-compatibility-links-xorg.mf	Mon Aug 02 12:18:55 2010 -0700
+++ b/pkg/manifests/x11-compatibility-links-xorg.mf	Tue Aug 03 20:42:27 2010 -0700
@@ -38,5 +38,6 @@
 link path=usr/X11/lib/X11/fonts/TrueType \
     target=../../../../share/fonts/TrueType
 link path=usr/X11/lib/X11/fonts/misc target=../../../../share/fonts/X11/misc
+link path=usr/X11/lib/X11/xserver target=../../../lib/xorg
 link path=usr/X11R6 target=X11
 link path=usr/openwin target=X11
--- a/pkg/manifests/x11-library-libxfont.mf	Mon Aug 02 12:18:55 2010 -0700
+++ b/pkg/manifests/x11-library-libxfont.mf	Tue Aug 03 20:42:27 2010 -0700
@@ -28,9 +28,6 @@
 dir path=etc/X11
 dir path=etc/X11/fontpath.d
 dir path=usr
-dir path=usr/X11
-dir path=usr/X11/lib
-dir path=usr/X11/lib/$(ARCH64)
 dir path=usr/include
 dir path=usr/include/X11
 dir path=usr/include/X11/fonts
@@ -59,12 +56,6 @@
 file path=usr/lib/pkgconfig/xfont.pc
 file path=usr/lib/xorg/$(ARCH64)/libXfont.so.1
 file path=usr/lib/xorg/libXfont.so.1
-link path=usr/X11/lib/$(ARCH64)/libXfont.so \
-    target=../../../lib/$(ARCH64)/libXfont.so
-link path=usr/X11/lib/$(ARCH64)/libXfont.so.1 \
-    target=../../../lib/$(ARCH64)/libXfont.so.1
-link path=usr/X11/lib/libXfont.so target=../../lib/libXfont.so
-link path=usr/X11/lib/libXfont.so.1 target=../../lib/libXfont.so.1
 link path=usr/lib/xorg/$(ARCH64)/libXfont.so target=libXfont.so.1
 link path=usr/lib/xorg/libXfont.so target=libXfont.so.1
 depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
--- a/pkg/manifests/x11-library-libxres.mf	Mon Aug 02 12:18:55 2010 -0700
+++ b/pkg/manifests/x11-library-libxres.mf	Tue Aug 03 20:42:27 2010 -0700
@@ -48,12 +48,12 @@
 file path=usr/share/man/man3xres/XResQueryClients.3xres
 file path=usr/share/man/man3xres/XResQueryExtension.3xres
 file path=usr/share/man/man3xres/XResQueryVersion.3xres
-link path=usr/X11/lib/$(ARCH64)/libXres.so \
-    target=../../../lib/$(ARCH64)/libXres.so
-link path=usr/X11/lib/$(ARCH64)/libXres.so.1 \
-    target=../../../lib/$(ARCH64)/libXres.so.1
-link path=usr/X11/lib/libXres.so target=../../lib/libXres.so
-link path=usr/X11/lib/libXres.so.1 target=../../lib/libXres.so.1
+link path=usr/X11/lib/$(ARCH64)/libXRes.so \
+    target=../../../lib/$(ARCH64)/libXRes.so
+link path=usr/X11/lib/$(ARCH64)/libXRes.so.1 \
+    target=../../../lib/$(ARCH64)/libXRes.so.1
+link path=usr/X11/lib/libXRes.so target=../../lib/libXRes.so
+link path=usr/X11/lib/libXRes.so.1 target=../../lib/libXRes.so.1
 link path=usr/lib/$(ARCH64)/libXRes.so target=libXRes.so.1
 link path=usr/lib/libXRes.so target=libXRes.so.1
 depend fmri=pkg:/x11/header/x11-protocols type=require facet.devel=true
sustaining/oi_151a/xnv