diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-01-29 00:06:56 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-01-29 00:06:56 +0100 |
| commit | c10f2d9b183c51fddfcb61024d01a5bd21197694 (patch) | |
| tree | be05642071d1d25f7bd6a17684a76bd9bdfde63c /testing/subtitleeditor | |
| parent | 47d62840a0a17ab1d9abf62acd4542370fe5b7ad (diff) | |
| download | aports-c10f2d9b183c51fddfcb61024d01a5bd21197694.tar.bz2 aports-c10f2d9b183c51fddfcb61024d01a5bd21197694.tar.xz | |
Remove stale patches from testing
Diffstat (limited to 'testing/subtitleeditor')
| -rw-r--r-- | testing/subtitleeditor/01-fix-build.patch | 37 | ||||
| -rw-r--r-- | testing/subtitleeditor/02-add-missing-potfiles.patch | 14 | ||||
| -rw-r--r-- | testing/subtitleeditor/03-fix-build-gstreamermm-1.8.0.patch | 43 | ||||
| -rw-r--r-- | testing/subtitleeditor/04-remove-deprecated-variable.patch | 20 | ||||
| -rw-r--r-- | testing/subtitleeditor/APKBUILD | 4 |
5 files changed, 0 insertions, 118 deletions
diff --git a/testing/subtitleeditor/01-fix-build.patch b/testing/subtitleeditor/01-fix-build.patch deleted file mode 100644 index 706fe65e54..0000000000 --- a/testing/subtitleeditor/01-fix-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -Author: Philip Rinn <rinni@inventati.org> -Description: Fix build -Last-update: 2016-10-15 ---- a/src/vp/gstplayer.cc -+++ b/src/vp/gstplayer.cc -@@ -417,8 +417,13 @@ - } - catch(std::runtime_error &ex) - { -- se_debug_message(SE_DEBUG_VIDEO_PLAYER, "failed to gen_audio_element '%s'", ex.what()); -- GST_ELEMENT_WARNING(m_pipeline->gobj(), RESOURCE, NOT_FOUND, (ex.what()), (NULL)); -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-security" -+ -+ se_debug_message(SE_DEBUG_VIDEO_PLAYER, "failed to gen_audio_element '%s'", ex.what()); -+ GST_ELEMENT_WARNING(m_pipeline->gobj(), RESOURCE, NOT_FOUND, (ex.what()), (NULL)); -+ -+#pragma GCC diagnostic pop - } - // Return an NULL ptr - return Glib::RefPtr<Gst::Element>(); -@@ -507,8 +512,13 @@ - } - catch(std::runtime_error &ex) - { -- se_debug_message(SE_DEBUG_VIDEO_PLAYER, "failed to gen_video_element '%s'", ex.what()); -- GST_ELEMENT_ERROR(m_pipeline->gobj(), RESOURCE, NOT_FOUND, (ex.what()), (NULL)); -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-security" -+ -+ se_debug_message(SE_DEBUG_VIDEO_PLAYER, "failed to gen_audio_element '%s'", ex.what()); -+ GST_ELEMENT_WARNING(m_pipeline->gobj(), RESOURCE, NOT_FOUND, (ex.what()), (NULL)); -+ -+#pragma GCC diagnostic pop - } - // Return an NULL ptr - return Glib::RefPtr<Gst::Element>(); diff --git a/testing/subtitleeditor/02-add-missing-potfiles.patch b/testing/subtitleeditor/02-add-missing-potfiles.patch deleted file mode 100644 index 5162f60876..0000000000 --- a/testing/subtitleeditor/02-add-missing-potfiles.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Philip Rinn <rinni@inventati.org> -Description: Add missing source files to po/POTFILES.in -Last-update: 2016-08-09 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -71,6 +71,8 @@ - plugins/actions/styleeditor/styleeditor.cc - plugins/actions/styleeditor/styleeditor.h - plugins/actions/stylize/stylize.cc -+plugins/actions/template/dialog-template-save-as.ui -+plugins/actions/template/template.cc - plugins/actions/textcorrection/assistant-text-correction.ui - plugins/actions/textcorrection/capitalizationpage.h - plugins/actions/textcorrection/commonerrorpage.h diff --git a/testing/subtitleeditor/03-fix-build-gstreamermm-1.8.0.patch b/testing/subtitleeditor/03-fix-build-gstreamermm-1.8.0.patch deleted file mode 100644 index ae47fd4723..0000000000 --- a/testing/subtitleeditor/03-fix-build-gstreamermm-1.8.0.patch +++ /dev/null @@ -1,43 +0,0 @@ -Author: Philip Rinn <rinni@inventati.org> -Description: Fx build with gstreamermm-1.0 1.8.0 -Last-update: 2016-10-15 ---- a/plugins/actions/keyframesmanagement/mediadecoder.h -+++ b/plugins/actions/keyframesmanagement/mediadecoder.h -@@ -200,7 +200,7 @@ - { - check_missing_plugins(); - -- Glib::ustring error = (msg) ? msg->parse().what() : Glib::ustring(); -+ Glib::ustring error = (msg) ? Glib::ustring(msg->parse_debug()) : Glib::ustring(); - - dialog_error(_("Media file could not be played.\n"), error); - // Critical error, cancel the work. -@@ -214,7 +214,7 @@ - { - check_missing_plugins(); - -- Glib::ustring error = (msg) ? msg->parse().what() : Glib::ustring(); -+ Glib::ustring error = (msg) ? Glib::ustring(msg->parse_debug()) : Glib::ustring(); - dialog_error(_("Media file could not be played.\n"), error); - - return true; ---- a/plugins/actions/waveformmanagement/mediadecoder.h -+++ b/plugins/actions/waveformmanagement/mediadecoder.h -@@ -200,7 +200,7 @@ - { - check_missing_plugins(); - -- Glib::ustring error = (msg) ? msg->parse().what() : Glib::ustring(); -+ Glib::ustring error = (msg) ? Glib::ustring(msg->parse_debug()) : Glib::ustring(); - - dialog_error(_("Media file could not be played.\n"), error); - // Critical error, cancel the work. -@@ -214,7 +214,7 @@ - { - check_missing_plugins(); - -- Glib::ustring error = (msg) ? msg->parse().what() : Glib::ustring(); -+ Glib::ustring error = (msg) ? Glib::ustring(msg->parse_debug()) : Glib::ustring(); - dialog_error(_("Media file could not be played.\n"), error); - - return true; diff --git a/testing/subtitleeditor/04-remove-deprecated-variable.patch b/testing/subtitleeditor/04-remove-deprecated-variable.patch deleted file mode 100644 index 6ede1f8a7b..0000000000 --- a/testing/subtitleeditor/04-remove-deprecated-variable.patch +++ /dev/null @@ -1,20 +0,0 @@ -Author: kitone <kitone@gna.org> -Description: Remove deprecated gnome-common variable GNOME2_DIR -Last-update: 2016-11-09 ---- trunk/autogen.sh -+++ trunk/autogen.sh -@@ -5,14 +5,6 @@ - - DIE=0 - --if [ -n "$GNOME2_DIR" ]; then -- ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS" -- LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH" -- PATH="$GNOME2_DIR/bin:$PATH" -- export PATH -- export LD_LIBRARY_PATH --fi -- - (test -f $srcdir/configure.ac) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level package directory" diff --git a/testing/subtitleeditor/APKBUILD b/testing/subtitleeditor/APKBUILD index 55fed1e700..6327e72505 100644 --- a/testing/subtitleeditor/APKBUILD +++ b/testing/subtitleeditor/APKBUILD @@ -12,10 +12,6 @@ makedepends="libxml++-2.6-dev enchant-dev libsigc++-dev xdg-utils gtkmm3-dev gtk desktop-file-utils gst-plugins-ugly automake autoconf libtool" subpackages="$pkgname-dev $pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/kitone/$pkgname/archive/$pkgver.tar.gz" -# 01-fix-build.patch -# 02-add-missing-potfiles.patch -# 03-fix-build-gstreamermm-1.8.0.patch -# 04-remove-deprecated-variable.patch" builddir="$srcdir/$pkgname-$pkgver" prepare() { |
