pool/emacs-apel
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 975203 from home:AndreasSchwab:f

Browse Source 
- Switch to APEL-LB from Wanderlust
- Update to version 10.8+80+g6947dc4:
  * Fold docstring within 80 characters
  * Fix fontset-pixel-size failure
  * Revive poe.el's dependency on pym.el
  * Remove conditional definition of functions and variable.
  * Remove codes for old platforms.
  * Update package description file for MELPA.
  * * product.el: Remove unneeded dependency on pym.el.
  * Don't use defun-maybe for mime-charset-list
- apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch,
  apel-emacs-escape-fix.patch, emacs-apel-fix-old-backquote.patch,
  prevent-fontset-error.patch: Remote obsolete patches

OBS-URL: https://build.opensuse.org/request/show/975203
OBS-URL: https://build.opensuse.org/package/show/M17N/emacs-apel?expand=0&rev=8
This commit is contained in:
Takashi Iwai 2022-05-10 08:32:01 +00:00 committed by Git OBS Bridge
parent c15f7a4e91
commit b0b9b057bb
11 changed files with 49 additions and 1153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
_service Normal file
View File

@ -0,0 +1,16 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="url">https://github.com/wanderlust/apel</param>
<param name="scm">git</param>
<param name="versionformat">10.8+@TAG_OFFSET@+g%h</param>
<param name="parent-tag">chise-base-0_25</param>
<param name="revision">apel-wl</param>
<param name="changesgenerate">enable</param>
</service>
<service mode="buildtime" name="tar" />
<service mode="buildtime" name="recompress">
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
<service mode="disabled" name="set_version" />
</services>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/wanderlust/apel</param>
<param name="changesrevision">6947dc4605ebbb87762edf7051a78a3f7b5f17c5</param></service></servicedata>

3
apel-10.8+80+g6947dc4.obscpio Normal file
View File

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

27
apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch
View File

