diff --git a/editors/subtitleeditor/Makefile b/editors/subtitleeditor/Makefile index 5ae04f1392e..01498deea45 100644 --- a/editors/subtitleeditor/Makefile +++ b/editors/subtitleeditor/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.41 2015/06/30 13:54:39 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.42 2015/09/21 16:56:40 jasper Exp $ SHARED_ONLY= Yes @@ -6,6 +6,7 @@ COMMENT= GTK+ subtitles editor V= 0.52.1 DISTNAME= subtitleeditor-${V} +REVISION= 0 CATEGORIES= graphics editors @@ -37,7 +38,7 @@ BUILD_DEPENDS= devel/iso-codes LIB_DEPENDS= multimedia/gstreamer1/mm \ multimedia/gstreamer1/plugins-base \ textproc/enchant \ - textproc/libxml++ \ + textproc/libxml++>=2.40.0 \ x11/gtk3mm RUN_DEPENDS= devel/desktop-file-utils \ @@ -57,6 +58,7 @@ USE_GMAKE= Yes CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + CXXFLAGS="-std=c++11" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --with-default-video-sink=autovideosink \ diff --git a/editors/subtitleeditor/patches/patch-configure b/editors/subtitleeditor/patches/patch-configure new file mode 100644 index 00000000000..14fd5768e28 --- /dev/null +++ b/editors/subtitleeditor/patches/patch-configure @@ -0,0 +1,15 @@ +$OpenBSD: patch-configure,v 1.1 2015/09/21 16:56:41 jasper Exp $ + +-ansi conflicts with -std=c++11 + +--- configure.orig Mon Sep 21 14:21:24 2015 ++++ configure Mon Sep 21 14:22:20 2015 +@@ -19575,7 +19575,7 @@ fi + # ========================================================================= + # gcc flags + +-CXXFLAGS="$CXXFLAGS -ansi -Wall -Wextra -Wconversion" #-Werror ++CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wconversion" #-Werror + + # ========================================================================= + # make use of ccache diff --git a/editors/subtitleeditor/patches/patch-plugins_actions_Makefile_in b/editors/subtitleeditor/patches/patch-plugins_actions_Makefile_in new file mode 100644 index 00000000000..99d4ef76099 --- /dev/null +++ b/editors/subtitleeditor/patches/patch-plugins_actions_Makefile_in @@ -0,0 +1,14 @@ +$OpenBSD: patch-plugins_actions_Makefile_in,v 1.1 2015/09/21 16:56:41 jasper Exp $ + +Disable non-C++11 compatible plugin(s) + +--- plugins/actions/Makefile.in.orig Mon Sep 21 14:48:13 2015 ++++ plugins/actions/Makefile.in Mon Sep 21 14:48:21 2015 +@@ -373,7 +373,6 @@ FILES = \ + command \ + configurekeyboardshortcuts \ + dialoguize \ +- documentmanagement \ + documentsnavigation \ + duplicatesubtitle \ + editcell \ diff --git a/editors/subtitleeditor/patches/patch-plugins_actions_dialoguize_dialoguize_cc b/editors/subtitleeditor/patches/patch-plugins_actions_dialoguize_dialoguize_cc new file mode 100644 index 00000000000..de165a2851b --- /dev/null +++ b/editors/subtitleeditor/patches/patch-plugins_actions_dialoguize_dialoguize_cc @@ -0,0 +1,16 @@ +$OpenBSD: patch-plugins_actions_dialoguize_dialoguize_cc,v 1.1 2015/09/21 16:56:41 jasper Exp $ + + is required for auto_ptr: https://gcc.gnu.org/onlinedocs/libstdc++/manual/memory.html + +--- plugins/actions/dialoguize/dialoguize.cc.orig Mon Sep 21 14:41:19 2015 ++++ plugins/actions/dialoguize/dialoguize.cc Mon Sep 21 14:41:27 2015 +@@ -22,7 +22,8 @@ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +- ++ ++#include + #include + #include "extension/action.h" + #include "i18n.h"