diff --git a/multimedia/misc/compface/pspec.xml b/multimedia/misc/compface/pspec.xml index 1f9ae50fbf..a37bf64356 100644 --- a/multimedia/misc/compface/pspec.xml +++ b/multimedia/misc/compface/pspec.xml @@ -12,7 +12,7 @@ library X-Face library Utilities and library to convert to/from X-Face format. - http://mirrors.ibiblio.org/xemacs/aux/compface-1.5.2.tar.gz + http://ftp.xemacs.org/pub/xemacs/aux/compface-1.5.2.tar.gz xbmp.patch shared.patch @@ -43,6 +43,13 @@ + + 2020-01-15 + 1.5.2 + Rebuild + İdris Kalp + idriskalp@gmail.com + 2018-09-01 1.5.2 diff --git a/office/spellcheck/aspell/actions.py b/office/spellcheck/aspell/actions.py index e5de9013c2..16e0eacd5f 100644 --- a/office/spellcheck/aspell/actions.py +++ b/office/spellcheck/aspell/actions.py @@ -10,8 +10,8 @@ from pisi.actionsapi import shelltools from pisi.actionsapi import get def setup(): - shelltools.system("sed -i '/ top.do_check ==/s/top.do_check/*&/' modules/filter/tex.cpp") - shelltools.system("sed -i '/word ==/s/word/*&/' prog/check_funs.cpp") + #shelltools.system("sed -i '/ top.do_check ==/s/top.do_check/*&/' modules/filter/tex.cpp") + #shelltools.system("sed -i '/word ==/s/word/*&/' prog/check_funs.cpp") autotools.autoreconf() autotools.configure("--disable-static \ diff --git a/office/spellcheck/aspell/files/fedora/aspell-0.60.7-fileconflict.patch b/office/spellcheck/aspell/files/fedora/aspell-0.60.7-fileconflict.patch new file mode 100644 index 0000000000..c4b93155f9 --- /dev/null +++ b/office/spellcheck/aspell/files/fedora/aspell-0.60.7-fileconflict.patch @@ -0,0 +1,55 @@ +diff --git a/Makefile.in b/Makefile.in +index f293649..e5d2b1a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -518,6 +518,7 @@ distcleancheck_listfiles = find . -type f -print + + # These are needed due to a bug in Automake + pkgdatadir = @pkgdatadir@ ++pkgdatadir2 = @pkgdatadir2@ + pkglibdir = @pkglibdir@ + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ +@@ -2071,7 +2072,7 @@ gen/dirs.h: gen/mk-dirs_h.pl + perl ${srcdir}/gen/mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir} ${sysconfdir} > gen/dirs.h + + scripts/run-with-aspell: scripts/run-with-aspell.create +- sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir} > scripts/run-with-aspell ++ sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir2} > scripts/run-with-aspell + chmod 755 scripts/run-with-aspell + @PSPELL_COMPATIBILITY_TRUE@scripts/pspell-config: scripts/mkconfig + @PSPELL_COMPATIBILITY_TRUE@ sh ${srcdir}/scripts/mkconfig ${VERSION} ${datadir} ${pkgdatadir} +diff --git a/configure b/configure +index 1236c90..8a6e697 100755 +--- a/configure ++++ b/configure +@@ -709,6 +709,7 @@ CXXFLAGS + CXX + pkglibdir + pkgdatadir ++pkgdatadir2 + pkgdocdir + MAINT + MAINTAINER_MODE_FALSE +@@ -3297,18 +3298,21 @@ pkgdatadir=undef + # Check whether --enable-pkgdatadir was given. + if test "${enable_pkgdatadir+set}" = set; then : + enableval=$enable_pkgdatadir; pkgdatadir=$enable_pkgdatadir ++ pkgdatadir2=$enable_pkgdatadir + fi + + + # Check whether --enable-pkgdata-dir was given. + if test "${enable_pkgdata_dir+set}" = set; then : + enableval=$enable_pkgdata_dir; pkgdatadir=$enable_dict_dir ++ pkgdatadir2=$enable_dict_dir + fi + + + if test "$pkgdatadir" = "undef" + then + pkgdatadir=\${libdir}/aspell-0.60 ++ pkgdatadir2=${exec_prefix}/lib/aspell-0.60:${exec_prefix}/lib64/aspell-0.60 + fi + + diff --git a/office/spellcheck/aspell/files/fedora/aspell-0.60.7-mp.patch b/office/spellcheck/aspell/files/fedora/aspell-0.60.7-mp.patch new file mode 100644 index 0000000000..4f4e94dc23 --- /dev/null +++ b/office/spellcheck/aspell/files/fedora/aspell-0.60.7-mp.patch @@ -0,0 +1,48 @@ +diff --git a/manual/aspell.1 b/manual/aspell.1 +index 854debf..b1106ca 100644 +--- a/manual/aspell.1 ++++ b/manual/aspell.1 +@@ -328,7 +328,6 @@ are also allowed. The \fI/etc/aspell.conf\fR file is a good example of + how to set these options and the Aspell Manual has more detailed info. + .SH SEE ALSO + .PP +-.BR aspell\-import (1), + .BR prezip\-bin (1), + .BR run\-with\-aspell (1), + .BR word\-list\-compress (1) +diff --git a/manual/prezip-bin.1 b/manual/prezip-bin.1 +index afb6c05..09b5784 100644 +--- a/manual/prezip-bin.1 ++++ b/manual/prezip-bin.1 +@@ -99,7 +99,6 @@ the output file is not complete. + .SH SEE ALSO + .PP + .BR aspell (1), +-.BR aspell\-import (1), + .BR run\-with\-aspell (1), + .BR word\-list\-compress (1) + .PP +diff --git a/manual/run-with-aspell.1 b/manual/run-with-aspell.1 +index 8dea131..67f3117 100644 +--- a/manual/run-with-aspell.1 ++++ b/manual/run-with-aspell.1 +@@ -28,7 +28,6 @@ such as ispell's own scripts. + .SH SEE ALSO + .PP + .BR aspell (1), +-.BR aspell\-import (1), + .BR word\-list\-compress (1) + .PP + Aspell is fully documented in its Texinfo manual. See the +diff --git a/manual/word-list-compress.1 b/manual/word-list-compress.1 +index 5126cd2..6686997 100644 +--- a/manual/word-list-compress.1 ++++ b/manual/word-list-compress.1 +@@ -80,7 +80,6 @@ be written to. + .SH SEE ALSO + .PP + .BR aspell (1), +-.BR aspell\-import (1), + .BR prezip\-bin (1), + .BR run\-with\-aspell (1) + .PP diff --git a/office/spellcheck/aspell/files/fedora/aspell-0.60.7-pspell_conf.patch b/office/spellcheck/aspell/files/fedora/aspell-0.60.7-pspell_conf.patch new file mode 100644 index 0000000000..a5fe8e4a45 --- /dev/null +++ b/office/spellcheck/aspell/files/fedora/aspell-0.60.7-pspell_conf.patch @@ -0,0 +1,65 @@ +diff --git a/Makefile.in b/Makefile.in +index e5d2b1a..bc53e34 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1019,6 +1019,8 @@ clean-filterLTLIBRARIES: + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ ++ mkdir -p $(DESTDIR)$(libdir)/pkgconfig; \ ++ cp aspell.pc $(DESTDIR)$(libdir)/pkgconfig/aspell.pc; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ +diff --git a/aspell.pc.in b/aspell.pc.in +new file mode 100644 +index 0000000..13da044 +--- /dev/null ++++ b/aspell.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++pkgdatadir=@pkgdatadir@ ++ ++Name: Aspell ++Description: A spelling checker. ++Version: @VERSION@ ++Requires: ++Libs: -L${libdir} -laspell ++Cflags: -I${includedir} +diff --git a/configure b/configure +index 8a6e697..995a3df 100755 +--- a/configure ++++ b/configure +@@ -18732,7 +18732,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + # # + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + +-ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile" ++ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile aspell.pc scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -19887,6 +19887,7 @@ do + "modules/filter/Makefile") CONFIG_FILES="$CONFIG_FILES modules/filter/Makefile" ;; + "myspell/Makefile") CONFIG_FILES="$CONFIG_FILES myspell/Makefile" ;; + "lib5/Makefile") CONFIG_FILES="$CONFIG_FILES lib5/Makefile" ;; ++ "aspell.pc") CONFIG_FILES="$CONFIG_FILES aspell.pc" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +diff --git a/scripts/mkconfig b/scripts/mkconfig +index 608e3f7..f15f31c 100755 +--- a/scripts/mkconfig ++++ b/scripts/mkconfig +@@ -15,7 +15,7 @@ case \$1 in + echo "$2" + ;; + --pkgdatadir | pkgdatadir) +- echo "$3" ++ pkg-config aspell --variable=pkgdatadir + ;; + *) + echo "usage: pspell-config version|datadir|pkgdatadir" diff --git a/office/spellcheck/aspell/pspec.xml b/office/spellcheck/aspell/pspec.xml index 34392a8e3a..eea0fd8d13 100644 --- a/office/spellcheck/aspell/pspec.xml +++ b/office/spellcheck/aspell/pspec.xml @@ -12,13 +12,22 @@ app:console A multi-language spellchecker Aspell is a spellchecker that has dictionaries for more than one language and is written as a replacement to ispell. - mirrors://gnu/aspell/aspell-0.60.6.1.tar.gz + mirrors://gnu/aspell/aspell-0.60.8.tar.gz + + + + fedora/aspell-0.60.7-fileconflict.patch + fedora/aspell-0.60.7-mp.patch + fedora/aspell-0.60.7-pspell_conf.patch @@ -51,6 +60,13 @@ + + 2020-01-15 + 0.60.8 + Version bump + Pisi Linux Community + admin@pisilinux.org + 2018-09-16 0.60.6.1