[arch-commits] Commit in geany-plugins/repos/community-x86_64 (4 files)
Eli Schwartz
eschwartz at archlinux.org
Thu Mar 22 19:12:08 UTC 2018
Date: Thursday, March 22, 2018 @ 19:12:07
Author: eschwartz
Revision: 310722
archrelease: copy trunk to community-x86_64
Added:
geany-plugins/repos/community-x86_64/PKGBUILD
(from rev 310721, geany-plugins/trunk/PKGBUILD)
geany-plugins/repos/community-x86_64/enchant-2.patch
(from rev 310721, geany-plugins/trunk/enchant-2.patch)
Deleted:
geany-plugins/repos/community-x86_64/PKGBUILD
geany-plugins/repos/community-x86_64/enchant-2.patch
-----------------+
PKGBUILD | 89 ++++++++++++++++++++++++----------------------
enchant-2.patch | 104 +++++++++++++++++++++++++++---------------------------
2 files changed, 100 insertions(+), 93 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-22 19:11:49 UTC (rev 310721)
+++ PKGBUILD 2018-03-22 19:12:07 UTC (rev 310722)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: Angel 'angvp' Velasquez <angvp at archlinux.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386 at gmail.com>
-# Contributor: Patrick Melo <patrick at patrickmelo.eti.br>
-
-pkgname=geany-plugins
-pkgver=1.33
-pkgrel=1
-pkgdesc='Plugins for Geany'
-arch=('x86_64')
-url='https://plugins.geany.org/'
-license=('GPL')
-depends=("geany>=$pkgver" 'ctpl' 'gpgme' 'gtkspell3' 'libgit2' 'lua51')
-makedepends=('cppcheck' 'intltool')
-source=("https://plugins.geany.org/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha256sums=('12825739e2c3caefbc1ad57e62f1e4f691af8db8368f173aa84c43dffb4503a2')
-
-prepare() {
- cd $pkgname-$pkgver
-
- autoreconf -fi
-}
-
-build() {
- cd "$pkgname-$pkgver"
-
- # Looking forward to Python 3 being supported
- export PYTHON=/usr/bin/python2
-
- ./configure --prefix=/usr --libexecdir=/usr/lib
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-}
-
-# getver: plugins.geany.org/downloads.html
-# vim: ts=2 sw=2 et:
Copied: geany-plugins/repos/community-x86_64/PKGBUILD (from rev 310721, geany-plugins/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-03-22 19:12:07 UTC (rev 310722)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Angel 'angvp' Velasquez <angvp at archlinux.org>
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz386 at gmail.com>
+# Contributor: Patrick Melo <patrick at patrickmelo.eti.br>
+
+pkgname=geany-plugins
+pkgver=1.33
+pkgrel=2
+pkgdesc='Plugins for Geany'
+arch=('x86_64')
+url='https://plugins.geany.org/'
+license=('GPL')
+depends=("geany>=$pkgver" 'ctpl' 'gpgme' 'gtkspell3' 'libgit2' 'lua51')
+makedepends=('cppcheck' 'intltool')
+source=("https://plugins.geany.org/$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig}
+ "https://github.com/geany/geany-plugins/commit/3d02ec2a2b0d3ccfeb28503534b95e60861e6fe8.patch")
+sha256sums=('12825739e2c3caefbc1ad57e62f1e4f691af8db8368f173aa84c43dffb4503a2'
+ 'SKIP'
+ '1e71e3aec1acbfb9a1e5bb803504bf8cc6feaf999dc24fb1e4d30760e3aacb99')
+validpgpkeys=('CD38C008828C2EF1B63A8ED1B5688B006F78F01E') # Frank Lanitz <frank at geany.org>
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # backport fix for https://github.com/geany/geany-plugins/pull/729
+ patch -p1 < ../3d02ec2a2b0d3ccfeb28503534b95e60861e6fe8.patch
+
+ autoreconf -fi
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # Looking forward to Python 3 being supported
+ export PYTHON=/usr/bin/python2
+
+ ./configure --prefix=/usr --libexecdir=/usr/lib
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
+
+# getver: plugins.geany.org/downloads.html
+# vim: ts=2 sw=2 et:
Deleted: enchant-2.patch
===================================================================
--- enchant-2.patch 2018-03-22 19:11:49 UTC (rev 310721)
+++ enchant-2.patch 2018-03-22 19:12:07 UTC (rev 310722)
@@ -1,52 +0,0 @@
---- geany-plugins-1.32/spellcheck/src/speller.c.orig 2017-10-17 04:58:25.000000000 +0000
-+++ geany-plugins-1.32/spellcheck/src/speller.c 2017-11-23 09:20:27.280196692 +0000
-@@ -470,7 +470,7 @@
- g_return_if_fail(sc_speller_dict != NULL);
- g_return_if_fail(word != NULL);
-
-- enchant_dict_add_to_pwl(sc_speller_dict, word, -1);
-+ enchant_dict_add(sc_speller_dict, word, -1);
- }
-
- gboolean sc_speller_dict_check(const gchar *word)
-@@ -518,24 +518,6 @@
- if (sc_speller_dict != NULL)
- enchant_broker_free_dict(sc_speller_broker, sc_speller_dict);
-
--#if HAVE_ENCHANT_1_5
-- {
-- const gchar *old_path;
-- gchar *new_path;
--
-- /* add custom dictionary path for myspell (primarily used on Windows) */
-- old_path = enchant_broker_get_param(sc_speller_broker, "enchant.myspell.dictionary.path");
-- if (old_path != NULL)
-- new_path = g_strconcat(
-- old_path, G_SEARCHPATH_SEPARATOR_S, sc_info->dictionary_dir, NULL);
-- else
-- new_path = sc_info->dictionary_dir;
--
-- enchant_broker_set_param(sc_speller_broker, "enchant.myspell.dictionary.path", new_path);
-- if (new_path != sc_info->dictionary_dir)
-- g_free(new_path);
-- }
--#endif
- create_dicts_array();
-
- /* Check if the stored default dictionary is (still) available, fall back to the first
---- geany-plugins-1.32/build/spellcheck.m4.orig 2017-07-16 19:00:27.000000000 +0000
-+++ geany-plugins-1.32/build/spellcheck.m4 2018-01-21 21:56:47.533646705 +0000
-@@ -4,11 +4,11 @@
-
- ENCHANT_VERSION=1.3
- OPT_ENCHANT_VERSION=1.5
-- PKG_CHECK_MODULES([ENCHANT], [enchant >= ${OPT_ENCHANT_VERSION}],
-+ PKG_CHECK_MODULES([ENCHANT], [enchant-2 >= ${OPT_ENCHANT_VERSION}],
- have_enchant_1_5=yes,
- have_enchant_1_5=no)
- GP_CHECK_PLUGIN_DEPS([spellcheck], [ENCHANT],
-- [enchant >= ${ENCHANT_VERSION}])
-+ [enchant-2 >= ${ENCHANT_VERSION}])
-
- AM_CONDITIONAL([HAVE_ENCHANT_1_5], [test "$have_enchant_1_5" = yes])
- GP_COMMIT_PLUGIN_STATUS([Spellcheck])
Copied: geany-plugins/repos/community-x86_64/enchant-2.patch (from rev 310721, geany-plugins/trunk/enchant-2.patch)
===================================================================
--- enchant-2.patch (rev 0)
+++ enchant-2.patch 2018-03-22 19:12:07 UTC (rev 310722)
@@ -0,0 +1,52 @@
+--- geany-plugins-1.32/spellcheck/src/speller.c.orig 2017-10-17 04:58:25.000000000 +0000
++++ geany-plugins-1.32/spellcheck/src/speller.c 2017-11-23 09:20:27.280196692 +0000
+@@ -470,7 +470,7 @@
+ g_return_if_fail(sc_speller_dict != NULL);
+ g_return_if_fail(word != NULL);
+
+- enchant_dict_add_to_pwl(sc_speller_dict, word, -1);
++ enchant_dict_add(sc_speller_dict, word, -1);
+ }
+
+ gboolean sc_speller_dict_check(const gchar *word)
+@@ -518,24 +518,6 @@
+ if (sc_speller_dict != NULL)
+ enchant_broker_free_dict(sc_speller_broker, sc_speller_dict);
+
+-#if HAVE_ENCHANT_1_5
+- {
+- const gchar *old_path;
+- gchar *new_path;
+-
+- /* add custom dictionary path for myspell (primarily used on Windows) */
+- old_path = enchant_broker_get_param(sc_speller_broker, "enchant.myspell.dictionary.path");
+- if (old_path != NULL)
+- new_path = g_strconcat(
+- old_path, G_SEARCHPATH_SEPARATOR_S, sc_info->dictionary_dir, NULL);
+- else
+- new_path = sc_info->dictionary_dir;
+-
+- enchant_broker_set_param(sc_speller_broker, "enchant.myspell.dictionary.path", new_path);
+- if (new_path != sc_info->dictionary_dir)
+- g_free(new_path);
+- }
+-#endif
+ create_dicts_array();
+
+ /* Check if the stored default dictionary is (still) available, fall back to the first
+--- geany-plugins-1.32/build/spellcheck.m4.orig 2017-07-16 19:00:27.000000000 +0000
++++ geany-plugins-1.32/build/spellcheck.m4 2018-01-21 21:56:47.533646705 +0000
+@@ -4,11 +4,11 @@
+
+ ENCHANT_VERSION=1.3
+ OPT_ENCHANT_VERSION=1.5
+- PKG_CHECK_MODULES([ENCHANT], [enchant >= ${OPT_ENCHANT_VERSION}],
++ PKG_CHECK_MODULES([ENCHANT], [enchant-2 >= ${OPT_ENCHANT_VERSION}],
+ have_enchant_1_5=yes,
+ have_enchant_1_5=no)
+ GP_CHECK_PLUGIN_DEPS([spellcheck], [ENCHANT],
+- [enchant >= ${ENCHANT_VERSION}])
++ [enchant-2 >= ${ENCHANT_VERSION}])
+
+ AM_CONDITIONAL([HAVE_ENCHANT_1_5], [test "$have_enchant_1_5" = yes])
+ GP_COMMIT_PLUGIN_STATUS([Spellcheck])
More information about the arch-commits
mailing list