teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

geany-plugins: switch to enchant-2

This commit is contained in:
maxice8 2018-11-09 14:49:12 -02:00 committed by maxice8
parent b82744edc7
commit 10a301f67b
2 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
srcpkgs/geany-plugins/patches/enchant-2.patch Normal file
View File

@ -0,0 +1,55 @@
commit ca949e8add6c45603cc41c8a31495c205c16738e
Author: Enrico Tröger <enrico.troeger@uvena.de>
Date: Sat Mar 17 15:43:26 2018 +0100
Spellcheck: support new "enchant-2" package name
Fixes #728.
diff --git a/build/spellcheck.m4 b/build/spellcheck.m4
index 6f7e4d0..4ea5341 100644
--- build/spellcheck.m4
+++ build/spellcheck.m4
@@ -2,17 +2,34 @@ AC_DEFUN([GP_CHECK_SPELLCHECK],
[
GP_ARG_DISABLE([spellcheck], [auto])
+ ENCHANT_PACKAGE_NAME=enchant-2
ENCHANT_VERSION=1.3
ENCHANT_VERSION_1_5=1.5
ENCHANT_VERSION_2_0=2.0
- PKG_CHECK_MODULES([ENCHANT_1_5], [enchant >= ${ENCHANT_VERSION_1_5}],
- have_enchant_1_5=yes,
- have_enchant_1_5=no)
- PKG_CHECK_MODULES([ENCHANT_2_0], [enchant >= ${ENCHANT_VERSION_2_0}],
- have_enchant_2_0=yes,
- have_enchant_2_0=no)
+ ENCHANT_VERSION_2_2=2.2
+
+ # check for enchant package
+ PKG_CHECK_MODULES([ENCHANT_2_2], [${ENCHANT_PACKAGE_NAME} >= ${ENCHANT_VERSION_2_2}],
+ have_enchant_2_2=yes,
+ have_enchant_2_2=no)
+ if [[ x"$have_enchant_2_2" = "xyes" ]]; then
+ # we have got the new enchant-2 package
+ have_enchant_1_5=yes
+ have_enchant_2_0=yes
+ else
+ # check for old enchant package
+ PKG_CHECK_MODULES([ENCHANT_1_5], [enchant >= ${ENCHANT_VERSION_1_5}],
+ have_enchant_1_5=yes,
+ have_enchant_1_5=no)
+ PKG_CHECK_MODULES([ENCHANT_2_0], [enchant >= ${ENCHANT_VERSION_2_0}],
+ have_enchant_2_0=yes,
+ have_enchant_2_0=no)
+
+ ENCHANT_PACKAGE_NAME=enchant
+ fi
+
GP_CHECK_PLUGIN_DEPS([spellcheck], [ENCHANT],
- [enchant >= ${ENCHANT_VERSION}])
+ [${ENCHANT_PACKAGE_NAME} >= ${ENCHANT_VERSION}])
AM_CONDITIONAL([HAVE_ENCHANT_1_5], [test "$have_enchant_1_5" = yes])
AM_CONDITIONAL([HAVE_ENCHANT_2_0], [test "$have_enchant_2_0" = yes])

6
srcpkgs/geany-plugins/template
View File

@ -1,18 +1,18 @@
# Template file for 'geany-plugins'
pkgname=geany-plugins
version=1.33.0
revision=3
revision=4
build_style=gnu-configure
configure_args="PYTHON=/usr/bin/python2 --enable-all-plugins --disable-devhelp
--disable-markdown --disable-peg-markdown --disable-webhelper"
hostmakedepends="automake gettext-devel intltool libtool pkg-config vala
glib-devel python-devel"
makedepends="geany-devel lua51-devel ctpl-devel libwnck2-devel GConf-devel
zlib-devel gpgme-devel enchant-devel pygtk-devel libgit2-devel libsoup-devel
zlib-devel gpgme-devel enchant2-devel pygtk-devel libgit2-devel libsoup-devel
gtkspell-devel"
short_desc="Geany IDE plugins"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="GPL-2"
license="GPL-2.0-or-later"
homepage="http://plugins.geany.org"
distfiles="https://github.com/geany/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=e889073b573452c91b4d3d87ce45bd4bb57f63e4cde03dea25b6304c5a89bf55