commit 4e1138f4201dd5e6d4ac5734ef584e40c7e1ebfb
Author: Jakub Bogusz <[email protected]>
Date: Sat Aug 22 15:51:43 2020 +0200
- updated to 4.6
- updated am patch
- removed outdated spaceblank,format-security patches
- switched to upstream .desktop files with small adjustments (added desktop
patch)
joe-am.patch | 9 +-
joe-desktop.patch | 64 +++++++++
joe-format-security.patch | 162 ----------------------
joe-spaceblank.patch | 345 ----------------------------------------------
joe.desktop | 13 --
joe.spec | 111 ++++++++-------
6 files changed, 130 insertions(+), 574 deletions(-)
---
diff --git a/joe.spec b/joe.spec
index ffa9682..a1ec322 100644
--- a/joe.spec
+++ b/joe.spec
@@ -1,6 +1,3 @@
-# TODO:
-# - port / fix -spaceblank patch
-#
Summary: Easy to use editor
Summary(de.UTF-8): Einfach handzuhabender Editor
Summary(es.UTF-8): Editor fácil de usar
@@ -11,30 +8,28 @@ Summary(ru.UTF-8): Простой в использовании текстовы
Summary(tr.UTF-8): Kolay kullanımlı metin düzenleyici
Summary(uk.UTF-8): Простий у використанні текстовий редактор
Name: joe
-Version: 3.7
-Release: 2
+Version: 4.6
+Release: 1
Epoch: 1
License: GPL
Group: Applications/Editors
-Source0: http://dl.sourceforge.net/joe-editor/%{name}-%{version}.tar.gz
-# Source0-md5: 66de1b073e869ba12abbfcde3885c577
+Source0:
http://downloads.sourceforge.net/joe-editor/%{name}-%{version}.tar.gz
+# Source0-md5: 9017484e6116830d846678b625ea5c43
Source1: %{name}.png
-Source2: %{name}.desktop
-Source3:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
-# Source3-md5: 47d050baa065ec9095d9d99217749abb
+Source2:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
+# Source2-md5: 47d050baa065ec9095d9d99217749abb
Patch0: %{name}-pl_man.patch
-Patch1: %{name}-spaceblank.patch
-Patch2: %{name}-asis.patch
-Patch3: %{name}-am.patch
-Patch4: %{name}-format-security.patch
+Patch1: %{name}-asis.patch
+Patch2: %{name}-am.patch
+Patch3: %{name}-desktop.patch
URL: http://sourceforge.net/projects/joe-editor/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.54
BuildRequires: automake
BuildRequires: ncurses-devel >= 5.0
+BuildRequires: rpmbuild(macros) >= 1.198
+Requires(post,postun): desktop-file-utils
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _sysconfdir /etc/joe
-
%description
Joe is a friendly and easy to use editor. It has a nice interface and
would be a good choice for a novice needing a text editor. It uses the
@@ -88,19 +83,18 @@ Joe - це дружній, простий у використанні текст
розробки програм фірми Borland (так званий стандарт WordStar).
%prep
-%setup -q -a3
+%setup -q -a2
%patch0 -p0
-#%patch1 -p0
+%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
%{__aclocal}
%{__autoconf}
%{__automake}
-%configure \
- --sysconfdir=/etc
+%configure
+
%{__make}
%install
@@ -112,45 +106,64 @@ install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
for a in hu pl ; do
install -d $RPM_BUILD_ROOT%{_mandir}/$a/man1
- install $a/man1/joe.1 $RPM_BUILD_ROOT%{_mandir}/$a/man1
+ cp -p $a/man1/joe.1 $RPM_BUILD_ROOT%{_mandir}/$a/man1
done
-install -d $RPM_BUILD_ROOT%{_mandir}/ru/man1
-install man/ru/joe.1 $RPM_BUILD_ROOT%{_mandir}/ru/man1
+#install -d $RPM_BUILD_ROOT%{_mandir}/ru/man1
+#install man/ru/joe.1 $RPM_BUILD_ROOT%{_mandir}/ru/man1
for a in "" hu pl ru ; do
- echo ".so joe" > $RPM_BUILD_ROOT%{_mandir}/$a/man1/jstar.1
- echo ".so joe" > $RPM_BUILD_ROOT%{_mandir}/$a/man1/jmacs.1
- echo ".so joe" > $RPM_BUILD_ROOT%{_mandir}/$a/man1/rjoe.1
- echo ".so joe" > $RPM_BUILD_ROOT%{_mandir}/$a/man1/jpico.1
+ echo ".so joe.1" > $RPM_BUILD_ROOT%{_mandir}/$a/man1/jstar.1
+ echo ".so joe.1" > $RPM_BUILD_ROOT%{_mandir}/$a/man1/jmacs.1
+ echo ".so joe.1" > $RPM_BUILD_ROOT%{_mandir}/$a/man1/rjoe.1
+ echo ".so joe.1" > $RPM_BUILD_ROOT%{_mandir}/$a/man1/jpico.1
done
-install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}
# remove bogus doc dir
-rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
-# po/*.po files don't fit anywhere and looks like they're broken too.
-# I'm removing them for now. Please check back in the next version/release.
-rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/lang
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+%update_desktop_database
+
+%postun
+%update_desktop_database
+
%files
%defattr(644,root,root,755)
-%doc ChangeLog HACKING LIST NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
+%doc ChangeLog NEWS.md README.md
+%attr(755,root,root) %{_bindir}/joe
+%attr(755,root,root) %{_bindir}/jmacs
+%attr(755,root,root) %{_bindir}/jpico
+%attr(755,root,root) %{_bindir}/jstar
+%attr(755,root,root) %{_bindir}/rjoe
%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/charmaps
-%dir %{_datadir}/%{name}/syntax
-%{_datadir}/%{name}/charmaps/klingon
-%{_datadir}/%{name}/syntax/*.jsf
-%dir %{_sysconfdir}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
-%{_mandir}/man1/*
-%lang(hu) %{_mandir}/hu/man1/*
-%lang(pl) %{_mandir}/pl/man1/*
-%lang(ru) %{_mandir}/ru/man1/*
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%{_datadir}/%{name}/charmaps
+%{_datadir}/%{name}/colors
+%dir %{_datadir}/%{name}/lang
+# joe uses custom gettext implementation, reading pure .po files
+%lang(de) %{_datadir}/%{name}/lang/de.po
+%lang(fr) %{_datadir}/%{name}/lang/fr.po
+%lang(ru) %{_datadir}/%{name}/lang/ru.po
+%lang(uk) %{_datadir}/%{name}/lang/uk.po
+%lang(zh_TW) %{_datadir}/%{name}/lang/zh_TW.po
+%{_datadir}/%{name}/syntax
+%dir %{_sysconfdir}/joe
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/joe/*
+%{_mandir}/man1/joe.1*
+%{_mandir}/man1/jmacs.1*
+%{_mandir}/man1/jpico.1*
+%{_mandir}/man1/jstar.1*
+%{_mandir}/man1/rjoe.1*
+%lang(hu) %{_mandir}/hu/man1/*.1*
+%lang(pl) %{_mandir}/pl/man1/*.1*
+%lang(ru) %{_mandir}/ru/man1/*.1*
+%{_desktopdir}/joe.desktop
+%{_desktopdir}/jmacs.desktop
+%{_desktopdir}/jpico.desktop
+%{_desktopdir}/jstar.desktop
+%{_pixmapsdir}/joe.png
diff --git a/joe-am.patch b/joe-am.patch
index 1508177..cc8795f 100644
--- a/joe-am.patch
+++ b/joe-am.patch
@@ -1,12 +1,11 @@
-diff -urN joe-3.7/configure.ac joe-3.7.new/configure.ac
---- joe-3.7/configure.ac 2008-10-30 04:06:44.000000000 +0100
-+++ joe-3.7.new/configure.ac 2013-01-31 12:51:36.243345584 +0100
+--- joe-4.6/configure.ac.orig 2020-08-22 11:31:09.104834368 +0200
++++ joe-4.6/configure.ac 2020-08-22 11:36:53.062970988 +0200
@@ -14,7 +14,7 @@
# Init automake
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
--AM_CONFIG_HEADER(autoconf.h)
-+AC_CONFIG_HEADERS(autoconf.h)
+-AM_CONFIG_HEADER(joe/autoconf.h)
++AC_CONFIG_HEADERS(joe/autoconf.h)
# Checks for programs.
AC_PROG_CC
diff --git a/joe-desktop.patch b/joe-desktop.patch
new file mode 100644
index 0000000..b28a699
--- /dev/null
+++ b/joe-desktop.patch
@@ -0,0 +1,64 @@
+--- joe-4.6/desktop/joe.desktop.orig 2018-01-10 17:28:34.000000000 +0100
++++ joe-4.6/desktop/joe.desktop 2020-08-22 13:15:59.270757617 +0200
+@@ -3,10 +3,11 @@
+ Name=Joe's Own Editor
+ GenericName=Text Editor
+ Comment=View and edit files
++Comment[pl]=Podgląd i edycja plików
+
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+ Exec=/usr/bin/joe %F
+ TryExec=joe
+-Icon=accessories-text-editor
++Icon=joe
+ Type=Application
+ Terminal=true
+-Categories=Utility;Development;TextEditor;
++Categories=Utility;Development;TextEditor;ConsoleOnly;
+--- joe-4.6/desktop/jmacs.desktop.orig 2018-01-10 17:28:34.000000000 +0100
++++ joe-4.6/desktop/jmacs.desktop 2020-08-22 13:16:19.777313190 +0200
+@@ -3,10 +3,11 @@
+ Name=Joe's Own Editor - EMACS Emulation
+ GenericName=Text Editor
+ Comment=View and edit files
++Comment[pl]=Podgląd i edycja plików
+
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+ Exec=/usr/bin/jmacs %F
+ TryExec=jmacs
+-Icon=accessories-text-editor
++Icon=joe
+ Type=Application
+ Terminal=true
+-Categories=Utility;Development;TextEditor;
++Categories=Utility;Development;TextEditor;ConsoleOnly;
+--- joe-4.6/desktop/jpico.desktop.orig 2018-01-10 17:28:34.000000000 +0100
++++ joe-4.6/desktop/jpico.desktop 2020-08-22 13:16:40.550533986 +0200
+@@ -3,10 +3,11 @@
+ Name=Joe's Own Editor - NANO/PICO Emulation
+ GenericName=Text Editor
+ Comment=View and edit files
++Comment[pl]=Podgląd i edycja plików
+
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+ Exec=/usr/bin/jpico %F
+ TryExec=jpico
+-Icon=accessories-text-editor
++Icon=joe
+ Type=Application
+ Terminal=true
+-Categories=Utility;Development;TextEditor;
++Categories=Utility;Development;TextEditor;ConsoleOnly;
+--- joe-4.6/desktop/jstar.desktop.orig 2018-01-10 17:28:34.000000000 +0100
++++ joe-4.6/desktop/jstar.desktop 2020-08-22 13:17:04.563737228 +0200
+@@ -3,10 +3,11 @@
+ Name=Joe's Own Editor - WordStar Emulation
+ GenericName=Text Editor
+ Comment=View and edit files
++Comment[pl]=Podgląd i edycja plików
+
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+ Exec=/usr/bin/jstar %F
+ TryExec=jstar
+-Icon=accessories-text-editor
++Icon=joe
+ Type=Application
+ Terminal=true
+-Categories=Utility;Development;TextEditor;
++Categories=Utility;Development;TextEditor;ConsoleOnly;
diff --git a/joe-format-security.patch b/joe-format-security.patch
deleted file mode 100644
index ac78f92..0000000
--- a/joe-format-security.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -urN joe-3.7/b.c joe-3.7.new/b.c
---- joe-3.7/b.c 2008-11-02 21:59:06.000000000 +0100
-+++ joe-3.7.new/b.c 2013-01-31 12:58:47.744341276 +0100
-@@ -2994,7 +2994,7 @@
- if (b->name)
- fprintf(ttsig_f, (char *)joe_gettext(_("\n***
File \'%s\'\n")), b->name);
- else
-- fprintf(ttsig_f, (char *)joe_gettext(_("\n***
File \'(Unnamed)\'\n")));
-+ fputs((char *)joe_gettext(_("\n*** File
\'(Unnamed)\'\n")), ttsig_f);
- fflush(ttsig_f);
- bsavefd(b->bof, fileno(ttsig_f), b->eof->byte);
- }
-diff -urN joe-3.7/cmd.c joe-3.7.new/cmd.c
---- joe-3.7/cmd.c 2008-11-02 02:31:59.000000000 +0100
-+++ joe-3.7.new/cmd.c 2013-01-31 13:04:09.836568627 +0100
-@@ -231,7 +231,7 @@
- if(bf1[0])
-
joe_snprintf_1(bf,sizeof(bf),joe_gettext(LOCKMSG1),bf1);
- else
--
joe_snprintf_0(bf,sizeof(bf),joe_gettext(LOCKMSG2));
-+ joe_snprintf_1(bf,sizeof(bf),"%s",
joe_gettext(LOCKMSG2));
- if (mkqw(bw->parent, sz(bf), steal_lock, NULL, b,
notify)) {
- return 0;
- } else {
-@@ -289,7 +289,7 @@
- if(bf1[0])
-
joe_snprintf_1(bf,sizeof(bf),joe_gettext(LOCKMSG1),bf1);
- else
--
joe_snprintf_0(bf,sizeof(bf),joe_gettext(LOCKMSG2));
-+ joe_snprintf_1(bf,sizeof(bf),"%s",
joe_gettext(LOCKMSG2));
- if (mkqw(bw->parent, sz(bf), steal_lock, NULL, b,
NULL)) {
- uquery(bw);
- if (!b->locked)
-diff -urN joe-3.7/main.c joe-3.7.new/main.c
---- joe-3.7/main.c 2008-10-27 04:01:11.000000000 +0100
-+++ joe-3.7.new/main.c 2013-01-31 13:05:46.226046440 +0100
-@@ -204,7 +204,7 @@
-
- #ifndef __MSDOS__
- if (!(cap = my_getcap(NULL, 9600, NULL, NULL))) {
-- fprintf(stderr, (char *)joe_gettext(_("Couldn't load
termcap/terminfo entry\n")));
-+ fputs((char *)joe_gettext(_("Couldn't load termcap/terminfo
entry\n")), stderr);
- return 1;
- }
- #endif
-@@ -356,7 +356,7 @@
- donerc:
-
- if (validate_rc()) {
-- fprintf(stderr,(char *)joe_gettext(_("rc file has no :main key
binding section or no bindings. Bye.\n")));
-+ fputs((char *)joe_gettext(_("rc file has no :main key binding
section or no bindings. Bye.\n")), stderr);
- return 1;
- }
-
-diff -urN joe-3.7/rc.c joe-3.7.new/rc.c
---- joe-3.7/rc.c 2008-11-02 21:33:45.000000000 +0100
-+++ joe-3.7.new/rc.c 2013-01-31 13:09:14.191586461 +0100
-@@ -1489,9 +1489,9 @@
-
- /* Print proper ending string */
- if (err)
-- fprintf(stderr, (char *)joe_gettext(_("\ndone\n")));
-+ fputs((char *)joe_gettext(_("\ndone\n")), stderr);
- else
-- fprintf(stderr, (char *)joe_gettext(_("done\n")));
-+ fputs((char *)joe_gettext(_("done\n")), stderr);
-
- return err; /* 0 for success, 1 for syntax error */
- }
-diff -urN joe-3.7/scrn.c joe-3.7.new/scrn.c
---- joe-3.7/scrn.c 2008-11-01 04:00:33.000000000 +0100
-+++ joe-3.7.new/scrn.c 2013-01-31 13:07:17.735550691 +0100
-@@ -717,7 +717,7 @@
- signrm();
- fprintf(stderr,"cm=%p ch=%p cv=%p ho=%p lf=%p DO=%p ll=%p up=%p UP=%p
cr=%p\n",
- t->cm, t->ch, t->cv, t->ho, t->lf, t->DO, t->ll,
t->up, t->UP, t->cr);
-- fprintf(stderr,(char *)joe_gettext(_("Sorry, your terminal can't do
absolute cursor positioning.\nIt's broken\n")));
-+ fputs((char *)joe_gettext(_("Sorry, your terminal can't do absolute
cursor positioning.\nIt's broken\n")), stderr);
- return NULL;
- ok:
-
-diff -urN joe-3.7/termcap.c joe-3.7.new/termcap.c
---- joe-3.7/termcap.c 2006-07-19 16:07:43.000000000 +0200
-+++ joe-3.7.new/termcap.c 2013-01-31 13:11:55.330713497 +0100
-@@ -213,7 +213,7 @@
- joe_free(cap);
- return 0;
- */
-- fprintf(stderr, (char *)joe_gettext(_("Couldn't load termcap
entry. Using ansi default\n")));
-+ fputs((char *)joe_gettext(_("Couldn't load termcap entry.
Using ansi default\n")), stderr);
- ti = 0;
- cap->tbuf = vsncpy(cap->tbuf, 0, sc(defentry));
- goto checktc;
-diff -urN joe-3.7/tty.c joe-3.7.new/tty.c
---- joe-3.7/tty.c 2008-11-02 21:53:40.000000000 +0100
-+++ joe-3.7.new/tty.c 2013-01-31 14:02:45.349518722 +0100
-@@ -323,7 +323,7 @@
-
- if (!termin) {
- if (idleout ? (!(termin = stdin) || !(termout = stdout)) :
(!(termin = fopen("/dev/tty", "r")) || !(termout = fopen("/dev/tty", "w")))) {
-- fprintf(stderr, (char *)joe_gettext(_("Couldn\'t open
/dev/tty\n")));
-+ fputs((char *)joe_gettext(_("Couldn\'t open
/dev/tty\n")), stderr);
- exit(1);
- } else {
- #ifdef SIGWINCH
-@@ -740,7 +740,7 @@
- if (cmd)
- execl((char *)s, (char *)s, "-c", cmd, NULL);
- else {
-- fprintf(stderr, (char *)joe_gettext(_("You are at the
command shell. Type 'exit' to return\n")));
-+ fputs((char *)joe_gettext(_("You are at the command
shell. Type 'exit' to return\n")), stderr);
- execl((char *)s, (char *)s, NULL);
- }
- _exit(0);
-@@ -804,7 +804,7 @@
- omode = ttymode;
- mpxsusp();
- ttclsn();
-- fprintf(stderr, (char *)joe_gettext(_("You have suspended the program.
Type 'fg' to return\n")));
-+ fputs((char *)joe_gettext(_("You have suspended the program. Type 'fg'
to return\n")), stderr);
- kill(0, SIGTSTP);
- #ifdef junk
- /* Hmmm... this should not have been necessary */
-diff -urN joe-3.7/uerror.c joe-3.7.new/uerror.c
---- joe-3.7/uerror.c 2006-07-19 02:27:13.000000000 +0200
-+++ joe-3.7.new/uerror.c 2013-01-31 14:04:09.697881996 +0100
-@@ -327,7 +327,7 @@
- if (n)
- joe_snprintf_1(msgbuf, JOE_MSGBUFSIZE, joe_gettext(_("%d
messages found")), n);
- else
-- joe_snprintf_0(msgbuf, JOE_MSGBUFSIZE, joe_gettext(_("No
messages found")));
-+ joe_snprintf_1(msgbuf, JOE_MSGBUFSIZE, "%s", joe_gettext(_("No
messages found")));
- msgnw(bw->parent, msgbuf);
- return 0;
- }
-@@ -341,7 +341,7 @@
- if (n)
- joe_snprintf_1(msgbuf, JOE_MSGBUFSIZE, joe_gettext(_("%d
messages found")), n);
- else
-- joe_snprintf_0(msgbuf, JOE_MSGBUFSIZE, joe_gettext(_("No
messages found")));
-+ joe_snprintf_1(msgbuf, JOE_MSGBUFSIZE, "%s", joe_gettext(_("No
messages found")));
- msgnw(bw->parent, msgbuf);
- return 0;
- }
-diff -urN joe-3.7/ufile.c joe-3.7.new/ufile.c
---- joe-3.7/ufile.c 2008-11-02 21:39:52.000000000 +0100
-+++ joe-3.7.new/ufile.c 2013-01-31 14:09:13.937220615 +0100
-@@ -62,11 +62,11 @@
- {
- if (saved)
- if (skipped)
-- joe_snprintf_0(msgbuf, JOE_MSGBUFSIZE,
joe_gettext(_("Some files have not been saved.")));
-+ joe_snprintf_1(msgbuf, JOE_MSGBUFSIZE, "%s",
joe_gettext(_("Some files have not been saved.")));
- else
-- joe_snprintf_0(msgbuf, JOE_MSGBUFSIZE,
joe_gettext(_("All modified files have been saved.")));
-+ joe_snprintf_1(msgbuf, JOE_MSGBUFSIZE, "%s",
joe_gettext(_("All modified files have been saved.")));
- else
-- joe_snprintf_0(msgbuf, JOE_MSGBUFSIZE, joe_gettext(_("No
modified files, so no updates needed.")));
-+ joe_snprintf_1(msgbuf, JOE_MSGBUFSIZE, "%s", joe_gettext(_("No
modified files, so no updates needed.")));
-
- msgnw(bw->parent, msgbuf);
-
diff --git a/joe-spaceblank.patch b/joe-spaceblank.patch
deleted file mode 100644
index 4d293f0..0000000
--- a/joe-spaceblank.patch
+++ /dev/null
@@ -1,345 +0,0 @@
---- b.c.old Tue Mar 19 20:39:33 2002
-+++ b.c Tue Mar 19 20:39:47 2002
-@@ -432,7 +432,7 @@
- P *q = pdup(p);
-
- p_goto_bol(q);
-- while (isblank(brc(q)))
-+ while (isblank_(brc(q)))
- pgetc(q);
- if (piseol(q)) {
- prm(q);
-@@ -449,7 +449,7 @@
- long col;
-
- p_goto_bol(q);
-- while (isblank(brc(q)))
-+ while (isblank_(brc(q)))
- pgetc(q);
- col = q->col;
- prm(q);
---- macro.c.old Tue Mar 19 20:40:55 2002
-+++ macro.c Tue Mar 19 20:41:02 2002
-@@ -129,7 +129,7 @@
- macroloop:
-
- /* Skip whitespace */
-- while (isblank(buf[x]))
-+ while (isblank_(buf[x]))
- ++x;
-
- /* Do we have a string? */
-@@ -231,13 +231,13 @@
- }
-
- /* Skip whitespace */
-- while (isblank(buf[x]))
-+ while (isblank_(buf[x]))
- ++x;
-
- /* Do we have a comma? */
- if (buf[x] == ',') {
- ++x;
-- while (isblank(buf[x]))
-+ while (isblank_(buf[x]))
- ++x;
- if (buf[x] && buf[x] != '\r' && buf[x] != '\n')
- goto macroloop;
---- rc.c.old Tue Mar 19 20:29:05 2002
-+++ rc.c Tue Mar 19 20:39:16 2002
-@@ -304,7 +304,7 @@
- if (arg) {
- int y;
-
-- for (y = 0; !isspace(arg[y]); ++y) ;
-+ for (y = 0; !isspace_(arg[y]); ++y) ;
- if (!arg[y])
- arg[y] = 0;
- if (options && y)
-@@ -638,7 +638,7 @@
- if (!strcmp(buf + 1, "def")) {
- int y;
-
-- for (buf[x] = c;
isblank(buf[x]); ++x) ;
-+ for (buf[x] = c;
isblank_(buf[x]); ++x) ;
- for (y = x;
!isspace_eof(buf[y]); ++y) ;
- c = buf[y];
- buf[y] = 0;
-@@ -646,7 +646,7 @@
- int sta;
- MACRO *m;
-
-- if (isblank(c)
-+ if (isblank_(c)
- && (m =
mparse(NULL, buf + y + 1, &sta)))
- addcmd(buf + x,
m);
- else {
-@@ -659,7 +659,7 @@
- }
- } else if (!strcmp(buf + 1, "inherit"))
- if (context) {
-- for (buf[x] = c;
isblank(buf[x]); ++x) ;
-+ for (buf[x] = c;
isblank_(buf[x]); ++x) ;
- for (c = x;
!isspace_eof(buf[c]); ++c) ;
- buf[c] = 0;
- if (c != x)
-@@ -672,7 +672,7 @@
- err = 1;
- fprintf(stderr, "\n%s
%d: No context selected for :inherit", name, line);
- } else if (!strcmp(buf + 1, "include"))
{
-- for (buf[x] = c;
isblank(buf[x]); ++x) ;
-+ for (buf[x] = c;
isblank_(buf[x]); ++x) ;
- for (c = x;
!isspace_eof(buf[c]); ++c) ;
- buf[c] = 0;
- if (c != x) {
-@@ -695,7 +695,7 @@
- if (context) {
- int y;
-
-- for (buf[x] = c;
isblank(buf[x]); ++x) ;
-+ for (buf[x] = c;
isblank_(buf[x]); ++x) ;
- for (y = x; buf[y] != 0
&& buf[y] != '\t' && buf[y] != '\n' && (buf[y] != ' ' || buf[y + 1]
-
!= ' '); ++y) ;
- buf[y] = 0;
---- uedit.c.old Tue Mar 19 20:29:41 2002
-+++ uedit.c Tue Mar 19 20:39:01 2002
-@@ -99,8 +99,8 @@
- {
- if (pisbof(bw->cursor)) {
- return -1; /* cursor is at beginning of file */
-- } else if (isspace(prgetc(bw->cursor))) {
-- while ((!pisbof(bw->cursor)) && (isspace(prgetc(bw->cursor))))
-+ } else if (isspace_(prgetc(bw->cursor))) {
-+ while ((!pisbof(bw->cursor)) && (isspace_(prgetc(bw->cursor))))
- /* do nothing */; /* if cursor is on white-space
char then find first non-white-space char */
- }
- if (pisbof(bw->cursor)) {
-@@ -109,7 +109,7 @@
- pgetc(bw->cursor);
-
- while (!pisbof(bw->cursor)) {
-- if (isspace(prgetc(bw->cursor))) { /* if previous
character is white-space then beginning of word was found */
-+ if (isspace_(prgetc(bw->cursor))) { /* if previous
character is white-space then beginning of word was found */
- pgetc(bw->cursor);
- break;
- }
-@@ -127,8 +127,8 @@
- {
- if (piseof(bw->cursor)) {
- return -1; /* cursor is at end of file */
-- } else if (isspace(pgetc(bw->cursor))) {
-- while ((!piseof(bw->cursor)) && (isspace(pgetc(bw->cursor))))
-+ } else if (isspace_(pgetc(bw->cursor))) {
-+ while ((!piseof(bw->cursor)) && (isspace_(pgetc(bw->cursor))))
- /* do nothing */; /* if cursor is on white-space
char then find first non-white-space char */
- }
- if (piseof(bw->cursor)) {
-@@ -137,7 +137,7 @@
- prgetc(bw->cursor);
-
- while (!piseof(bw->cursor)) {
-- if (isspace(pgetc(bw->cursor))) { /* if next character is
white-space then end of word was found */
-+ if (isspace_(pgetc(bw->cursor))) { /* if next character is
white-space then end of word was found */
- prgetc(bw->cursor);
- break;
- }
-@@ -148,7 +148,7 @@
- static P *pboi(P *p)
- {
- p_goto_bol(p);
-- while (isblank(brc(p)))
-+ while (isblank_(brc(p)))
- pgetc(p);
- return p;
- }
-@@ -166,9 +166,9 @@
- pboi(q);
- if (q->byte == p->byte)
- goto left;
-- if (isblank(c = brc(p))) {
-+ if (isblank_(c = brc(p))) {
- pset(q, p);
-- if (isblank(prgetc(q)))
-+ if (isblank_(prgetc(q)))
- goto no;
- if (c == '\t')
- goto right;
-@@ -660,8 +660,8 @@
- if (isalnum_(c))
- while (c = brc(p), isalnum_(c))
- pgetc(p);
-- else if (isspace(c))
-- while (c = brc(p), isspace(c))
-+ else if (isspace_(c))
-+ while (c = brc(p), isspace_(c))
- pgetc(p);
- else
- pgetc(p);
-@@ -689,8 +689,8 @@
- /* do nothing */;
- if (c != MAXINT)
- pgetc(bw->cursor);
-- } else if (isspace(c)) {
-- while (c = prgetc(bw->cursor), isspace(c))
-+ } else if (isspace_(c)) {
-+ while (c = prgetc(bw->cursor), isspace_(c))
- /* do nothing */;
- if (c != MAXINT)
- pgetc(bw->cursor);
-@@ -788,7 +788,7 @@
- while (piscol(bw->cursor) < bw->o.lmargin)
- binsc(bw->cursor, ' '), pgetc(bw->cursor);
- binsc(bw->cursor, k), pgetc(bw->cursor);
-- if (bw->o.wordwrap && piscol(bw->cursor) > bw->o.rmargin &&
!isblank(k))
-+ if (bw->o.wordwrap && piscol(bw->cursor) > bw->o.rmargin &&
!isblank_(k))
- wrapword(bw->cursor, (long) bw->o.lmargin,
bw->o.french, NULL), simple = 0;
- else if (bw->o.overtype && !piseol(bw->cursor)
- && k != '\t')
-@@ -1054,7 +1054,7 @@
- binsc(bw->cursor, '\n'), pgetc(bw->cursor);
- if (bw->o.autoindent) {
- p_goto_bol(p);
-- while (isspace(c = pgetc(p)) && c != 10)
-+ while (isspace_(c = pgetc(p)) && c != 10)
- binsc(bw->cursor, c), pgetc(bw->cursor);
- }
- prm(p);
---- uformat.c.old Tue Mar 19 20:34:20 2002
-+++ uformat.c Tue Mar 19 20:40:36 2002
-@@ -26,7 +26,7 @@
- int c;
-
- p_goto_eol(p);
-- while (isblank(c = prgetc(p)))
-+ while (isblank_(c = prgetc(p)))
- /* do nothing */;
- if (c == '\n') {
- pgetc(p);
-@@ -38,7 +38,7 @@
- endcol = piscol(p);
-
- p_goto_bol(p);
-- while (isblank(c = pgetc(p)))
-+ while (isblank_(c = pgetc(p)))
- /* do nothing */;
- if (c == '\n') {
- prgetc(p);
-@@ -129,7 +129,7 @@
- while (cpara(brc(q)))
- pgetc(q);
- while (!pisbol(q))
-- if (!isblank(prgetc(q))) {
-+ if (!isblank_(prgetc(q))) {
- pgetc(q);
- break;
- }
-@@ -285,7 +285,7 @@
- p_goto_bol(r);
- q = pdup(r);
- while(cpara(c = brc(q))) {
-- if(!isblank(c))
-+ if(!isblank_(c))
- f = 1;
- pgetc(q);
- }
-@@ -301,7 +301,7 @@
- */
-
- /* Get to beginning of word */
-- while (!pisbol(p) && piscol(p) > indent && !isblank(prgetc(p)))
-+ while (!pisbol(p) && piscol(p) > indent && !isblank_(prgetc(p)))
- /* do nothing */;
-
- /* If we found the beginning of a word... */
-@@ -310,7 +310,7 @@
- word */
- q = pdup(p);
- while (!pisbol(q))
-- if (!isblank(c = prgetc(q))) {
-+ if (!isblank_(c = prgetc(q))) {
- pgetc(q);
- if ((c == '.' || c == '?' || c == '!')
- && q->byte != p->byte && !french)
-@@ -428,7 +428,7 @@
- }
-
- /* Stop if we found white-space followed by end of line */
-- if (isblank(c)) {
-+ if (isblank_(c)) {
- char *r = b;
- int rlen = len;
- int z;
-@@ -437,7 +437,7 @@
- z = *r++;
- if (z == '\n')
- break;
-- if (!isblank(z))
-+ if (!isblank_(z))
- goto ok;
- }
- ++len;
-@@ -451,7 +451,7 @@
- pgetc(p);
-
- /* Do word wrap if we reach right margin */
-- if (piscol(p) > bw->o.rmargin && !isblank(c)) {
-+ if (piscol(p) > bw->o.rmargin && !isblank_(c)) {
- wrapword(p, indent, bw->o.french, indents);
- break;
- }
-@@ -460,12 +460,12 @@
- /* Do rest */
-
- while (len > 0)
-- if (isspace(*b) || *b == '\r') {
-+ if (isspace_(*b) || *b == '\r') {
- int f = 0;
-
- /* Set f if there are two spaces after . ? or ! instead
of one */
- if ((b[-1] == '.' || b[-1] == '?' || b[-1] == '!')
-- && isspace(b[1]))
-+ && isspace_(b[1]))
- f = 1;
-
- /* Skip past the whitespace. Skip over indentations */
-@@ -488,7 +488,7 @@
- }
- }
-
-- if (len && isblank(*b)) {
-+ if (len && isblank_(*b)) {
- if (b - buf == curoff)
- pset(bw->cursor, p);
- ++b, --len;
---- utils.c.old Tue Mar 19 20:34:41 2002
-+++ utils.c Tue Mar 19 20:42:43 2002
-@@ -28,7 +28,17 @@
- */
- int isspace_eof(int c)
- {
-- return(isspace(c) || (!c));
-+ return(isspace_(c) || (!c));
-+}
-+
-+int isspace_(int c)
-+{
-+ return(c >= 0 && c < 256 && isspace(c));
-+}
-+
-+int isblank_(int c)
-+{
-+ return(c >= 0 && c < 256 && isblank(c));
- }
-
- /*
---- utils.h.old Tue Mar 19 20:40:04 2002
-+++ utils.h Tue Mar 19 20:40:08 2002
-@@ -38,7 +38,7 @@
- * even #including <ctype.h> without additional hackery doesn't import
- * the prototype, so we define it here unconditionaly
- */
--int isblank PARAMS((int c));
-+int isblank_ PARAMS((int c));
-
- /*
- * Functions which return minimum/maximum of two numbers
diff --git a/joe.desktop b/joe.desktop
deleted file mode 100644
index 01fa259..0000000
--- a/joe.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Joe
-Comment=Easy to use editor
-Comment[de]=Einfach handzuhabender Editor
-Comment[fr]=Éditeur facile à utiliser
-Comment[pl]=Łatwy w użyciu edytor tekstowy
-Comment[tr]=Kolay kullanımlı metin düzenleyici
-Icon=joe
-Exec=joe
-Terminal=true
-Type=Application
-Categories=ConsoleOnly;TextEditor;
-# vi: encoding=utf-8
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/joe.git/commitdiff/4e1138f4201dd5e6d4ac5734ef584e40c7e1ebfb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
