From a1549f371d79b5b570e154fedca310a86ebe9a99 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Mon, 10 Aug 2015 09:17:12 +0300 Subject: [PATCH] aspell:moved into main for pisi 2.0 --- office/spellcheck/aspell/actions.py | 29 +++++++ .../fedora/aspell-0.60.3-install_info.patch | 30 ++++++++ .../fedora/aspell-0.60.5-fileconflict.patch | 70 +++++++++++++++++ .../fedora/aspell-0.60.5-pspell_conf.patch | 60 +++++++++++++++ .../files/fedora/aspell-0.60.6-mp.patch | 44 +++++++++++ .../files/fedora/aspell-0.60.6-zero.patch | 11 +++ office/spellcheck/aspell/pspec.xml | 76 +++++++++++++++++++ office/spellcheck/aspell/translations.xml | 14 ++++ 8 files changed, 334 insertions(+) create mode 100644 office/spellcheck/aspell/actions.py create mode 100644 office/spellcheck/aspell/files/fedora/aspell-0.60.3-install_info.patch create mode 100644 office/spellcheck/aspell/files/fedora/aspell-0.60.5-fileconflict.patch create mode 100644 office/spellcheck/aspell/files/fedora/aspell-0.60.5-pspell_conf.patch create mode 100644 office/spellcheck/aspell/files/fedora/aspell-0.60.6-mp.patch create mode 100644 office/spellcheck/aspell/files/fedora/aspell-0.60.6-zero.patch create mode 100644 office/spellcheck/aspell/pspec.xml create mode 100644 office/spellcheck/aspell/translations.xml diff --git a/office/spellcheck/aspell/actions.py b/office/spellcheck/aspell/actions.py new file mode 100644 index 0000000000..c6b8798a92 --- /dev/null +++ b/office/spellcheck/aspell/actions.py @@ -0,0 +1,29 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get + +def setup(): + autotools.autoreconf() + autotools.configure("--disable-static \ + --sysconfdir=/etc/aspell \ + --enable-docdir=/usr/share/doc/%s" % get.srcNAME()) + + pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + # install ispell/spell compatibility scripts + pisitools.insinto("/usr/bin","scripts/ispell","ispell-aspell") + pisitools.insinto("/usr/bin","scripts/spell", "spell-aspell") + + pisitools.dodoc("README*", "TODO") diff --git a/office/spellcheck/aspell/files/fedora/aspell-0.60.3-install_info.patch b/office/spellcheck/aspell/files/fedora/aspell-0.60.3-install_info.patch new file mode 100644 index 0000000000..34e5636314 --- /dev/null +++ b/office/spellcheck/aspell/files/fedora/aspell-0.60.3-install_info.patch @@ -0,0 +1,30 @@ +diff -up aspell-0.60.6.1/manual/Makefile.in.iinfo aspell-0.60.6.1/manual/Makefile.in +--- aspell-0.60.6.1/manual/Makefile.in.iinfo 2011-07-04 10:58:49.000000000 +0200 ++++ aspell-0.60.6.1/manual/Makefile.in 2011-08-15 16:29:40.999718535 +0200 +@@ -607,16 +607,16 @@ install-info-am: $(INFO_DEPS) + else : ; fi; \ + done; \ + done +- @$(POST_INSTALL) +- @if (install-info --version && \ +- install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ +- list='$(INFO_DEPS)'; \ +- for file in $$list; do \ +- relfile=`echo "$$file" | sed 's|^.*/||'`; \ +- echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ +- install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ +- done; \ +- else : ; fi ++# @$(POST_INSTALL) ++# @if (install-info --version && \ ++# install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ ++# list='$(INFO_DEPS)'; \ ++# for file in $$list; do \ ++# relfile=`echo "$$file" | sed 's|^.*/||'`; \ ++# echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ ++# install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ ++# done; \ ++# else : ; fi + install-man: install-man1 + + install-pdf: install-pdf-am diff --git a/office/spellcheck/aspell/files/fedora/aspell-0.60.5-fileconflict.patch b/office/spellcheck/aspell/files/fedora/aspell-0.60.5-fileconflict.patch new file mode 100644 index 0000000000..08f1fbda1d --- /dev/null +++ b/office/spellcheck/aspell/files/fedora/aspell-0.60.5-fileconflict.patch @@ -0,0 +1,70 @@ +diff -up aspell-0.60.6.1/configure.fc aspell-0.60.6.1/configure +--- aspell-0.60.6.1/configure.fc 2011-07-04 10:58:50.000000000 +0200 ++++ aspell-0.60.6.1/configure 2011-08-16 11:28:58.626771599 +0200 +@@ -839,6 +839,7 @@ MAINTAINER_MODE_FALSE + MAINT + pkgdocdir + pkgdatadir ++pkgdatadir2 + pkglibdir + CXX + CXXFLAGS +@@ -2634,18 +2635,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 + + +@@ -20119,6 +20123,7 @@ MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_F + MAINT!$MAINT$ac_delim + pkgdocdir!$pkgdocdir$ac_delim + pkgdatadir!$pkgdatadir$ac_delim ++pkgdatadir2!$pkgdatadir2$ac_delim + pkglibdir!$pkglibdir$ac_delim + CXX!$CXX$ac_delim + CXXFLAGS!$CXXFLAGS$ac_delim +@@ -20142,7 +20147,7 @@ ac_ct_CC!$ac_ct_CC$ac_delim + CCDEPMODE!$CCDEPMODE$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +diff -up aspell-0.60.6.1/Makefile.in.fc aspell-0.60.6.1/Makefile.in +--- aspell-0.60.6.1/Makefile.in.fc 2011-07-04 10:58:49.000000000 +0200 ++++ aspell-0.60.6.1/Makefile.in 2011-08-16 11:20:09.030887258 +0200 +@@ -344,6 +344,7 @@ distcleancheck_listfiles = find . -type + + # These are needed due to a bug in Automake + pkgdatadir = @pkgdatadir@ ++pkgdatadir2 = @pkgdatadir2@ + pkglibdir = @pkglibdir@ + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ +@@ -1932,7 +1933,7 @@ gen/dirs.h: gen/mk-dirs_h.pl + cd gen; perl mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir} ${sysconfdir} > 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/office/spellcheck/aspell/files/fedora/aspell-0.60.5-pspell_conf.patch b/office/spellcheck/aspell/files/fedora/aspell-0.60.5-pspell_conf.patch new file mode 100644 index 0000000000..9236ab4205 --- /dev/null +++ b/office/spellcheck/aspell/files/fedora/aspell-0.60.5-pspell_conf.patch @@ -0,0 +1,60 @@ +diff -up aspell-0.60.6.1/configure.mlib aspell-0.60.6.1/configure +--- aspell-0.60.6.1/configure.mlib 2011-08-16 11:40:48.000000000 +0200 ++++ aspell-0.60.6.1/configure 2011-08-16 11:41:44.013663519 +0200 +@@ -18989,7 +18989,7 @@ rm -f core conftest.err conftest.$ac_obj + # # + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + +-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 +@@ -19985,7 +19985,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" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; +diff -up aspell-0.60.6.1/Makefile.in.mlib aspell-0.60.6.1/Makefile.in +--- aspell-0.60.6.1/Makefile.in.mlib 2011-08-16 11:20:09.000000000 +0200 ++++ aspell-0.60.6.1/Makefile.in 2011-08-16 11:46:30.643236786 +0200 +@@ -816,6 +816,8 @@ clean-filterLTLIBRARIES: + done + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) ++ mkdir -p $(libdir)/pkgconfig; \ ++ cp aspell.pc $(libdir)/pkgconfig/aspell.pc; \ + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +diff -up aspell-0.60.6.1/scripts/mkconfig.mlib aspell-0.60.6.1/scripts/mkconfig +--- aspell-0.60.6.1/scripts/mkconfig.mlib 2004-01-03 13:06:24.000000000 +0100 ++++ aspell-0.60.6.1/scripts/mkconfig 2011-08-16 11:42:46.810519200 +0200 +@@ -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" +--- /dev/null 2007-01-02 09:09:01.616000852 +0100 ++++ aspell-0.60.6.1/aspell.pc.in 2007-01-02 14:59:04.000000000 +0100 +@@ -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/office/spellcheck/aspell/files/fedora/aspell-0.60.6-mp.patch b/office/spellcheck/aspell/files/fedora/aspell-0.60.6-mp.patch new file mode 100644 index 0000000000..d7ef3d282c --- /dev/null +++ b/office/spellcheck/aspell/files/fedora/aspell-0.60.6-mp.patch @@ -0,0 +1,44 @@ +diff -up aspell-0.60.6/manual/aspell.1.pom aspell-0.60.6/manual/aspell.1 +--- aspell-0.60.6/manual/aspell.1.pom 2006-12-19 11:55:08.000000000 +0100 ++++ aspell-0.60.6/manual/aspell.1 2010-08-17 09:42:14.000000000 +0200 +@@ -328,7 +328,6 @@ are also allowed. The \fI/etc/aspell.co + 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 -up aspell-0.60.6/manual/prezip-bin.1.pom aspell-0.60.6/manual/prezip-bin.1 +--- aspell-0.60.6/manual/prezip-bin.1.pom 2005-10-21 14:18:23.000000000 +0200 ++++ aspell-0.60.6/manual/prezip-bin.1 2010-08-17 09:42:21.000000000 +0200 +@@ -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 -up aspell-0.60.6/manual/run-with-aspell.1.pom aspell-0.60.6/manual/run-with-aspell.1 +--- aspell-0.60.6/manual/run-with-aspell.1.pom 2004-03-05 05:05:02.000000000 +0100 ++++ aspell-0.60.6/manual/run-with-aspell.1 2010-08-17 09:42:28.000000000 +0200 +@@ -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 -up aspell-0.60.6/manual/word-list-compress.1.pom aspell-0.60.6/manual/word-list-compress.1 +--- aspell-0.60.6/manual/word-list-compress.1.pom 2005-10-21 14:18:23.000000000 +0200 ++++ aspell-0.60.6/manual/word-list-compress.1 2010-08-17 09:42:35.000000000 +0200 +@@ -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.6-zero.patch b/office/spellcheck/aspell/files/fedora/aspell-0.60.6-zero.patch new file mode 100644 index 0000000000..11f476d918 --- /dev/null +++ b/office/spellcheck/aspell/files/fedora/aspell-0.60.6-zero.patch @@ -0,0 +1,11 @@ +diff -up aspell-0.60.6/common/convert.cpp.zero aspell-0.60.6/common/convert.cpp +--- aspell-0.60.6/common/convert.cpp.zero 2007-12-03 07:55:45.000000000 +0100 ++++ aspell-0.60.6/common/convert.cpp 2008-09-01 12:04:39.000000000 +0200 +@@ -813,6 +813,7 @@ namespace acommon { + { + ToUniLookup lookup; + void decode(const char * in, int size, FilterCharVector & out) const { ++ if (size == 0) return; // if size == 0 then while loop cause SIGSEGV + const char * stop = in + size; // this is OK even if size == -1 + while (*in && in != stop) { + out.append(from_utf8(in, stop)); diff --git a/office/spellcheck/aspell/pspec.xml b/office/spellcheck/aspell/pspec.xml new file mode 100644 index 0000000000..be2c7a723e --- /dev/null +++ b/office/spellcheck/aspell/pspec.xml @@ -0,0 +1,76 @@ + + + + + aspell + http://aspell.net/ + + PisiLinux Community + admins@pisilinux.org + + LGPLv2 + 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 + + fedora/aspell-0.60.3-install_info.patch + fedora/aspell-0.60.5-fileconflict.patch + fedora/aspell-0.60.5-pspell_conf.patch + fedora/aspell-0.60.6-mp.patch + fedora/aspell-0.60.6-zero.patch + + + + + aspell + + libgcc + + + /usr/bin + /usr/lib + /usr/share/aspell + /usr/share/doc + /usr/share/man + /usr/share/info + /usr/share/locale + + + + + aspell-devel + Development files for aspell + + aspell + + + /usr/include + /usr/share/info/aspell-dev.info + + + + + + 2014-05-25 + 0.60.6.1 + Rebuild + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2014-01-18 + 0.60.6.1 + Rebuild + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2012-09-14 + 0.60.6.1 + First release + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + diff --git a/office/spellcheck/aspell/translations.xml b/office/spellcheck/aspell/translations.xml new file mode 100644 index 0000000000..06bfaab4c2 --- /dev/null +++ b/office/spellcheck/aspell/translations.xml @@ -0,0 +1,14 @@ + + + + aspell + Bir yazım kontrol aracı + GNU Aspell birden fazla dil destekleyen bir yazım kontrol aracıdır. + Ce programme rend possible de vérifier facilement les documents en UTF-8 sans avoir à utiliser un dictionnaire spécial. + + + + aspell-devel + aspell için geliştirme dosyaları + +