Moinak Ghosh wrote:
> Hi Alan,
>
> Was merging the updates into my workspace and had a question.
> You have put symlinks for libXcursor into SUNWxwrtl package,
> but which package is delivering the actual binary,
> X11/lib/libXcursor.so.1 ?
SUNWxwplt - which I haven't put the package definitions for into
the FOX tree yet.
When I was doing the OpenSolaris code drops for X, I only included
the package definitions for the packages you could fully build from
the code drops, but for FOX I suppose it would make more sense to
just include all of them, so we can more easily see which parts
still need to be replaced. I can work on that next week if that
makes sense to everyone else too.
For this putback, the packaging changes to non-published packages
were:
###############################################################################
--- /net/paravon/export/x-re/gate/XW_NV_MWS/packages/SUNWxwinc/prototype
2007-08-27 12:48:52.801186000 -0700
+++ /net/x11x/export/dev/alanc/XW_S11_mod/packages/SUNWxwinc/prototype
2007-08-27 13:17:30.304766000 -0700
@@ -27,7 +27,7 @@
# of the copyright holder.
#
#
-# ident "@(#)prototype 35.72 07/08/27 SMI"
+# ident "%W% %E% SMI"
#
# X Window System include files
@@ -566,6 +566,11 @@
f none openwin/server/include/AccessXproto.h 0444 root bin
f none openwin/server/include/AccessXstruct.h 0444 root bin
+!search $HOME/X11/include/X11/Xcursor
+# open-src/lib/libXcursor
+d none X11/include/X11/Xcursor 0755 root bin
+s none openwin/share/include/X11/Xcursor=../../../../X11/include/X11/Xcursor
+f none X11/include/X11/Xcursor/Xcursor.h 0444 root bin
# pkgconfig data files for X modular protocols & libraries
@@ -601,6 +606,7 @@
f none lib/pkgconfig/xau.pc 0444 root bin
f none lib/pkgconfig/xcomposite.pc 0444 root bin
+f none lib/pkgconfig/xcursor.pc 0444 root bin
f none lib/pkgconfig/xdamage.pc 0444 root bin
f none lib/pkgconfig/xdmcp.pc 0444 root bin
f none lib/pkgconfig/xfixes.pc 0444 root bin
@@ -646,6 +652,7 @@
!search $HOME/lib/$plat_64/pkgconfig
f none lib/$plat_64/pkgconfig/xau.pc 0444 root bin
f none lib/$plat_64/pkgconfig/xcomposite.pc 0444 root bin
+f none lib/$plat_64/pkgconfig/xcursor.pc 0444 root bin
f none lib/$plat_64/pkgconfig/xdamage.pc 0444 root bin
f none lib/$plat_64/pkgconfig/xdmcp.pc 0444 root bin
f none lib/$plat_64/pkgconfig/xfixes.pc 0444 root bin
###############################################################################
--- /net/paravon/export/x-re/gate/XW_NV_MWS/packages/SUNWxwman/prototype_com
2007-04-19 17:31:26.858691000 -0700
+++ /net/x11x/export/dev/alanc/XW_S11_mod/packages/SUNWxwman/prototype_com
2007-08-20 19:21:24.385657000 -0700
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype_com 35.32 07/04/19 SMI"
+# ident "%Z%%M% %I% %E% SMI"
#
# X Window System online user man pages
@@ -192,6 +192,9 @@
!search $NEWHOME/man1
+# open-src/app/xcursorgen
+f none X11/share/man/man1/xcursorgen.1 0444 root bin
+
# open-src/app/xdpyinfo
f none X11/share/man/man1/xdpyinfo.1 0444 root bin
###############################################################################
--- /net/paravon/export/x-re/gate/XW_NV_MWS/packages/SUNWxwopt/depend
2006-07-31 10:32:18.715073000 -0700
+++ /net/x11x/export/dev/alanc/XW_S11_mod/packages/SUNWxwopt/depend
2007-08-20
15:06:52.361305000 -0700
@@ -1,7 +1,7 @@
# Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
# Use subject to license terms.
#
-# @(#)depend 1.4 06/07/31 Sun Microsystems, Inc.
+# %W% %E% Sun Microsystems, Inc.
P SUNWcsu Core Solaris, (Usr)
P SUNWcsl Core Solaris Libraries
@@ -10,4 +10,4 @@
P SUNWxwplt X Window System platform software
P SUNWxwxft Xft (X Freetype) Library
P SUNWfontconfig Fontconfig library
-
+P SUNWpng Portable Network Graphics library
###############################################################################
--- /net/paravon/export/x-re/gate/XW_NV_MWS/packages/SUNWxwopt/prototype
2006-06-08 14:50:24.689438000 -0700
+++ /net/x11x/export/dev/alanc/XW_S11_mod/packages/SUNWxwopt/prototype
2007-08-20 19:29:54.065906000 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype 35.34 06/06/05 SMI"
+# ident "%W% %E% SMI"
##
# nonessential X core clients and server extensions
@@ -34,11 +34,11 @@
i copyright=../copyright
i depend
-!HOME=../openwin
+!HOME=../usr
d none openwin 0755 root bin
-!search $HOME/bin
+!search $HOME/openwin/bin
d none openwin/bin 0755 root bin
f none openwin/bin/appres 0755 root bin
f none openwin/bin/atobm 0755 root bin
@@ -82,7 +82,7 @@
d none openwin/lib/app-defaults 0755 root bin
s none openwin/lib/X11/app-defaults/= ../app-defaults
-!search $HOME/lib/X11/app-defaults
+!search $HOME/openwin/lib/X11/app-defaults
f none openwin/lib/app-defaults/Viewres 0644 root bin
f none openwin/lib/app-defaults/XFontSel 0644 root bin
f none openwin/lib/app-defaults/XLoad 0644 root bin
@@ -90,14 +90,14 @@
f none openwin/lib/app-defaults/Xedit 0644 root bin
f none openwin/lib/app-defaults/Xman 0644 root bin
-!search $HOME/lib/X11/twm
+!search $HOME/openwin/lib/X11/twm
d none openwin/lib/X11 0755 root bin
d none openwin/lib/X11/twm 0755 root bin
s none openwin/lib/X11/system.twmrc= ./twm/system.twmrc
f none openwin/lib/X11/twm/system.twmrc 0644 root bin
#d none openwin/lib/xdm 0755 root bin
-#!search $HOME/lib/xdm
+#!search $HOME/openwin/lib/xdm
#f none openwin/lib/xdm/StartOW 0755 root bin
#f none openwin/lib/xdm/Startup 0755 root bin
#f none openwin/lib/xdm/Reset 0755 root bin
@@ -112,7 +112,7 @@
# There is a new path to xdm in r6 keep old version around
# for compatibility
-#!search $HOME/lib/xdm
+#!search $HOME/openwin/lib/xdm
#d none openwin/lib/xdm 0755 root bin
#f none openwin/lib/xdm/GiveConsole 0755 root bin
@@ -123,7 +123,7 @@
# new place for xdm in r6
-!search $HOME/lib/X11/xdm
+!search $HOME/openwin/lib/X11/xdm
d none openwin/lib/X11/xdm 0755 root bin
#s none openwin/lib/X11/xdm/GiveConsole=../../xdm/GiveConsole
@@ -145,12 +145,12 @@
f none openwin/lib/X11/xdm/xdm-config 0755 root bin
f none openwin/lib/X11/xdm/StartX 0755 root bin
-!search $HOME/lib/xdm
+!search $HOME/openwin/lib/xdm
s none openwin/lib/xdm=X11/xdm
d none openwin/lib/config 0755 root bin
s none openwin/lib/X11/config=../config
-!search $HOME/lib/X11/config
+!search $HOME/openwin/lib/X11/config
f none openwin/lib/config/Imake.rules 0644 root bin
f none openwin/lib/config/Imake.tmpl 0644 root bin
f none openwin/lib/config/Library.tmpl 0644 root bin
@@ -167,3 +167,7 @@
f none openwin/lib/config/noop.rules 0644 root bin
f none openwin/lib/config/Threads.tmpl 0644 root bin
+!search $HOME/X11/bin
+d none X11 0755 root bin
+d none X11/bin 0755 root bin
+f none X11/bin/xcursorgen 0755 root bin
###############################################################################
--- /net/paravon/export/x-re/gate/XW_NV_MWS/packages/SUNWxwplt/prototype_com
2007-07-19 13:02:11.080840000 -0700
+++ /net/x11x/export/dev/alanc/XW_S11_mod/packages/SUNWxwplt/prototype_com
2007-08-20 19:22:29.262457000 -0700
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# "@(#)prototype_com 35.131 07/07/19 Sun Microsystems"
+# "%W% %E% Sun Microsystems"
#
# X Window System required core package
@@ -191,6 +191,10 @@
f none X11/lib/libXcomposite.so.1 0644 root bin
s none X11/lib/libXcomposite.so=libXcomposite.so.1
+# open-src/lib/libXcursor (never delivered into /usr/openwin/lib)
+f none X11/lib/libXcursor.so.1 0644 root bin
+s none X11/lib/libXcursor.so=libXcursor.so.1
+
# open-src/lib/libXdamage (never delivered into /usr/openwin/lib -
# only into /usr/openwin/sfw/lib, which is covered by symlink below)
s none X11/lib/libXdamage.so=./libXdamage.so.1
@@ -244,6 +248,10 @@
f none X11/lib/$plat_64/libXcomposite.so.1 0644 root bin
s none X11/lib/$plat_64/libXcomposite.so=libXcomposite.so.1
+# open-src/lib/libXcursor (never delivered into /usr/openwin/lib)
+f none X11/lib/$plat_64/libXcursor.so.1 0644 root bin
+s none X11/lib/$plat_64/libXcursor.so=libXcursor.so.1
+
# open-src/lib/libXdamage (never delivered into /usr/openwin/lib -
# only into /usr/openwin/sfw/lib, which is covered by symlink below)
s none X11/lib/$plat_64/libXdamage.so=./libXdamage.so.1
--
-Alan Coopersmith- alan.coopersmith at sun.com
Sun Microsystems, Inc. - X Window System Engineering
