From 9654e90a12075b5137daa6edff52d16464a115aa Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 12 May 2015 20:24:15 +0200 Subject: [PATCH 1/6] enchant: remove aspell support. --- srcpkgs/enchant/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/enchant/template b/srcpkgs/enchant/template index c5bbe1f543..1daa2f9f6b 100644 --- a/srcpkgs/enchant/template +++ b/srcpkgs/enchant/template @@ -1,11 +1,11 @@ # Template file for 'enchant' pkgname=enchant version=1.6.0 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--disable-zemberek --disable-ispell" +configure_args="--disable-zemberek --disable-ispell --disable-aspell" hostmakedepends="automake libtool pkg-config" -makedepends="glib-devel aspell-devel hunspell-devel" +makedepends="glib-devel hunspell-devel" short_desc="Generic spell checking library" homepage="http://www.abisource.com/projects/enchant/" license="LGPL-2.1" From 0bf7a02bbaaa6dd1c6d9be6981223a18b9ee2128 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 12 May 2015 20:24:36 +0200 Subject: [PATCH 2/6] mcabber: use enchant instead of aspell. --- srcpkgs/mcabber/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mcabber/template b/srcpkgs/mcabber/template index 15cdd4b9b2..dbf0c469bb 100644 --- a/srcpkgs/mcabber/template +++ b/srcpkgs/mcabber/template @@ -2,9 +2,9 @@ pkgname="mcabber" version="0.10.3" -revision=3 +revision=4 build_style=gnu-configure -configure_args="--enable-hgcset --enable-aspell --enable-otr" +configure_args="--enable-hgcset --enable-enchant --enable-otr" short_desc="A small XMPP (Jabber) console client" maintainer="Lukas Epple " license="GPL-2" @@ -12,5 +12,5 @@ homepage="http://mcabber.com" distfiles="http://mcabber.com/files/mcabber-${version}.tar.bz2" checksum="77466138496cc26db125145cc28dc4fc0df79827143b922dfb9f02eb0dc7fa6d" -makedepends="aspell-devel ncurses-devel glib-devel loudmouth-devel gpgme-devel libgcrypt-devel libotr-devel" +makedepends="enchant-devel ncurses-devel glib-devel loudmouth-devel gpgme-devel libgcrypt-devel libotr-devel" hostmakedepends="pkg-config" From f32f3d9e1d14a0d840961e2fb64186399c71b806 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 12 May 2015 20:24:55 +0200 Subject: [PATCH 3/6] weechat: use enchant instead of aspell. --- srcpkgs/weechat/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template index 55fa1c7f89..2163a77155 100644 --- a/srcpkgs/weechat/template +++ b/srcpkgs/weechat/template @@ -1,12 +1,12 @@ # Template file for 'weechat' pkgname=weechat version=1.2 -revision=1 +revision=2 lib32disabled=yes build_style=cmake -configure_args="-DENABLE_MAN=ON -DPYTHON_EXECUTABLE=/usr/bin/python2.7 -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so" +configure_args="-DENABLE_MAN=ON -DENABLE_ENCHANT=ON -DPYTHON_EXECUTABLE=/usr/bin/python2.7 -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so" hostmakedepends="cmake pkg-config python-devel libgcrypt-devel tcl-devel asciidoc" -makedepends="tcl-devel aspell-devel libgcrypt-devel gnutls-devel +makedepends="tcl-devel enchant-devel libgcrypt-devel gnutls-devel python-devel ruby-devel lua-devel libcurl-devel" depends="ca-certificates" short_desc="Fast, light and extensible IRC client" @@ -25,7 +25,7 @@ fi weechat-aspell_package() { lib32disabled=yes depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - aspell plugin" + short_desc+=" - aspell/enchant plugin" pkg_install() { vmove usr/lib/weechat/plugins/aspell.so } From 7726a74aab46b31036a8454268426286b186afe0 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 12 May 2015 20:25:33 +0200 Subject: [PATCH 4/6] php: remove php-pspell (deprecated since 5.3.) --- srcpkgs/php-pspell | 1 - srcpkgs/php/template | 14 ++------------ 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 120000 srcpkgs/php-pspell diff --git a/srcpkgs/php-pspell b/srcpkgs/php-pspell deleted file mode 120000 index fa557ad95d..0000000000 --- a/srcpkgs/php-pspell +++ /dev/null @@ -1 +0,0 @@ -php \ No newline at end of file diff --git a/srcpkgs/php/template b/srcpkgs/php/template index 0dc12bdc7e..66bdd3b6ab 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,7 +1,7 @@ # Template build file for 'php' pkgname=php version=5.6.8 -revision=1 +revision=2 short_desc="An HTML-embedded scripting language" license="PHP" homepage="http://www.php.net" @@ -9,7 +9,7 @@ homepage="http://www.php.net" hostmakedepends="pkg-config bison" makedepends="postgresql-libs-devel libldap-devel libvpx-devel sqlite-devel unixodbc-devel net-snmp-devel libzip-devel enchant-devel libmcrypt-devel - aspell-devel libltdl-devel libpng-devel libjpeg-turbo-devel icu-devel + libltdl-devel libpng-devel libjpeg-turbo-devel icu-devel libcurl-devel libxslt-devel libressl-devel bzip2-devel zlib-devel db-devel gmp-devel gdbm-devel freetype-devel apache-devel tidy-devel readline-devel libmysqlclient-devel $(vopt_if systemd systemd-devel)" @@ -82,7 +82,6 @@ do_build() { --with-pdo-sqlite=shared,/usr \ --with-pgsql=shared \ --with-png-dir=/usr \ - --with-pspell=shared \ --with-snmp=shared \ --with-sqlite3=shared,/usr \ --with-unixODBC=shared,/usr \ @@ -313,15 +312,6 @@ php-pgsql_package() { } } -php-pspell_package() { - lib32disabled=yes - depends="php-${version}_${revision}" - short_desc+=' - pspell module' - pkg_install() { - vmove usr/lib/php/modules/pspell.so - } -} - php-snmp_package() { lib32disabled=yes depends="php-${version}_${revision}" From ff4b88567bc560c969e5db204772123393f645c3 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 12 May 2015 20:26:05 +0200 Subject: [PATCH 5/6] kdelibs: remove aspell. --- srcpkgs/kdelibs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdelibs/template b/srcpkgs/kdelibs/template index 35a6e0eac9..93ef942e91 100644 --- a/srcpkgs/kdelibs/template +++ b/srcpkgs/kdelibs/template @@ -1,7 +1,7 @@ # Template file for 'kdelibs' pkgname=kdelibs version=4.14.2 -revision=2 +revision=3 short_desc="KDE core libraries" maintainer="Juan RP " license="GPL, LGPL, FDL" @@ -18,7 +18,7 @@ configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF -DKDE_DISTRIBUTION_TEXT=Void hostmakedepends="cmake perl automoc4 pkg-config docbook-xsl" makedepends="libressl-devel libSM-devel libXext-devel libXScrnSaver-devel libXrender-devel phonon-devel strigi-devel pcre-devel libjpeg-turbo-devel - libpng-devel giflib-devel acl-devel aspell-devel enchant-devel jasper-devel + libpng-devel giflib-devel acl-devel enchant-devel jasper-devel liblzma-devel mit-krb5-devel avahi-libs-devel libudev-devel libxslt-devel polkit-qt-devel libdbusmenu-qt-devel attica-devel grantlee-devel qca-devel libutempter-devel MesaLib-devel udisks2-devel From 3b3eb8d1a9aff3c33e5d6d02aec192f42c2c4413 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 12 May 2015 20:26:23 +0200 Subject: [PATCH 6/6] lyx: rebuild to remove dependency on aspell. --- srcpkgs/lyx/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/lyx/template b/srcpkgs/lyx/template index d7bc998a37..7689c5712f 100644 --- a/srcpkgs/lyx/template +++ b/srcpkgs/lyx/template @@ -1,7 +1,7 @@ # Template file for 'lyx' pkgname=lyx version=2.1.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-included-boost" short_desc="The Document Processor WYSIWYM Editor & Latex frontend" @@ -10,7 +10,6 @@ license="GPL-2" hostmakedepends="pkg-config bc python" makedepends="file-devel boost-devel enchant-devel qt-devel" depends="virtual?texlive GraphicsMagick" -conf_files="/etc/lyx/lyxrc.dist" homepage="http://www.lyx.org/Home" distfiles="ftp://ftp.lyx.org/pub/${pkgname}/stable/2.1.x/${pkgname}-${version}.tar.xz" checksum=2fd52e7e5ee372983eb6b0a7f04765cb0df6f8c1f3420081d9f7761acfc75682