[PATCH pkgs/ediff] Adapt ediff dependencies to new vc

Vin Shelton acs at alumni.princeton.edu
Fri Nov 2 11:04:44 EDT 2007


With the latest round of changes to ediff, I can no longer build the packages:

>>Error occurred processing ediff-diff.el: Symbol's value as variable
is void: vc-workfile-version

Done
make[2]: *** [ediff-diff.elc] Error 1

Indeed, vc-workfile is a function.  The patch below allows things to compile.

diff -u {scmroot/xemacs-packages,$BLDROOT/xemacs-packages-$(today)}/xemacs-packages/ediff/$f
done
--- scmroot/xemacs-packages/xemacs-packages/ediff/ediff-vers.el
2007-11-02 10:12:31.000000000 -0400
+++ /usr/local/build/xemacs-packages-2007-11-02/xemacs-packages/ediff/ediff-vers.el
    2007-11-02 10:57:47.000000000 -0400
@@ -60,7 +60,7 @@
 (defalias 'ediff-vc-working-revision
   (if (fboundp 'vc-working-revision)
       'vc-working-revision
-    vc-workfile-version))
+    'vc-workfile-version))

 ;; VC.el support

--- scmroot/xemacs-packages/xemacs-packages/ediff/Makefile
2007-08-30 20:06:05.000000000 -0400
+++ /usr/local/build/xemacs-packages-2007-11-02/xemacs-packages/ediff/Makefile
 2007-11-02 10:59:07.000000000 -0400
@@ -22,7 +22,7 @@
 MAINTAINER = Michael Kifer <kifer at cs.sunysb.edu>
 PACKAGE = ediff
 PKG_TYPE = regular
-REQUIRES = pcl-cvs elib dired xemacs-base edebug prog-modes
+REQUIRES = pcl-cvs elib dired xemacs-base edebug prog-modes gnus tramp vc
 CATEGORY = standard

 ELCS = ediff-diff.elc ediff-help.elc ediff-hook.elc ediff-init.elc \


Regards,
  Vin



More information about the XEmacs-Patches mailing list