From e64930d128f0d986ff6a2ee0bbf67bde591306df Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Fri, 30 Mar 2018 16:41:09 -0300
Subject: [PATCH] ogmrip: rebuild against enchant-2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: #13077 [via git-merge-pr]
Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
---
 srcpkgs/ogmrip/patches/enchant-2.patch | 24 ++++++++++++++++++++++++
 srcpkgs/ogmrip/template                | 24 +++++++++++++-----------
 2 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/ogmrip/patches/enchant-2.patch

diff --git a/srcpkgs/ogmrip/patches/enchant-2.patch b/srcpkgs/ogmrip/patches/enchant-2.patch
new file mode 100644
index 0000000000..25acfd9899
--- /dev/null
+++ b/srcpkgs/ogmrip/patches/enchant-2.patch
@@ -0,0 +1,24 @@
+Source: Arch Linux
+Upstream: Unknown
+Reason: Fixes compilation with enchant-2
+
+--- src/ogmrip-spell-dialog.c
++++ src/ogmrip-spell-dialog.c
+@@ -315,14 +315,14 @@
+         enchant_dict_add_to_session (dialog->priv->dict, word, len);
+         break;
+       case OGMRIP_SPELL_RESPONSE_ADD_WORD:
+-        enchant_dict_add_to_personal (dialog->priv->dict, word, len);
++        enchant_dict_add (dialog->priv->dict, word, len);
+         break;
+       default:
+         break;
+     }
+ 
+     if (suggs && n_suggs)
+-      enchant_dict_free_suggestions (dialog->priv->dict, suggs);
++      enchant_dict_free_string_list (dialog->priv->dict, suggs);
+   }
+ 
+   return status;
+
diff --git a/srcpkgs/ogmrip/template b/srcpkgs/ogmrip/template
index 2a3ade0550..b059a43be7 100644
--- a/srcpkgs/ogmrip/template
+++ b/srcpkgs/ogmrip/template
@@ -1,22 +1,24 @@
 # Template file for 'ogmrip'
 pkgname=ogmrip
 version=1.0.1
-revision=4
+revision=5
+configure_args="--disable-static"
+build_style=gnu-configure
+hostmakedepends="intltool pkg-config"
+makedepends="GConf-devel dbus-glib-devel enca-devel enchant2-devel lame-devel
+ libdvdread-devel libglade-devel libnotify-devel libtheora-devel mplayer
+ vorbis-tools x264-devel xvidcore-devel"
+depends="desktop-file-utils mplayer"
 short_desc="Application to rip and encode DVDs into AVI, OGM, MP4, or Matroska"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://ogmrip.sourceforge.net/en/index.html"
 distfiles="${SOURCEFORGE_SITE}/ogmrip/ogmrip/${version%.*}/${version}/ogmrip-${version}.tar.gz"
 checksum=4e2e9778ac4da9fe1ab159e3dc6d4367b7a9dbd8f3501df99733ecedb25b02ff
-build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
-depends="mplayer desktop-file-utils"
-makedepends="
- glib-devel enca-devel libxml2-devel libdvdread-devel
- gtk+ vorbis-tools lame-devel libtheora-devel GConf-devel
- libglade-devel libnotify-devel dbus-glib-devel enchant-devel
- libpng-devel tiff-devel xvidcore-devel x264-devel mplayer"
+
+pre_configure() {
+	sed -i 's/enchant >=/enchant-2 >=/' configure
+}
 
 post_install() {
 	# Remove development stuff.