ogmrip-1.0.1-5.parabola1: rebuild

3 files changed, 37 insertions, 6 deletions

diff --git a/libre/ogmrip/PKGBUILD b/libre/ogmrip/PKGBUILD
index 705ff5770..123814595 100644
--- a/libre/ogmrip/PKGBUILD
+++ b/libre/ogmrip/PKGBUILD
@@ -3,19 +3,20 @@
 # Contributor (Arch): Daenyth
 # Contributor (Arch): Allan McRae <allan@archlinux.org>
 # Contributor (Arch): Vrob (Markus Heuser) mheuser@mi.fu-berlin.de
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=ogmrip
 pkgver=1.0.1
-pkgrel=3.parabola1
+pkgrel=5.parabola1
 pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder, without nonfree faac support"
 arch=('i686' 'x86_64' 'mips64el' 'armv7h')
 url="http://ogmrip.sourceforge.net/"
 license=('GPL')
 depends=('libdvdread>=4.1.3' 'mplayer' 'mencoder' 'enca' 'pkg-config' 'gconf' 'libglade' 'libnotify' 'enchant')
-makedepends=('patch' 'intltool' 'perl-xml-parser' 'lame' 'libtheora' 'ogmtools' 'gpac' 'vorbis-tools' 'tesseract')
+makedepends=('patch' 'intltool' 'perl-xml-parser' 'lame' 'libtheora'
+             'ogmtools' 'gpac' 'vorbis-tools' 'tesseract' 'python')
 optdepends=('lame: support for the MP3 audio codec'
-            'mkvtoolnix: create, alter, and inspect Matroska files'
             'libtheora: decode and encode Ogg Theora files'
             'ogmtools: support for the Ogg Media container'
             'gpac: support for the MP4 container'
@@ -27,13 +28,21 @@ replaces=("${pkgname}-libre" "${pkgname}-parabola")
 conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 options=('!makeflags')
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('4e2e9778ac4da9fe1ab159e3dc6d4367b7a9dbd8f3501df99733ecedb25b02ff')
+source=(https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+        enchant-2.patch)
+sha256sums=('4e2e9778ac4da9fe1ab159e3dc6d4367b7a9dbd8f3501df99733ecedb25b02ff'
+            '61fa359d44af8135ca80fbef2c98d6c30dcaf82e8817aeaf477d9203835f0ba8')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../enchant-2.patch
+}
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
   ./configure --prefix=/usr --sysconfdir=/usr/share
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
diff --git a/libre/ogmrip/enchant-2.patch b/libre/ogmrip/enchant-2.patch
new file mode 100644
index 000000000..00d492023
--- /dev/null
+++ b/libre/ogmrip/enchant-2.patch
@@ -0,0 +1,19 @@
+--- ogmrip-1.0.1/src/ogmrip-spell-dialog.c.orig	2015-01-10 13:39:43.000000000 +0000
++++ ogmrip-1.0.1/src/ogmrip-spell-dialog.c	2017-11-23 08:47:19.352081545 +0000
+@@ -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/libre/ogmrip/ogmrip.changelog b/libre/ogmrip/ogmrip.changelog
index b42409784..216a1cdb7 100644
--- a/libre/ogmrip/ogmrip.changelog
+++ b/libre/ogmrip/ogmrip.changelog
@@ -1,3 +1,6 @@
+2017-11-16 Jaroslav Lichtblau <svetlemodry@archlinux.org>
+	* ogmrip 1.0.1-4 removed out-of-repo dependency
+
 2016-05-01 Jaroslav Lichtblau <svetlemodry@archlinux.org>
 	* ogmrip 1.0.1-3 pacman hooks rebuild