aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörg Schuck2017-12-06 15:00:35 +0100
committerJörg Schuck2017-12-06 15:00:35 +0100
commit5cafdee6561f104489fd9485f744fde13b20870e (patch)
tree93e782553bbd1cd428c863e1ba2f63d292bf9da4
parent0790ea8298dc4de69b536635fe3c48fdc5d7f739 (diff)
downloadaur-5cafdee6561f104489fd9485f744fde13b20870e.tar.gz
This should do it.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--makefile_1.6.patch7
3 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 170bc6bc3613..1afd9b0dfc1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Wed Dec 6 13:32:25 UTC 2017
+# Wed Dec 6 14:00:36 UTC 2017
pkgbase = enchant1.6
pkgdesc = A wrapper library for generic spell checking
pkgver = 1.6.1
@@ -17,7 +17,7 @@ pkgbase = enchant1.6
source = git+https://github.com/AbiWord/enchant.git#commit=7c0ec265a89808893a692f6205f2555f30198444
source = makefile_1.6.patch
sha256sums = SKIP
- sha256sums = ed2a2be438e6b251a6d512a75936346fcda5f40dbe0967e571e542e4cb611b81
+ sha256sums = e36a045b347b1540b9612472563c523e24a354764b21e7734c48f6adaf1bda5d
pkgname = enchant1.6
diff --git a/PKGBUILD b/PKGBUILD
index cfd28445cfaa..8b6fcec98fa0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ source=(
"makefile_1.6.patch"
)
sha256sums=('SKIP'
- 'ed2a2be438e6b251a6d512a75936346fcda5f40dbe0967e571e542e4cb611b81')
+ 'e36a045b347b1540b9612472563c523e24a354764b21e7734c48f6adaf1bda5d')
pkgver() {
cd $_pkgname
@@ -29,6 +29,7 @@ pkgver() {
prepare() {
cd $_pkgname
+ patch -p1 < ../makefile_1.6.patch
NOCONFIGURE=1 ./autogen.sh
}
@@ -47,8 +48,8 @@ package() {
local _tempdir=$(readlink -f "./maketarget")
make DESTDIR="${_tempdir}" install
- install -dm 755 "${pkgdir}/usr/lib/enchant"
- cp -a "${_tempdir}/usr/lib/enchant/"* "${pkgdir}/usr/lib/enchant/."
+ install -dm 755 "${pkgdir}/usr/lib/enchant1.6"
+ cp -a "${_tempdir}/usr/lib/enchant/"* "${pkgdir}/usr/lib/enchant1.6/."
cp -a "${_tempdir}/usr/lib/libenchant.so.1"* "${pkgdir}/usr/lib/."
}
diff --git a/makefile_1.6.patch b/makefile_1.6.patch
index 55151c5fc9f7..eaa84dcaeac4 100644
--- a/makefile_1.6.patch
+++ b/makefile_1.6.patch
@@ -2,16 +2,15 @@ diff --git a/src/Makefile.am b/src/Makefile.am
index 17cf8c2..9db81f8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,6 @@
SUBDIRS=. aspell ispell uspell myspell hspell applespell voikko zemberek
-AM_CPPFLAGS=-I$(top_srcdir) $(ENCHANT_CFLAGS) $(CC_WARN_CFLAGS) -DENCHANT_GLOBAL_MODULE_DIR=\"$(libdir)/enchant\" -DENCHANT_GLOBAL_ORDERING=\"$(datadir)/enchant\" -D_ENCHANT_BUILD=1 -DENCHANT_VERSION_STRING=\"@ENCHANT_MAJOR_VERSION@.@ENCHANT_MINOR_VERSION@.@ENCHANT_MICRO_VERSION@\"
-+AM_CPPFLAGS=-I$(top_srcdir) $(ENCHANT_CFLAGS) $(CC_WARN_CFLAGS) -DENCHANT_GLOBAL_MODULE_DIR=\"$(libdir)/enchant1.6\" -DENCHANT_GLOBAL_ORDERING=\"$(datadir)/enchant1.6\"
-+-D_ENCHANT_BUILD=1 -DENCHANT_VERSION_STRING=\"@ENCHANT_MAJOR_VERSION@.@ENCHANT_MINOR_VERSION@.@ENCHANT_MICRO_VERSION@\"
++AM_CPPFLAGS=-I$(top_srcdir) $(ENCHANT_CFLAGS) $(CC_WARN_CFLAGS) -DENCHANT_GLOBAL_MODULE_DIR=\"$(libdir)/enchant1.6\" -DENCHANT_GLOBAL_ORDERING=\"$(datadir)/enchant\" -D_ENCHANT_BUILD=1 -DENCHANT_VERSION_STRING=\"@ENCHANT_MAJOR_VERSION@.@ENCHANT_MINOR_VERSION@.@ENCHANT_MICRO_VERSION@\"
lib_LTLIBRARIES = libenchant.la
-@@ -16,7 +17,7 @@ endif
+@@ -16,7 +16,7 @@ endif
libenchant_la_DEPENDENCIES = @ENCHANT_WIN32_RESOURCE@
libenchant_la_SOURCES = enchant.c pwl.c enchant.h pwl.h