4cfc530523
- Update to version 4.4:
- Small spec file cleanup
old: editors/joe
new: home:pluskalm:branches:editors/joe rev None
Index: joe-3.1-fix_isblanck_argument.patch
===================================================================
--- joe-3.1-fix_isblanck_argument.patch (revision 27)
+++ joe-3.1-fix_isblanck_argument.patch (revision 2)
@@ -2,10 +2,10 @@
joe/b.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
-Index: joe-4.1/joe/b.c
+Index: joe/b.c
===================================================================
---- joe-4.1.orig/joe/b.c
-+++ joe-4.1/joe/b.c
+--- joe/b.c.orig
++++ joe/b.c
@@ -633,9 +633,10 @@ int piseow(P *p)
int pisblank(P *p)
{
Index: joe-3.3-warnings.patch
===================================================================
--- joe-3.3-warnings.patch (revision 27)
+++ joe-3.3-warnings.patch (revision 2)
@@ -2,10 +2,10 @@
joe/bw.c | 1 +
1 file changed, 1 insertion(+)
-Index: joe-4.2/joe/bw.c
+Index: joe/bw.c
===================================================================
---- joe-4.2.orig/joe/bw.c 2016-03-06 16:39:55.000000000 +0100
-+++ joe-4.2/joe/bw.c 2016-05-02 10:16:25.981304470 +0200
+--- joe/bw.c.orig
++++ joe/bw.c
@@ -209,6 +209,7 @@ void bwfllw(W *w)
static HIGHLIGHT_STATE get_highlight_state(BW *w, P *p, off_t line)
{
Index: joe-3.7-additional_key_mappings.patch
===================================================================
--- joe-3.7-additional_key_mappings.patch (revision 27)
+++ joe-3.7-additional_key_mappings.patch (revision 2)
@@ -6,11 +6,11 @@
rc/rjoerc.in | 2 ++
5 files changed, 14 insertions(+)
-Index: joe-4.2/rc/jmacsrc.in
+Index: rc/jmacsrc.in
===================================================================
---- joe-4.2.orig/rc/jmacsrc.in 2016-03-06 16:39:56.000000000 +0100
-+++ joe-4.2/rc/jmacsrc.in 2016-05-02 10:16:25.989304424 +0200
-@@ -1055,6 +1055,7 @@ home .kh Goto beginning of line
+--- rc/jmacsrc.in.orig
++++ rc/jmacsrc.in
+@@ -1058,6 +1058,7 @@ home .kh Goto beginning of line
home ^A
home ^[ [ H
home ^[ [ 1 ~
@@ -18,7 +18,7 @@
bop ^[ p (uemacs)
bop ^[ P (uemacs)
bop ^[ {
-@@ -1086,6 +1087,7 @@ eol .@7
+@@ -1089,6 +1090,7 @@ eol .@7
eol ^E
eol ^[ [ F
eol ^[ [ 4 ~
@@ -26,11 +26,11 @@
eop ^[ n (uemacs)
eop ^[ N (uemacs)
eop ^[ }
-Index: joe-4.2/rc/joerc.in
+Index: rc/joerc.in
===================================================================
---- joe-4.2.orig/rc/joerc.in 2016-03-06 19:53:12.000000000 +0100
-+++ joe-4.2/rc/joerc.in 2016-05-02 10:16:25.989304424 +0200
-@@ -1103,6 +1103,9 @@ bof ^K u
+--- rc/joerc.in.orig
++++ rc/joerc.in
+@@ -1106,6 +1106,9 @@ bof ^K u
bol ^# SP A
home .kh
home ^A
@@ -40,7 +40,7 @@
center ^K A Center line
center ^K ^A
center ^K a
-@@ -1129,6 +1132,9 @@ eof ^K v
+@@ -1132,6 +1135,9 @@ eof ^K v
eol .kH Go to end of line
eol .@7
eol ^E
@@ -50,11 +50,11 @@
exsave ^K X Save and exit
exsave ^K ^X
exsave ^K x
-Index: joe-4.2/rc/jpicorc.in
+Index: rc/jpicorc.in
===================================================================
---- joe-4.2.orig/rc/jpicorc.in 2016-03-06 16:39:56.000000000 +0100
-+++ joe-4.2/rc/jpicorc.in 2016-05-02 10:16:25.989304424 +0200
-@@ -874,6 +874,7 @@ home .kh Goto beginning of line
+--- rc/jpicorc.in.orig
++++ rc/jpicorc.in
+@@ -877,6 +877,7 @@ home .kh Goto beginning of line
home ^A
home ^[ [ H
home ^[ [ 1 ~
@@ -62,7 +62,7 @@
center ^[ ^C Center line
center ^[ c
delch .kD Delete character
-@@ -902,6 +903,7 @@ eol .@7
+@@ -905,6 +906,7 @@ eol .@7
eol ^E
eol ^[ [ F
eol ^[ [ 4 ~
@@ -70,11 +70,11 @@
execmd ^[ X Prompt for command to execute
execmd ^[ ^X Prompt for command to execute
execmd ^[ x Prompt for command to execute
-Index: joe-4.2/rc/jstarrc.in
+Index: rc/jstarrc.in
===================================================================
---- joe-4.2.orig/rc/jstarrc.in 2016-03-06 16:39:56.000000000 +0100
-+++ joe-4.2/rc/jstarrc.in 2016-05-02 10:16:25.989304424 +0200
-@@ -912,6 +912,7 @@ bof ^Q .kP
+--- rc/jstarrc.in.orig
++++ rc/jstarrc.in
+@@ -915,6 +915,7 @@ bof ^Q .kP
home .kh Goto beginning of line
home ^[ [ H
home ^[ [ 1 ~
@@ -82,7 +82,7 @@
home ^Q S
home ^Q ^S
home ^Q s
-@@ -953,6 +954,7 @@ eol .kH Go to end of line
+@@ -956,6 +957,7 @@ eol .kH Go to end of line
eol .@7
eol ^[ [ F
eol ^[ [ 4 ~
@@ -90,11 +90,11 @@
eol ^Q D
eol ^Q ^D
eol ^Q d
-Index: joe-4.2/rc/rjoerc.in
+Index: rc/rjoerc.in
===================================================================
---- joe-4.2.orig/rc/rjoerc.in 2016-03-06 16:39:56.000000000 +0100
-+++ joe-4.2/rc/rjoerc.in 2016-05-02 10:16:25.989304424 +0200
-@@ -916,6 +916,7 @@ bol .kh Goto beginning of line
+--- rc/rjoerc.in.orig
++++ rc/rjoerc.in
+@@ -919,6 +919,7 @@ bol .kh Goto beginning of line
bol ^A
bol ^[ [ H
bol ^[ [ 1 ~
@@ -102,7 +102,7 @@
bol ^# SP A
center ^K A Center line
center ^K ^A
-@@ -944,6 +945,7 @@ eol .kH Go to end of line
+@@ -947,6 +948,7 @@ eol .kH Go to end of line
eol ^E
eol ^[ [ F
eol ^[ [ 4 ~
Index: joe-3.7-spec_association.patch
===================================================================
--- joe-3.7-spec_association.patch (revision 27)
+++ joe-3.7-spec_association.patch (revision 2)
@@ -2,11 +2,11 @@
rc/ftyperc | 6 ++++++
1 file changed, 6 insertions(+)
-Index: joe-4.1/rc/ftyperc
+Index: rc/ftyperc
===================================================================
---- joe-4.1.orig/rc/ftyperc
-+++ joe-4.1/rc/ftyperc
-@@ -575,6 +575,12 @@
+--- rc/ftyperc.orig
++++ rc/ftyperc
+@@ -605,6 +605,12 @@
*jpicorc.in
-syntax joerc
Index: joe-sigiot.patch
===================================================================
--- joe-sigiot.patch (revision 27)
+++ joe-sigiot.patch (revision 2)
@@ -2,10 +2,10 @@
joe/uformat.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
-Index: joe-4.1/joe/uformat.c
+Index: joe/uformat.c
===================================================================
---- joe-4.1.orig/joe/uformat.c
-+++ joe-4.1/joe/uformat.c
+--- joe/uformat.c.orig
++++ joe/uformat.c
@@ -459,7 +459,7 @@ void wrapword(BW *bw, P *p, off_t indent
if (!pisbol(p) && piscol(p) > indent) {
/* Move q to two (or one if 'french' is set) spaces after end of previous
Index: joe.changes
===================================================================
--- joe.changes (revision 27)
+++ joe.changes (revision 2)
@@ -1,4 +1,56 @@
-------------------------------------------------------------------
+Mon Jan 23 15:50:17 UTC 2017 - mpluskal@suse.com
+
+- Update to version 4.4:
+ * Fix segfault due to buffer overrun. This happens if a line
+ with many backslashes appears in the status line context display.
+ * Fix jmacs: ^X ^F and ^X ^B were not working
+ * Build fixes for Solaris
+ * Improve php highlighter: allow numbers in substitution variable names
+ * Unicode tweak: treat private use characters (Co) as printable
+ * Dockerfile highlighter: Add Docker new commands from 1.12,
+ mark bad strings in arrays
+ * Fix loading external charmaps
+- Changes for version 4.3:
+ * Improve memory usage by shrinking buffer header size and
+ highlighter state size.
+ * Improve performance of status line context display (which shows
+ the first line of the function that the cursor is currently in).
+ This feature was making JOE very slow on extremely large files with
+ auto indent enabled (typically JSON or XML data files). Now
+ the syntax highlighter computes the context display (using a new
+ syntax named context.jsf).
+ * Add a mode 'title' to enable or disable the status line context
+ display (previously autoindent mode was overloaded to do this).
+ * Disable syntax highlighting and context display in very large
+ files
+ * Force more appropriate modes when we enter hex dump display:
+ enable overtype, disable autoindent, wordwrap, ansi, picture.
+ * Handle middle mouse button in "joe -mouse" mode (before it did
+ nothing). It's treated as paste (copy region to mouse) as
+ expected. (patch from Petr Olsak).
+ * Do not kill region highlighting during incremental search (patch
+ from Petr Olsak).
+ * Negative numbers were not being recognized in blocks
+ * PgUp/PgDn would try to scroll menu if the window above is a menu
+ (it should do this only for completion menus associated with
+ prompts)
+ * Use 'LC_ALL=C sed' to get JOE to compile in OS X.
+ * Forward direction delimiter matching where the delimiters do
+ not begin with special characters (for example in Verilog
+ "begin" / "end") was not working.
+ * Get mouse to work in menus: this broke in 4.1
+ * Character classes with ranges were not working for UTF-8 (as in \\[a-z])
+ * Apply spec highlighting to .spec files
+ * Gracefully handle short terminals: fix segfaults which occur when
+ trying to shrink terminal while many windows are on the screen or
+ while turning on help with a short terminal. Fix similar bugs
+ involving the skiptop option. JOE now works even if the terminal
+ height is only one line.
+- Refresh patches
+- Small spec file cleanup
+
+-------------------------------------------------------------------
Mon May 2 10:14:54 CEST 2016 - pth@suse.de
- Update to 4.2:
Index: joe.spec
===================================================================
--- joe.spec (revision 27)
+++ joe.spec (revision 2)
@@ -1,7 +1,7 @@
#
# spec file for package joe
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,14 @@
Name: joe
-Version: 4.2
+Version: 4.4
Release: 0
Summary: A Text Editor
License: GPL-2.0+
+# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
Group: Productivity/Editors/Other
Url: http://sourceforge.net/projects/joe-editor
-Source: http://downloads.sf.net/joe-editor/%name-%version.tar.gz
+Source: http://downloads.sf.net/joe-editor/%{name}-%{version}.tar.gz
Source2: de.po
Source3: joe-rpmlintrc
Patch2: joe-3.1-fix_isblanck_argument.patch
@@ -41,14 +42,14 @@
%prep
%setup -q
-%patch2 -p1
-%patch3 -p1
-%patch7 -p1
-%patch8 -p1
-%patch10 -p1
+%patch2
+%patch3
+%patch7
+%patch8
+%patch10
%build
-autoreconf -fi
+autoreconf -fiv
export CFLAGS="%{optflags} -W -Wno-unused"
%configure \
--prefix=%{_prefix} \
@@ -59,7 +60,7 @@
make %{?_smp_mflags}
%install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
for i in jmacs jpico jstar rjoe; do
ln -s joe.1.gz %{buildroot}%{_mandir}/man1/$i.1.gz
done
Index: joe-4.4.tar.gz
===================================================================
Binary file joe-4.4.tar.gz (revision 2) added
Index: joe-4.2.tar.gz
===================================================================
Binary file joe-4.2.tar.gz (revision 27) deleted
OBS-URL: https://build.opensuse.org/request/show/451978
OBS-URL: https://build.opensuse.org/package/show/editors/joe?expand=0&rev=28
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
---
|
|
joe/uformat.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
Index: joe/uformat.c
|
|
===================================================================
|
|
--- joe/uformat.c.orig
|
|
+++ joe/uformat.c
|
|
@@ -459,7 +459,7 @@ void wrapword(BW *bw, P *p, off_t indent
|
|
if (!pisbol(p) && piscol(p) > indent) {
|
|
/* Move q to two (or one if 'french' is set) spaces after end of previous
|
|
word */
|
|
- q = pdup(p, "wrapword");
|
|
+ q = pdup(p, "wrapword;");
|
|
while (!pisbol(q))
|
|
if (!joe_isblank(p->b->o.charmap, (c = prgetc(q)))) {
|
|
pgetc(q);
|
|
@@ -596,10 +596,12 @@ int uformat(W *w, int k)
|
|
if (!bw->o.autoindent) {
|
|
/* Don't indent second line of single-line paragraphs if autoindent is off */
|
|
ptrdiff_t tx = zlen(indents);
|
|
+ ptrdiff_t start = tx;
|
|
while (tx && (indents[tx - 1] == ' ' || indents[tx - 1] == '\t'))
|
|
indents[--tx] = 0;
|
|
if (tx) {
|
|
- indents[tx++] = ' ';
|
|
+ if (tx < start)
|
|
+ indents[tx++] = ' ';
|
|
indents[tx] = 0;
|
|
}
|
|
indent = txtwidth1(bw->o.charmap, bw->o.tab, indents, tx);
|