@ -1,27 +0,0 @@
Subject: Fix wrong type argument on Emacs 24.3.50 to check make-temp-file
From: Tatsuya Kinoshita <tats@debian.org>
Bug-Debian: http://bugs.debian.org/718765
diff --git a/ChangeLog b/ChangeLog
index 8e96224..9505b2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,5 @@
+2013-08-05 Tatsuya Kinoshita <tats@vega.ocn.ne.jp>
+
+ * poe.el: Fix wrong type argument on Emacs 24.3.50 to check
+ `make-temp-file'.
+
diff --git a/poe.el b/poe.el
index be52847..b381f90 100644
--- a/poe.el
+++ b/poe.el
@@ -1667,7 +1667,7 @@ See `walk-windows' for the meaning of MINIBUF and FRAME."
)))
;; arglist: (prefix &optional dir-flag suffix)
(cond
- ((not arglist)
+ ((or (not arglist) (not (listp arglist)))
;; `make-temp-file' is a built-in; expects 3-args.
(put 'make-temp-file 'defun-maybe '3-args))
((> (length arglist) 3)

3
apel-10.8.tar.gz
View File

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

38
apel-emacs-escape-fix.patch
View File

@ -1,38 +0,0 @@
---
poe.el | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
--- a/poe.el
+++ b/poe.el
@@ -1079,11 +1079,11 @@ If the replaced text has at least one wo
then capitalize each word in NEWTEXT.
If third arg LITERAL is non-nil, insert NEWTEXT literally.
-Otherwise treat `\' as special:
- `\&' in NEWTEXT means substitute original matched text.
- `\N' means substitute what matched the Nth `\(...\)'.
+Otherwise treat `\\' as special:
+ `\\&' in NEWTEXT means substitute original matched text.
+ `\\N' means substitute what matched the Nth `\(...\)'.
If Nth parens didn't match, substitute nothing.
- `\\' means insert one `\'.
+ `\\\\' means insert one `\\'.
FIXEDCASE and LITERAL are optional arguments.
Leaves point at end of replacement text.
@@ -1131,11 +1131,11 @@ If the replaced text has at least one wo
then capitalize each word in NEWTEXT.
If third arg LITERAL is non-nil, insert NEWTEXT literally.
-Otherwise treat `\' as special:
- `\&' in NEWTEXT means substitute original matched text.
- `\N' means substitute what matched the Nth `\(...\)'.
+Otherwise treat `\\' as special:
+ `\\&' in NEWTEXT means substitute original matched text.
+ `\\N' means substitute what matched the Nth `\(...\)'.
If Nth parens didn't match, substitute nothing.
- `\\' means insert one `\'.
+ `\\\\' means insert one `\\'.
FIXEDCASE and LITERAL are optional arguments.
Leaves point at end of replacement text.

5
apel.obsinfo Normal file
View File

@ -0,0 +1,5 @@
name: apel
version: 10.8+80+g6947dc4
mtime: 1651058513
commit: 6947dc4605ebbb87762edf7051a78a3f7b5f17c5

1040
emacs-apel-fix-old-backquote.patch
View File

File diff suppressed because it is too large Load Diff

17
emacs-apel.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu May 05 13:11:15 UTC 2022 - schwab@linux-m68k.org
- Switch to APEL-LB from Wanderlust
- Update to version 10.8+80+g6947dc4:
* Fold docstring within 80 characters
* Fix fontset-pixel-size failure
* Revive poe.el's dependency on pym.el
* Remove conditional definition of functions and variable.
* Remove codes for old platforms.
* Update package description file for MELPA.
* * product.el: Remove unneeded dependency on pym.el.
* Don't use defun-maybe for mime-charset-list
- apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch,
apel-emacs-escape-fix.patch, emacs-apel-fix-old-backquote.patch,
prevent-fontset-error.patch: Remote obsolete patches
-------------------------------------------------------------------
Mon Sep 28 11:42:59 UTC 2020 - Marguerite Su <i@marguerite.su>

22
emacs-apel.spec
View File

@ -17,20 +17,14 @@
Name: emacs-apel
Version: 10.8
Version: 10.8+80+g6947dc4
Release: 0
Summary: A Portable Emacs Library
License: GPL-2.0-or-later
Group: Productivity/Editors/Emacs
URL: http://git.chise.org/elisp/apel
Source: http://git.chise.org/elisp/dist/apel/apel-%{version}.tar.gz
URL: https://github.com/wanderlust/apel
Source: apel-%{version}.tar.gz
Source1: suse-start-apel.el
Patch0: prevent-fontset-error.patch
# PATCH-FIX-UPSTREAM
Patch1: apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch
Patch2: apel-emacs-escape-fix.patch
#PATCH-FIX-UPSTREAM use new style backquotes
Patch3: https://src.fedoraproject.org/rpms/emacs-apel/raw/master/f/emacs-apel-fix-old-backquote.patch
BuildRequires: emacs-nox
Requires: emacs
Requires: emacs_program
@ -44,15 +38,7 @@ A Portable Emacs Library
%prep
%setup -q -n apel-%{version}
%patch0 -p1
%if 0%{?suse_version} > 1310
%patch1 -p1
%endif
%patch2 -p1
%patch3 -p1
cp -p %{SOURCE1} .
iconv -fiso2022jp -tutf-8 README.ja > README.ja.new
mv README.ja.new README.ja
%build
make "CFLAGS=%{optflags}" LDFLAGS=-s EMACS=emacs PREFIX=%{_prefix} %{?_smp_mflags}
@ -64,7 +50,7 @@ install -m 644 suse-start-apel.el %{buildroot}%{_datadir}/emacs/site-lisp/
%files
%defattr(-,root,root)
%doc README.en README.ja ChangeLog
%doc README.en README.ja
%{_datadir}/emacs/site-lisp/suse-start-apel.el
%{_datadir}/emacs/site-lisp/emu
%{_datadir}/emacs/site-lisp/apel

27
prevent-fontset-error.patch
View File

@ -1,27 +0,0 @@
Description: Prevent an error of fontset-pixel-size for Emacs 23.
Bug-Debian: http://bugs.debian.org/477177
Author: Tatsuya Kinoshita <tats@debian.org>
* poem-e20.el (fontset-pixel-size): Don't cause an error. Workaround
for Emacs 23.
--- apel-10.7+0.20080906.orig/poem-e20.el
+++ apel-10.7+0.20080906/poem-e20.el
@@ -25,6 +25,7 @@
;;; Code:
(defun fontset-pixel-size (fontset)
+ (condition-case nil
(let* ((info (fontset-info fontset))
(height (aref info 1))
)
@@ -32,7 +33,8 @@
((string-match "-\\([0-9]+\\)-" fontset)
(string-to-number
(substring fontset (match-beginning 1)(match-end 1))))
- (t 0))))
+ (t 0)))
+ (error 0)))
;;; @ character set