rpm/joe
SHA256
1
0
Fork 0
forked from pool/joe
Code Pull Requests Activity

Accepting request 336335 from home:jengelh:branches:editors

Browse Source 
- Update to new upstream release 4.1

OBS-URL: https://build.opensuse.org/request/show/336335
OBS-URL: https://build.opensuse.org/package/show/editors/joe?expand=0&rev=24
This commit is contained in:
Dirk Stoecker 2015-10-04 20:57:00 +00:00 committed by Git OBS Bridge
parent 58a87e23a0
commit 9c5becbb93
11 changed files with 114 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
joe-3.1-fix_isblanck_argument.patch
View File

@ -1,11 +1,15 @@
Index: joe-4.0/joe/b.c
---
joe/b.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Index: joe-4.1/joe/b.c
===================================================================
--- joe-4.0.orig/joe/b.c
+++ joe-4.0/joe/b.c
@@ -626,9 +626,10 @@ int piseow(P *p)
--- joe-4.1.orig/joe/b.c
+++ joe-4.1/joe/b.c
@@ -633,9 +633,10 @@ int piseow(P *p)
int pisblank(P *p)
{
P *q = pdup(p, USTR "pisblank");
P *q = pdup(p, "pisblank");
+ int brc_result;
p_goto_bol(q);
@ -14,10 +18,10 @@ Index: joe-4.0/joe/b.c
pgetb(q);
if (piseol(q)) {
prm(q);
@@ -660,9 +661,10 @@ long pisindent(P *p)
@@ -667,9 +668,10 @@ off_t pisindent(P *p)
{
P *q = pdup(p, USTR "pisindent");
long col;
P *q = pdup(p, "pisindent");
off_t col;
+ int brc_result;
p_goto_bol(q);

13
joe-3.1-terminate_buffer.patch
View File

@ -1,13 +0,0 @@
Index: joe-4.0/joe/path.c
===================================================================
--- joe-4.0.orig/joe/path.c
+++ joe-4.0/joe/path.c
@@ -200,6 +200,8 @@ unsigned char *mktmp(unsigned char *wher
where = (unsigned char *)getenv("TEMP");
if (!where)
where = USTR _PATH_TMP;
+ if (strlen(where) > PATH_MAX+NAME_MAX)
+ where[PATH_MAX+NAME_MAX+1] = '\0';
namesize = zlen(where) + 16;
name = vsmk(namesize); /* [G.Ghibo'] we need to use vsmk() and not malloc() as

22
joe-3.3-warnings.patch
View File

@ -1,12 +1,16 @@
Index: joe-4.0/joe/bw.c
---
joe/bw.c | 1 +
1 file changed, 1 insertion(+)
Index: joe-4.1/joe/bw.c
===================================================================
--- joe-4.0.orig/joe/bw.c
+++ joe-4.0/joe/bw.c
@@ -206,6 +206,7 @@ HIGHLIGHT_STATE get_highlight_state(BW *
#ifdef junk
P *tmp = 0;
--- joe-4.1.orig/joe/bw.c
+++ joe-4.1/joe/bw.c
@@ -178,6 +178,7 @@ void bwfllw(W *w)
static HIGHLIGHT_STATE get_highlight_state(BW *w, P *p, off_t line)
{
HIGHLIGHT_STATE state;
+ memset((void*)&state,0,sizeof(HIGHLIGHT_STATE));
+ memset((void *)&state, 0, sizeof(HIGHLIGHT_STATE));
/* Screen y position of requested line */
int y = line-w->top->line+w->y;
if(!w->o.highlight || !w->o.syntax) {
invalidate_state(&state);

62
joe-3.7-additional_key_mappings.patch
View File

@ -1,28 +1,36 @@
Index: joe-4.0/rc/jmacsrc.in
---
rc/jmacsrc.in | 2 ++
rc/joerc.in | 6 ++++++
rc/jpicorc.in | 2 ++
rc/jstarrc.in | 2 ++
rc/rjoerc.in | 2 ++
5 files changed, 14 insertions(+)
Index: joe-4.1/rc/jmacsrc.in
===================================================================
--- joe-4.0.orig/rc/jmacsrc.in
+++ joe-4.0/rc/jmacsrc.in
@@ -938,6 +938,7 @@ home .kh Goto beginning of line
--- joe-4.1.orig/rc/jmacsrc.in
+++ joe-4.1/rc/jmacsrc.in
@@ -1046,6 +1046,7 @@ home .kh Goto beginning of line
home ^A
home ^[ [ H
home ^[ [ 1 ~
+home ^[ [ 7 ~
bop ^[ p (uemacs)
bop ^[ P (uemacs)
bop ^[ {
bufed ^X b
@@ -966,6 +967,7 @@ eol .@7
@@ -1077,6 +1078,7 @@ eol .@7
eol ^E
eol ^[ [ F
eol ^[ [ 4 ~
+eol ^[ [ 8 ~
eop ^[ n (uemacs)
eop ^[ N (uemacs)
eop ^[ }
execmd ^[ x
Index: joe-4.0/rc/joerc.in
Index: joe-4.1/rc/joerc.in
===================================================================
--- joe-4.0.orig/rc/joerc.in
+++ joe-4.0/rc/joerc.in
@@ -1016,6 +1016,9 @@ bof ^K u
--- joe-4.1.orig/rc/joerc.in
+++ joe-4.1/rc/joerc.in
@@ -1048,6 +1048,9 @@ bof ^K u
bol ^# SP A
home .kh
home ^A
@ -32,7 +40,7 @@ Index: joe-4.0/rc/joerc.in
center ^K A Center line
center ^K ^A
center ^K a
@@ -1040,6 +1043,9 @@ eof ^K v
@@ -1072,6 +1075,9 @@ eof ^K v
eol .kH Go to end of line
eol .@7
eol ^E
@ -42,11 +50,11 @@ Index: joe-4.0/rc/joerc.in
exsave ^K X Save and exit
exsave ^K ^X
exsave ^K x
Index: joe-4.0/rc/jpicorc.in
Index: joe-4.1/rc/jpicorc.in
===================================================================
--- joe-4.0.orig/rc/jpicorc.in
+++ joe-4.0/rc/jpicorc.in
@@ -837,6 +837,7 @@ home .kh Goto beginning of line
--- joe-4.1.orig/rc/jpicorc.in
+++ joe-4.1/rc/jpicorc.in
@@ -865,6 +865,7 @@ home .kh Goto beginning of line
home ^A
home ^[ [ H
home ^[ [ 1 ~
@ -54,7 +62,7 @@ Index: joe-4.0/rc/jpicorc.in
center ^[ ^C Center line
center ^[ c
delch .kD Delete character
@@ -865,6 +866,7 @@ eol .@7
@@ -893,6 +894,7 @@ eol .@7
eol ^E
eol ^[ [ F
eol ^[ [ 4 ~
@ -62,11 +70,11 @@ Index: joe-4.0/rc/jpicorc.in
execmd ^[ X Prompt for command to execute
execmd ^[ ^X Prompt for command to execute
execmd ^[ x Prompt for command to execute
Index: joe-4.0/rc/jstarrc.in
Index: joe-4.1/rc/jstarrc.in
===================================================================
--- joe-4.0.orig/rc/jstarrc.in
+++ joe-4.0/rc/jstarrc.in
@@ -875,6 +875,7 @@ bof ^Q .kP
--- joe-4.1.orig/rc/jstarrc.in
+++ joe-4.1/rc/jstarrc.in
@@ -903,6 +903,7 @@ bof ^Q .kP
home .kh Goto beginning of line
home ^[ [ H
home ^[ [ 1 ~
@ -74,7 +82,7 @@ Index: joe-4.0/rc/jstarrc.in
home ^Q S
home ^Q ^S
home ^Q s
@@ -916,6 +917,7 @@ eol .kH Go to end of line
@@ -944,6 +945,7 @@ eol .kH Go to end of line
eol .@7
eol ^[ [ F
eol ^[ [ 4 ~
@ -82,11 +90,11 @@ Index: joe-4.0/rc/jstarrc.in
eol ^Q D
eol ^Q ^D
eol ^Q d
Index: joe-4.0/rc/rjoerc.in
Index: joe-4.1/rc/rjoerc.in
===================================================================
--- joe-4.0.orig/rc/rjoerc.in
+++ joe-4.0/rc/rjoerc.in
@@ -880,6 +880,7 @@ bol .kh Goto beginning of line
--- joe-4.1.orig/rc/rjoerc.in
+++ joe-4.1/rc/rjoerc.in
@@ -907,6 +907,7 @@ bol .kh Goto beginning of line
bol ^A
bol ^[ [ H
bol ^[ [ 1 ~
@ -94,7 +102,7 @@ Index: joe-4.0/rc/rjoerc.in
bol ^# SP A
center ^K A Center line
center ^K ^A
@@ -906,6 +907,7 @@ eol .kH Go to end of line
@@ -933,6 +934,7 @@ eol .kH Go to end of line
eol ^E
eol ^[ [ F
eol ^[ [ 4 ~

14
joe-3.7-spec_association.patch
View File

@ -1,8 +1,12 @@
Index: joe-4.0/rc/ftyperc
---
rc/ftyperc | 6 ++++++
1 file changed, 6 insertions(+)
Index: joe-4.1/rc/ftyperc
===================================================================
--- joe-4.0.orig/rc/ftyperc
+++ joe-4.0/rc/ftyperc
@@ -935,6 +935,12 @@
--- joe-4.1.orig/rc/ftyperc
+++ joe-4.1/rc/ftyperc
@@ -575,6 +575,12 @@
*jpicorc.in
-syntax joerc
@ -13,5 +17,5 @@ Index: joe-4.0/rc/ftyperc
+-syntax spec
+
Markdown
[markdown]
*.md
-syntax md

3
joe-4.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c556adff77fd97bf1b86198de6cb82e0b92cda18579c4fef6c83b608d2ed2915
size 838783

3
joe-4.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:816211b2bd951f792de3602afd74ea4b51612fffdd9bc24a7808660053fef6db
size 1292957

40
joe-codecleanup.patch
View File

@ -1,40 +0,0 @@
Index: joe-4.0/joe/b.c
===================================================================
--- joe-4.0.orig/joe/b.c
+++ joe-4.0/joe/b.c
@@ -2327,13 +2327,13 @@ unsigned char *parsens(unsigned char *s,
#if HAVE_LONG_LONG
if (n[x + 1] == 'x' || n[x + 1] == 'X')
- sscanf((char *)(n + x + 2), "%llx", &skipr);
+ sscanf((char *)(n + x + 2), "%llx", (long long unsigned int *)skipr);
else if (n[x + 1] == '0' && (n[x + 2] == 'x' || n[x + 2] == 'X'))
- sscanf((char *)(n + x + 3), "%llx", &skipr);
+ sscanf((char *)(n + x + 3), "%llx", (long long unsigned int *)skipr);
else if (n[x + 1] == '0')
- sscanf((char *)(n + x + 1), "%llo", &skipr);
+ sscanf((char *)(n + x + 1), "%llo", (long long unsigned int *)skipr);
else
- sscanf((char *)(n + x + 1), "%llu", &skipr);
+ sscanf((char *)(n + x + 1), "%llu", (long long int *)skipr);
#else
if (n[x + 1] == 'x' || n[x + 1] == 'X')
sscanf((char *)(n + x + 2), "%lx", &skipr);
@@ -2353,13 +2353,13 @@ unsigned char *parsens(unsigned char *s,
*amnt = *skip;
#ifdef HAVE_LONG_LONG
if (n[x + 1] == 'x' || n[x + 1] == 'X')
- sscanf((char *)(n + x + 2), "%llx", &skipr);
+ sscanf((char *)(n + x + 2), "%llx", (long long unsigned int *)&skipr);
else if (n[x + 1] == '0' && (n[x + 2] == 'x' || n[x + 2] == 'X'))
- sscanf((char *)(n + x + 3), "%llx", &skipr);
+ sscanf((char *)(n + x + 3), "%llx", (long long unsigned int *)skipr);
else if (n[x + 1] == '0')
- sscanf((char *)(n + x + 1), "%llo", &skipr);
+ sscanf((char *)(n + x + 1), "%llo", (long long unsigned int *)skipr);
else
- sscanf((char *)(n + x + 1), "%llu", &skipr);
+ sscanf((char *)(n + x + 1), "%llu", (long long int *)skipr);
#else
if (n[x + 1] == 'x' || n[x + 1] == 'X')
sscanf((char *)(n + x + 2), "%lx", &skipr);

38
joe-sigiot.patch
View File

@ -1,27 +1,31 @@
Index: joe-4.0/joe/uformat.c
---
joe/uformat.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Index: joe-4.1/joe/uformat.c
===================================================================
--- joe-4.0.orig/joe/uformat.c
+++ joe-4.0/joe/uformat.c
@@ -444,7 +444,7 @@ void wrapword(BW *bw, P *p, long int ind
--- joe-4.1.orig/joe/uformat.c
+++ joe-4.1/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, USTR "wrapword");
+ q = pdup(p, USTR "wrapword;");
- q = pdup(p, "wrapword");
+ q = pdup(p, "wrapword;");
while (!pisbol(q))
if (!joe_isblank(p->b->o.charmap, (c = prgetc(q)))) {
pgetc(q);
@@ -578,10 +578,12 @@ int uformat(BW *bw)
@@ -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 */
int x = zlen(indents);
+ int start = x;
while (x && (indents[x - 1] == ' ' || indents[x - 1] == '\t'))
indents[--x] = 0;
if (x) {
- indents[x++] = ' ';
+ if(x < start)
+ indents[x++] = ' ';
indents[x] = 0;
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, x);
indent = txtwidth1(bw->o.charmap, bw->o.tab, indents, tx);

19
joe.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Sun Oct 4 17:03:55 UTC 2015 - jengelh@inai.de
- Update to new upstream release 4.1
* JOE can now edit UTF-16BE and UTF-16LE files. It does this by
converting them to UTF-8 during load and back to UTF-16 during
save.
* Within JOE, native byte order is called UTF-16 and reversed order
is called UTF-16R. Changing the encoding (with ^T E) between
UTF-8, UTF-16 and UTF-16R will make JOE convert the file to the
desired encoding on save.
* New regular expression engine, which is a compiled Thompson NFA
matcher. Now supports alternatives "X\|Y", grouping and submatch
"a\(inside\)b", repetition ranges "x\{3,5}" for "xxxx\?x\?".
* Unicode 8.0 character class support.
- Use shorter download URL
- Remove joe-codecleanup.patch (code to replace is no longer there),
remove joe-3.1-terminate_buffer.patch (code changed to const).
-------------------------------------------------------------------
Sat Sep 19 05:33:29 UTC 2015 - mpluskal@suse.com

8
joe.spec
View File

@ -17,21 +17,19 @@
Name: joe
Version: 4.0
Version: 4.1
Release: 0
Summary: A Text Editor
License: GPL-2.0+
Group: Productivity/Editors/Other
Url: http://sourceforge.net/projects/joe-editor
Source0: http://sourceforge.net/projects/joe-editor/files/JOE%%20sources/%{name}-%{version}/%{name}-%{version}.tar.gz
Source: http://downloads.sf.net/joe-editor/%name-%version.tar.gz
Source2: de.po
Source3: joe-rpmlintrc
Patch0: joe-3.1-terminate_buffer.patch
Patch2: joe-3.1-fix_isblanck_argument.patch
Patch3: joe-3.3-warnings.patch
Patch7: joe-3.7-additional_key_mappings.patch
Patch8: joe-3.7-spec_association.patch
Patch9: joe-codecleanup.patch
Patch10: joe-sigiot.patch
BuildRequires: automake
BuildRequires: ncurses-devel
@ -43,12 +41,10 @@ WordStar keybindings used in Borland's development environment.
%prep
%setup -q
%patch0 -p1
%patch2 -p1
%patch3 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%build