[Pkg-jed-commit] r770 - in jed/branches/0.99.19/debian: . patches
Jörg Sommer
jo-guest at alioth.debian.org
Thu Jun 7 15:04:30 UTC 2007
Author: jo-guest
Date: 2007-06-07 15:04:30 +0000 (Thu, 07 Jun 2007)
New Revision: 770
Added:
jed/branches/0.99.19/debian/patches/remove_jed_library_path.dpatch
Modified:
jed/branches/0.99.19/debian/changelog
jed/branches/0.99.19/debian/control
jed/branches/0.99.19/debian/patches/00list
jed/branches/0.99.19/debian/rules
Log:
• debian/patches/remove_jed_library_path.dpatch
· A patch to kick jed library path. I send furter explanations to the
mailing list.
• debian/rules
· Added now compiler options for code checks.
• debian/control
· Added slsh as a dependency, because we need the require.
Modified: jed/branches/0.99.19/debian/changelog
===================================================================
--- jed/branches/0.99.19/debian/changelog 2007-06-06 19:48:07 UTC (rev 769)
+++ jed/branches/0.99.19/debian/changelog 2007-06-07 15:04:30 UTC (rev 770)
@@ -3,8 +3,11 @@
* New upstream release, taken from the upstream SVN repository at
gna.org
- -- Jörg Sommer <joerg at alea.gnuu.de> Wed, 6 Jun 2007 20:37:18 +0200
+ * Added slsh to the Depends field for slsh, because since 0.99.19-82
+ jed uses the require from slsh.
+ -- Jörg Sommer <joerg at alea.gnuu.de> Thu, 7 Jun 2007 16:59:04 +0200
+
jed (1:0.99.19~pre89-1) experimental; urgency=low
* New upstream release, taken from the upstream SVN repository at
Modified: jed/branches/0.99.19/debian/control
===================================================================
--- jed/branches/0.99.19/debian/control 2007-06-06 19:48:07 UTC (rev 769)
+++ jed/branches/0.99.19/debian/control 2007-06-07 15:04:30 UTC (rev 770)
@@ -78,7 +78,7 @@
Replaces: jed-sl
Conflicts: jed-sl, jed (<< ${source:Version}), xjed (<< ${source:Version})
Recommends: jed | xjed
-Depends: findutils (>= 4.1.20-6), debconf | debconf-2.0
+Depends: findutils (>= 4.1.20-6), debconf | debconf-2.0, slsh
Description: S-Lang runtime files for jed and xjed
Jed is a small, fast and powerful text editor.
.
Modified: jed/branches/0.99.19/debian/patches/00list
===================================================================
--- jed/branches/0.99.19/debian/patches/00list 2007-06-06 19:48:07 UTC (rev 769)
+++ jed/branches/0.99.19/debian/patches/00list 2007-06-07 15:04:30 UTC (rev 770)
@@ -13,6 +13,7 @@
60_gpm-mouse-support
#endif
+remove_jed_library_path
fix-multi-key
slang2
fix-warnings
Added: jed/branches/0.99.19/debian/patches/remove_jed_library_path.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/remove_jed_library_path.dpatch (rev 0)
+++ jed/branches/0.99.19/debian/patches/remove_jed_library_path.dpatch 2007-06-07 15:04:30 UTC (rev 770)
@@ -0,0 +1,209 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove_jed_library_path.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
+##
+## DP: In version 0.99.19-82 the require and provides functions where dropped
+## DP: from jed and the functions from slsh stepped in. They have a different
+## DP: argument list than the old jed functions and they do not care about jed
+## DP: library path. So it's time to kick the jed library path and replace it
+## DP: slang load path.
+## DP: This patch includes two SLang function [gs]et_jed_library_path() as
+## DP: wrapper around [gs]et_slang_load_path() to ease migratition.
+
+ at DPATCH@
+diff -urNad 0.99.19~/lib/os.sl 0.99.19/lib/os.sl
+--- 0.99.19~/lib/os.sl 2006-11-10 21:33:59.000000000 +0100
++++ 0.99.19/lib/os.sl 2007-06-07 12:42:34.034482624 +0200
+@@ -14,7 +14,7 @@
+ autoload ("_win32_get_helper_app_name", "runpgm");
+ # ifexists set_import_module_path
+ $1 = path_concat (JED_ROOT, "slsh");
+-set_jed_library_path (strcat (get_jed_library_path (), ",", $1));
++set_slang_load_path (strcat (get_slang_load_path (), char(path_get_delimiter()), $1));
+ % set the library path for modules.
+ set_import_module_path(path_concat($1, "modules"));
+ # endif
+diff -urNad 0.99.19~/lib/site.sl 0.99.19/lib/site.sl
+--- 0.99.19~/lib/site.sl 2007-05-29 04:40:18.000000000 +0200
++++ 0.99.19/lib/site.sl 2007-06-07 12:47:34.880968624 +0200
+@@ -44,6 +44,21 @@
+ public variable _Jed_Color_Scheme = NULL;
+ public variable _Jed_Default_Color_Scheme = "black3";
+
++% These are function to archive backward compatibiliy and give third
++% party mode time to migrate to slang load path.
++public define get_jed_library_path()
++{
++ variable t = get_slang_load_path();
++ () = strreplace(t, char(path_get_delimiter()), ",", strlen(t));
++ return ();
++}
++
++public define set_jed_library_path(path)
++{
++ () = strreplace(path, ",", char(path_get_delimiter()), strlen(path));
++ set_slang_load_path( () );
++}
++
+ %!%+
+ %\variable{Tab_Always_Inserts_Tab}
+ %\synopsis{Configure the tab key}
+@@ -482,7 +497,7 @@
+ %!%-
+ define search_path_for_file ()
+ {
+- variable path, f, delim = ',';
++ variable path, f, delim = path_get_delimiter();
+ if (_NARGS == 3)
+ delim = ();
+ (path, f) = ();
+@@ -511,7 +526,7 @@
+ %!%-
+ define expand_jedlib_file (f)
+ {
+- f = search_path_for_file (get_jed_library_path (), f);
++ f = search_path_for_file (get_slang_load_path (), f);
+ if (f == NULL)
+ return "";
+ f;
+@@ -569,8 +584,8 @@
+ Jed_Bin_Dir = dircat (JED_ROOT, "bin");
+ #endif
+
+-Jed_Highlight_Cache_Path = get_jed_library_path ();
+-Jed_Highlight_Cache_Dir = extract_element (Jed_Highlight_Cache_Path, 0, ',');
++Jed_Highlight_Cache_Path = get_slang_load_path ();
++Jed_Highlight_Cache_Dir = extract_element (Jed_Highlight_Cache_Path, 0, path_get_delimiter());
+
+ variable Jed_Doc_Files = "";
+ #ifdef VMS
+@@ -2134,7 +2149,7 @@
+
+ % Comma separated list of directories
+ public variable Color_Scheme_Path = "";
+-foreach (strtok (get_jed_library_path (), ","))
++foreach (strtok (get_slang_load_path (), char(path_get_delimiter()) ))
+ {
+ $1 = ();
+ Color_Scheme_Path = dircat ($1, "colors");
+@@ -2149,11 +2164,11 @@
+ return;
+ scheme = string (scheme); % for back-compatability, file may be an integer
+
+- file = search_path_for_file (Color_Scheme_Path, scheme + ".sl");
++ file = search_path_for_file (Color_Scheme_Path, scheme + ".sl", ',');
+ if (file == NULL)
+ {
+ % Try .slc file
+- file = search_path_for_file (Color_Scheme_Path, scheme + ".slc");
++ file = search_path_for_file (Color_Scheme_Path, scheme + ".slc", ',');
+ if (file == NULL)
+ {
+ vmessage ("Color scheme %S is not supported", scheme);
+@@ -3270,13 +3285,13 @@
+ if (2 != file_status ($2))
+ continue;
+
+- set_jed_library_path (strcat (get_jed_library_path (), ",", $2));
++ set_slang_load_path (strcat (get_slang_load_path (), char(path_get_delimiter()), $2));
+ $2 = path_concat ($2, "help");
+ if (2 == file_status ($2))
+ jed_append_doc_file ($2);
+
+ $2 = path_concat ($1, "share/slsh");
+- set_jed_library_path (strcat (get_jed_library_path (), ",", $2));
++ set_slang_load_path (strcat (get_slang_load_path (), char(path_get_delimiter()), $2));
+ $2 = path_concat ($2, "help");
+ if (2 == file_status ($2))
+ jed_append_doc_file ($2);
+diff -urNad 0.99.19~/src/ledit.c 0.99.19/src/ledit.c
+--- 0.99.19~/src/ledit.c 2006-12-09 18:21:24.000000000 +0100
++++ 0.99.19/src/ledit.c 2007-06-07 12:42:34.042482624 +0200
+@@ -87,8 +87,6 @@
+ int Ignore_Beep = 0;
+ int MiniBuffer_Active = 0;
+
+-char *Jed_Library;
+-
+ /* Do not change this value without changing file_findfirst/next. */
+ #define JED_MAX_COMPLETION_LEN JED_MAX_PATH_LEN
+
+@@ -1379,7 +1377,7 @@
+ VFILE *vp = NULL;
+
+ libf = file;
+- lib = Jed_Library;
++ lib = SLpath_get_load_path ();
+
+ /* If file begins with ./,then read it from the current directory */
+ if ((0 == strncmp (file, "./", 2))
+@@ -1403,7 +1401,8 @@
+ type = NULL;
+
+ n = 0;
+- while (0 == SLextract_list_element (lib, n, ',', libfsl, sizeof(libfsl)))
++ while (0 == SLextract_list_element (lib, n, SLpath_get_delimiter(),
++ libfsl, sizeof(libfsl)))
+ {
+ n++;
+
+diff -urNad 0.99.19~/src/ledit.h 0.99.19/src/ledit.h
+--- 0.99.19~/src/ledit.h 2006-03-04 08:55:05.000000000 +0100
++++ 0.99.19/src/ledit.h 2007-06-07 12:42:34.042482624 +0200
+@@ -67,7 +67,6 @@
+ extern void set_tab(int *);
+ extern char *command_line_argv(int *);
+ extern int MiniBuffer_Active;
+-extern char *Jed_Library;
+ extern FILE *jed_open_slang_file(char *, char *);
+ extern char *Completion_Buffer;
+ extern void set_expansion_hook (char *);
+diff -urNad 0.99.19~/src/main.c 0.99.19/src/main.c
+--- 0.99.19~/src/main.c 2006-12-16 17:59:16.000000000 +0100
++++ 0.99.19/src/main.c 2007-06-07 12:42:34.046482624 +0200
+@@ -191,9 +191,8 @@
+ }
+ }
+ else strcpy(jed_lib, jl);
+-
+- Jed_Library = SLang_create_slstring (jed_lib);
+- if (Jed_Library == NULL)
++
++ if (SLpath_set_load_path(jed_lib) != 0)
+ exit_error ("Out of memory", 0);
+ }
+
+diff -urNad 0.99.19~/src/replace.c 0.99.19/src/replace.c
+--- 0.99.19~/src/replace.c 2006-08-08 05:34:21.000000000 +0200
++++ 0.99.19/src/replace.c 2007-06-07 12:42:34.046482624 +0200
+@@ -304,22 +304,6 @@
+
+ /*}}}*/
+
+-static char *get_jed_library_path (void)
+-{
+- return Jed_Library;
+-}
+-
+-static void set_jed_library_path (void)
+-{
+- char *s;
+-
+- if (SLang_pop_slstring (&s))
+- return;
+-
+- SLang_free_slstring (Jed_Library);
+- Jed_Library = s;
+-}
+-
+ static int set_buffer_umask (int *cmask)
+ {
+ int u = CBuf->umask;
+@@ -393,8 +377,6 @@
+ #endif
+ MAKE_INTRINSIC("count_narrows", jed_count_narrows, INT_TYPE, 0),
+ MAKE_INTRINSIC("widen_buffer", widen_this_buffer, VOID_TYPE, 0),
+- MAKE_INTRINSIC ("get_jed_library_path", get_jed_library_path, STRING_TYPE, 0),
+- MAKE_INTRINSIC ("set_jed_library_path", set_jed_library_path, VOID_TYPE, 0),
+ MAKE_INTRINSIC(NULL, NULL, 0, 0)
+ };
+
Property changes on: jed/branches/0.99.19/debian/patches/remove_jed_library_path.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: jed/branches/0.99.19/debian/rules
===================================================================
--- jed/branches/0.99.19/debian/rules 2007-06-06 19:48:07 UTC (rev 769)
+++ jed/branches/0.99.19/debian/rules 2007-06-07 15:04:30 UTC (rev 770)
@@ -4,7 +4,9 @@
# These additional compiler flags should bring up warnings about common
# sources of errors.
-CFLAGS += -Wall -Wformat=2 -Wunused -Wundef -Wextra -g
+CFLAGS += -g -Wall -Wformat=2 -Wunused -Wundef -Wextra -Wswitch-enum -Wshadow \
+ -Wpointer-arith -Wnested-externs -Wbad-function-cast -Wcast-qual \
+ -Wcast-align
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
More information about the Pkg-jed-commit
mailing list