diff -Nru subtitlecomposer-0.6.5/ChangeLog subtitlecomposer-0.6.6/ChangeLog --- subtitlecomposer-0.6.5/ChangeLog 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/ChangeLog 2018-02-11 02:08:46.000000000 +0000 @@ -1,3 +1,23 @@ +Version 0.6.6 + - Fixed open video dialog filters + - Fixed "Insert Line" on waveform adding at the wrong index - thanks @qsniyg + - Added MMB seeking on waveform - thanks @qsniyg + - Fixed some compilation issues + - Updated translations - thanks @gogogogi, @muzena + - Fixed vobsub when opening from video file and symbol cache filename + - Fixed subtitle loading times of huge files + - Improved vobsub text detection + - Fixed ASS rich text parsing on import subtitle stream action + - Replaced buggy mplayer vobsub import code with ffmpeg + - Fixed memory leaks/usage of WaveformWidget's scroll animation + - Optimized import subtitle stream from video action + - Replaced gstreamer with ffmpeg libraries in application core usage + - Added abort button to speech recognition + - Waveform smooth scrolling + - Added join/split lines actions to waveform context menu + - Fixed some crashes, memory leaks and overall code cleanups + - Cleaned up settings widget and texts + Version 0.6.5 - ADD: Added support for binary subtitle formats - ADD: fine control video playback speed @@ -94,166 +114,166 @@ - FIX: Phonon player backend was displaying embeded subtitles - FIX: OBS (OpenSuse) package creation was failing - Version 0.5.7 -- ADD: GStreamer 1.0 support -- ADD: added Debian build -- MOD: updated Bulgarian and Croatian translations -- FIX: Phonon backend supports audio channel change -- FIX: Command line params were expected to be URL encoded -- FIX: UTF subtitles are saved with BOM -- FIX: updated/fixed translation catalogs and list of translators -- FIX: some files were wrongly identified as tmplayer subtitles +Version 0.5.7 + - ADD: GStreamer 1.0 support + - ADD: added Debian build + - MOD: updated Bulgarian and Croatian translations + - FIX: Phonon backend supports audio channel change + - FIX: Command line params were expected to be URL encoded + - FIX: UTF subtitles are saved with BOM + - FIX: updated/fixed translation catalogs and list of translators + - FIX: some files were wrongly identified as tmplayer subtitles Version 0.5.6: -- SubStation Alpha format fixes and color support -- source cleanup + - SubStation Alpha format fixes and color support + - source cleanup Version 0.5.5: -- text color support -- SubRip text color support -- reworked MicroDVD open/save + - text color support + - SubRip text color support + - reworked MicroDVD open/save Version 0.5.4: -- mplayer2 support -- mplayer VDPAU decoding support -- minor cmake build fixes + - mplayer2 support + - mplayer VDPAU decoding support + - minor cmake build fixes Version 0.5.3: -- added Czech, Brazilian Portuguese, Bulgarian, French and German translations contributed by Petr + - added Czech, Brazilian Portuguese, Bulgarian, French and German translations contributed by Petr Gadula, Marcio P. Moraes, Petar Toushkov, Thomas Gastine and Panagiotis Papadopoulos respectively and updated Spanish translation -- added Kross powered scripting interface with some basic examples in Ruby, Python and JavaScript -- added action to translate subtitles using Google translation services -- fixed many bugs including some that would crash the application + - added Kross powered scripting interface with some basic examples in Ruby, Python and JavaScript + - added action to translate subtitles using Google translation services + - fixed many bugs including some that would crash the application * selecting a file from the recently opened list could crash the application when using Qt 4.5 * video playback was completely broken with Qt 4.5 * bugs related to searching text and errors * bugs related to undo/redo that could result in a crash -- other minor fixes, user interface changes and improvements + - other minor fixes, user interface changes and improvements Version 0.5.2: -- added Polish translation and updated Serbian and Spanish ones (thanks to Tomasz Argasiński and Slobodan Simic) -- ported lines and errors views to Qt4 Model/View + - added Polish translation and updated Serbian and Spanish ones (thanks to Tomasz Argasiński and Slobodan Simic) + - ported lines and errors views to Qt4 Model/View * greatly improves performance * renders lines using the application style * lines' texts display tooltips with errors information on hover -- improved the current line text edit (mainly by using the KDE version of the control) + - improved the current line text edit (mainly by using the KDE version of the control) * supports KDE standard shortcuts and spelling with on the fly highlighting of misspelled words * context menu shows suggestions for misspelled words and actions to ignore or add to dictionary * relevant shorcuts are caught so that don't trigger other application actions -- improved inline editing behavior + - improved inline editing behavior * navigation between editable cells is possible with Up/Down arrows and tab/back tab keys -- added actions to retrocede and advance the current line (Alt+[Up|Down] arrows) -- added a configuration page for spelling options -- comply with Shared MIME-info spec for registering file types -- fixed switching audio and subtitle streams on video player -- fixed actions shortcuts on full screen mode (sequences using the keypad didn't work) -- fixed subtitles preview (subtitles disappeared when leaving full screen) -- fixed compression of actions (undoing actions broke things) -- fixed crash caused by removing lines in some scenarios -- fixed crash caused by find/replace/spelling actions when there was no current line -- fixed Xine CMake checks (correctly enable XCB support when available) -- many other minor fixes and improvements + - added actions to retrocede and advance the current line (Alt+[Up|Down] arrows) + - added a configuration page for spelling options + - comply with Shared MIME-info spec for registering file types + - fixed switching audio and subtitle streams on video player + - fixed actions shortcuts on full screen mode (sequences using the keypad didn't work) + - fixed subtitles preview (subtitles disappeared when leaving full screen) + - fixed compression of actions (undoing actions broke things) + - fixed crash caused by removing lines in some scenarios + - fixed crash caused by find/replace/spelling actions when there was no current line + - fixed Xine CMake checks (correctly enable XCB support when available) + - many other minor fixes and improvements Version 0.5.1: -- added Greek translation and completed Spanish one (thanks to Alexandros Perdikomatis) -- added automatic tests for important classes -- fixed many bugs (lots of crashes, configuration saving, recent files history, GUI glitches, etc.) -- minor and not so minor cosmetic changes (fixed strings to comply with HIG, updated some icons, changed some dialogs' layouts) + - added Greek translation and completed Spanish one (thanks to Alexandros Perdikomatis) + - added automatic tests for important classes + - fixed many bugs (lots of crashes, configuration saving, recent files history, GUI glitches, etc.) + - minor and not so minor cosmetic changes (fixed strings to comply with HIG, updated some icons, changed some dialogs' layouts) Version 0.5.0: -- ported to KDE4/Qt4 -- added Phonon player backend + - ported to KDE4/Qt4 + - added Phonon player backend Version 0.4.2: -- added Spanish and Serbian translations and updated pot file (thanks to Daniel Lambea and Slobodan Simic) -- improved styles handling: + - added Spanish and Serbian translations and updated pot file (thanks to Daniel Lambea and Slobodan Simic) + - improved styles handling: * styles don't have to be applied to whole lines anymore * added "strike through" style support -- added configurable outline for subtitles in video player -- use KIO facilities to allow loading and saving subtitles from other than local files -- other minor fixes + - added configurable outline for subtitles in video player + - use KIO facilities to allow loading and saving subtitles from other than local files + - other minor fixes Version 0.4.1: -- detection of line terminator used in input subtitle and support for changing it (or not) when saving -- show additional information for current line (characters per line / total characters) -- added subtitlecomposer.pot file (now the program can be translated) -- added action to fix overlapping lines -- added "Select All" and "Select None" buttons to check errors and clear errors dialogs -- resume playing (if paused) when a line has been double clicked -- ensure all error items are visible in the errors dialog when changing the current line -- fixed parsing and writing of SSA/ASS files and parsing of MPL files -- fixed bug related to setting and clearing the subtitle's dirty state -- fixed bug which prevented the error icon from being shown in some cases -- fixed compilation with GCC 4.3 (thanks to David Watzke for the patch) + - detection of line terminator used in input subtitle and support for changing it (or not) when saving + - show additional information for current line (characters per line / total characters) + - added subtitlecomposer.pot file (now the program can be translated) + - added action to fix overlapping lines + - added "Select All" and "Select None" buttons to check errors and clear errors dialogs + - resume playing (if paused) when a line has been double clicked + - ensure all error items are visible in the errors dialog when changing the current line + - fixed parsing and writing of SSA/ASS files and parsing of MPL files + - fixed bug related to setting and clearing the subtitle's dirty state + - fixed bug which prevented the error icon from being shown in some cases + - fixed compilation with GCC 4.3 (thanks to David Watzke for the patch) Version 0.4.0: -- support for working with translations -- video player full screen mode -- Xine player backend -- non destructive edition of files with unnsupported data (such as SSA or ASS) -- actions to shift to video position and adjust from video position (anchoring first or last line) -- actions for increasing and decreasing the volume -- actions for increasing and decreasing the subtitles font size -- fix find and replace implementations to support all dialog options and (proper) regex replacements -- make find actions to jump to video position in full screen mode -- make consistent use of the grabbed video position compensation in all relevant user actions -- renamed "Polska" format to its correct name, TMPlayer, and added support TMPlayer+ -- many other fixes, changes and general improvements... + - support for working with translations + - video player full screen mode + - Xine player backend + - non destructive edition of files with unnsupported data (such as SSA or ASS) + - actions to shift to video position and adjust from video position (anchoring first or last line) + - actions for increasing and decreasing the volume + - actions for increasing and decreasing the subtitles font size + - fix find and replace implementations to support all dialog options and (proper) regex replacements + - make find actions to jump to video position in full screen mode + - make consistent use of the grabbed video position compensation in all relevant user actions + - renamed "Polska" format to its correct name, TMPlayer, and added support TMPlayer+ + - many other fixes, changes and general improvements... Version 0.3.1: -- fix the opening of files with MPlayer video backend -- rename "Polska" subtitles format to it's actual name, TMPlayer + - fix the opening of files with MPlayer video backend + - rename "Polska" subtitles format to it's actual name, TMPlayer Version 0.3: -- errors checking and reporting -- actions to join and split subtitles -- action to sort lines -- added support for "Polska" subtitles (*) -- added default shortcuts to common actions -- open video files dropped into the video widget -- correctly handle opening of invalid video files -- rearrange the main menu and the main view context menu -- rewrite the recent files menus (application should compile in KDE 3.4 now) -- many other internal changes including a revamp of the actions classes (which now support "compression" of actions) -- updated features plan: next version will focus on KDE4 porting and subtitle translations support + - errors checking and reporting + - actions to join and split subtitles + - action to sort lines + - added support for "Polska" subtitles (*) + - added default shortcuts to common actions + - open video files dropped into the video widget + - correctly handle opening of invalid video files + - rearrange the main menu and the main view context menu + - rewrite the recent files menus (application should compile in KDE 3.4 now) + - many other internal changes including a revamp of the actions classes (which now support "compression" of actions) + - updated features plan: next version will focus on KDE4 porting and subtitle translations support (*) I don't know the real name of the format, if anyone does (maybe the guys who requested it?), please, drop me a note. Version 0.2.1: -- fix bug in MPlayer video backend wich prevented sound playback -- fix a couple of user visible strings -- enforce the currently set volume when changing audio streams + - fix bug in MPlayer video backend wich prevented sound playback + - fix a couple of user visible strings + - enforce the currently set volume when changing audio streams Version 0.2: -- open subtitle files dropped into the application window -- command line option to open a given file on start -- install mimetypes and update aplication desktop file to handle them -- rearrange GUI controls and add a (toggable) editable position control -- highlight currently playing line -- action to make current line follow video position -- actions to make video position jump to next/previous line -- actions to make video position jump forwards/backwards -- action to set current line show/hide time to video position (+ option to compensate the grabbed time) -- actions to join and split lines -- action to change lines text case (lower case, upper case, title case and sentence case) -- action to fix lines punctuation -- action to maximize lines duration -- action to automaticaty set lines duration based on text -- actions to quick shift selected lines (and option to specify the shift amount) -- action to synchronize or adjust the current subtitle with a reference one + - open subtitle files dropped into the application window + - command line option to open a given file on start + - install mimetypes and update aplication desktop file to handle them + - rearrange GUI controls and add a (toggable) editable position control + - highlight currently playing line + - action to make current line follow video position + - actions to make video position jump to next/previous line + - actions to make video position jump forwards/backwards + - action to set current line show/hide time to video position (+ option to compensate the grabbed time) + - actions to join and split lines + - action to change lines text case (lower case, upper case, title case and sentence case) + - action to fix lines punctuation + - action to maximize lines duration + - action to automaticaty set lines duration based on text + - actions to quick shift selected lines (and option to specify the shift amount) + - action to synchronize or adjust the current subtitle with a reference one Version 0.1: -- load and save from most common formats (srt, sub, ssa) with support for multiple encodings -- full undo/redo support -- integrated video player with support for multiple video backends (gstreamer/mplayer) and subtitles overlaying -- insert/remove lines -- edit text and styles -- adjust times -- change frame rate -- find/replace with regular expressions -- check spelling + - load and save from most common formats (srt, sub, ssa) with support for multiple encodings + - full undo/redo support + - integrated video player with support for multiple video backends (gstreamer/mplayer) and subtitles overlaying + - insert/remove lines + - edit text and styles + - adjust times + - change frame rate + - find/replace with regular expressions + - check spelling diff -Nru subtitlecomposer-0.6.5/cmake/FindFFmpeg.cmake subtitlecomposer-0.6.6/cmake/FindFFmpeg.cmake --- subtitlecomposer-0.6.5/cmake/FindFFmpeg.cmake 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.6.6/cmake/FindFFmpeg.cmake 2018-02-11 02:08:46.000000000 +0000 @@ -0,0 +1,65 @@ +# - Try to find FFmpeg libraries +# Once done this will define +# FFMPEG_FOUND - System has FFmpeg +# FFMPEG_INCLUDE_DIRS - The FFmpeg include directories +# FFMPEG_LIBRARIES - The libraries needed to use FFmpeg + +find_package(PkgConfig REQUIRED) +pkg_check_modules(PC_FFMPEG_AVCODEC QUIET libavcodec) +pkg_check_modules(PC_FFMPEG_AVFORMAT QUIET libavformat) +pkg_check_modules(PC_FFMPEG_AVUTIL QUIET libavutil) +pkg_check_modules(PC_FFMPEG_SWRESAMPLE QUIET libswresample) +set(FFMPEG_DEFINITIONS ${PC_FFMPEG_CFLAGS_OTHER}) +set(FFMPEG_VERSION ${PC_FFMPEG_VERSION}) + +find_path(FFMPEG_INCLUDE_DIR libavcodec/avcodec.h + HINTS + ${PC_FFMPEG_AVCODEC_INCLUDEDIR} ${PC_FFMPEG_AVCODEC_INCLUDE_DIRS} + ${PC_FFMPEG_AVFORMAT_INCLUDEDIR} ${PC_FFMPEG_AVFORMAT_INCLUDE_DIRS} + ${PC_FFMPEG_AVUTIL_INCLUDEDIR} ${PC_FFMPEG_AVUTIL_INCLUDE_DIRS} + PATH_SUFFIXES ffmpeg) + +find_library(FFMPEG_AVCODEC_LIBRARY + NAMES avcodec + HINTS + ${PC_FFMPEG_AVCODEC_LIBDIR} ${PC_FFMPEG_AVCODEC_LIBRARY_DIRS}) + +find_library(FFMPEG_AVFORMAT_LIBRARY + NAMES avformat + HINTS + ${PC_FFMPEG_AVFORMAT_LIBDIR} ${PC_FFMPEG_AVFORMAT_LIBRARY_DIRS}) + +find_library(FFMPEG_AVUTIL_LIBRARY + NAMES avutil + HINTS + ${PC_FFMPEG_AVUTIL_LIBDIR} ${PC_FFMPEG_AVUTIL_LIBRARY_DIRS}) + +find_library(FFMPEG_SWRESAMPLE_LIBRARY + NAMES swresample + HINTS + ${PC_FFMPEG_SWRESAMPLE_LIBDIR} ${PC_FFMPEG_SWRESAMPLE_LIBRARY_DIRS}) + +set(FFMPEG_LIBRARIES ${FFMPEG_AVCODEC_LIBRARY} ${FFMPEG_AVFORMAT_LIBRARY} ${FFMPEG_AVUTIL_LIBRARY} ${FFMPEG_SWRESAMPLE_LIBRARY}) +set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIR}) + +include(FindPackageHandleStandardArgs) +# handle the QUIETLY and REQUIRED arguments and set FFMPEG_FOUND to TRUE if all listed variables are TRUE +find_package_handle_standard_args(FFMPEG + REQUIRED_VARS FFMPEG_AVCODEC_LIBRARY FFMPEG_AVFORMAT_LIBRARY FFMPEG_AVUTIL_LIBRARY FFMPEG_SWRESAMPLE_LIBRARY FFMPEG_INCLUDE_DIR) + +if(FFMPEG_FOUND) + if(NOT FFmpeg_FIND_QUIETLY) + message(STATUS "Found FFmpeg: " + "\n\tinclude dir: ${FFMPEG_INCLUDE_DIR}" + "\n\t${FFMPEG_AVCODEC_LIBRARY} (version ${PC_FFMPEG_AVCODEC_VERSION})" + "\n\t${FFMPEG_AVFORMAT_LIBRARY} (version ${PC_FFMPEG_AVFORMAT_VERSION})" + "\n\t${FFMPEG_AVUTIL_LIBRARY} (version ${PC_FFMPEG_AVUTIL_VERSION})" + "\n\t${FFMPEG_SWRESAMPLE_LIBRARY} (version ${PC_FFMPEG_SWRESAMPLE_VERSION})") + endif(NOT FFmpeg_FIND_QUIETLY) +else(FFMPEG_FOUND) + if(Fmpeg_FIND_REQUIRED) + message(FATAL_ERROR "FFmpeg was not found.") + endif(Fmpeg_FIND_REQUIRED) +endif(FFMPEG_FOUND) + +mark_as_advanced(FFMPEG_INCLUDE_DIR FFMPEG_LIBRARY) diff -Nru subtitlecomposer-0.6.5/cmake/FindGLIB2.cmake subtitlecomposer-0.6.6/cmake/FindGLIB2.cmake --- subtitlecomposer-0.6.5/cmake/FindGLIB2.cmake 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/cmake/FindGLIB2.cmake 2018-02-11 02:08:46.000000000 +0000 @@ -16,8 +16,8 @@ set(GLIB2_FIND_QUIETLY TRUE) endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) -find_package(PkgConfig) -pkg_check_modules(PC_LibGLIB2 glib-2.0) +find_package(PkgConfig REQUIRED) +pkg_check_modules(PC_LibGLIB2 QUIET glib-2.0) find_path(GLIB2_MAIN_INCLUDE_DIR NAMES glib.h diff -Nru subtitlecomposer-0.6.5/cmake/FindGObject.cmake subtitlecomposer-0.6.6/cmake/FindGObject.cmake --- subtitlecomposer-0.6.5/cmake/FindGObject.cmake 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/cmake/FindGObject.cmake 2018-02-11 02:08:46.000000000 +0000 @@ -13,7 +13,7 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. FIND_PACKAGE(PkgConfig) -PKG_CHECK_MODULES(PC_GOBJECT gobject-2.0) +PKG_CHECK_MODULES(PC_GOBJECT QUIET gobject-2.0) SET(GOBJECT_DEFINITIONS ${PC_GOBJECT_CFLAGS_OTHER}) FIND_PATH(GOBJECT_INCLUDE_DIR gobject.h diff -Nru subtitlecomposer-0.6.5/cmake/FindGStreamer.cmake subtitlecomposer-0.6.6/cmake/FindGStreamer.cmake --- subtitlecomposer-0.6.5/cmake/FindGStreamer.cmake 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/cmake/FindGStreamer.cmake 2018-02-11 02:08:46.000000000 +0000 @@ -25,7 +25,7 @@ # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls # don't make this check required - otherwise you can't use macro_optional_find_package on this one - PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-1.0) + PKG_CHECK_MODULES(PKG_GSTREAMER QUIET gstreamer-1.0) SET(GSTREAMER_VERSION ${PKG_GSTREAMER_VERSION}) SET(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS}) ENDIF (NOT WIN32) @@ -84,7 +84,7 @@ IF (GSTREAMER_FOUND) IF (NOT GStreamer_FIND_QUIETLY) - MESSAGE(STATUS "Found GStreamer: ${GSTREAMER_LIBRARIES}") + MESSAGE(STATUS "Found GStreamer: ${GSTREAMER_LIBRARIES} (version ${GSTREAMER_VERSION})") ENDIF (NOT GStreamer_FIND_QUIETLY) ELSE (GSTREAMER_FOUND) IF (GStreamer_FIND_REQUIRED) diff -Nru subtitlecomposer-0.6.5/cmake/FindGStreamerPlugins.cmake subtitlecomposer-0.6.6/cmake/FindGStreamerPlugins.cmake --- subtitlecomposer-0.6.5/cmake/FindGStreamerPlugins.cmake 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/cmake/FindGStreamerPlugins.cmake 2018-02-11 02:08:46.000000000 +0000 @@ -17,46 +17,48 @@ FIND_PACKAGE(PkgConfig REQUIRED) IF (NOT WIN32) - # don't make this check required - otherwise you can't use macro_optional_find_package on this one - PKG_CHECK_MODULES( PKG_GSTREAMER_PLUGINSBASE gstreamer-plugins-base-1.0 ) + # don't make this check required - otherwise you can't use macro_optional_find_package on this one + PKG_CHECK_MODULES( PKG_GSTREAMER_PLUGINSBASE QUIET gstreamer-plugins-base-1.0 ) ENDIF (NOT WIN32) MACRO(MACRO_FIND_GSTREAMER_PLUGIN _plugin _header) - STRING(TOUPPER ${_plugin} _upper) - IF (NOT WIN32) - # don't make this check required - otherwise you can't use macro_optional_find_package on this one - PKG_CHECK_MODULES( PKG_GSTREAMER_${_upper} gstreamer-${_plugin}-1.0 ) - ENDIF (NOT WIN32) - - FIND_LIBRARY(GSTREAMER_PLUGIN_${_upper}_LIBRARY NAMES gst${_plugin}-1.0 - PATHS - ${PKG_GSTREAMER_PLUGINSBASE_LIBRARY_DIRS} - ${PKG_GSTREAMER_${_upper}_LIBRARY_DIRS} - ) - - FIND_PATH(GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR - NAMES gst/${_plugin}/${_header} - PATHS - ${PKG_GSTREAMER_PLUGINSBASE_INCLUDE_DIRS} - ${PKG_GSTREAMER_${_upper}_INCLUDE_DIRS} - ) - - IF(GSTREAMER_PLUGIN_${_upper}_LIBRARY AND GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR) - SET(GSTREAMER_PLUGIN_${_upper}_FOUND TRUE) - LIST(APPEND GSTREAMERPLUGINSBASE_INCLUDE_DIRS GSTREAMER_${_upper}_INCLUDE_DIR) - LIST(APPEND GSTREAMERPLUGINSBASE_LIBRARIES GSTREAMER_${_upper}_LIBRARY) - ELSE(GSTREAMER_PLUGIN_${_upper}_LIBRARY AND GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR) - MESSAGE(STATUS "Could not find ${_plugin} plugin") - MESSAGE(STATUS "${_upper} library: ${GSTREAMER_${_upper}_LIBRARY}") - MESSAGE(STATUS "${_upper} include dir: ${GSTREAMER_${_upper}_INCLUDE_DIR}") - SET(GSTREAMER_PLUGIN_${_upper}_FOUND FALSE) - SET(GSTREAMER_PLUGIN_${_upper}_LIBRARY GSTREAMER_${_upper}_LIBRARY-NOTFOUND) - SET(GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR GSTREAMER_${_upper}_INCLUDE_DIR-NOTFOUND) - SET(GSTREAMERPLUGINSBASE_FOUND FALSE) - ENDIF(GSTREAMER_PLUGIN_${_upper}_LIBRARY AND GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR) + STRING(TOUPPER ${_plugin} _upper) + IF (NOT WIN32) + # don't make this check required - otherwise you can't use macro_optional_find_package on this one + PKG_CHECK_MODULES( PKG_GSTREAMER_${_upper} QUIET gstreamer-${_plugin}-1.0 ) + ENDIF (NOT WIN32) + + FIND_LIBRARY(GSTREAMER_PLUGIN_${_upper}_LIBRARY NAMES gst${_plugin}-1.0 + PATHS + ${PKG_GSTREAMER_PLUGINSBASE_LIBRARY_DIRS} + ${PKG_GSTREAMER_${_upper}_LIBRARY_DIRS} + ) + + FIND_PATH(GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR + NAMES gst/${_plugin}/${_header} + PATHS + ${PKG_GSTREAMER_PLUGINSBASE_INCLUDE_DIRS} + ${PKG_GSTREAMER_${_upper}_INCLUDE_DIRS} + ) + + IF(GSTREAMER_PLUGIN_${_upper}_LIBRARY AND GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR) + SET(GSTREAMER_PLUGIN_${_upper}_FOUND TRUE) + LIST(APPEND GSTREAMERPLUGINSBASE_INCLUDE_DIRS GSTREAMER_${_upper}_INCLUDE_DIR) + LIST(APPEND GSTREAMERPLUGINSBASE_LIBRARIES GSTREAMER_${_upper}_LIBRARY) + ELSE(GSTREAMER_PLUGIN_${_upper}_LIBRARY AND GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR) +# IF(NOT GStreamer_Plugins_FIND_QUIETLY) +# MESSAGE(STATUS "Could not find ${_plugin} plugin") +# MESSAGE(STATUS "${_upper} library: ${GSTREAMER_${_upper}_LIBRARY}") +# MESSAGE(STATUS "${_upper} include dir: ${GSTREAMER_${_upper}_INCLUDE_DIR}") +# ENDIF(NOT GStreamer_Plugins_FIND_QUIETLY) + SET(GSTREAMER_PLUGIN_${_upper}_FOUND FALSE) + SET(GSTREAMER_PLUGIN_${_upper}_LIBRARY GSTREAMER_${_upper}_LIBRARY-NOTFOUND) + SET(GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR GSTREAMER_${_upper}_INCLUDE_DIR-NOTFOUND) + SET(GSTREAMERPLUGINSBASE_FOUND FALSE) + ENDIF(GSTREAMER_PLUGIN_${_upper}_LIBRARY AND GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR) - MARK_AS_ADVANCED(GSTREAMER_PLUGIN_${_upper}_LIBRARY - GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR) + MARK_AS_ADVANCED(GSTREAMER_PLUGIN_${_upper}_LIBRARY + GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR) ENDMACRO(MACRO_FIND_GSTREAMER_PLUGIN) # @@ -88,25 +90,25 @@ MACRO_FIND_GSTREAMER_PLUGIN(video video.h) IF (GSTREAMERPLUGINSBASE_FOUND) - LIST(REMOVE_DUPLICATES GSTREAMERPLUGINSBASE_LIBRARIES) - LIST(REMOVE_DUPLICATES GSTREAMERPLUGINSBASE_INCLUDE_DIRS) - IF (NOT GStreamer_Plugins_FIND_QUIETLY) - MESSAGE(STATUS "Found GStreamer Plugins: - ${GSTREAMER_PLUGIN_AUDIO_LIBRARIES} - ${GSTREAMER_PLUGIN_CDDA_LIBRARIES} - ${GSTREAMER_PLUGIN_NETBUFFER_LIBRARIES} - ${GSTREAMER_PLUGIN_PBUTILS_LIBRARIES} - ${GSTREAMER_PLUGIN_RIFF_LIBRARIES} - ${GSTREAMER_PLUGIN_RTP_LIBRARIES} - ${GSTREAMER_PLUGIN_RTSP_LIBRARIES} - ${GSTREAMER_PLUGIN_SDP_LIBRARIES} - ${GSTREAMER_PLUGIN_TAG_LIBRARIES} - ${GSTREAMER_PLUGIN_VIDEO_LIBRARIES}") - ENDIF (NOT GStreamer_Plugins_FIND_QUIETLY) + LIST(REMOVE_DUPLICATES GSTREAMERPLUGINSBASE_LIBRARIES) + LIST(REMOVE_DUPLICATES GSTREAMERPLUGINSBASE_INCLUDE_DIRS) + IF (NOT GStreamer_Plugins_FIND_QUIETLY) + MESSAGE(STATUS "Found GStreamer Plugins: + ${GSTREAMER_PLUGIN_AUDIO_LIBRARIES} + ${GSTREAMER_PLUGIN_CDDA_LIBRARIES} + ${GSTREAMER_PLUGIN_NETBUFFER_LIBRARIES} + ${GSTREAMER_PLUGIN_PBUTILS_LIBRARIES} + ${GSTREAMER_PLUGIN_RIFF_LIBRARIES} + ${GSTREAMER_PLUGIN_RTP_LIBRARIES} + ${GSTREAMER_PLUGIN_RTSP_LIBRARIES} + ${GSTREAMER_PLUGIN_SDP_LIBRARIES} + ${GSTREAMER_PLUGIN_TAG_LIBRARIES} + ${GSTREAMER_PLUGIN_VIDEO_LIBRARIES}") + ENDIF (NOT GStreamer_Plugins_FIND_QUIETLY) ELSE (GSTREAMERPLUGINSBASE_FOUND) - SET(GSTREAMERPLUGINSBASE_LIBRARIES GSTREAMERPLUGINSBASE_LIBRARIES-NOTFOUND) - SET(GSTREAMERPLUGINSBASE_INCLUDE_DIRS GSTREAMERPLUGINSBASE_INCLUDE_DIRS-NOTFOUND) - IF (GStreamer_Plugins_FIND_REQUIRED) - MESSAGE(SEND_ERROR "Could NOT find GStreamer Plugins") - ENDIF (GStreamer_Plugins_FIND_REQUIRED) + SET(GSTREAMERPLUGINSBASE_LIBRARIES GSTREAMERPLUGINSBASE_LIBRARIES-NOTFOUND) + SET(GSTREAMERPLUGINSBASE_INCLUDE_DIRS GSTREAMERPLUGINSBASE_INCLUDE_DIRS-NOTFOUND) + IF (GStreamer_Plugins_FIND_REQUIRED) + MESSAGE(SEND_ERROR "Could NOT find GStreamer Plugins") + ENDIF (GStreamer_Plugins_FIND_REQUIRED) ENDIF (GSTREAMERPLUGINSBASE_FOUND) diff -Nru subtitlecomposer-0.6.5/cmake/FindPocketSphinx.cmake subtitlecomposer-0.6.6/cmake/FindPocketSphinx.cmake --- subtitlecomposer-0.6.5/cmake/FindPocketSphinx.cmake 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/cmake/FindPocketSphinx.cmake 2018-02-11 02:08:46.000000000 +0000 @@ -7,7 +7,7 @@ # POCKETSPHINX_DEFINITIONS - Compiler switches required for using PocketSphinx # POCKETSPHINX_MODELDIR - Directory that contains PocketSphinx models -find_package(PkgConfig REQUIRED QUIET) +find_package(PkgConfig REQUIRED) pkg_check_modules(PC_POCKETSPHINX QUIET pocketsphinx) set(POCKETSPHINX_DEFINITIONS ${PC_POCKETSPHINX_CFLAGS_OTHER}) set(POCKETSPHINX_VERSION ${PC_POCKETSPHINX_VERSION}) @@ -18,15 +18,21 @@ unset(POCKETSPHINX_INCDIR) unset(SPHINXBASE_INCDIR) -#find_library(POCKETSPHINX_LIBRARY NAMES pocketsphinx sphinxbase sphinxad HINTS ${PC_POCKETSPHINX_LIBDIR} ${PC_POCKETSPHINX_LIBRARY_DIRS}) -set(POCKETSPHINX_LIBRARY ${PC_POCKETSPHINX_LIBRARIES}) +foreach(_LIB ${PC_POCKETSPHINX_LIBRARIES}) + set(_LIB_PATH "_LIB_PATH-NOTFOUND") + find_library(_LIB_PATH + NAMES ${_LIB} + HINTS ${PC_POCKETSPHINX_LIBDIR} ${PC_POCKETSPHINX_LIBRARY_DIRS}) + set(POCKETSPHINX_LIBRARIES ${POCKETSPHINX_LIBRARIES} ${_LIB_PATH}) +endforeach(_LIB) -set(POCKETSPHINX_LIBRARIES ${POCKETSPHINX_LIBRARY}) set(POCKETSPHINX_INCLUDE_DIRS ${POCKETSPHINX_INCLUDE_DIR}) include(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set POCKETSPHINX_FOUND to TRUE if all listed variables are TRUE -find_package_handle_standard_args(POCKETSPHINX DEFAULT_MSG POCKETSPHINX_LIBRARY POCKETSPHINX_INCLUDE_DIR) +find_package_handle_standard_args(POCKETSPHINX + REQUIRED_VARS POCKETSPHINX_LIBRARIES POCKETSPHINX_INCLUDE_DIR + VERSION_VAR POCKETSPHINX_VERSION) execute_process(COMMAND pkg-config --variable=modeldir pocketsphinx OUTPUT_VARIABLE POCKETSPHINX_MODELDIR_OUTPUT diff -Nru subtitlecomposer-0.6.5/cmake/FindXine.cmake subtitlecomposer-0.6.6/cmake/FindXine.cmake --- subtitlecomposer-0.6.5/cmake/FindXine.cmake 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/cmake/FindXine.cmake 2018-02-11 02:08:46.000000000 +0000 @@ -22,7 +22,7 @@ IF (NOT WIN32) FIND_PACKAGE(PkgConfig) - PKG_CHECK_MODULES(PKG_XINE libxine) + PKG_CHECK_MODULES(PKG_XINE QUIET libxine) ENDIF (NOT WIN32) FIND_PATH(XINE_INCLUDE_DIR NAMES xine.h @@ -46,6 +46,13 @@ SET(CMAKE_REQUIRED_INCLUDES ${XINE_INCLUDE_DIR}) SET(CMAKE_REQUIRED_LIBRARIES ${XINE_LIBRARY}) CHECK_C_SOURCE_COMPILES("#include \nint main()\n{\n xine_open_video_driver(xine_new(), \"auto\", XINE_VISUAL_TYPE_XCB, NULL);\n return 0;\n}\n" XINE_XCB_FOUND) + if(NOT Xine_FIND_QUIETLY) + message(STATUS "Found Xine: ${XINE_LIBRARY} (version ${XINE_VERSION})") + endif(NOT Xine_FIND_QUIETLY) +else(XINE_FOUND) + if(GStreamer_FIND_REQUIRED) + message(SEND_ERROR "Could NOT find Xine") + endif(GStreamer_FIND_REQUIRED) endif(XINE_FOUND) MARK_AS_ADVANCED(XINE_INCLUDE_DIR XINE_LIBRARY) diff -Nru subtitlecomposer-0.6.5/CMakeLists.txt subtitlecomposer-0.6.6/CMakeLists.txt --- subtitlecomposer-0.6.5/CMakeLists.txt 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/CMakeLists.txt 2018-02-11 02:08:46.000000000 +0000 @@ -1,18 +1,18 @@ project(subtitlecomposer) -cmake_minimum_required(VERSION 2.8.12) -set(QT_MIN_VERSION "5.2.0") +cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +set(QT_MIN_VERSION "5.3.0") +set(KF5_MIN_VERSION "5.2.0") -#set(CMAKE_CXX_STANDARD 11) -#set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(ECM 1.2.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") cmake_policy(SET CMP0043 NEW) -if(CMAKE_VERSION VERSION_GREATER 3.3.0) - cmake_policy(SET CMP0063 NEW) -endif(CMAKE_VERSION VERSION_GREATER 3.3.0) +cmake_policy(SET CMP0063 NEW) +cmake_policy(SET CMP0071 NEW) include(KDEInstallDirs) include(KDECMakeSettings) @@ -24,11 +24,11 @@ include(FeatureSummary) -set(CMAKE_INCLUDE_CURRENT_DIR ON) +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS + Core Widgets Gui Test +) -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Test) - -find_package(KF5 REQUIRED +find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Auth Config ConfigWidgets CoreAddons I18n KIO XmlGui Sonnet Kross Codecs TextWidgets WidgetsAddons) diff -Nru subtitlecomposer-0.6.5/configure subtitlecomposer-0.6.6/configure --- subtitlecomposer-0.6.5/configure 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/configure 2018-02-11 02:08:46.000000000 +0000 @@ -8,7 +8,7 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_LIBDIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ .. && \ diff -Nru subtitlecomposer-0.6.5/COPYING subtitlecomposer-0.6.6/COPYING --- subtitlecomposer-0.6.5/COPYING 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/COPYING 2018-02-11 02:08:46.000000000 +0000 @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -303,10 +303,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. @@ -336,5 +335,5 @@ This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff -Nru subtitlecomposer-0.6.5/debian/changelog subtitlecomposer-0.6.6/debian/changelog --- subtitlecomposer-0.6.5/debian/changelog 2017-11-07 08:55:44.000000000 +0000 +++ subtitlecomposer-0.6.6/debian/changelog 2018-02-15 07:35:11.000000000 +0000 @@ -1,8 +1,23 @@ -subtitlecomposer (0.6.5-1build1) bionic; urgency=medium +subtitlecomposer (0.6.6-2) unstable; urgency=medium - * No-change rebuild for icu soname change. + * Team upload. + * Configure Xvfb so it has a proper depth; it should work also when Qt is + built with OpenGL ES. - -- Matthias Klose Tue, 07 Nov 2017 08:55:44 +0000 + -- Pino Toscano Thu, 15 Feb 2018 08:35:11 +0100 + +subtitlecomposer (0.6.6-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * Add new build dependencies required by the new version: libavcodec-dev, + libavformat-dev, libavutil-dev, and libswresample-dev. + * Do not fail if cmake does not have policy CMP0071; patch cmake-policy.diff. + * Bump Standards-Version to 4.1.3, no changes required. + * Update copyright. + * Small changes to the description. + + -- Pino Toscano Thu, 15 Feb 2018 07:49:50 +0100 subtitlecomposer (0.6.5-1) unstable; urgency=medium diff -Nru subtitlecomposer-0.6.5/debian/control subtitlecomposer-0.6.6/debian/control --- subtitlecomposer-0.6.5/debian/control 2017-09-29 17:24:31.000000000 +0000 +++ subtitlecomposer-0.6.6/debian/control 2018-02-15 06:48:22.000000000 +0000 @@ -18,6 +18,10 @@ libkf5textwidgets-dev, libkf5widgetsaddons-dev, libkf5xmlgui-dev, + libavcodec-dev, + libavformat-dev, + libavutil-dev, + libswresample-dev, libphonon4qt5-dev, libphonon4qt5experimental-dev, pkg-config, libgstreamer-plugins-base1.0-dev, libglib2.0-dev, @@ -27,7 +31,7 @@ libxcb1-dev, # for tests: xvfb, xauth, -Standards-Version: 4.1.1 +Standards-Version: 4.1.3 Homepage: https://github.com/maxrd2/subtitlecomposer Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-extras/subtitlecomposer.git Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-extras/subtitlecomposer.git @@ -36,11 +40,11 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: mplayer -Description: Subtitles editor for KDE - A text-based subtitles editor for KDE supporting basic operations (text, - time and style edition), realtime previewing and spell checking. Other - fancy features are delaying all subtitles in the current subtitle file, - checking errors or creating translations. +Description: text-based subtitle editor + A text-based subtitles editor supporting basic operations (text, time and + style edition), realtime previewing and spell checking. Other fancy features + are delaying all subtitles in the current subtitle file, checking errors or + creating translations. . - Different backends (GStreamer, MPlayer, or Phonon) can be used to play + Different backends (GStreamer, MPlayer, MPV, or Phonon) can be used to play the realtime video preview which helps to synchronize the subtitles. diff -Nru subtitlecomposer-0.6.5/debian/copyright subtitlecomposer-0.6.6/debian/copyright --- subtitlecomposer-0.6.5/debian/copyright 2017-09-29 17:22:15.000000000 +0000 +++ subtitlecomposer-0.6.6/debian/copyright 2018-02-15 06:38:44.000000000 +0000 @@ -42,16 +42,10 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: src/formats/vobsub/mplayer/* -Copyright: MPlayer - 2005, Jindrich Makovicka - 2007, Ulion -License: GPL-2+ - Files: debian/* Copyright: 2009, José Manuel Santamaría Lema 2015, Martin Steghöfer - 2016-2017, Pino Toscano + 2016-2018, Pino Toscano License: GPL-2+ License: GPL-2+ diff -Nru subtitlecomposer-0.6.5/debian/patches/cmake-policy.diff subtitlecomposer-0.6.6/debian/patches/cmake-policy.diff --- subtitlecomposer-0.6.5/debian/patches/cmake-policy.diff 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.6.6/debian/patches/cmake-policy.diff 2018-02-14 07:24:06.000000000 +0000 @@ -0,0 +1,18 @@ +Author: Pino Toscano +Description: Do not fail if cmake does not have policy CMP0071 +Forwarded: no +Last-Update: 2018-02-14 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,7 +12,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT + + cmake_policy(SET CMP0043 NEW) + cmake_policy(SET CMP0063 NEW) +-cmake_policy(SET CMP0071 NEW) ++if(POLICY CMP0071) ++ cmake_policy(SET CMP0071 NEW) ++endif() + + include(KDEInstallDirs) + include(KDECMakeSettings) diff -Nru subtitlecomposer-0.6.5/debian/patches/series subtitlecomposer-0.6.6/debian/patches/series --- subtitlecomposer-0.6.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.6.6/debian/patches/series 2018-02-14 07:15:27.000000000 +0000 @@ -0,0 +1 @@ +cmake-policy.diff diff -Nru subtitlecomposer-0.6.5/debian/rules subtitlecomposer-0.6.6/debian/rules --- subtitlecomposer-0.6.5/debian/rules 2017-09-29 16:46:41.000000000 +0000 +++ subtitlecomposer-0.6.6/debian/rules 2018-02-15 07:29:38.000000000 +0000 @@ -6,4 +6,4 @@ dh $@ --parallel --with=kf5 override_dh_auto_test: - xvfb-run -a dh_auto_test + xvfb-run -a --server-args="-screen 0 1024x768x24+32" dh_auto_test diff -Nru subtitlecomposer-0.6.5/install subtitlecomposer-0.6.6/install --- subtitlecomposer-0.6.5/install 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/install 2018-02-11 02:08:46.000000000 +0000 @@ -8,7 +8,7 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_LIBDIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF \ .. && \ diff -Nru subtitlecomposer-0.6.5/pkg/arch/PKGBUILD subtitlecomposer-0.6.6/pkg/arch/PKGBUILD --- subtitlecomposer-0.6.5/pkg/arch/PKGBUILD 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/pkg/arch/PKGBUILD 2018-02-11 02:08:46.000000000 +0000 @@ -44,7 +44,7 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_LIBDIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF make diff -Nru subtitlecomposer-0.6.5/pkg/arch/PKGBUILD-git subtitlecomposer-0.6.6/pkg/arch/PKGBUILD-git --- subtitlecomposer-0.6.5/pkg/arch/PKGBUILD-git 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/pkg/arch/PKGBUILD-git 2018-02-11 02:08:46.000000000 +0000 @@ -19,7 +19,7 @@ arch=('i686' 'x86_64') url="https://github.com/maxrd2/${_name}" license=('GPL') -depends=('kcoreaddons' 'sonnet' 'kcodecs' 'kross' 'kxmlgui' 'ki18n' 'gstreamer') +depends=('kcoreaddons' 'sonnet' 'kcodecs' 'kross' 'kxmlgui' 'ki18n' 'ffmpeg') makedepends=('extra-cmake-modules' 'git') # Comment/uncomment the following dependencies to disable/enable # building of plugins for MPV and Xine player backends. @@ -27,10 +27,12 @@ makedepends+=('mpv') #makedepends+=('pocketsphinx') conflicts=(${_name}) -optdepends=('mpv: for MPV backend' - 'mplayer: for MPlayer backend' - 'xine-lib: for Xine backend' - 'pocketsphinx: for speech recognition' +optdepends=('gstreamer: for GStreamer videoplayer backend' + 'mpv: for MPV videoplayer backend' + 'mplayer: for MPlayer videoplayer backend' + 'phonon-qt5: for Phonon videoplayer backend' + 'xine-lib: for Xine videoplayer backend' + 'pocketsphinx: for speech recognition backend' 'kross-interpreters: for ruby and python scripting support' 'ruby: for scripting' 'python: for scripting') @@ -49,7 +51,7 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_LIBDIR=lib \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ -DBUILD_TESTING=OFF make diff -Nru subtitlecomposer-0.6.5/pkg/debian/changelog subtitlecomposer-0.6.6/pkg/debian/changelog --- subtitlecomposer-0.6.5/pkg/debian/changelog 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/pkg/debian/changelog 2018-02-11 02:08:46.000000000 +0000 @@ -1,36 +1,117 @@ -subtitlecomposer (0.6.3-~stretch) trusty; urgency=low +subtitlecomposer (0.6.5-1) unstable; urgency=medium - * Added waveform widget - * Added Speech recognition with PocketSphinx - * Waveform and Player widgets can be docked to any side of the main window - * Updated german and croatian translations, translation fixes - * Added ability to demux text streams from loaded video - * Added anchor points sync method - * Removed binary dependency on player packages - * Various smaller improvements and fixes - * Finished KF5 porting - - -- Mladen Milinkovic Fri, 08 Apr 2016 12:32:11 +0100 - -subtitlecomposer (0.5.7.4~vivid) vivid; urgency=high - - * Add MPV player support - * Add GStreamer 1.0 support - * Add added Debian build - * Add updated Bulgarian and Croatian translations - * Add Phonon backend supports audio channel change - * Add Command line params were expected to be URL encoded - * Add UTF subtitles are saved with BOM - * Add updated/fixed translation catalogs and list of translators - * Add some files were wrongly identified as tmplayer subtitles + * Team upload. + * New upstream release. + * Replace the transitional build dependencies: + - kio-dev -> libkf5kio-dev + * Update copyright. + * Update the patches: + - xine-cmake.diff: drop, backported from upstream + * Do not install the upstream TODO as documentation, since it is not + interesting for users, and in this case also basically empty. + * Bump Standards-Version to 4.1.1, no changes required. + * Update Vcs-Browser field. + + -- Pino Toscano Fri, 29 Sep 2017 19:27:28 +0200 + +subtitlecomposer (0.6.4-2) unstable; urgency=medium + + * Team upload. + * Remove support for Xine: + - drop the libxine2-dev build dependency + - stop mentioning it in the description + - stop using the xine dh addon + - stop mentioning the ${xine-x:Depends} variable + - avoid cmake failure when Xine is not found; patch xine-cmake.diff. + + -- Pino Toscano Fri, 17 Jun 2016 23:33:49 +0200 + +subtitlecomposer (0.6.4-1) unstable; urgency=medium + + * Team upload. + * New upstream release: + - fixes build with GCC 6 (Closes: #812035) + * Update copyright. + * Update the patches: + - fix-plugins-loading.diff: drop, fixed upstream + * Bump Standards-Version to 3.9.8, no changes required. + + -- Pino Toscano Mon, 16 May 2016 08:28:08 +0200 + +subtitlecomposer (0.6.3-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * Fix Vcs-Git field. + * Update the patches: + - link-x11.diff: drop, fixed upstream + * Fix the loading of videoplayer plugins; patch fix-plugins-loading.diff. + + -- Pino Toscano Tue, 05 Apr 2016 00:04:04 +0200 + +subtitlecomposer (0.6.2-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * Update the build dependencies following the port to Frameworks: + - remove kdelibs5-dev + - add qtbase5-dev, extra-cmake-modules, libkf5auth-dev, libkf5codecs-dev, + libkf5config-dev, libkf5configwidgets-dev, libkf5coreaddons-dev, + libkf5i18n-dev, kio-dev, kross-dev, libkf5sonnet-dev, + libkf5textwidgets-dev, libkf5widgetsaddons-dev, libkf5xmlgui-dev + * Use the right dh addon: + - switch from kde to kf5 dh addon + - bump the pkg-kde-tools build dependency to >= 0.15.16 + * Update Homepage to the new github home. + * Drop menu file, since subtitlecomposer already provides a .desktop file. + * Remove useless dh_install override, since it does the same thing. + * Update the build dependencies: + - add libphonon4qt5-dev, libphonon4qt5experimental-dev, libicu-dev, + libmpv-dev, and libxcb1-dev, needed by the new version + - remove unused libxml2-dev + - make pkg-config explicit + * Update the Vcs-* fields. + * Update the patches: + - 0001-Link-phonon.patch: drop, fixed upstream + - 0002-Link-against-X11.patch: drop, reworking it in a new link-x11.diff + - 0003-Find-platform-dependant-include-files-of-GStreamer.patch: drop, + fixed upstream + - 0004-Fix-crash-Sonnet-Dialog-cannot-handle-empty-buffers.patch: drop, + obsolete + * The test suite needs X11, so: + - add the xvfb and xauth build dependencies + - run dh_auto_test with xvfb-run + * Update lintian overrides. + * Link in as-needed mode. + * Bump Standards-Version to 3.9.7, no changes required. + * Remove no more useful Build-Conflicts: qt5-default. + * Switch mplayer2 suggest to mplayer. + * Update copyright. + + -- Pino Toscano Sun, 27 Mar 2016 13:13:26 +0200 + +subtitlecomposer (0.5.7-1) unstable; urgency=medium + + [ Martin Steghöfer ] + * Imported Upstream version 0.5.7 (Closes: #571687, #704067, #776326, + #799957). + * Dropped patches regarding bugs that are already fixed in the new upstream version. + * Rebased remaining patches onto new upstream version. + * Updated debian/watch to new repository location. + * The new upstream version needs GStreamer 1.x. (Closes: #785853) + * Patched FindGStreamer.cmake, so it finds gst/gstconfig.h in the Debian directory layout. + * Declared build conflict with Qt5. (Closes: #784075) + * Suggest "mplayer2" instead of "mplayer". (Closes: #686167) + * Removed lintian override that is both malformed (lintian complains about the override itself) + and obsolete (lintian accepts a Build-Depends on "libxine2-dev"). + * Bumped Standards-Version to 3.9.6 (no changes necessary according to upgrading checklist). + * Fix crash on spell checking an empty subtitle entry. (Closes: #694812) + + [ Maximiliano Curia ] + * Migrate copyright file to copyright 1.0. + * Update watch file. - -- Goran Vidovic (gogo) Fri, 30 Jan 2015 13:35:05 +0100 - -subtitlecomposer (0.5.6.9~trusty) trusty; urgency=high - - * New release - - -- Goran Vidovic (gogo) Fri, 14 Jun 2014 20:07:05 +0100 + -- Maximiliano Curia Fri, 16 Oct 2015 11:33:42 +0200 subtitlecomposer (0.5.3-4) unstable; urgency=low diff -Nru subtitlecomposer-0.6.5/pkg/debian/control subtitlecomposer-0.6.6/pkg/debian/control --- subtitlecomposer-0.6.5/pkg/debian/control 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/pkg/debian/control 2018-02-11 02:08:46.000000000 +0000 @@ -1,26 +1,46 @@ Source: subtitlecomposer Section: kde Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian KDE Extras Team -Uploaders: gogo -Build-Depends: debhelper (>= 9), qtbase5-dev, git, cmake, extra-cmake-modules, - libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, kdelibs5-dev, libkf5xmlgui-dev, kross-dev, - mpv, libmpv-dev, mplayer, libxine2-dev, libphonon4qt5-dev, libphonon4qt5experimental-dev, libsphinxbase3, libsphinxbase-dev, libpocketsphinx3, libpocketsphinx-dev -Standards-Version: 3.9.4 +Maintainer: Debian KDE Extras Team +Uploaders: Maximiliano Curia +Build-Depends: debhelper (>= 9), cmake, pkg-kde-tools (>= 0.15.16), + qtbase5-dev, + extra-cmake-modules (>= 1.2.0), + libkf5auth-dev, + libkf5codecs-dev, + libkf5config-dev, + libkf5configwidgets-dev, + libkf5coreaddons-dev, + libkf5i18n-dev, + libkf5kio-dev, + kross-dev, + libkf5sonnet-dev, + libkf5textwidgets-dev, + libkf5widgetsaddons-dev, + libkf5xmlgui-dev, + libphonon4qt5-dev, libphonon4qt5experimental-dev, + pkg-config, + libgstreamer-plugins-base1.0-dev, libglib2.0-dev, + libx11-dev, + libicu-dev, + libmpv-dev, + libxcb1-dev, +# for tests: + xvfb, xauth, +Standards-Version: 4.1.1 Homepage: https://github.com/maxrd2/subtitlecomposer -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/subtitlecomposer.git -Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/subtitlecomposer.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-extras/subtitlecomposer.git +Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-extras/subtitlecomposer.git Package: subtitlecomposer Architecture: any -Depends: kio, pocketsphinx, pocketsphinx-en-us, ${shlibs:Depends}, ${misc:Depends}, ${gstreamer:Depends} -Suggests: mplayer, mpv, ${xine-x:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: mplayer Description: Subtitles editor for KDE A text-based subtitles editor for KDE supporting basic operations (text, time and style edition), realtime previewing and spell checking. Other fancy features are delaying all subtitles in the current subtitle file, checking errors or creating translations. . - Different backends (GStreamer, MPlayer, Phonon or xine) can be used to play + Different backends (GStreamer, MPlayer, or Phonon) can be used to play the realtime video preview which helps to synchronize the subtitles. diff -Nru subtitlecomposer-0.6.5/pkg/debian/copyright subtitlecomposer-0.6.6/pkg/debian/copyright --- subtitlecomposer-0.6.5/pkg/debian/copyright 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/pkg/debian/copyright 2018-02-11 02:08:46.000000000 +0000 @@ -1,109 +1,69 @@ -This package was debianized by José Manuel Santamaría Lema on -Fri, 10 Apr 2009 22:11:11 +0200 - - -Upstream Author: - - Mladen Milinkovic - - -Copyright: - - Copyright © 2007-2009 Sergio Pistone - Copyright © 2010-2015 Mladen Milinkovic - - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the license, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - MA 02110-1301, USA. - -On Debian systems, the complete text of the GNU General Public License -can be found in the file `/usr/share/common-licenses/GPL-2'. - -Files src/player/mplayer/mediadata.h, src/widgets/pointingslider.h, -src/widgets/pointingslider.cpp, src/widgets/attachablewidget.h and -src/widgets/attachablewidget.cpp: - - Copyright © 2006-2008 Ricardo Villalba - Copyright © 2007-2008 Sergio Pistone - -File src/player/xine/FindXCB.cmake: - - Copyright © 2007 Matthias Kretz - - Redistribution and use is allowed according to the terms of the BSD license. - For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - Contents of COPYING-CMAKE-SCRIPTS file: - +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: subtitlecomposer +Source: https://github.com/maxrd2/subtitlecomposer + +Files: * +Copyright: 2006-2008, Ricardo Villalba + 2007-2009, Sergio Pistone based on Kaffeine by Jürgen Kofler + 2007-2009, Sergio Pistone based on smplayer by Ricardo Villalba + 2007-2012, Sergio Pistone + 2010-2017, Mladen Milinkovic +License: GPL-2+ + +Files: cmake/* +Copyright: 2006-2008, Laurent Montel + 2006-2007, Matthias Kretz + 2006, Tim Beaulen + 2008, Helio Chissini de Castro + 2009, Nokia Corporation + 2010, Yury G. Kudryashov + 2011, Raphael Kubo da Costa +License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright + are met: + . + 1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + . THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Files src/main/utils/kreplace.h, src/main/utils/kreplace.cpp -and src/main/utils/kfind_p.h: + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: src/formats/vobsub/mplayer/* +Copyright: MPlayer + 2005, Jindrich Makovicka + 2007, Ulion +License: GPL-2+ + +Files: debian/* +Copyright: 2009, José Manuel Santamaría Lema + 2015, Martin Steghöfer + 2016-2017, Pino Toscano +License: GPL-2+ - Copyright © 2001 S.R.Haque - Copyright © 2002 David Faure - Copyright © 2004 Arend van Beelen jr. - - These files are under GNU Lesser General Public License as published by the - Free Software Foundation, version 2; on Debian systems the full text of the - GNU Lesser General Public License can be found in the - `/usr/share/common-licenses/LGPL-2' file. - -Files src/common/qxtsignalwaiter.h and src/common/qxtsignalwaiter.cpp: - - Copyright © 2006 Adam Higerd - - QxtSignalWaiter is free software; you can redistribute it and/or modify +License: GPL-2+ + This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, version 2 or greater, or under the terms - of the GNU Lesser General Public License, version 2.1 or greater, or - under the terms of the Q Public License as published by Trolltech. - This disjunctive license follows the license of the linked Qt toolkit. - Specifically, if you use Qt under the GPL, QxtSignalWaiter is licensed - to you under the GPL. If you use Qt under the QPL, this is licensed to - you under the QPL. If you use Qt with a commercial license purchased - from Trolltech, this is licensed to you under the LGPL. - - QxtSignalWaiter is distributed in the hope that it will be useful, + the Free Software Foundation; either version 2 of the license, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - appropriate license agreement for more details. - -The Debian packaging is © 2009 José Manuel Santamaría Lema - and is licensed under the GPL v2 or later, -see `/usr/share/common-licenses/GPL-2'. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + The complete text of the GNU General Public License version 2 can be found in + the file `/usr/share/common-licenses/GPL-2'. diff -Nru subtitlecomposer-0.6.5/pkg/debian/docs subtitlecomposer-0.6.6/pkg/debian/docs --- subtitlecomposer-0.6.5/pkg/debian/docs 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/pkg/debian/docs 2018-02-11 02:08:46.000000000 +0000 @@ -1,2 +1 @@ -TODO AUTHORS diff -Nru subtitlecomposer-0.6.5/pkg/debian/.gitattributes subtitlecomposer-0.6.6/pkg/debian/.gitattributes --- subtitlecomposer-0.6.5/pkg/debian/.gitattributes 1970-01-01 00:00:00.000000000 +0000 +++ subtitlecomposer-0.6.6/pkg/debian/.gitattributes 2018-02-11 02:08:46.000000000 +0000 @@ -0,0 +1 @@ +changelog merge=dpkg-mergechangelogs diff -Nru subtitlecomposer-0.6.5/pkg/debian/man/subtitlecomposer.1 subtitlecomposer-0.6.6/pkg/debian/man/subtitlecomposer.1 --- subtitlecomposer-0.6.5/pkg/debian/man/subtitlecomposer.1 2017-09-17 23:11:43.000000000 +0000 +++ subtitlecomposer-0.6.6/pkg/debian/man/subtitlecomposer.1 2018-02-11 02:08:46.000000000 +0000 @@ -1,51 +1,152 @@ .\" This file was generated by kdemangen.pl and edited by hand -.TH SUBTITLECOMPOSER 1 "Apr 2016" "K Desktop Environment" "A KDE subtitle editor." +.TH SUBTITLECOMPOSER 1 "Jun 2009" "K Desktop Environment" "A KDE subtitle editor." .SH NAME subtitlecomposer -\- +\- A KDE subtitle editor. .SH SYNOPSIS -subtitlecomposer [options] [primary\-url] [translation\-url] +subtitlecomposer [Qt\-options] [KDE\-options] [Primary URL] [Translation URL] .SH DESCRIPTION A KDE subtitle editor. .SH OPTIONS .SS .SS Arguments: .TP -.B primary-url +.B Primary URL Open location as primary subtitle .TP -.B translation-url +.B Translation URL Open location as translation subtitle -.SS -.SS Options: +.SS Generic options: .TP -.B \-h, \-\-help +.B \-\-help Show help about options .TP -.B \-v, \-\-version -Show version information +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options .TP -.B \-\-author +.B \-\-help\-all +Show all options +.TP +.B \-\-author Show author information .TP -.B \-\-license +.B \-v, \-\-version +Show version information +.TP +.B \-\-license Show license information .TP -.B \-\-desktopfile -The base file name of the desktop entry for this application -.SS +.B \-\- +End of options +.SS +.SS KDE options: +.TP +.B \-\-caption +Use 'caption' as name in the titlebar +.TP +.B \-\-icon +Use 'icon' as the application icon +.TP +.B \-\-config +Use alternative configuration file +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style