[csw-users] vim/gvim 7.3.884 updated recipes

[Laurent Blume]

Here are patches to update vim & gvim to the current version (patch 884).
I've got remarks and questions:
first, the 0001-Expect-tab-instead-of-whitespace.patch is not needed 
anymore and can be removed.
The patch I'm adding is needed for both vim and gvim. I think I will 
take it upstream, as well as the 
-DXutf8TextPropertyToTextList=XmbTextPropertyToTextList that is needed 
for gvim.

As for the question, the vim recipe has that bit, introduced in 2009:
make-interps-lazy:
        @perl -i.bak -plne \
            's/(-l(?:perl|python|ruby|tcl)\S*)/-zlazyload $$1 
-znolazyload/' \
            $(WORKSRC)/src/auto/config.mk

Is it still useful? If yes, should it be added to gvim?

Since a lot of those two recipes should be kept identical, is there a 
way to do that? Have a vim-common.mk somewhere?

Also, gvim is suffixed with -x11, to avoid its CLI vim-x11 binary to 
collide. I think that's wrong, but I've not yet found a clean way to 
avoid it. Both packages should exist independently.

I'll post an update when I find a solution for that.

Laurent

3c3
< PATCHREV = 254
---
> PATCHREV = 884
18a19,21
> 
> BUILD_DEP_PKGS += CSWpython-dev
> 
57c60
< PATCHFILES += 0001-Expect-tab-instead-of-whitespace.patch
---
> PATCHFILES += 0002-test-works-in-utf8-encoding.patch
58a62,63
> PATCHDIRLEVEL = 0
> 
78,79d82
< PATCHDIRLEVEL = 0
< 
--- src/testdir/test92.in	dim. avr   7 21:12:32 2013
+++ src/testdir/test92.in	dim. avr   7 21:59:51 2013
@@ -43,6 +43,6 @@
     four leadinG spaces
 two		consecutive tabs
 two	tabs	in one line
-one … multibyteCharacter
-a “b” two multiByte characters
-“c”1€ three mulTibyte characters
+one € multibyteCharacter
+€€ two multiByte characters
+€€€ three mulTibyte characters
3c3
< PATCHREV = 055
---
> PATCHREV = 884
27a28
> PATCHFILES += 0002-test-works-in-utf8-encoding.patch
29c30
< WORKSRC = $(WORKDIR)/$(NAME)$(subst .,,$(DISTVERSION))
---
> PATCHDIRLEVEL = 0
30a32,33
> DISTNAME = $(NAME)$(subst .,,$(DISTVERSION))
> 
43c46,53
< PATCHDIRLEVEL = 0
---
> BUILD_DEP_PKGS += CSWlibgnomeui-devel
> BUILD_DEP_PKGS += CSWlibgnome-dev
> BUILD_DEP_PKGS += CSWlibgnomecanvas-dev
> BUILD_DEP_PKGS += CSWgnomevfs2-dev
> BUILD_DEP_PKGS += CSWlibgconf-dev
> BUILD_DEP_PKGS += CSWgnomekeyring-dev
> BUILD_DEP_PKGS += CSWlibncurses-dev
> BUILD_DEP_PKGS += CSWggettext-dev
53a64,67
> # Patch 852 introduced a dependency on an Xutf8 function that doesn't exist
> # in S10
> EXTRA_CFLAGS += -DXutf8TextPropertyToTextList=XmbTextPropertyToTextList
> 
_______________________________________________
users mailing list
users@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/users