diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | PKGBUILD | 43 | ||||
| -rw-r--r-- | enchant-2.patch | 29 |
3 files changed, 72 insertions, 24 deletions
@@ -1,18 +1,22 @@ -pkgbase = gtkhtml4 +pkgbase = gtkhtml4-git pkgdesc = A lightweight HTML renderer/editor widget for GTK3 - pkgver = 4.10.0 + pkgver = latest pkgrel = 1 - url = http://www.gnome.org + url = https://github.com/GNOME/gtkhtml arch = i686 arch = x86_64 license = GPL makedepends = intltool - depends = gtk3 - depends = enchant - depends = iso-codes - depends = libsoup - source = https://download.gnome.org/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz - sha256sums = ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3 + depends = cairo>=1.10.0 + depends = enchant>=2.0 + depends = gnome-common>=3.2.0 + depends = gnome-icon-theme>=2.22 + depends = gtk3>=3.2.0 + depends = iso-codes>=0.49 + source = gtkhtml4::git+https://github.com/GNOME/gtkhtml.git + source = enchant-2.patch + sha256sums = SKIP + sha256sums = 8f8f26cf66c8ffa7efd0845153e9e8ce0cdbd0d161a48c28f860dc51004686f3 -pkgname = gtkhtml4 +pkgname = gtkhtml4-git @@ -1,29 +1,44 @@ -# $Id$ +# Maintainer: Jonathon Fernyhough <jonathon at_manjaro dot_org> +# Contributor: Gaming4JC # Previous Maintainer: Ionut Biru <ibiru@archlinux.org> -pkgname=gtkhtml4 +pkgname=gtkhtml4-git +_pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.10.0 +pkgver=latest pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64) license=('GPL') -depends=('gtk3' 'enchant' 'iso-codes' 'libsoup') +depends=('cairo>=1.10.0' + 'enchant>=2.0' + 'gnome-common>=3.2.0' + 'gnome-icon-theme>=2.22' + 'gtk3>=3.2.0' + 'iso-codes>=0.49') makedepends=('intltool') -url="http://www.gnome.org" -source=(https://download.gnome.org/sources/$_pkgbasename/${pkgver:0:4}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3') +url='https://github.com/GNOME/gtkhtml' +source=("${pkgname/-git/}::git+https://github.com/GNOME/${_pkgbasename}.git" + 'enchant-2.patch') +sha256sums=('SKIP' + '2b78f071f7893e19618959443f3775bd435941a37ea9198b2fe72b596c205891') + +prepare() { + cd "${pkgname/-git/}" + patch -Np0 < ../enchant-2.patch +} build() { - cd "$_pkgbasename-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gtkhtml4 \ - --localstatedir=/var --disable-static - make + cd "${pkgname/-git/}" + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gtkhtml4 \ + --localstatedir=/var --disable-static + ./configure + make } package() { - cd "$_pkgbasename-$pkgver" - make DESTDIR="$pkgdir" install + cd "${pkgname/-git/}" + make DESTDIR="$pkgdir" install } diff --git a/enchant-2.patch b/enchant-2.patch new file mode 100644 index 000000000000..88a9d2c8255a --- /dev/null +++ b/enchant-2.patch @@ -0,0 +1,29 @@ +Description: Switch checks and functions for enchant-2 + Existing sources check for and expect enchant-1. This patch switched the + pkg-config check to check for enchant-2, and updates one function to the + enchant-2 version. +Author: Jonathon Fernyhough <jonathon at_manjaro_dot org> + +--- configure.ac 2018-02-24 10:33:32.311420000 +0000 ++++ configure.ac 2018-02-24 10:32:33.630608000 +0000 +@@ -140,7 +140,7 @@ AC_SUBST(GAIL_MODULES) + dnl ********************************** + dnl GTKHTML modules + dnl ********************************** +-GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant >= enchant_minimum_version gsettings-desktop-schemas iso-codes cairo >= cairo_minimum_version" ++GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant-2 >= enchant_minimum_version gsettings-desktop-schemas iso-codes cairo >= cairo_minimum_version" + PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES) + AC_SUBST(GTKHTML_CFLAGS) + AC_SUBST(GTKHTML_LIBS) + +--- components/editor/gtkhtml-spell-checker.c 2018-02-24 10:36:50.592732000 +0000 ++++ components/editor/gtkhtml-spell-checker.c 2018-02-24 10:41:41.450950010 +0000 +@@ -375,7 +375,7 @@ gtkhtml_spell_checker_add_word (GtkhtmlS + if ((dict = spell_checker_request_dict (checker)) == NULL) + return; + +- enchant_dict_add_to_pwl (dict, word, length); ++ enchant_dict_add (dict, word, length); + g_signal_emit (G_OBJECT (checker), signals[ADDED], 0, word, length); + } + |