two bits

Jaakko Niemi <[email protected]> Tue, 27 Dec 2005 22:24:00 +0200
Newsgroups gmane.comp.file-systems.sfs.general
Message-ID <[email protected]>
--PEIAKu/WMn1b1Hv9
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

 Hello,

 Attached are two patches that I needed to get things
 bootstrapped from cvs. First one comes from error with
 gcc 4.0.3:

 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=338532

 Second one works around the thing that Debian recently,
 due FHS pressure, split different TeX things to use
 /usr/share/texmf-$texthingy, which broke doc/Makefile.
 Not sure if it's worth worrying about the case that
 kpsewhich might not be on path.. All non-linux boxes
 having TeX installed that I can access do have that.

		--j


--PEIAKu/WMn1b1Hv9
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="rpctypes-h.patch"

--- sfs1-checkout/arpc/rpctypes.h	2004-09-20 01:02:20.000000000 +0300
+++ sfs1/arpc/rpctypes.h	2005-12-27 20:16:52.000000000 +0200
@@ -271,9 +271,9 @@
   using rpc_vec<char, n>::base;
   using rpc_vec<char, n>::size;
 
-  void setstrmem (const str &s) { set (s.cstr (), s.len ()); }
+  void setstrmem (const str &s) { this->set (s.cstr (), s.len ()); }
   rpc_bytes &operator= (const str &s)
-    { setsize (s.len ()); memcpy (base (), s.cstr (), size ()); return *this; }
+    { this->setsize (s.len ()); memcpy (base (), s.cstr (), size ()); return *this; }
   template<size_t m> rpc_bytes &operator= (const rpc_vec<char, m> &v)
     { rpc_vec<char, n>::operator= (v); return *this; }
   template<size_t m> rpc_bytes &operator= (const array<char, m> &v)

--PEIAKu/WMn1b1Hv9
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="texmf.patch"

--- sfs1-checkout/doc/Makefile.am	2005-09-16 20:01:01.000000000 +0300
+++ sfs1/doc/Makefile.am	2005-12-27 21:26:59.000000000 +0200
@@ -20,11 +20,7 @@
 
 epsf.tex:
 	@rm -f epsf.tex
-	epsftex=`find $(prefix)/share/texmf \
-		/usr/share/texmf \
-		/usr/local/share/texmf \
-		/usr/athena/share/texmf \
-		-name epsf.tex | head -1`; \
+	epsftex=`kpsewhich epsf.tex | head -1`; \
 		test "$$epsftex" && ln -s $$epsftex .
 
 PATHFILT = sed -e 's!\([^ ]\)/!\1@dslash{}!g'

--PEIAKu/WMn1b1Hv9--