[Pkg-jed-devel] error building jed_0.99.16.pre.0.99.17.84-1

[Jörg Sommer]

--17pEHd4RhPHOinZp
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

G. Milde schrieb am Tue 19. Apr, 11:40 (+0200) :
> On 18.04.05, J=F6rg Sommer wrote:
> > G. Milde schrieb am Mon 18. Apr, 09:50 (+0200) :
>=20
> > > * if John doesnot like a new command line arg just for Debian, we cou=
ld
> > >   still "emulate" it in jed.conf by looking at __argv and killing the
> > >   spurious "argument buffer". As this argument is rather seldom used,=
 the
> > >   overhead of the spurious buffer would not seriusly harm.
> >=20
> > This is ugly.
>=20
> Agreed. But I wonder whether it would be less ugly to have a Debian
> specific patch in site.sl?

I've a new idea. We don't modify the site.sl file that goes into the
package, but we overlay it with a patched version. Here is a patch
against revision 27.

Index: debian/patches/00list
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- debian/patches/00list	(Revision 27)
+++ debian/patches/00list	(Arbeitskopie)
@@ -1,6 +1,6 @@
 40_freetype-include
 50_slangfun-txt.dpatch
-50_jed-conf-build-fix
+# 50_jed-conf-build-fix
 50_jed-manpage-option-g
 50_enable-xrenderfont
 50_emacs-bindings
Index: debian/site.sl.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- debian/site.sl.patch	(Revision 0)
+++ debian/site.sl.patch	(Revision 0)
@@ -0,0 +1,35 @@
+--- lib/site.sl	2005-04-22 17:24:35.000000000 +0200
++++ site.sl	2005-04-22 17:24:24.000000000 +0200
+@@ -38,6 +38,8 @@
+ %}}}
+ %{{{ Global Variables
+=20
++set_jed_library_path(get_jed_library_path()+"/lib");
++
+ public variable _Jed_Emulation =3D NULL;
+ public variable _Jed_Default_Emulation =3D "emacs";
+ public variable Default_Jedrc_Startup_File =3D "jed.rc";
+@@ -3163,14 +3165,14 @@
+ if (strlen(expand_jedlib_file("defaults.sl")))
+   () =3D evalfile("defaults");
+ #ifdef UNIX
+-else foreach (["/etc/jed.conf", "/usr/local/etc/jed.conf", "/usr/etc/jed.=
conf"])
+-{
+-   $1 =3D ();
+-   if (1 =3D=3D file_status ($1))
+-     {
+-	() =3D evalfile ($1);
+-	break;
+-     }
+-}
++% else foreach (["/etc/jed.conf", "/usr/local/etc/jed.conf", "/usr/etc/je=
d.conf"])
++% {
++%    $1 =3D ();
++%    if (1 =3D=3D file_status ($1))
++%      {
++% 	() =3D evalfile ($1);
++% 	break;
++%      }
++% }
+ #endif
+=20
Index: debian/rules
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- debian/rules	(Revision 27)
+++ debian/rules	(Arbeitskopie)
@@ -95,8 +95,11 @@
 	@echo
 	@echo --- JED-SL ---
 	@echo
+	# Overload site.sl with a patched version, that do not load jed.conf
+	cp lib/site.sl .
+	patch site.sl debian/site.sl.patch
 	# compile .sl; move compileable .sl to jed-sl.deb
-	JED_ROOT=3D`pwd` NO_JED_CONF=3D1 ./src/$(ARCH)objs/jed -batch -n -l prepa=
rse.sl
+	JED_LIBRARY=3D`pwd` ./src/$(ARCH)objs/jed -batch -n -l preparse.sl
 	cp -r lib $(jed-common)/usr/share/jed/
 	for i in $(jed-common)/usr/share/jed/lib/*.slc; do \
 	    sl=3D`basename $$i .slc`.sl; \

J=F6rg.
--=20
Nicht was du bist, ist es was dich ehrt, wie du bist bestimmt den Wert.
W=FCnsche hat man oft und viel, nur wer lernt erreicht sein Ziel.

--17pEHd4RhPHOinZp
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iQEVAwUBQmkioIZ13Cz2nwVYAQK/9wf/Tony3xEoxq2Dmr3miOApXYiDYfRICyMo
F9GDtvUf6Weqmpe7BsB1rR9J7H1+zW15pNxtV+vIrJUwaN0KtYS908KTiNgeUZmi
opxEGaUgpBJ51B7VYjX1k9dInDRvVuYMfLwOIpMzNNAzdsHgD6SHvdYrw6GQdMMk
K+kfocPW4Ir9ez9vUSY1OCTfUs4Dj/5yQQkQnDiRT0sswEYmQm/xC6lBvCOpWTZY
CUMwxbqr3+jSIinL7alf9oRZ64tEGtkBygK/3ttBwu3heYH4zdGJTnm9iBU/Ewaz
KNiZh4AXLNl6ifRjG4LJyl0GkYInqRZKWH1TKg0l2MTQIR84JU0phQ==
=dxzR
-----END PGP SIGNATURE-----

--17pEHd4RhPHOinZp--