[arch-commits] Commit in enchant/trunk (PKGBUILD hunspell14_buildfix.diff)

Jan de Groot jgc at archlinux.org
Fri Feb 10 14:54:50 UTC 2017


    Date: Friday, February 10, 2017 @ 14:54:49
  Author: jgc
Revision: 288548

upgpkg: enchant 1.6.1-1

Fix overlinking. Remove dbus-glib from dependencies, disables the zemberek plugin which was enabled by accident

Modified:
  enchant/trunk/PKGBUILD
Deleted:
  enchant/trunk/hunspell14_buildfix.diff

--------------------------+
 PKGBUILD                 |   31 ++++++++++++++++++-------------
 hunspell14_buildfix.diff |   14 --------------
 2 files changed, 18 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-10 14:43:03 UTC (rev 288547)
+++ PKGBUILD	2017-02-10 14:54:49 UTC (rev 288548)
@@ -4,34 +4,39 @@
 # Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=enchant
-pkgver=1.6.0
-pkgrel=10
+pkgver=1.6.1
+pkgrel=1
 pkgdesc="A wrapper library for generic spell checking"
 arch=('i686' 'x86_64')
-url="http://www.abisource.com/enchant/"
+url="https://abiword.github.io/enchant/"
 license=('LGPL')
-depends=('aspell' 'dbus-glib' 'hunspell' 'hspell' 'libvoikko')
-source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-       hunspell14_buildfix.diff)
-md5sums=('de11011aff801dc61042828041fb59c7'
-         '1305a6c285b5970bb1ef0f033f49f329')
+depends=('aspell' 'hunspell' 'hspell' 'libvoikko' 'glib2')
+makedepends=(autoconf-archive git)
+_commit=7c0ec265a89808893a692f6205f2555f30198444  # tags/enchant-1-6-1
+source=("git+https://github.com/AbiWord/enchant.git#commit=$_commit")
+sha256sums=('SKIP')
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^enchant-//;s/-/\./g'
+}
+
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # http://bugzilla.abisource.com/show_bug.cgi?id=13772
-  patch -Np1 -i ${srcdir}/hunspell14_buildfix.diff
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname
   ./configure --prefix=/usr \
     --disable-static \
     --disable-ispell \
     --with-myspell-dir=/usr/share/myspell
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname
   make DESTDIR="${pkgdir}" install
 }

Deleted: hunspell14_buildfix.diff
===================================================================
--- hunspell14_buildfix.diff	2017-02-10 14:43:03 UTC (rev 288547)
+++ hunspell14_buildfix.diff	2017-02-10 14:54:49 UTC (rev 288548)
@@ -1,14 +0,0 @@
-diff -ru enchant-1.6.0-orig/src/myspell/myspell_checker.cpp enchant-1.6.0/src/myspell/myspell_checker.cpp
---- enchant-1.6.0-orig/src/myspell/myspell_checker.cpp	2016-04-18 12:25:00.094614256 +0100
-+++ enchant-1.6.0/src/myspell/myspell_checker.cpp	2016-04-18 12:26:09.108569576 +0100
-@@ -148,6 +148,10 @@
- 		g_iconv_close(m_translate_out);
- }
- 
-+#ifndef MAXWORDLEN
-+#   define MAXWORDLEN 100
-+#endif
-+
- bool
- MySpellChecker::checkWord(const char *utf8Word, size_t len)
- {



More information about the arch-commits mailing list