[Pkg-virtualbox-commits] [kbuild] 03/09: New upstream version 0.1.9998svn3149+dfsg
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Fri Mar 16 11:52:28 UTC 2018
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository kbuild.
commit 59682479907fdff9364269e10921e51d46e5030d
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date: Thu Mar 15 18:43:24 2018 +0100
New upstream version 0.1.9998svn3149+dfsg
---
SlickEdit/kdev.e | 26 +++++++++++++++-----------
SlickEdit/kkeys.e | 12 +++++++++++-
src/kmk/Makefile.kmk | 3 +--
src/kmk/configure.ac | 35 +++++++++++++++++++----------------
src/kmk/glob/fnmatch.c | 2 +-
src/kmk/glob/glob.c | 6 ++++--
src/kmk/kmkbuiltin/chmod.c | 2 +-
src/kmk/kmkbuiltin/cp.c | 2 +-
src/kmk/kmkbuiltin/cp_utils.c | 2 +-
src/kmk/kmkbuiltin/rm.c | 2 +-
src/kmk/main.c | 2 +-
11 files changed, 56 insertions(+), 38 deletions(-)
diff --git a/SlickEdit/kdev.e b/SlickEdit/kdev.e
index 81c624e..7cfd1ab 100644
--- a/SlickEdit/kdev.e
+++ b/SlickEdit/kdev.e
@@ -1,4 +1,4 @@
-/* $Id: kdev.e 3137 2018-03-06 22:29:41Z bird $ -*- tab-width: 4 c-indent-level: 4 -*- */
+/* $Id: kdev.e 3146 2018-03-15 17:01:15Z bird $ -*- tab-width: 4 c-indent-level: 4 -*- */
/** @file
* Visual SlickEdit Documentation Macros.
*/
@@ -3564,7 +3564,9 @@ _command void kdev_load_settings()
/*
* Load the color profile (was lexer).
*/
- cload(_strip_filename(__FILE__, 'N') '/user.vlx');
+ int rc = cload(_strip_filename(__FILE__, 'N') '/user.vlx');
+ if (rc != 0)
+ messageNwait('cload of user.vlx failed: ' rc);
#endif
/*
@@ -3575,6 +3577,17 @@ _command void kdev_load_settings()
_default_option('R', '130'); /* Vertical line in column 130. */
def_mfsearch_init_flags = 2 | 4; /* MFSEARCH_INIT_CURWORD | MFSEARCH_INIT_SELECTION */
def_line_insert = 'B'; /* insert before */
+ def_updown_col=0; /* cursor movement */
+ def_cursorwrap=0; /* ditto. */
+ def_click_past_end=1; /* ditto */
+ def_start_on_first=1; /* vs A B C; view A. */
+ def_vc_system='Subversion' /* svn is default version control */
+#if __VERSION__ >= 16.0
+ def_auto_unsurround_block=0; /* Delete line, not block. */
+#endif
+ _config_modify_flags(CFGMODIFY_DEFDATA);
+
+#if __VERSION__ < 21.0 /* I think this is obsolete... */
def_file_types='All Files (*),' /** @todo make this prettier */
'C/C++ Files (*.c;*.cc;*.cpp;*.cp;*.cxx;*.c++;*.h;*.hh;*.hpp;*.hxx;*.inl;*.xpm),'
'Assembler (*.s;*.asm;*.mac;*.S),'
@@ -3618,16 +3631,7 @@ _command void kdev_load_settings()
'Vera Files (*.vr;*.vrh),'
'Erlang Files (*.erl;*.hrl),'
;
-
- def_updown_col=0; /* cursor movement */
- def_cursorwrap=0; /* ditto. */
- def_click_past_end=1; /* ditto */
- def_start_on_first=1; /* vs A B C; view A. */
- def_vc_system='Subversion' /* svn is default version control */
-#if __VERSION__ >= 16.0
- def_auto_unsurround_block=0; /* Delete line, not block. */
#endif
- _config_modify_flags(CFGMODIFY_DEFDATA);
/* Make it grok: # include <stuff.h> */
for (i = 0; i < aCLikeIncs._length(); i++)
diff --git a/SlickEdit/kkeys.e b/SlickEdit/kkeys.e
index 2614376..0221e58 100644
--- a/SlickEdit/kkeys.e
+++ b/SlickEdit/kkeys.e
@@ -1,4 +1,4 @@
-/* $Id: kkeys.e 3015 2016-11-29 10:14:56Z bird $ */
+/* $Id: kkeys.e 3146 2018-03-15 17:01:15Z bird $ */
/** @file
* Bird's key additions to Visual Slickedit.
*/
@@ -53,6 +53,12 @@ def 'C-DEL' = kkeys_delete_right
#if __VERSION__ >= 15.0
def 'S-C-=' = svn_diff_with_base
#endif
+#if __VERSION__ >= 22.0
+def 'C-=' = diff;
+def 'C--' = nil;
+def 'S-A-C-=' = wfont_zoom_in;
+def 'S-A-C--' = wfont_zoom_out;
+#endif
#if __VERSION__ >= 14.0
def 'C-/' = kkeys_push_ref
def 'S-C-/' = push_ref
@@ -79,6 +85,10 @@ def 'S-M-]' = next_buff_tab
def 'S-M-[' = prev_buff_tab
def 'S-M-U' = kkeys_gen_uuid
#endif
+#if __VERSION__ >= 22.0
+def 'S-M-C-=' = wfont_zoom_in;
+def 'S-M-C--' = wfont_zoom_out;
+#endif
/* Fixing brainfucked slickedit silliness: */
def 'M-v' = paste
diff --git a/src/kmk/Makefile.kmk b/src/kmk/Makefile.kmk
index 5d3bed4..43765a9 100644
--- a/src/kmk/Makefile.kmk
+++ b/src/kmk/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 3140 2018-03-14 21:28:10Z bird $
+# $Id: Makefile.kmk 3147 2018-03-15 17:29:12Z bird $
## @file
# Sub-makefile for kmk / GNU Make.
#
@@ -125,7 +125,6 @@ kmkmissing_SOURCES.linux += \
kmkbuiltin/strlcpy.c
kmkmissing_SOURCES.netbsd = \
- glob/glob.c \
glob/fnmatch.c
kmkmissing_SOURCES.openbsd = \
diff --git a/src/kmk/configure.ac b/src/kmk/configure.ac
index 9875b15..fb4b502 100644
--- a/src/kmk/configure.ac
+++ b/src/kmk/configure.ac
@@ -393,26 +393,29 @@ AS_IF([(/usr/sccs/admin -n s.conftest || admin -n s.conftest) >/dev/null 2>&1 &&
])
rm -f s.conftest conftoast
+## bird: always use our glob impl. Avoids trouble with newish glibc.
# Check the system to see if it provides GNU glob. If not, use our
# local version.
-AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob],
-[ AC_EGREP_CPP([gnu glob],[
-#include <features.h>
-#include <glob.h>
-#include <fnmatch.h>
-
-#define GLOB_INTERFACE_VERSION 1
-#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
-# include <gnu-versions.h>
-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
- gnu glob
-# endif
-#endif],
- [make_cv_sys_gnu_glob=yes],
- [make_cv_sys_gnu_glob=no])])
-AS_IF([test "$make_cv_sys_gnu_glob" = no],
+#x# AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob],
+#x# [ AC_EGREP_CPP([gnu glob],[
+#x# #include <features.h>
+#x# #include <glob.h>
+#x# #include <fnmatch.h>
+#x#
+#x# #define GLOB_INTERFACE_VERSION 1
+#x# #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
+#x# # include <gnu-versions.h>
+#x# # if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
+#x# gnu glob
+#x# # endif
+#x# #endif],
+#x# [make_cv_sys_gnu_glob=yes],
+#x# [make_cv_sys_gnu_glob=no])])
+#x# AS_IF([test "$make_cv_sys_gnu_glob" = no],
+AS_IF([test yes = yes],
[ GLOBINC='-I$(srcdir)/glob'
GLOBLIB=glob/libglob.a
+ make_cv_sys_gnu_glob=no
])
AC_SUBST([GLOBINC])
AC_SUBST([GLOBLIB])
diff --git a/src/kmk/glob/fnmatch.c b/src/kmk/glob/fnmatch.c
index 03d0352..b346e10 100644
--- a/src/kmk/glob/fnmatch.c
+++ b/src/kmk/glob/fnmatch.c
@@ -56,7 +56,7 @@ USA. */
program understand `configure --with-gnu-libc' and omit the object files,
it is simpler to just do this in the source for each such file. */
-#if defined _LIBC || !defined __GNU_LIBRARY__
+#if defined _LIBC || !defined __GNU_LIBRARY__ || 1 /* bird: Same as for glob.c, don't want trouble. */
# if defined STDC_HEADERS || !defined isascii
diff --git a/src/kmk/glob/glob.c b/src/kmk/glob/glob.c
index d36848d..b2cb32a 100644
--- a/src/kmk/glob/glob.c
+++ b/src/kmk/glob/glob.c
@@ -50,12 +50,14 @@ USA. */
it is simpler to just do this in the source for each such file. */
#define GLOB_INTERFACE_VERSION 1
+#if 0 /* bird: Apparently this causes trouble for some debian builds. */
#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
# include <gnu-versions.h>
# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
# define ELIDE_CODE
# endif
#endif
+#endif
#ifndef ELIDE_CODE
@@ -209,7 +211,7 @@ my_realloc (p, n)
#endif /* __GNU_LIBRARY__ || __DJGPP__ */
-#if !defined __alloca && !defined __GNU_LIBRARY__
+#if !defined __alloca /*&& !defined __GNU_LIBRARY__ - bird: unresolved __alloca symbol if skipping this for gnu libc. duh. */
# ifdef __GNUC__
# undef alloca
@@ -226,7 +228,7 @@ extern char *alloca ();
# endif /* WINDOWS32 */
# endif /* Not _AIX. */
# endif /* sparc or HAVE_ALLOCA_H. */
-# endif /* GCC. */
+# endif /* Not GCC. */
# define __alloca alloca
diff --git a/src/kmk/kmkbuiltin/chmod.c b/src/kmk/kmkbuiltin/chmod.c
index e6db989..d4aa745 100644
--- a/src/kmk/kmkbuiltin/chmod.c
+++ b/src/kmk/kmkbuiltin/chmod.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94";
#include "err.h"
#include <errno.h>
-#include <fts.h>
+#include "fts.h"
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/kmk/kmkbuiltin/cp.c b/src/kmk/kmkbuiltin/cp.c
index 57bf223..d07ebe4 100644
--- a/src/kmk/kmkbuiltin/cp.c
+++ b/src/kmk/kmkbuiltin/cp.c
@@ -65,7 +65,7 @@ __FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.50 2004/04/06 20:06:44 markm Exp $");
#include "err.h"
#include <errno.h>
-#include <fts.h>
+#include "fts.h"
#include <limits.h>
#include <signal.h>
#include <stdio.h>
diff --git a/src/kmk/kmkbuiltin/cp_utils.c b/src/kmk/kmkbuiltin/cp_utils.c
index 5410f6f..5e001c7 100644
--- a/src/kmk/kmkbuiltin/cp_utils.c
+++ b/src/kmk/kmkbuiltin/cp_utils.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.43 2004/04/06 20:06:44 markm Exp $");
#include "err.h"
#include <errno.h>
#include <fcntl.h>
-#include <fts.h>
+#include "fts.h"
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/kmk/kmkbuiltin/rm.c b/src/kmk/kmkbuiltin/rm.c
index 5c814c9..4f92131 100644
--- a/src/kmk/kmkbuiltin/rm.c
+++ b/src/kmk/kmkbuiltin/rm.c
@@ -53,7 +53,7 @@ static char sccsid[] = "@(#)rm.c 8.5 (Berkeley) 4/18/94";
#include "err.h"
#include <errno.h>
#include <fcntl.h>
-#include <fts.h>
+#include "fts.h"
#include <grp.h>
#include <pwd.h>
#include <stdio.h>
diff --git a/src/kmk/main.c b/src/kmk/main.c
index c2bcf50..d72ca02 100644
--- a/src/kmk/main.c
+++ b/src/kmk/main.c
@@ -4056,7 +4056,7 @@ print_version (void)
#ifdef KMK
printf ("\n\
%skBuild modifications:\n\
-%s Copyright (c) 2005-2013 knut st. osmundsen.\n\
+%s Copyright (c) 2005-2018 knut st. osmundsen.\n\
\n\
%skmkbuiltin commands derived from *BSD sources:\n\
%s Copyright (c) 1983 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994\n\
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/kbuild.git
More information about the Pkg-virtualbox-commits
mailing list