Index: branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_common_common.cpp =================================================================== --- branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_common_common.cpp (revision 439339) +++ branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_common_common.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- src/common/common.cpp.orig 2015-07-18 11:39:41 UTC -+++ src/common/common.cpp -@@ -33,6 +33,10 @@ - #include "common/strings/editing.h" - #include "common/translation.h" - -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ - #if !defined(LIBMATROSKA_VERSION) || (LIBMATROSKA_VERSION <= 0x000801) - #define matroska_init() - #define matroska_done() Property changes on: branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_common_common.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp =================================================================== --- branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp (revision 439339) +++ branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- src/common/dts.cpp.orig 2015-07-18 11:39:41 UTC -+++ src/common/dts.cpp -@@ -23,6 +23,10 @@ - #include "common/endian.h" - #include "common/math.h" - -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ - // --------------------------------------------------------------------------- - - namespace mtx { namespace dts { Property changes on: branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_common_dts.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp =================================================================== --- branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp (revision 439339) +++ branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- src/input/r_wav.cpp.orig 2015-07-18 11:39:41 UTC -+++ src/input/r_wav.cpp -@@ -32,6 +32,10 @@ - #include "output/p_dts.h" - #include "output/p_pcm.h" - -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ - #define AC3ACM_READ_SIZE 100000 - - wav_demuxer_c::wav_demuxer_c(wav_reader_c *reader, Property changes on: branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_input_r__wav.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h =================================================================== --- branches/2017Q2/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h (revision 439339) +++ branches/2017Q2/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h (nonexistent) @@ -1,10 +0,0 @@ ---- lib/libebml/ebml/EbmlBinary.h.orig 2015-07-18 11:39:43 UTC -+++ lib/libebml/ebml/EbmlBinary.h -@@ -41,6 +41,7 @@ - - #include "EbmlTypes.h" - #include "EbmlElement.h" -+#include - - // ----- Added 10/15/2003 by jcsston from Zen ----- - #if defined (__BORLANDC__) //Maybe other compilers? Property changes on: branches/2017Q2/multimedia/mkvtoolnix/files/patch-lib__libebml__ebml__EbmlBinary.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp =================================================================== --- branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp (revision 439339) +++ branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- src/input/r_dts.cpp.orig 2015-07-18 11:39:41 UTC -+++ src/input/r_dts.cpp -@@ -27,6 +27,10 @@ - #include "merge/input_x.h" - #include "output/p_dts.h" - -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ - #define READ_SIZE 16384 - - int Property changes on: branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_input_r__dts.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_mkvtoolnix-gui_util_file__identifier.cpp =================================================================== --- branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_mkvtoolnix-gui_util_file__identifier.cpp (revision 439339) +++ branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_mkvtoolnix-gui_util_file__identifier.cpp (nonexistent) @@ -1,21 +0,0 @@ ---- src/mkvtoolnix-gui/util/file_identifier.cpp.orig 2016-07-14 05:51:59 UTC -+++ src/mkvtoolnix-gui/util/file_identifier.cpp -@@ -1,5 +1,7 @@ - #include "common/common_pch.h" - -+#include -+ - #include - #include - #include -@@ -288,8 +290,8 @@ FileIdentifier::addProbeRangePercentageA - if (probeRangePercentage <= 0) - return; - -- auto integerPart = static_cast(std::round(probeRangePercentage * 100)) / 100; -- auto decimalPart = static_cast(std::round(probeRangePercentage * 100)) % 100; -+ auto integerPart = static_cast(round(probeRangePercentage * 100)) / 100; -+ auto decimalPart = static_cast(round(probeRangePercentage * 100)) % 100; - - if (integerPart >= 100) - return; Property changes on: branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_mkvtoolnix-gui_util_file__identifier.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp =================================================================== --- branches/2017Q2/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp (revision 439339) +++ branches/2017Q2/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp (nonexistent) @@ -1,81 +0,0 @@ ---- lib/nlohmann-json/src/json.hpp.orig 2016-04-23 13:52:02 UTC -+++ lib/nlohmann-json/src/json.hpp -@@ -87,6 +87,14 @@ struct has_mapped_type - static constexpr bool value = sizeof(test(0)) == 1; - }; - -+template -+std::string ToString(T val) -+{ -+ std::ostringstream TempStream; -+ TempStream << val; -+ return TempStream.str(); -+} -+ - } - - /*! -@@ -3029,7 +3037,7 @@ class basic_json - catch (std::out_of_range&) - { - // create better exception explanation -- throw std::out_of_range("array index " + std::to_string(idx) + " is out of range"); -+ throw std::out_of_range("array index " + ToString(idx) + " is out of range"); - } - } - else -@@ -3073,7 +3081,7 @@ class basic_json - catch (std::out_of_range&) - { - // create better exception explanation -- throw std::out_of_range("array index " + std::to_string(idx) + " is out of range"); -+ throw std::out_of_range("array index " + ToString(idx) + " is out of range"); - } - } - else -@@ -6224,7 +6232,7 @@ class basic_json - // use integer array index as key - case value_t::array: - { -- return std::to_string(array_index); -+ return ToString(array_index); - } - - // use key from the object -@@ -8204,7 +8212,7 @@ basic_json_parser_63: - */ - long double str_to_float_t(long double* /* type */, char** endptr) const - { -- return std::strtold(reinterpret_cast(m_start), endptr); -+ return std::strtod(reinterpret_cast(m_start), endptr); - } - - /*! -@@ -8244,7 +8252,8 @@ basic_json_parser_63: - */ - float str_to_float_t(float* /* type */, char** endptr) const - { -- return std::strtof(reinterpret_cast(m_start), endptr); -+ auto v = std::strtod(reinterpret_cast(m_start), endptr); -+ return (float)v; - } - - /*! -@@ -8316,7 +8325,7 @@ basic_json_parser_63: - { - // positive, parse with strtoull and attempt cast to - // number_unsigned_t -- if (attempt_cast(std::strtoull(reinterpret_cast(m_start), &endptr, -+ if (attempt_cast(strtoull(reinterpret_cast(m_start), &endptr, - 10), result.m_value.number_unsigned)) - { - result.m_type = value_t::number_unsigned; -@@ -8331,7 +8340,7 @@ basic_json_parser_63: - { - // Negative, parse with strtoll and attempt cast to - // number_integer_t -- if (attempt_cast(std::strtoll(reinterpret_cast(m_start), &endptr, -+ if (attempt_cast(strtoll(reinterpret_cast(m_start), &endptr, - 10), result.m_value.number_integer)) - { - result.m_type = value_t::number_integer; Property changes on: branches/2017Q2/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_input_r__qtmp4.cpp =================================================================== --- branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_input_r__qtmp4.cpp (revision 439339) +++ branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_input_r__qtmp4.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/input/r_qtmp4.cpp.orig 2016-09-11 12:16:51 UTC -+++ src/input/r_qtmp4.cpp -@@ -107,7 +107,7 @@ read_qtmp4_atom(mm_io_c *read_from, - if (exit_on_error) - mxerror(boost::format(Y("Quicktime/MP4 reader: Invalid chunk size %1% at %2%.\n")) % a.size % a.pos); - else -- throw mtx::atom_chunk_size_x{a.size, a.pos}; -+ throw mtx::atom_chunk_size_x{static_cast(a.size), static_cast(a.pos)}; - } - - return a; Property changes on: branches/2017Q2/multimedia/mkvtoolnix/files/patch-src_input_r__qtmp4.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q2/multimedia/mkvtoolnix/Makefile =================================================================== --- branches/2017Q2/multimedia/mkvtoolnix/Makefile (revision 439339) +++ branches/2017Q2/multimedia/mkvtoolnix/Makefile (revision 439340) @@ -1,72 +1,71 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= mkvtoolnix -PORTVERSION= 10.0.0 -PORTREVISION= 1 +PORTVERSION= 11.0.0 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \ https://mkvtoolnix.download/sources/ MAINTAINER= riggs@FreeBSD.org COMMENT= Tools to extract from/get info about/create Matroska media streams LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= rake:devel/rubygem-rake \ docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg \ libebml.so:textproc/libebml \ libboost_regex.so:devel/boost-libs \ libpugixml.so:textproc/pugixml \ libmatroska.so:multimedia/libmatroska BROKEN_sparc64= does not install USES= compiler:c++14-lang iconv localbase pkgconfig tar:xz GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_PO4A=no CONFIGURE_ARGS= --with-boost=${LOCALBASE} \ --with-boost-filesystem=boost_filesystem \ --with-boost-system=boost_system \ --with-boost-regex=boost_regex \ --with-docbook-xsl-root=${PREFIX}/share/xsl/docbook MAKE_ENV= V=1 MAKE_CMD= rake -v MAKEFILE= Rakefile ALL_TARGET= #Empty OPTIONS_DEFINE= FLAC NLS QT5 MANTRANS OPTIONS_DEFAULT= FLAC QT5 OPTIONS_SUB= yes FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CONFIGURE_WITH= flac NLS_USES= gettext NLS_CONFIGURE_WITH= gettext QT5_DESC= Build and install GUI application (Qt 5) QT5_USES= desktop-file-utils shared-mime-info -QT5_USE= QT5=buildtools_build,concurrent,core,gui,network,quick,widgets +QT5_USE= QT5=buildtools_build,concurrent,core,gui,multimedia,network,quick,widgets QT5_CONFIGURE_ENABLE= qt QT5_BUILD_DEPENDS= qmake:devel/qt5-qmake MANTRANS_DESC= Build and install manpage translations MANTRANS_BUILD_DEPENDS= po4a:textproc/po4a post-patch: @${REINPLACE_CMD} -e '/LIBS="-lintl/s,-liconv,$$ICONV_LIBS,' \ ${WRKSRC}/configure post-configure-NLS-off: # https://github.com/mbunkus/mkvtoolnix/issues/1501 # Fixed in 8.6.0 @${REINPLACE_CMD} -e 's|LIBINTL_LIBS =|#LIBINTL_LIBS =|g' ${WRKSRC}/build-config @${REINPLACE_CMD} -e 's|#define HAVE_LIBINTL_H|//#define HAVE_LIBINTL_H|g' ${WRKSRC}/config.h @${REINPLACE_CMD} -e 's|S["LIBINTL_LIBS"]=|#S["LIBINTL_LIBS"]=|g' ${WRKSRC}/config.status .include Index: branches/2017Q2/multimedia/mkvtoolnix/distinfo =================================================================== --- branches/2017Q2/multimedia/mkvtoolnix/distinfo (revision 439339) +++ branches/2017Q2/multimedia/mkvtoolnix/distinfo (revision 439340) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491027764 -SHA256 (mkvtoolnix-10.0.0.tar.xz) = 12be72c373645b5bb9b9ea79ce8447958a1b806162868bb67803baa6d0032333 -SIZE (mkvtoolnix-10.0.0.tar.xz) = 3695108 +TIMESTAMP = 1492947573 +SHA256 (mkvtoolnix-11.0.0.tar.xz) = bb642e1eb2c402c4f93a962f41a1832c99ee5b782f1596dc20f996e9a4aa426d +SIZE (mkvtoolnix-11.0.0.tar.xz) = 4471692 Index: branches/2017Q2/multimedia/mkvtoolnix/pkg-plist =================================================================== --- branches/2017Q2/multimedia/mkvtoolnix/pkg-plist (revision 439339) +++ branches/2017Q2/multimedia/mkvtoolnix/pkg-plist (revision 439340) @@ -1,120 +1,123 @@ bin/mkvextract bin/mkvinfo bin/mkvmerge bin/mkvpropedit %%QT5%%bin/mkvtoolnix-gui %%MANTRANS%%man/ca/man1/mkvextract.1.gz %%MANTRANS%%man/ca/man1/mkvinfo.1.gz %%MANTRANS%%man/ca/man1/mkvmerge.1.gz %%MANTRANS%%man/ca/man1/mkvpropedit.1.gz %%MANTRANS%%%%QT5%%man/ca/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/de/man1/mkvextract.1.gz %%MANTRANS%%man/de/man1/mkvinfo.1.gz %%MANTRANS%%man/de/man1/mkvmerge.1.gz %%MANTRANS%%man/de/man1/mkvpropedit.1.gz %%MANTRANS%%%%QT5%%man/de/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/es/man1/mkvextract.1.gz %%MANTRANS%%man/es/man1/mkvinfo.1.gz %%MANTRANS%%man/es/man1/mkvmerge.1.gz %%MANTRANS%%man/es/man1/mkvpropedit.1.gz %%MANTRANS%%%%QT5%%man/es/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/ja/man1/mkvextract.1.gz %%MANTRANS%%man/ja/man1/mkvinfo.1.gz %%MANTRANS%%man/ja/man1/mkvmerge.1.gz %%MANTRANS%%man/ja/man1/mkvpropedit.1.gz %%MANTRANS%%%%QT5%%man/ja/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/ko/man1/mkvextract.1.gz %%MANTRANS%%man/ko/man1/mkvinfo.1.gz %%MANTRANS%%man/ko/man1/mkvmerge.1.gz %%MANTRANS%%man/ko/man1/mkvpropedit.1.gz %%MANTRANS%%%%QT5%%man/ko/man1/mkvtoolnix-gui.1.gz man/man1/mkvextract.1.gz man/man1/mkvinfo.1.gz man/man1/mkvmerge.1.gz man/man1/mkvpropedit.1.gz %%MANTRANS%%%%QT5%%man/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/nl/man1/mkvextract.1.gz %%MANTRANS%%man/nl/man1/mkvinfo.1.gz %%MANTRANS%%man/nl/man1/mkvmerge.1.gz %%MANTRANS%%man/nl/man1/mkvpropedit.1.gz %%MANTRANS%%%%QT5%%man/nl/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/pl/man1/mkvextract.1.gz %%MANTRANS%%man/pl/man1/mkvinfo.1.gz %%MANTRANS%%man/pl/man1/mkvmerge.1.gz %%MANTRANS%%man/pl/man1/mkvpropedit.1.gz %%MANTRANS%%%%QT5%%man/pl/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/uk/man1/mkvextract.1.gz %%MANTRANS%%man/uk/man1/mkvinfo.1.gz %%MANTRANS%%man/uk/man1/mkvmerge.1.gz %%MANTRANS%%man/uk/man1/mkvpropedit.1.gz %%MANTRANS%%%%QT5%%man/uk/man1/mkvtoolnix-gui.1.gz %%MANTRANS%%man/zh_CN/man1/mkvextract.1.gz %%MANTRANS%%man/zh_CN/man1/mkvinfo.1.gz %%MANTRANS%%man/zh_CN/man1/mkvmerge.1.gz %%MANTRANS%%man/zh_CN/man1/mkvpropedit.1.gz %%MANTRANS%%%%QT5%%man/zh_CN/man1/mkvtoolnix-gui.1.gz -%%QT5%%share/applications/mkvinfo.desktop -%%QT5%%share/applications/mkvtoolnix-gui.desktop +%%QT5%%share/applications/org.bunkus.mkvinfo.desktop +%%QT5%%share/applications/org.bunkus.mkvtoolnix-gui.desktop %%QT5%%share/icons/hicolor/128x128/apps/mkvextract.png %%QT5%%share/icons/hicolor/128x128/apps/mkvinfo.png %%QT5%%share/icons/hicolor/128x128/apps/mkvmerge.png %%QT5%%share/icons/hicolor/128x128/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/128x128/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/16x16/apps/mkvextract.png %%QT5%%share/icons/hicolor/16x16/apps/mkvinfo.png %%QT5%%share/icons/hicolor/16x16/apps/mkvmerge.png %%QT5%%share/icons/hicolor/16x16/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/16x16/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/24x24/apps/mkvextract.png %%QT5%%share/icons/hicolor/24x24/apps/mkvinfo.png %%QT5%%share/icons/hicolor/24x24/apps/mkvmerge.png %%QT5%%share/icons/hicolor/24x24/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/24x24/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/256x256/apps/mkvextract.png %%QT5%%share/icons/hicolor/256x256/apps/mkvinfo.png %%QT5%%share/icons/hicolor/256x256/apps/mkvmerge.png %%QT5%%share/icons/hicolor/256x256/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/256x256/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/32x32/apps/mkvextract.png %%QT5%%share/icons/hicolor/32x32/apps/mkvinfo.png %%QT5%%share/icons/hicolor/32x32/apps/mkvmerge.png %%QT5%%share/icons/hicolor/32x32/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/32x32/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/48x48/apps/mkvextract.png %%QT5%%share/icons/hicolor/48x48/apps/mkvinfo.png %%QT5%%share/icons/hicolor/48x48/apps/mkvmerge.png %%QT5%%share/icons/hicolor/48x48/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/48x48/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/64x64/apps/mkvextract.png %%QT5%%share/icons/hicolor/64x64/apps/mkvinfo.png %%QT5%%share/icons/hicolor/64x64/apps/mkvmerge.png %%QT5%%share/icons/hicolor/64x64/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/64x64/apps/mkvtoolnix-gui.png %%QT5%%share/icons/hicolor/96x96/apps/mkvextract.png %%QT5%%share/icons/hicolor/96x96/apps/mkvinfo.png %%QT5%%share/icons/hicolor/96x96/apps/mkvmerge.png %%QT5%%share/icons/hicolor/96x96/apps/mkvpropedit.png %%QT5%%share/icons/hicolor/96x96/apps/mkvtoolnix-gui.png %%NLS%%share/locale/ca/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/cs/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/de/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/es/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/eu/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/fr/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/it/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/ja/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/ko/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/lt/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/nl/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/pl/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/pt/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/ru/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/sr_RS/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/sr_RS@latin/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/sv/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/tr/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/uk/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/mkvtoolnix.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/mkvtoolnix.mo %%QT5%%share/mime/packages/mkvtoolnix.xml +%%QT5%%%%DATADIR%%/sounds/finished-1.ogg +%%QT5%%%%DATADIR%%/sounds/finished-2.ogg +%%QT5%%%%DATADIR%%/sounds/finished-3.ogg Index: branches/2017Q2 =================================================================== --- branches/2017Q2 (revision 439339) +++ branches/2017Q2 (revision 439340) Property changes on: branches/2017Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r437589,439260