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

Accepting request 662655 from editors

Browse Source 
- Small packaging simplifications
- Lets enable selinux

- Added patch to fix build on SLe_12_Sp3 and openSUSE_Leap_42.3
  * joe-4.6-nonvoid-functions.patch

- Fixed broken build: Added patch which was forgotten to add to version control. 

- Add Patch joe-4.6-desktop_files.patch: Desktop Category was wrong.
- Update to version 4.6
   * Upgrade to Unicode 10.0.0. Add configure environment variable that allows
     you select Unicode 8.0.0, 9.0.0 or 10.0.0.
   * Install Gnome .desktop files for JOE. This allows you to use JOE in GUI
     "Open With" mouse actions.
   * Support strikeout and double-underline attributes for the few terminal
     emulators that support them. Use "stricken" and "dunderline" in the syntax
     files, or \s and \z in help screens and status line.
   * Fix bug where JOE would sometimes crash when editing shell scripts. This
     was due to an obscure bug in the syntax highlighter: 'reset' command (used
     for default state) was incorrectly messing with stack.
   * -highlighter_context was missing from many file types, which negated some
     improvements from the previous version.
   * Fixed signed char overflow with old style mouse events in large windows
   * Fix bug where path restart (//) was being applied to block filter command
     prompt. Strange things would happen if you had adjacent slashes in command
     arguments.
   * Allow ~ expansion but suppress path restart (//) in compiler error parsing.
     Restore default handling of SIGPIPE and SIGINT for shell commands. This
     fixes an issue where SIGPIPE doesn't terminate a process as expected, for
     example by the head -n 10 in: ^K R !sh -c 'while :; do echo y; done' |

OBS-URL: https://build.opensuse.org/request/show/662655
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/joe?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2019-01-08 11:18:58 +00:00 committed by Git OBS Bridge
commit 8616fa478a
10 changed files with 174 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
joe-3.1-fix_isblanck_argument.patch
View File

@ -6,7 +6,7 @@ Index: joe/b.c
=================================================================== ===================================================================
--- joe/b.c.orig --- joe/b.c.orig
+++ joe/b.c +++ joe/b.c
@@ -633,9 +633,10 @@ int piseow(P *p) @@ -638,9 +638,10 @@ int piseow(P *p)
int pisblank(P *p) int pisblank(P *p)
{ {
P *q = pdup(p, "pisblank"); P *q = pdup(p, "pisblank");
@ -18,7 +18,7 @@ Index: joe/b.c
pgetb(q); pgetb(q);
if (piseol(q)) { if (piseol(q)) {
prm(q); prm(q);
@@ -667,9 +668,10 @@ off_t pisindent(P *p) @@ -672,9 +673,10 @@ off_t pisindent(P *p)
{ {
P *q = pdup(p, "pisindent"); P *q = pdup(p, "pisindent");
off_t col; off_t col;

2
joe-3.3-warnings.patch
View File

@ -6,7 +6,7 @@ Index: joe/bw.c
=================================================================== ===================================================================
--- joe/bw.c.orig --- joe/bw.c.orig
+++ joe/bw.c +++ joe/bw.c
@@ -209,6 +209,7 @@ void bwfllw(W *w) @@ -231,6 +231,7 @@ void bwfllw(W *w)
static HIGHLIGHT_STATE get_highlight_state(BW *w, P *p, off_t line) static HIGHLIGHT_STATE get_highlight_state(BW *w, P *p, off_t line)
{ {
HIGHLIGHT_STATE state; HIGHLIGHT_STATE state;

20
joe-3.7-additional_key_mappings.patch
View File

@ -10,7 +10,7 @@ Index: rc/jmacsrc.in
=================================================================== ===================================================================
--- rc/jmacsrc.in.orig --- rc/jmacsrc.in.orig
+++ rc/jmacsrc.in +++ rc/jmacsrc.in
@@ -1058,6 +1058,7 @@ home .kh Goto beginning of line @@ -1019,6 +1019,7 @@ home .kh Goto beginning of line
home ^A home ^A
home ^[ [ H home ^[ [ H
home ^[ [ 1 ~ home ^[ [ 1 ~
@ -18,7 +18,7 @@ Index: rc/jmacsrc.in
bop ^[ p (uemacs) bop ^[ p (uemacs)
bop ^[ P (uemacs) bop ^[ P (uemacs)
bop ^[ { bop ^[ {
@@ -1089,6 +1090,7 @@ eol .@7 @@ -1050,6 +1051,7 @@ eol .@7
eol ^E eol ^E
eol ^[ [ F eol ^[ [ F
eol ^[ [ 4 ~ eol ^[ [ 4 ~
@ -30,7 +30,7 @@ Index: rc/joerc.in
=================================================================== ===================================================================
--- rc/joerc.in.orig --- rc/joerc.in.orig
+++ rc/joerc.in +++ rc/joerc.in
@@ -1106,6 +1106,9 @@ bof ^K u @@ -1065,6 +1065,9 @@ bof ^K u
bol ^# SP A bol ^# SP A
home .kh home .kh
home ^A home ^A
@ -40,7 +40,7 @@ Index: rc/joerc.in
center ^K A Center line center ^K A Center line
center ^K ^A center ^K ^A
center ^K a center ^K a
@@ -1132,6 +1135,9 @@ eof ^K v @@ -1091,6 +1094,9 @@ eof ^K v
eol .kH Go to end of line eol .kH Go to end of line
eol .@7 eol .@7
eol ^E eol ^E
@ -54,7 +54,7 @@ Index: rc/jpicorc.in
=================================================================== ===================================================================
--- rc/jpicorc.in.orig --- rc/jpicorc.in.orig
+++ rc/jpicorc.in +++ rc/jpicorc.in
@@ -877,6 +877,7 @@ home .kh Goto beginning of line @@ -837,6 +837,7 @@ home .kh Goto beginning of line
home ^A home ^A
home ^[ [ H home ^[ [ H
home ^[ [ 1 ~ home ^[ [ 1 ~
@ -62,7 +62,7 @@ Index: rc/jpicorc.in
center ^[ ^C Center line center ^[ ^C Center line
center ^[ c center ^[ c
delch .kD Delete character delch .kD Delete character
@@ -905,6 +906,7 @@ eol .@7 @@ -865,6 +866,7 @@ eol .@7
eol ^E eol ^E
eol ^[ [ F eol ^[ [ F
eol ^[ [ 4 ~ eol ^[ [ 4 ~
@ -74,7 +74,7 @@ Index: rc/jstarrc.in
=================================================================== ===================================================================
--- rc/jstarrc.in.orig --- rc/jstarrc.in.orig
+++ rc/jstarrc.in +++ rc/jstarrc.in
@@ -915,6 +915,7 @@ bof ^Q .kP @@ -874,6 +874,7 @@ bof ^Q .kP
home .kh Goto beginning of line home .kh Goto beginning of line
home ^[ [ H home ^[ [ H
home ^[ [ 1 ~ home ^[ [ 1 ~
@ -82,7 +82,7 @@ Index: rc/jstarrc.in
home ^Q S home ^Q S
home ^Q ^S home ^Q ^S
home ^Q s home ^Q s
@@ -956,6 +957,7 @@ eol .kH Go to end of line @@ -915,6 +916,7 @@ eol .kH Go to end of line
eol .@7 eol .@7
eol ^[ [ F eol ^[ [ F
eol ^[ [ 4 ~ eol ^[ [ 4 ~
@ -94,7 +94,7 @@ Index: rc/rjoerc.in
=================================================================== ===================================================================
--- rc/rjoerc.in.orig --- rc/rjoerc.in.orig
+++ rc/rjoerc.in +++ rc/rjoerc.in
@@ -919,6 +919,7 @@ bol .kh Goto beginning of line @@ -879,6 +879,7 @@ bol .kh Goto beginning of line
bol ^A bol ^A
bol ^[ [ H bol ^[ [ H
bol ^[ [ 1 ~ bol ^[ [ 1 ~
@ -102,7 +102,7 @@ Index: rc/rjoerc.in
bol ^# SP A bol ^# SP A
center ^K A Center line center ^K A Center line
center ^K ^A center ^K ^A
@@ -947,6 +948,7 @@ eol .kH Go to end of line @@ -907,6 +908,7 @@ eol .kH Go to end of line
eol ^E eol ^E
eol ^[ [ F eol ^[ [ F
eol ^[ [ 4 ~ eol ^[ [ 4 ~

4
joe-3.7-spec_association.patch
View File

@ -6,9 +6,9 @@ Index: rc/ftyperc
=================================================================== ===================================================================
--- rc/ftyperc.orig --- rc/ftyperc.orig
+++ rc/ftyperc +++ rc/ftyperc
@@ -605,6 +605,12 @@ @@ -647,6 +647,12 @@
*jpicorc.in
-syntax joerc -syntax joerc
-highlighter_context
+*.spec +*.spec
+-syntax spec +-syntax spec

3
joe-4.4.tar.gz
View File

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

40
joe-4.6-desktop_files.patch Normal file
View File

@ -0,0 +1,40 @@
Index: joe-4.6/desktop/jmacs.desktop
===================================================================
--- joe-4.6.orig/desktop/jmacs.desktop
+++ joe-4.6/desktop/jmacs.desktop
@@ -9,4 +9,4 @@ TryExec=jmacs
Icon=accessories-text-editor
Type=Application
Terminal=true
-Categories=Utility;Development;TextEditor;
+Categories=Utility;TextEditor;
Index: joe-4.6/desktop/joe.desktop
===================================================================
--- joe-4.6.orig/desktop/joe.desktop
+++ joe-4.6/desktop/joe.desktop
@@ -9,4 +9,4 @@ TryExec=joe
Icon=accessories-text-editor
Type=Application
Terminal=true
-Categories=Utility;Development;TextEditor;
+Categories=Utility;TextEditor;
Index: joe-4.6/desktop/jpico.desktop
===================================================================
--- joe-4.6.orig/desktop/jpico.desktop
+++ joe-4.6/desktop/jpico.desktop
@@ -9,4 +9,4 @@ TryExec=jpico
Icon=accessories-text-editor
Type=Application
Terminal=true
-Categories=Utility;Development;TextEditor;
+Categories=Utility;TextEditor;
Index: joe-4.6/desktop/jstar.desktop
===================================================================
--- joe-4.6.orig/desktop/jstar.desktop
+++ joe-4.6/desktop/jstar.desktop
@@ -9,4 +9,4 @@ TryExec=jstar
Icon=accessories-text-editor
Type=Application
Terminal=true
-Categories=Utility;Development;TextEditor;
+Categories=Utility;TextEditor;

10
joe-4.6-nonvoid-functions.patch Normal file
View File

@ -0,0 +1,10 @@
Index: joe-4.6/joe/util/checkwidths.c
===================================================================
--- joe-4.6.orig/joe/util/checkwidths.c
+++ joe-4.6/joe/util/checkwidths.c
@@ -188,4 +188,5 @@ int main()
}
tcsetattr(fileno(stdin), TCSADRAIN, &org_attr);
+ return 0;
}

BIN
joe-4.6.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

92
joe.changes
View File

@ -1,3 +1,95 @@
-------------------------------------------------------------------
Thu Jan 3 12:39:35 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
- Small packaging simplifications
- Lets enable selinux
-------------------------------------------------------------------
Thu Jan 3 11:56:03 UTC 2019 - Enno Gotthold <egotthold@suse.com>
- Added patch to fix build on SLe_12_Sp3 and openSUSE_Leap_42.3
* joe-4.6-nonvoid-functions.patch
-------------------------------------------------------------------
Thu Jan 3 11:36:05 UTC 2019 - Enno Gotthold <egotthold@suse.com>
- Fixed broken build: Added patch which was forgotten to add to version control.
-------------------------------------------------------------------
Fri Nov 30 14:26:27 UTC 2018 - Enno Gotthold <egotthold@suse.com>
- Add Patch joe-4.6-desktop_files.patch: Desktop Category was wrong.
- Update to version 4.6
* Upgrade to Unicode 10.0.0. Add configure environment variable that allows
you select Unicode 8.0.0, 9.0.0 or 10.0.0.
* Install Gnome .desktop files for JOE. This allows you to use JOE in GUI
"Open With" mouse actions.
* Support strikeout and double-underline attributes for the few terminal
emulators that support them. Use "stricken" and "dunderline" in the syntax
files, or \s and \z in help screens and status line.
* Fix bug where JOE would sometimes crash when editing shell scripts. This
was due to an obscure bug in the syntax highlighter: 'reset' command (used
for default state) was incorrectly messing with stack.
* -highlighter_context was missing from many file types, which negated some
improvements from the previous version.
* Fixed signed char overflow with old style mouse events in large windows
* Fix bug where path restart (//) was being applied to block filter command
prompt. Strange things would happen if you had adjacent slashes in command
arguments.
* Allow ~ expansion but suppress path restart (//) in compiler error parsing.
Restore default handling of SIGPIPE and SIGINT for shell commands. This
fixes an issue where SIGPIPE doesn't terminate a process as expected, for
example by the head -n 10 in: ^K R !sh -c 'while :; do echo y; done' |
head -n 10. This issue only occurred in read/write to !, JOE already did
the right thing for shell windows and the filter region through shell
command.
* Improve screen update algorithm so that spaces at the ends of lines are
always emitted. This allows them to be preserved when cutting text with
the mouse from a terminal emulator window.
* Improve efficiency of screen update algorithm: JOE had been resetting
attributes such as background color before performing cursor motions
(probably as work around for bugs in old terminal emulators). This made
screen update slow when there were many attributes, as with syntax
highlighting and color schemes. It was also repeatedly emitting ESC [ K.
* Switch JOE to issue scrolling commands, even at high baud rates (before
this, JOE issued scrolling commands only at 19200 and below because it
used to be that simple screen refresh was faster than scrolling in
terminal emulators. But this is no longer true with complex screens
involving color schemes, unicode and highlighting).
- Update to version 4.5
* New color scheme feature, which can be accessed with ^T S or by setting
* the -colors option.
* 24-bit color support can be enabled by setting the COLORTERM environment
variable to truecolor or 24bit.
* Several schemes included in-the-box:
* gruvbox by Pavel Pertsev
* ir_black by Todd Werth
* molokai by Tomas Restrepo
* solarized by Ethan Schoonover
* wombat by Lars H. Nielsen
* xoria by Dmitriy Y. Zotikov
* zenburn by Jani Nurminen
* The current line can be highlighted by pressing ^T U or by enabling the
-hiline option.
* The gutter containing line numbers has a dynamic size based on the length
of the file, rather than a fixed size of 10.
* Updated all language syntax files to use comment_todo and string/comment
contexts where appropriate.
* Now pass character which invoked a macro to each macro step and call. If a
macro step happens to be the 'type' command, the character which invoked
the macro will be typed in. For example, this macro will type three 'X's.
Before this change you got three NULs.
* type,type,type X
* Fix exsave: (^K ^X) should close file when a block is present in the
window, and the file is unmodified (regression from ^C change in 4.2).
* Fix regex assertions: they were not working because the character before
the search position was not being loaded.
* For jmacs: ^Q^J now again inserts \n in the string replace prompt. This
broke beginning with JOE 4.0.
* Don't try to open files for writing to check file access. This behaves
better on unionfs mounts.
* Fix stray blocks created after find/replace.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 23 15:50:17 UTC 2017 - mpluskal@suse.com Mon Jan 23 15:50:17 UTC 2017 - mpluskal@suse.com

27
joe.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package joe # spec file for package joe
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,18 +12,17 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
Name: joe Name: joe
Version: 4.4 Version: 4.6
Release: 0 Release: 0
Summary: A Text Editor Summary: A Text Editor
License: GPL-2.0+ License: GPL-2.0-or-later
# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Productivity/Text/Editors
Group: Productivity/Editors/Other URL: http://sourceforge.net/projects/joe-editor
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 Source2: de.po
Source3: joe-rpmlintrc Source3: joe-rpmlintrc
@ -32,9 +31,11 @@ Patch3: joe-3.3-warnings.patch
Patch7: joe-3.7-additional_key_mappings.patch Patch7: joe-3.7-additional_key_mappings.patch
Patch8: joe-3.7-spec_association.patch Patch8: joe-3.7-spec_association.patch
Patch10: joe-sigiot.patch Patch10: joe-sigiot.patch
Patch11: joe-4.6-desktop_files.patch
Patch12: joe-4.6-nonvoid-functions.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: libselinux-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
Joe is a powerful, easy to use, modeless text editor. It uses the same Joe is a powerful, easy to use, modeless text editor. It uses the same
@ -47,16 +48,14 @@ WordStar keybindings used in Borland's development environment.
%patch7 %patch7
%patch8 %patch8
%patch10 %patch10
%patch11 -p1
%patch12 -p1
%build %build
autoreconf -fiv autoreconf -fiv
export CFLAGS="%{optflags} -W -Wno-unused" export CFLAGS="%{optflags} -W -Wno-unused"
%configure \ %configure \
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--sysconfdir=%{_sysconfdir} \
--docdir=%{_defaultdocdir}/%{name} --docdir=%{_defaultdocdir}/%{name}
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -67,7 +66,6 @@ done
rm -rf %{buildroot}/%{_datadir}/%{name}/lang rm -rf %{buildroot}/%{_datadir}/%{name}/lang
%files %files
%defattr(-,root,root)
%doc %{_defaultdocdir}/%{name} %doc %{_defaultdocdir}/%{name}
%{_mandir}/man1/* %{_mandir}/man1/*
%{_mandir}/*/man1/* %{_mandir}/*/man1/*
@ -80,5 +78,8 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/lang
%{_datadir}/%{name}/charmaps %{_datadir}/%{name}/charmaps
%dir %{_datadir}/%{name}/syntax %dir %{_datadir}/%{name}/syntax
%config(noreplace) %{_datadir}/%{name}/syntax/* %config(noreplace) %{_datadir}/%{name}/syntax/*
%{_datadir}/applications/*.desktop
%{_datadir}/joe/colors
%{_datadir}/joe/colors/*.jcf
%changelog %changelog