tech-userlevel archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkgsrc and XAPPLRESDIR



dholland-tech@ wrote:

> On Mon, Nov 14, 2011 at 02:36:18AM +0900, Izumi Tsutsui wrote:
>  > Most users don't have any interest in how it works (or sucks)
>  > but just want to know what's required to make it work.
>  > 
>  > So my suggestion is to apply patch in xsrc/26357, or
>  > add a MESSAGE file that mentions XAPPLRESDIR for pkg_add users.
> 
> As already pointed out, there'ss already a MESSAGE.

At least "pkg_add kterm" doesn't show anything about XAPPLRESDIR.
http://mail-index.NetBSD.org/tech-userlevel/2011/11/14/msg005778.html

> There are 108 packages whose PLIST matches lib/X11/app-defaults/.
> Most of them are ancient things unlikely to get major updates from
> upstream, so patching them isn't necessarily infeasible or reckless.
> 
> However, I thought of what might be a better way... is there an Xt
> call that can load an app-defaults file such that the resources get
> handled with the right search priority? Because if so, we can probably
> solve the whole problem with some shared library hacks.

I'm not sure if I see your point, but isn't that what PR/26357 claims?

http://gnats.NetBSD.org/26357
---
 Index: src/x11/lib/Xt/Makefile
 ===================================================================
 RCS file: /cvsroot/src/x11/lib/Xt/Makefile,v
 retrieving revision 1.10
 diff -c -r1.10 Makefile
 *** src/x11/lib/Xt/Makefile    9 Feb 2004 04:30:05 -0000       1.10
 --- src/x11/lib/Xt/Makefile    18 Jul 2004 12:49:44 -0000
 ***************
 *** 24,30 ****
   CPPFLAGS+=   ${X11FLAGS.THREADLIB}
   CPPFLAGS+=   -DUSE_POLL -DUSE_SNPRINTF -DLIBXT -I.

   
 ! CPPFLAGS.Intrinsic.c=        
-DXFILESEARCHPATHDEFAULT=\"${X11LIBDIR}/%L/%T/%N%C%S:${X11LIBDIR}/%l/%T/%N%C%S:${X11LIBDIR}/%T/%N%C%S:${X11LIBDIR}/%L/%T/%N%S:${X11LIBDIR}/%l/%T/%N%S:${X11LIBDIR}/%T/%N%S\"
   CPPFLAGS.Error.c=    -DERRORDB=\"${X11LIBDIR}/XtErrorDB\" \
                        -DXTERROR_PREFIX=\"\" -DXTWARNING_PREFIX=\"\"
   CPPFLAGS.TMkey.c=    -DXKB
 --- 24,34 ----
   CPPFLAGS+=   ${X11FLAGS.THREADLIB}
   CPPFLAGS+=   -DUSE_POLL -DUSE_SNPRINTF -DLIBXT -I.

   
 ! # XXX should be defined in bsd.own.mk
 ! LOCALBASE?=  /usr/pkg
 ! LOCALX11LIBDIR=      ${LOCALBASE}/lib/X11
 ! 
 ! CPPFLAGS.Intrinsic.c=        
-DXFILESEARCHPATHDEFAULT=\"${LOCALX11LIBDIR}/%L/%T/%N%C%S:${LOCALX11LIBDIR}/%l/%T/%N%C%S:${LOCALX11LIBDIR}/%T/%N%C%S:${LOCALX11LIBDIR}/%L/%T/%N%S:${LOCALX11LIBDIR}/%l/%T/%N%S:${LOCALX11LIBDIR}/%T/%N%S:${X11LIBDIR}/%L/%T/%N%C%S:${X11LIBDIR}/%l/%T/%N%C%S:${X11LIBDIR}/%T/%N%C%S:${X11LIBDIR}/%L/%T/%N%S:${X11LIBDIR}/%l/%T/%N%S:${X11LIBDIR}/%T/%N%S\"
   CPPFLAGS.Error.c=    -DERRORDB=\"${X11LIBDIR}/XtErrorDB\" \
                        -DXTERROR_PREFIX=\"\" -DXTWARNING_PREFIX=\"\"
   CPPFLAGS.TMkey.c=    -DXKB
 Index: xsrc/xc/config/cf/NetBSD.cf
 ===================================================================
 RCS file: /cvsroot/xsrc/xc/config/cf/NetBSD.cf,v
 retrieving revision 1.109
 diff -c -r1.109 NetBSD.cf
 *** xsrc/xc/config/cf/NetBSD.cf        23 Dec 2003 16:30:20 -0000      1.109
 --- xsrc/xc/config/cf/NetBSD.cf        18 Jul 2004 12:49:44 -0000
 ***************
 *** 949,951 ****
 --- 949,958 ----
   #ifndef UseRgbTxt
   #define UseRgbTxt    NO
   #endif
 + 
 + /*
 +  * for xpkgwedge
 +  */
 + #define PackageBaseDir               /usr/pkg
 + #define PackageLibX11Dir     PackageBaseDir/lib/X11
 + #define XFileSearchPathDefault       
Concat4(PackageLibX11Dir/%L/%T/%N%C,%S:PackageLibX11Dir/%l/%T/%N%C,%S:PackageLibX11Dir/%T/%N%C,%S:PackageLibX11Dir/%L/%T/%N%S:PackageLibX11Dir/%l/%T/%N%S:PackageLibX11Dir/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
 Index: xsrc/xfree/xc/config/cf/NetBSD.cf
 ===================================================================
 RCS file: /cvsroot/xsrc/xfree/xc/config/cf/NetBSD.cf,v
 retrieving revision 1.59
 diff -c -r1.59 NetBSD.cf
 *** xsrc/xfree/xc/config/cf/NetBSD.cf  27 Dec 2003 08:46:58 -0000      1.59
 --- xsrc/xfree/xc/config/cf/NetBSD.cf  18 Jul 2004 12:49:45 -0000
 ***************
 *** 747,749 ****
 --- 747,756 ----
   #define HasDevRandom         YES
   #define RandomDeviceFile     /dev/urandom
   #endif
 + 
 + /*
 +  * for xpkgwedge
 +  */
 + #define PackageBaseDir               /usr/pkg
 + #define PackageLibX11Dir     PackageBaseDir/lib/X11
 + #define XFileSearchPathDefault       
Concat4(PackageLibX11Dir/%L/%T/%N%C,%S:PackageLibX11Dir/%l/%T/%N%C,%S:PackageLibX11Dir/%T/%N%C,%S:PackageLibX11Dir/%L/%T/%N%S:PackageLibX11Dir/%l/%T/%N%S:PackageLibX11Dir/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)

---
Izumi Tsutsui


Home | Main Index | Thread Index | Old Index