On Tue Aug 29, 2023 at 10:28:28AM +0100, Stuart Henderson wrote:
> On 2023/08/29 01:49, Rafael Sadowski wrote:
> > Update aspell to 0.60.8. Would like to here feedback.
> >
> > I know this affects a lot of ports but I wanted to make a push and
> > update this port. If it is committed, I would take care of the dicts.
> >
> > Is this a candidate for a bulk build?
>
> It only directly affects about a dozen ports. Building and doing runtime
> tests for some of those would take less time and be more valuable than
> going through a bulk build.
>
> For some updates (like some of the Qt/kde related things where something
> seems to break on nearly every update) so many ports are involved that
> a bulk(7) makes sense but for things like this the number is much
> smaller and a more targetted approach seems sensible.
>
> $ grep aspell/core /usr/local/share/ports-INDEX | cut -d'|' -f2 | grep -v aspell/dicts
> databases/recoll
> databases/recoll,-gui
> devel/kf5/sonnet,-aspell
sonnet is also happy
> devel/p5-Test-Spelling
> editors/teaqt
> lang/php/7.4,-pspell
> lang/php/8.0,-pspell
> lang/php/8.1,-pspell
> lang/php/8.2,-pspell
> mail/alpine
> mail/alpine,-c-client
> mail/alpine,-imap
> mail/alpine,-mailutil
> mail/alpine,-pico
> mail/alpine,-pilot
> net/weechat
Tested with weechat at runtime (en,de)
> print/lyx
> textproc/aspell/core
> textproc/enchant
> textproc/enchant2
> textproc/p5-Text-Aspell
> x11/gnustep/gui
>
> when mbuhl@ sent an update to 0.60.8 last year I tested php, enchant,
> enchant2 and those seemed happy. (fwiw he had a patch to the Makefile
> to avoid using addprefix rather than needing USE_GMAKE).
Thank you, adapted and adopted.
>
> > -SHARED_LIBS += aspell 17.0 # .16.4
> > -SHARED_LIBS += pspell 17.0 # .16.4
> > +SHARED_LIBS += aspell 18.0 # .16.4
> > +SHARED_LIBS += pspell 17.0 # .16.4
>
> the upstream versions of these are now .18.1 (check shared_libs.log).
>
Thanks, fixed.
New diff:
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/textproc/aspell/core/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- core/Makefile 11 Mar 2022 20:02:20 -0000 1.50
+++ core/Makefile 29 Aug 2023 10:58:40 -0000
@@ -1,13 +1,13 @@
-COMMENT= spell checker designed to eventually replace Ispell
+COMMENT= spell checker with multi-language support
-DISTNAME= aspell-0.60.6.1
-REVISION= 11
-SHARED_LIBS += aspell 17.0 # .16.4
-SHARED_LIBS += pspell 17.0 # .16.4
+DISTNAME= aspell-0.60.8
DIST_SUBDIR= aspell
CATEGORIES= textproc
-DIST_EN= aspell6-en-7.1-0
+SHARED_LIBS += aspell 18.0 # .18.1
+SHARED_LIBS += pspell 17.0 # .18.1
+
+DIST_EN= aspell6-en-2020.12.07-0
MASTER_SITES0= ${MASTER_SITE_GNU:=aspell/}
MASTER_SITES1= ${MASTER_SITE_GNU:=aspell/dict/en/}
@@ -20,9 +20,9 @@ HOMEPAGE= http://aspell.net/
# LGPLv2.1
PERMIT_PACKAGE= Yes
-WANTLIB= c iconv intl m curses pthread ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} c curses iconv intl m
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc base-gcc
# use ld.lld on mips64 to avoid ld.bfd ICE:
# /usr/bin/ld: BFD 2.17 internal error, aborting at /usr/src/gnu/usr.bin/binutils-2.17/bfd/elfxx-mips.c line 4797 in mips_elf_create_dynamic_relocation
@@ -33,8 +33,10 @@ USE_LLD = Yes
LIB_DEPENDS= devel/gettext,-runtime
CONFIGURE_STYLE= gnu
+
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
CONFIGURE_ARGS+= --enable-static \
--enable-curses=ncursesw \
--enable-dict-dir=${PREFIX}/share/aspell \
Index: core/distinfo
===================================================================
RCS file: /cvs/ports/textproc/aspell/core/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- core/distinfo 18 Jan 2015 03:15:17 -0000 1.7
+++ core/distinfo 29 Aug 2023 10:58:40 -0000
@@ -1,4 +1,4 @@
-SHA256 (aspell/aspell-0.60.6.1.tar.gz) = 9SWDqDpjYzcBxfcds9xAqrh7f3aylyOusnlB7/Qt9uE=
-SHA256 (aspell/aspell6-en-7.1-0.tar.bz2) = /53zwujFuxnGpmB4s2oO9MTfsPy5aeKfe1NF4m10jQo=
-SIZE (aspell/aspell-0.60.6.1.tar.gz) = 1878163
-SIZE (aspell/aspell6-en-7.1-0.tar.bz2) = 175360
+SHA256 (aspell/aspell-0.60.8.tar.gz) = +bd+UVM0p1Gy5g2qtdsjSZ4mySCfXnt0Q7BSNa0CJvI=
+SHA256 (aspell/aspell6-en-2020.12.07-0.tar.bz2) = TI9zSiigiLiLtkgfz5ctCyw9yNqUT3ZzKDzkh+rEn7M=
+SIZE (aspell/aspell-0.60.8.tar.gz) = 3486448
+SIZE (aspell/aspell6-en-2020.12.07-0.tar.bz2) = 188972
Index: core/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/aspell/core/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_in
--- core/patches/patch-Makefile_in 11 Mar 2022 20:02:20 -0000 1.5
+++ core/patches/patch-Makefile_in 29 Aug 2023 10:58:40 -0000
@@ -1,6 +1,7 @@
---- Makefile.in.orig Mon Jul 4 10:58:49 2011
-+++ Makefile.in Tue Jan 17 10:55:18 2012
-@@ -482,7 +482,7 @@ top_builddir = @top_builddir@
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -667,7 +667,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign subdir-objects
SUBDIRS = . po manual
@@ -8,4 +9,13 @@
+DIST_SUBDIRS = ${SUBDIRS} myspell lib5
filterdir = ${pkglibdir}
optdir = ${pkgdatadir}
+
+@@ -2053,7 +2053,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIP
+ # settings.h added as a dependency so it will get recreated if
+ # the COMPILE_IN_FILTERS option changes
+ gen/static_filters.src.cpp: ${static_optfiles} gen/mk-static-filter.pl gen/settings.h
+- ${PERLPROG} ${srcdir}/gen/mk-static-filter.pl $(addprefix ${srcdir}/,${static_optfiles})
++ ${PERLPROG} ${srcdir}/gen/mk-static-filter.pl ${srcdir}/${static_optfiles}
+
+ ${srcdir}/lib/new_filter.cpp: gen/static_filters.src.cpp
Index: core/patches/patch-common_cache-t_hpp
===================================================================
RCS file: core/patches/patch-common_cache-t_hpp
diff -N core/patches/patch-common_cache-t_hpp
--- core/patches/patch-common_cache-t_hpp 11 Mar 2022 20:02:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Fix segfault when building dictionaries on macppc
-see https://github.com/GNUAspell/aspell/pull/532
-
-Index: common/cache-t.hpp
---- common/cache-t.hpp.orig
-+++ common/cache-t.hpp
-@@ -16,6 +16,7 @@ class GlobalCacheBase (public)
- const char * name;
- GlobalCacheBase * next;
- GlobalCacheBase * * prev;
-+ static Mutex global_cache_lock;
- protected:
- Cacheable * first;
- void del(Cacheable * d);
Index: core/patches/patch-common_cache_cpp
===================================================================
RCS file: core/patches/patch-common_cache_cpp
diff -N core/patches/patch-common_cache_cpp
--- core/patches/patch-common_cache_cpp 11 Mar 2022 20:02:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-Fix segfaults while building dictionaries on macppc
-see https://github.com/GNUAspell/aspell/pull/532
-
-Index: common/cache.cpp
---- common/cache.cpp.orig
-+++ common/cache.cpp
-@@ -5,8 +5,8 @@
-
- namespace acommon {
-
--static StackPtr<Mutex> global_cache_lock(new Mutex);
- static GlobalCacheBase * first_cache = 0;
-+Mutex GlobalCacheBase::global_cache_lock;
-
- void Cacheable::copy() const
- {
-@@ -70,7 +70,7 @@ void release_cache_data(GlobalCacheBase * cache, const
- GlobalCacheBase::GlobalCacheBase(const char * n)
- : name (n)
- {
-- LOCK(global_cache_lock);
-+ LOCK(&global_cache_lock);
- next = first_cache;
- prev = &first_cache;
- if (first_cache) first_cache->prev = &next;
-@@ -80,14 +80,14 @@ GlobalCacheBase::GlobalCacheBase(const char * n)
- GlobalCacheBase::~GlobalCacheBase()
- {
- detach_all();
-- LOCK(global_cache_lock);
-+ LOCK(&global_cache_lock);
- *prev = next;
- if (next) next->prev = prev;
- }
-
- bool reset_cache(const char * which)
- {
-- LOCK(global_cache_lock);
-+ LOCK(&GlobalCacheBase::global_cache_lock);
- bool any = false;
- for (GlobalCacheBase * i = first_cache; i; i = i->next)
- {
Index: core/patches/patch-common_lock_hpp
===================================================================
RCS file: core/patches/patch-common_lock_hpp
diff -N core/patches/patch-common_lock_hpp
--- core/patches/patch-common_lock_hpp 11 Mar 2022 20:02:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-common/lock.hpp:63: error: 'NULL' was not declared in this scope
-
---- common/lock.hpp.orig Tue Jan 17 11:20:03 2012
-+++ common/lock.hpp Tue Jan 17 11:20:13 2012
-@@ -16,6 +16,7 @@
- #define DISTRIBNET_LOCK__HPP
-
- #include <assert.h>
-+#include <cstddef>
-
- #include "settings.h"
-
Index: core/patches/patch-configure
===================================================================
RCS file: /cvs/ports/textproc/aspell/core/patches/patch-configure,v
retrieving revision 1.8
diff -u -p -r1.8 patch-configure
--- core/patches/patch-configure 11 Mar 2022 20:02:20 -0000 1.8
+++ core/patches/patch-configure 29 Aug 2023 10:58:40 -0000
@@ -1,6 +1,7 @@
---- configure.orig Mon Jul 4 09:58:50 2011
-+++ configure Mon Apr 17 22:05:04 2017
-@@ -2645,7 +2645,7 @@ fi
+Index: configure
+--- configure.orig
++++ configure
+@@ -3308,7 +3308,7 @@ fi
if test "$pkgdatadir" = "undef"
then
@@ -9,17 +10,12 @@
fi
-@@ -20216,10 +20216,10 @@ XGETTEXT!$XGETTEXT$ac_delim
- XGETTEXT_015!$XGETTEXT_015$ac_delim
- MSGMERGE!$MSGMERGE$ac_delim
- INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
--LIBICONV!$LIBICONV$ac_delim
-+LIBICONV!$LTLIBICONV$ac_delim
- LTLIBICONV!$LTLIBICONV$ac_delim
--INTLLIBS!$INTLLIBS$ac_delim
--LIBINTL!$LIBINTL$ac_delim
-+INTLLIBS!$LTLIBINTL$ac_delim
-+LIBINTL!$LTLIBINTL$ac_delim
- LTLIBINTL!$LTLIBINTL$ac_delim
- POSUB!$POSUB$ac_delim
- PTHREAD_LIB!$PTHREAD_LIB$ac_delim
+@@ -3329,7 +3329,7 @@ fi
+
+ if test "$pkglibdir" = "undef"
+ then
+- pkglibdir=\${libdir}/aspell-0.60
++ pkglibdir=\${libdir}/aspell
+ fi
+
+
Index: core/patches/patch-interfaces_cc_aspell_h
===================================================================
RCS file: core/patches/patch-interfaces_cc_aspell_h
diff -N core/patches/patch-interfaces_cc_aspell_h
--- core/patches/patch-interfaces_cc_aspell_h 11 Mar 2022 20:02:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-fix with clang; from https://svnweb.freebsd.org/ports?view=revision&revision=343830
-
-should be obsoleted by upstream patch targetted for 0.60.7
-https://github.com/GNUAspell/aspell/commit/502e8f99a9c7c63344f5acdcb96ddecd30ee32f1
-
---- interfaces/cc/aspell.h.orig Sat Jul 2 22:53:27 2011
-+++ interfaces/cc/aspell.h Mon Apr 17 22:05:44 2017
-@@ -236,7 +236,7 @@ void delete_aspell_can_have_error(struct AspellCanHave
-
- /******************************** errors ********************************/
-
--
-+#ifndef ASPELL_ERRORS__HPP
- extern const struct AspellErrorInfo * const aerror_other;
- extern const struct AspellErrorInfo * const aerror_operation_not_supported;
- extern const struct AspellErrorInfo * const aerror_cant_copy;
-@@ -322,7 +322,7 @@ extern const struct AspellErrorInfo * const aerror_m
- extern const struct AspellErrorInfo * const aerror_bad_magic;
- extern const struct AspellErrorInfo * const aerror_expression;
- extern const struct AspellErrorInfo * const aerror_invalid_expression;
--
-+
No comments:
Post a Comment