Skip to content

Commit

Permalink
Prepare merge
Browse files Browse the repository at this point in the history
  • Loading branch information
sp1ff committed Feb 17, 2025
1 parent e80e64a commit 5ab2382
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 14 deletions.
21 changes: 21 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
2025-02-16 Michael Herstine <sp1ff@pobox.com>

Prepare merge

Update copyrights

Fix byte-compilation & melpazoid warnings.
There are still a few left; can't get rid of them trivially.
Also, try to get this workflow to run against the current branch.

Fix melpazoid.
Melpazoid has been broken for some time. This patch fixes only
the fatal melpazoid complaint. I'll look at all the warnings
in a subsequent commit.

Restore the unit tests to working order.
Somewhere along the way, the printed representation
"<anonymous closure>" was changed to "<anonymous function>".
This happened after Emacs 29.4, but at or before the
development build of Emacs I'm running locally.

2024-07-10 Michael Herstine <sp1ff@pobox.com>

Cut release 1.2.8.
Expand Down
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ elfeed-score News -- history of user-visible changes -*- outline -*-

* elfeed-score 1.2

** changes in elfeed-score 1.2.9

No user-visible changes (hygienic updates only).
** changes in elfeed-score 1.2.8

No user-visible changes (hygienic updates only).
Expand Down
16 changes: 8 additions & 8 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#+DESCRIPTION: Gnus-style scoring for Elfeed
#+AUTHOR: Michael Herstine
#+EMAIL: sp1ff@pobox.com
#+DATE: <2024-07-10 Wed 21:16>
#+DATE: <2025-02-16 Sun 19:19>
#+AUTODATE: t
#+OPTIONS: toc:nil org-md-headline-style:setext *:t ^:nil
#+STARTUP: overview
Expand Down Expand Up @@ -73,7 +73,7 @@ The easiest way to install elfeed-score is [[https://github.com/melpa/melpa][MEL
If you would prefer to install the package manually, you can also download the Emacs package file on the GitHub releases [[https://github.com/sp1ff/elfeed-score/releases][page]] or from my personal [[https://www.unwoundstack/distros.html][page]]. Then say:

#+BEGIN_SRC elisp
(package-install-file "elfeed-score-1.2.8.tar")
(package-install-file "elfeed-score-1.2.9.tar")
#+END_SRC

** Autotools Source Distributions
Expand All @@ -82,8 +82,8 @@ You can also download Autotools source tarballs (again available either on the G

#+BEGIN_SRC bash
cd /tmp
curl -L --output elfeed-score-1.2.8.tar.gz https://github.com/sp1ff/elfeed-score/releases/download/1.2.8/elfeed-score-1.2.8.tar.gz
tar xvf elfeed-score-1.2.8.tar.gz && cd elfeed-score-1.2.8
curl -L --output elfeed-score-1.2.9.tar.gz https://github.com/sp1ff/elfeed-score/releases/download/1.2.9/elfeed-score-1.2.9.tar.gz
tar xvf elfeed-score-1.2.9.tar.gz && cd elfeed-score-1.2.9
export EMACSLOADPATH=$HOME/.emacs.d/elpa/elfeed-20200209.1942:$EMACSLOADPATH
./configure
make
Expand All @@ -98,16 +98,16 @@ The unit tests require some macros defined by the [[https://github.com/skeeto/el
#+BEGIN_SRC bash
cd /tmp
git clone https://github.com/skeeto/elfeed.git
curl -L --output=elfeed-score-1.2.8.tar.gz https://github.com/sp1ff/elfeed-score/releases/download/1.2.8/elfeed-score-1.2.8.tar.gz
tar xvf elfeed-score-1.2.8.tar.gz && cd elfeed-score-1.2.8
export EMACSLOADPATH=/tmp/elfeed-score-1.2.8:/tmp/elfeed:/tmp/elfeed/tests:$EMACSLOADPATH
curl -L --output=elfeed-score-1.2.9.tar.gz https://github.com/sp1ff/elfeed-score/releases/download/1.2.9/elfeed-score-1.2.9.tar.gz
tar xvf elfeed-score-1.2.9.tar.gz && cd elfeed-score-1.2.9
export EMACSLOADPATH=/tmp/elfeed-score-1.2.9:/tmp/elfeed:/tmp/elfeed/tests:$EMACSLOADPATH
./configure
make
make check
sudo make install
#+END_SRC

Again, unless you already use =EMACSLOADPATH=, you'll need to set =EMACSLOADPATH= appropriately to your system, something like =EMACSLOADPATH=/tmp/elfeed-score-1.2.8:/tmp/elfeed:/tmp/elfeed/tests:/usr/share/emacs/25.2/lisp=.
Again, unless you already use =EMACSLOADPATH=, you'll need to set =EMACSLOADPATH= appropriately to your system, something like =EMACSLOADPATH=/tmp/elfeed-score-1.2.9:/tmp/elfeed:/tmp/elfeed/tests:/usr/share/emacs/25.2/lisp=.
** Building From Source

Finally, you can of course just clone this repo & build there. I've started a [[https://github.com/sp1ff/elfeed-score/wiki][wiki]], whose intended audience are people looking to hack on elfeed-score, that includes build instructions.
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ([2.69])
AC_INIT([elfeed-score], [1.2.8], [sp1ff@pobox.com], [elfeed-score], [https://github.com/sp1ff/elfeed-score])
AC_INIT([elfeed-score], [1.2.9], [sp1ff@pobox.com], [elfeed-score], [https://github.com/sp1ff/elfeed-score])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR([./elfeed-score.el])
AC_PROG_MAKE_SET
Expand Down
4 changes: 2 additions & 2 deletions doc/version.texi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@set UPDATED 17 February 2025
@set UPDATED-MONTH February 2025
@set EDITION 1.2.8
@set VERSION 1.2.8
@set EDITION 1.2.9
@set VERSION 1.2.9
2 changes: 1 addition & 1 deletion elfeed-score-pkg.el
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
;;; SPDX-License-Identifier: GPL-3.0-or-later
(define-package
"elfeed-score"
"1.2.8"
"1.2.9"
"Gnus-style scoring for Elfeed"
'((emacs "26.1") (elfeed "3.3.0")))
4 changes: 2 additions & 2 deletions elfeed-score.el
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
;; Copyright (C) 2019-2025 Michael Herstine <sp1ff@pobox.com>

;; Author: Michael Herstine <sp1ff@pobox.com>
;; Version: 1.2.8
;; Version: 1.2.9
;; Package-Requires: ((emacs "26.1") (elfeed "3.3.0"))
;; Keywords: news
;; URL: https://github.com/sp1ff/elfeed-score
Expand Down Expand Up @@ -44,7 +44,7 @@
(require 'elfeed-score-scoring)
(require 'elfeed-score-maint)

(defconst elfeed-score-version "1.2.8")
(defconst elfeed-score-version "1.2.9")

(defgroup elfeed-score nil
"Gnus-style scoring for Elfeed entries."
Expand Down

0 comments on commit 5ab2382

Please sign in to comment.