diff --git a/testing/subtitleeditor/APKBUILD b/testing/subtitleeditor/APKBUILD index c76836945f2..8a63f089368 100644 --- a/testing/subtitleeditor/APKBUILD +++ b/testing/subtitleeditor/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista # Maintainer: Francesco Colista pkgname=subtitleeditor -pkgver=0.54.0 -pkgrel=3 +pkgver=0.55.0 +pkgrel=0 pkgdesc="GTK+3 tool to create and edit subtitles" url="https://kitone.github.io/subtitleeditor/" arch="x86 x86_64" @@ -12,9 +12,7 @@ makedepends="libxml++-2.6-dev enchant2-dev libsigc++-dev xdg-utils gtkmm3-dev gst-libav desktop-file-utils gst-plugins-ugly automake autoconf libtool intltool" subpackages="$pkgname-dev $pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/kitone/subtitleeditor/archive/$pkgver.tar.gz - enchant2.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/kitone/subtitleeditor/archive/$pkgver.tar.gz" prepare() { default_prepare @@ -37,5 +35,6 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bea4610ccc452555be6eb1105601bfba767f849044c27e393687d3a698e8e14247278377464a57ff89b91c452cd428650dc014085fc70486106c16b294b072cd subtitleeditor-0.54.0.tar.gz -f27484a999e61eea8375b9fa9b4daf7c2d6137eb27352dee634a66cc85eb20e25a2cdd50f0ececc45fb6b85d5ae4f73a775c68381937f1db85ef9f501902a79a enchant2.patch" +sha512sums=" +7bb9bc102b6cffb305b1e0e606362c509b33af3c6172b85a88b2dcc75cade7389c7e5f03fdf368433a9aea03bb7a2099c4901e2c8c0c485feeaf714a69cae1d2 subtitleeditor-0.55.0.tar.gz +" diff --git a/testing/subtitleeditor/enchant2.patch b/testing/subtitleeditor/enchant2.patch deleted file mode 100644 index bf167ed7bac..00000000000 --- a/testing/subtitleeditor/enchant2.patch +++ /dev/null @@ -1,41 +0,0 @@ -Backported from upstream master. - -Patch below is alterned to revert commit 5e9525c41272e850cbba0f65ce5809e5167880f2 - - -From 1dd00d036344f72ab8d647d3f5614940c95e2384 Mon Sep 17 00:00:00 2001 -From: Nikolay Shaplov -Date: Sat, 30 Nov 2019 20:57:57 +0300 -Subject: [PATCH] Fix build with old version of enchant, take two - -enchant-2 is not wide spread enough, for example debian have it only in experemental repo now. -So it would be wise to make it possible to buld subtitleeditor with both enchant and echant-2 ---- - configure.ac | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index bfe30a3..beddd65 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -74,10 +74,17 @@ AC_SUBST(GTKMM_LIBS) - # ========================================================================= - # check enchant - --PKG_CHECK_MODULES(ENCHANT, enchant >= 1.4.0) -+PKG_CHECK_MODULES(ENCHANT2, enchant-2 >= 2.2.0, have_enchant_2=yes, have_enchant_2=no) - --AC_SUBST(ENCHANT_CFLAGS) --AC_SUBST(ENCHANT_LIBS) -+if test "x$have_enchant_2" = "xyes"; then -+ ENCHANT_CFLAGS=$ENCHANT2_CFLAGS -+ ENCHANT_LIBS=$ENCHANT2_LIBS -+ AC_SUBST(ENCHANT_CFLAGS) -+ AC_SUBST(ENCHANT_LIBS) -+ -+else -+ PKG_CHECK_MODULES(ENCHANT, enchant >= 1.4.0) -+fi - - # ========================================================================= - # check libxml++