Move from enchant to enchant-2.

This commit is contained in:
ajacoutot 2022-04-17 09:33:06 +00:00
parent f21f6a8aff
commit 763076cd4c
3 changed files with 122 additions and 84 deletions

View File

@ -2,31 +2,31 @@ COMMENT= GTK+ subtitles editor
V= 0.54.0
DISTNAME= subtitleeditor-${V}
REVISION= 2
REVISION= 3
CATEGORIES= graphics editors
SHARED_LIBS += subtitleeditor 0.0 # .0.0
SHARED_LIBS += subtitleeditor 0.0 # unknown
HOMEPAGE= http://kitone.github.io/subtitleeditor/
# GPLv3
PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0
WANTLIB += atkmm-1.6 atspi c cairo cairo-gobject cairomm-1.0 dbus-1
WANTLIB += enchant epoxy expat ffi fontconfig freetype fribidi
WANTLIB += gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0
WANTLIB += glibmm-2.4 gmodule-2.0 gobject-2.0 graphite2 gstallocators-1.0
WANTLIB += gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstcheck-1.0 gstcontroller-1.0
WANTLIB += gstfft-1.0 gstnet-1.0 gstpbutils-1.0 gstreamer-1.0
WANTLIB += gstreamermm-1.0 gstriff-1.0 gstrtp-1.0 gstrtsp-1.0
WANTLIB += gstsdp-1.0 gsttag-1.0 gstvideo-1.0 gthread-2.0 gtk-3
WANTLIB += gtkmm-3.0 harfbuzz iconv intl lzma m orc-0.4 pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pangomm-1.4 pcre pixman-1
WANTLIB += png sigc-2.0 xcb xcb-render xcb-shm xml++-2.6 xml2
WANTLIB += z Xau Xdmcp execinfo jpeg
WANTLIB += ${COMPILER_LIBCXX} X11 Xau Xcomposite Xcursor Xdamage
WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender aspell
WANTLIB += atk-1.0 atk-bridge-2.0 atkmm-1.6 c cairo cairo-gobject
WANTLIB += cairomm-1.0 enchant-2 epoxy execinfo expat ffi fontconfig
WANTLIB += freetype fribidi gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0
WANTLIB += giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0
WANTLIB += graphite2 gstallocators-1.0 gstapp-1.0 gstaudio-1.0
WANTLIB += gstbase-1.0 gstcheck-1.0 gstcontroller-1.0 gstfft-1.0
WANTLIB += gstnet-1.0 gstpbutils-1.0 gstreamer-1.0 gstreamermm-1.0
WANTLIB += gstriff-1.0 gstrtp-1.0 gstrtsp-1.0 gstsdp-1.0 gsttag-1.0
WANTLIB += gstvideo-1.0 gtk-3 gtkmm-3.0 harfbuzz iconv intl jpeg
WANTLIB += lzma m orc-0.4 pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pangomm-1.4 pcre pixman-1 png sigc-2.0 xcb xcb-render
WANTLIB += xcb-shm xml++-2.6 xml2 z
MASTER_SITES= https://github.com/kitone/subtitleeditor/releases/download/${V}/
@ -34,7 +34,7 @@ BUILD_DEPENDS= devel/iso-codes
LIB_DEPENDS= multimedia/gstreamer1/mm \
multimedia/gstreamer1/plugins-base \
textproc/enchant \
textproc/enchant2 \
textproc/libxml++ \
x11/gtk3mm
@ -51,10 +51,14 @@ COMPILER = base-clang ports-gcc
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION= 2.69
CONFIGURE_STYLE= autoconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CXXFLAGS="-std=c++11" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-default-video-sink=autovideosink \
--with-default-audio-sink=autoaudiosink \
--enable-ccache=no

View File

@ -0,0 +1,34 @@
From 5e9525c41272e850cbba0f65ce5809e5167880f2 Mon Sep 17 00:00:00 2001
From: kitone <kitone@free.fr>
Date: Tue, 31 Jul 2018 19:37:01 +0200
Subject: [PATCH] Fix #13: Compiling - enchant dependency not met when enchant-2 is installed
From 1dd00d036344f72ab8d647d3f5614940c95e2384 Mon Sep 17 00:00:00 2001
From: Nikolay Shaplov <dhyan@nataraj.su>
Date: Sat, 30 Nov 2019 20:57:57 +0300
Subject: [PATCH] Fix build with old version of enchant, take two
Index: configure.ac
--- configure.ac.orig
+++ 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++

View File

