diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-11-14 23:02:47 +0100 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-11-15 20:40:50 +0100 |
| commit | 59765f508225998d8a73b1da8380ff06b4a6b79c (patch) | |
| tree | 9397850a4ab5bac51ec373558722c45be4fe7258 /patches/vim-7.4.1952.local.patch | |
| parent | 8739dbe67d82f90d1c3b63a8d07af291c4ace600 (diff) | |
| download | midipix_build-59765f508225998d8a73b1da8380ff06b4a6b79c.tar.bz2 midipix_build-59765f508225998d8a73b1da8380ff06b4a6b79c.tar.xz | |
1) Replaces the SysV-style build script link mechanism w/ build {,meta-}targets,
2) splits build.{subr,sh}} into subr/{build,pkg,rtl}.subr and build.sh,
3) replaces {997.strip,998.midipix_sh,999.tarballs}.build with subr/{strip,tarball}.subr,
4) moves patches to patches/, vars files to vars/, and everything else to etc/,
5) renames `Create `Midipix mintty shell' shortcut.vbs' to midipix_shortcut.vbs,
6) fixes a Weechat configure issue, and
7) updates etc/{build.usage,README}.
Diffstat (limited to 'patches/vim-7.4.1952.local.patch')
| -rw-r--r-- | patches/vim-7.4.1952.local.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/patches/vim-7.4.1952.local.patch b/patches/vim-7.4.1952.local.patch new file mode 100644 index 00000000..178e0fc5 --- /dev/null +++ b/patches/vim-7.4.1952.local.patch @@ -0,0 +1,56 @@ +--- vim-7.4.1952/src/osdef2.h.in.orig 2016-06-21 23:42:20.000000000 +0200 ++++ vim-7.4.1952/src/osdef2.h.in 2016-09-06 18:33:43.655518796 +0200 +@@ -92,5 +92,5 @@ + extern int _Xmblen(char const *, size_t); + #else + /* This is different from the header but matches mblen() */ +-extern int _Xmblen(char *, size_t); ++extern int _Xmblen(char *, int); + #endif +--- vim-7.4.1952/src/Makefile.orig 2016-06-21 23:42:20.000000000 +0200 ++++ vim-7.4.1952/src/Makefile 2016-09-07 06:29:14.483862359 +0200 +@@ -2692,7 +2692,7 @@ + $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@ + + auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in +- CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh ++ CC="$(CC) $(OSDEF_CFLAGS) -I$(PKG_PREFIX)/include" srcdir=$(srcdir) sh $(srcdir)/osdef.sh + + auto/pathdef.c: Makefile auto/config.mk + -@echo creating $@ +--- vim-7.4.1952/src/auto/configure.orig 2016-06-21 23:42:20.000000000 +0200 ++++ vim-7.4.1952/src/auto/configure 2016-09-16 16:37:28.147266000 +0200 +@@ -2603,7 +2603,7 @@ + ## -------------------- ## + + ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' ++ac_cpp='$CPP $CFLAGS $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -7607,6 +7607,7 @@ + + # Standard set of common directories for X headers. + # Check X11 before X11Rn because it is often a symlink to the current release. ++if test -z "$ac_x_header_dirs"; then + ac_x_header_dirs=' + /usr/X11/include + /usr/X11R7/include +@@ -7645,6 +7646,7 @@ + + /usr/openwin/include + /usr/openwin/share/include' ++fi + + if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. +@@ -9488,7 +9490,7 @@ + + + +- ++SKIP_MOTIF=YES + if test -z "$SKIP_MOTIF"; then + gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX" + GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`" |