Re: [PATCH pkgs/ediff] Adapt ediff dependencies to new vc
- First Post
- Replies
- Stats
-
Go to
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2005 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2004 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2003 -----
- December
- November
- October
- September
On Monday 29 October 2007, Michael Kifer wrote:
No problem. This is just for the makefile, which I do not maintain.
Actually, my bad - this patch lacks a related part which I have in my local
tree. In the new vc, vc-call is a macro, so vc-hooks needs to be loaded for
ediff-vers.el (ediff-vc-latest-version) at compile time to avoid it being
miscompiled.
I posted this patch in September but don't remember exactly why I haven't
applied it, possibly because I don't remember seeing a reply to my post back
then: http://calypso.tux.org/pipermail/xemacs-beta/2007-September/012194.html
Ok to apply this along with the rest of the previous patch?
Index: ediff-vers.el
===================================================================
RCS
file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ediff/ediff-vers.el,v
retrieving revision 1.17
diff -u -r1.17 ediff-vers.el
--- ediff-vers.el 23 Jan 2007 21:42:43 -0000 1.17
+++ ediff-vers.el 29 Oct 2007 21:32:29 -0000
＠＠ -61,6 +61,9 ＠＠
;; VC.el support
+(eval-when-compile
+ (require 'vc-hooks)) ;; for vc-call macro
+
(defun ediff-vc-latest-version (file)
"Return the version level of the latest version of FILE in repository."
(if (fboundp 'vc-latest-version)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
Vin Shelton
Friday, 2 November
Fri, 2 Nov
3:04 p.m.
New subject: [PATCH pkgs/ediff] Adapt ediff dependencies to new vc
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(a)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
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
6259
days inactive
6263
days old
1 comments
2 participants
tags (0)
participants (2)
-
Ville Skyttä -
Vin Shelton