@ -1,76 +1,76 @@
@bin bin/subtitleeditor
lib/libsubtitleeditor.a
@static-lib lib/libsubtitleeditor.a
lib/libsubtitleeditor.la
@lib lib/libsubtitleeditor.so.${LIBsubtitleeditor_VERSION}
lib/subtitleeditor/
lib/subtitleeditor/plugins/
lib/subtitleeditor/plugins/actions/
lib/subtitleeditor/plugins/actions/libabout.so
lib/subtitleeditor/plugins/actions/libadjusttime.so
lib/subtitleeditor/plugins/actions/libapplytranslation.so
lib/subtitleeditor/plugins/actions/libbestfit.so
lib/subtitleeditor/plugins/actions/libchangeframerate.so
lib/subtitleeditor/plugins/actions/libclipboard.so
lib/subtitleeditor/plugins/actions/libcombinesubtitles.so
lib/subtitleeditor/plugins/actions/libcommand.so
lib/subtitleeditor/plugins/actions/libconfigurekeyboardshortcuts.so
lib/subtitleeditor/plugins/actions/libdialoguize.so
lib/subtitleeditor/plugins/actions/libdocumentmanagement.so
lib/subtitleeditor/plugins/actions/libdocumentsnavigation.so
lib/subtitleeditor/plugins/actions/libduplicatesubtitle.so
lib/subtitleeditor/plugins/actions/libeditcell.so
lib/subtitleeditor/plugins/actions/liberrorchecking.so
lib/subtitleeditor/plugins/actions/libextendlength.so
lib/subtitleeditor/plugins/actions/libexternalvideoplayer.so
lib/subtitleeditor/plugins/actions/libfindandreplace.so
lib/subtitleeditor/plugins/actions/libinsertsubtitle.so
lib/subtitleeditor/plugins/actions/libinsertsubtitlefromkeyframe.so
lib/subtitleeditor/plugins/actions/libitalicize.so
lib/subtitleeditor/plugins/actions/libjoindocument.so
lib/subtitleeditor/plugins/actions/libkeyframesmanagement.so
lib/subtitleeditor/plugins/actions/libminimizeduration.so
lib/subtitleeditor/plugins/actions/libmoveafterprecedingsubtitle.so
lib/subtitleeditor/plugins/actions/libmovesubtitles.so
lib/subtitleeditor/plugins/actions/libplaintext.so
lib/subtitleeditor/plugins/actions/libpreferences.so
lib/subtitleeditor/plugins/actions/libremovesubtitle.so
lib/subtitleeditor/plugins/actions/libreversetextandtranslation.so
lib/subtitleeditor/plugins/actions/libscalesubtitles.so
lib/subtitleeditor/plugins/actions/libselection.so
lib/subtitleeditor/plugins/actions/libsortsubtitles.so
lib/subtitleeditor/plugins/actions/libspellchecking.so
lib/subtitleeditor/plugins/actions/libsplitdocument.so
lib/subtitleeditor/plugins/actions/libsplitsubtitle.so
lib/subtitleeditor/plugins/actions/libstacksubtitles.so
lib/subtitleeditor/plugins/actions/libstyleeditor.so
lib/subtitleeditor/plugins/actions/libstylize.so
lib/subtitleeditor/plugins/actions/libtemplate.so
lib/subtitleeditor/plugins/actions/libtextcorrection.so
lib/subtitleeditor/plugins/actions/libtimemodemanagement.so
lib/subtitleeditor/plugins/actions/libtimingfromplayer.so
lib/subtitleeditor/plugins/actions/libtypewriter.so
lib/subtitleeditor/plugins/actions/libvideoplayermanagement.so
lib/subtitleeditor/plugins/actions/libviewmanager.so
lib/subtitleeditor/plugins/actions/libwaveformmanagement.so
@so lib/subtitleeditor/plugins/actions/libabout.so
@so lib/subtitleeditor/plugins/actions/libadjusttime.so
@so lib/subtitleeditor/plugins/actions/libapplytranslation.so
@so lib/subtitleeditor/plugins/actions/libbestfit.so
@so lib/subtitleeditor/plugins/actions/libchangeframerate.so
@so lib/subtitleeditor/plugins/actions/libclipboard.so
@so lib/subtitleeditor/plugins/actions/libcombinesubtitles.so
@so lib/subtitleeditor/plugins/actions/libcommand.so
@so lib/subtitleeditor/plugins/actions/libconfigurekeyboardshortcuts.so
@so lib/subtitleeditor/plugins/actions/libdialoguize.so
@so lib/subtitleeditor/plugins/actions/libdocumentmanagement.so
@so lib/subtitleeditor/plugins/actions/libdocumentsnavigation.so
@so lib/subtitleeditor/plugins/actions/libduplicatesubtitle.so
@so lib/subtitleeditor/plugins/actions/libeditcell.so
@so lib/subtitleeditor/plugins/actions/liberrorchecking.so
@so lib/subtitleeditor/plugins/actions/libextendlength.so
@so lib/subtitleeditor/plugins/actions/libexternalvideoplayer.so
@so lib/subtitleeditor/plugins/actions/libfindandreplace.so
@so lib/subtitleeditor/plugins/actions/libinsertsubtitle.so
@so lib/subtitleeditor/plugins/actions/libinsertsubtitlefromkeyframe.so
@so lib/subtitleeditor/plugins/actions/libitalicize.so
@so lib/subtitleeditor/plugins/actions/libjoindocument.so
@so lib/subtitleeditor/plugins/actions/libkeyframesmanagement.so
@so lib/subtitleeditor/plugins/actions/libminimizeduration.so
@so lib/subtitleeditor/plugins/actions/libmoveafterprecedingsubtitle.so
@so lib/subtitleeditor/plugins/actions/libmovesubtitles.so
@so lib/subtitleeditor/plugins/actions/libplaintext.so
@so lib/subtitleeditor/plugins/actions/libpreferences.so
@so lib/subtitleeditor/plugins/actions/libremovesubtitle.so
@so lib/subtitleeditor/plugins/actions/libreversetextandtranslation.so
@so lib/subtitleeditor/plugins/actions/libscalesubtitles.so
@so lib/subtitleeditor/plugins/actions/libselection.so
@so lib/subtitleeditor/plugins/actions/libsortsubtitles.so
@so lib/subtitleeditor/plugins/actions/libspellchecking.so
@so lib/subtitleeditor/plugins/actions/libsplitdocument.so
@so lib/subtitleeditor/plugins/actions/libsplitsubtitle.so
@so lib/subtitleeditor/plugins/actions/libstacksubtitles.so
@so lib/subtitleeditor/plugins/actions/libstyleeditor.so
@so lib/subtitleeditor/plugins/actions/libstylize.so
@so lib/subtitleeditor/plugins/actions/libtemplate.so
@so lib/subtitleeditor/plugins/actions/libtextcorrection.so
@so lib/subtitleeditor/plugins/actions/libtimemodemanagement.so
@so lib/subtitleeditor/plugins/actions/libtimingfromplayer.so
@so lib/subtitleeditor/plugins/actions/libtypewriter.so
@so lib/subtitleeditor/plugins/actions/libvideoplayermanagement.so
@so lib/subtitleeditor/plugins/actions/libviewmanager.so
@so lib/subtitleeditor/plugins/actions/libwaveformmanagement.so
lib/subtitleeditor/plugins/subtitleformats/
lib/subtitleeditor/plugins/subtitleformats/libadobeencoredvdntsc.so
lib/subtitleeditor/plugins/subtitleformats/libadobeencoredvdpal.so
lib/subtitleeditor/plugins/subtitleformats/libadvancedsubstationalpha.so
lib/subtitleeditor/plugins/subtitleformats/libavidds.so
lib/subtitleeditor/plugins/subtitleformats/libbitc.so
lib/subtitleeditor/plugins/subtitleformats/libdcsubtitle.so
lib/subtitleeditor/plugins/subtitleformats/libmicrodvd.so
lib/subtitleeditor/plugins/subtitleformats/libmpl2.so
lib/subtitleeditor/plugins/subtitleformats/libmpsub.so
lib/subtitleeditor/plugins/subtitleformats/libplaintextformat.so
lib/subtitleeditor/plugins/subtitleformats/libsami.so
lib/subtitleeditor/plugins/subtitleformats/libsbv.so
lib/subtitleeditor/plugins/subtitleformats/libsprucestl.so
lib/subtitleeditor/plugins/subtitleformats/libsubrip.so
lib/subtitleeditor/plugins/subtitleformats/libsubstationalpha.so
lib/subtitleeditor/plugins/subtitleformats/libsubtitleeditorproject.so
lib/subtitleeditor/plugins/subtitleformats/libsubviewer2.so
lib/subtitleeditor/plugins/subtitleformats/libtimedtextauthoringformat1.so
@so lib/subtitleeditor/plugins/subtitleformats/libadobeencoredvdntsc.so
@so lib/subtitleeditor/plugins/subtitleformats/libadobeencoredvdpal.so
@so lib/subtitleeditor/plugins/subtitleformats/libadvancedsubstationalpha.so
@so lib/subtitleeditor/plugins/subtitleformats/libavidds.so
@so lib/subtitleeditor/plugins/subtitleformats/libbitc.so
@so lib/subtitleeditor/plugins/subtitleformats/libdcsubtitle.so
@so lib/subtitleeditor/plugins/subtitleformats/libmicrodvd.so
@so lib/subtitleeditor/plugins/subtitleformats/libmpl2.so
@so lib/subtitleeditor/plugins/subtitleformats/libmpsub.so
@so lib/subtitleeditor/plugins/subtitleformats/libplaintextformat.so
@so lib/subtitleeditor/plugins/subtitleformats/libsami.so
@so lib/subtitleeditor/plugins/subtitleformats/libsbv.so
@so lib/subtitleeditor/plugins/subtitleformats/libsprucestl.so
@so lib/subtitleeditor/plugins/subtitleformats/libsubrip.so
@so lib/subtitleeditor/plugins/subtitleformats/libsubstationalpha.so
@so lib/subtitleeditor/plugins/subtitleformats/libsubtitleeditorproject.so
@so lib/subtitleeditor/plugins/subtitleformats/libsubviewer2.so
@so lib/subtitleeditor/plugins/subtitleformats/libtimedtextauthoringformat1.so
@man man/man1/subtitleeditor.1
share/appdata/
share/appdata/subtitleeditor.appdata.xml