rpms/subtitleeditor/F-10 subtitleeditor-0.30.0-bug12649.patch, NONE, 1.1 subtitleeditor.spec, 1.6, 1.7
Martin Sourada
mso at fedoraproject.org
Wed Dec 10 23:54:24 UTC 2008
Author: mso
Update of /cvs/extras/rpms/subtitleeditor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6638/F-10
Modified Files:
subtitleeditor.spec
Added Files:
subtitleeditor-0.30.0-bug12649.patch
Log Message:
Add patch for upstream bug 12649 + small improvements to spec file, thanks
to lubek.
subtitleeditor-0.30.0-bug12649.patch:
--- NEW FILE subtitleeditor-0.30.0-bug12649.patch ---
Index: plugins/actions/insertsubtitle/Makefile.am
===================================================================
--- plugins/actions/insertsubtitle/Makefile.am (révision 478)
+++ plugins/actions/insertsubtitle/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
insertsubtitle.cc
libinsertsubtitle_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libinsertsubtitle_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libinsertsubtitle_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = insertsubtitle.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/reversetextandtranslation/Makefile.am
===================================================================
--- plugins/actions/reversetextandtranslation/Makefile.am (révision 478)
+++ plugins/actions/reversetextandtranslation/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
reversetextandtranslation.cc
libreversetextandtranslation_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libreversetextandtranslation_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libreversetextandtranslation_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = reversetextandtranslation.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/moveafterprecedingsubtitle/Makefile.am
===================================================================
--- plugins/actions/moveafterprecedingsubtitle/Makefile.am (révision 478)
+++ plugins/actions/moveafterprecedingsubtitle/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
moveafterprecedingsubtitle.cc
libmoveafterprecedingsubtitle_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libmoveafterprecedingsubtitle_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libmoveafterprecedingsubtitle_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = moveafterprecedingsubtitle.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/scalesubtitles/Makefile.am
===================================================================
--- plugins/actions/scalesubtitles/Makefile.am (révision 478)
+++ plugins/actions/scalesubtitles/Makefile.am (copie de travail)
@@ -17,7 +17,7 @@
scalesubtitles.cc
libscalesubtitles_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libscalesubtitles_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libscalesubtitles_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = scalesubtitles.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/dialoguize/Makefile.am
===================================================================
--- plugins/actions/dialoguize/Makefile.am (révision 478)
+++ plugins/actions/dialoguize/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
dialoguize.cc
libdialoguize_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libdialoguize_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libdialoguize_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = dialoguize.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/findandreplace/Makefile.am
===================================================================
--- plugins/actions/findandreplace/Makefile.am (révision 478)
+++ plugins/actions/findandreplace/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
findandreplace.cc
libfindandreplace_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libfindandreplace_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libfindandreplace_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = findandreplace.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/timemodemanagement/Makefile.am
===================================================================
--- plugins/actions/timemodemanagement/Makefile.am (révision 478)
+++ plugins/actions/timemodemanagement/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
timemodemanagement.cc
libtimemodemanagement_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libtimemodemanagement_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libtimemodemanagement_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = timemodemanagement.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/movesubtitles/Makefile.am
===================================================================
--- plugins/actions/movesubtitles/Makefile.am (révision 478)
+++ plugins/actions/movesubtitles/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
movesubtitles.cc
libmovesubtitles_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libmovesubtitles_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libmovesubtitles_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = movesubtitles.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/styleeditor/Makefile.am
===================================================================
--- plugins/actions/styleeditor/Makefile.am (révision 478)
+++ plugins/actions/styleeditor/Makefile.am (copie de travail)
@@ -19,7 +19,7 @@
styleeditor.cc
libstyleeditor_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libstyleeditor_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libstyleeditor_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = styleeditor.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/removesubtitle/Makefile.am
===================================================================
--- plugins/actions/removesubtitle/Makefile.am (révision 478)
+++ plugins/actions/removesubtitle/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
removesubtitle.cc
libremovesubtitle_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libremovesubtitle_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libremovesubtitle_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = removesubtitle.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/adjusttime/Makefile.am
===================================================================
--- plugins/actions/adjusttime/Makefile.am (révision 478)
+++ plugins/actions/adjusttime/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
adjusttime.cc
libadjusttime_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libadjusttime_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libadjusttime_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = adjusttime.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/documentmanagement/Makefile.am
===================================================================
--- plugins/actions/documentmanagement/Makefile.am (révision 478)
+++ plugins/actions/documentmanagement/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
documentmanagement.cc
libdocumentmanagement_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libdocumentmanagement_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libdocumentmanagement_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = documentmanagement.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/changeframerate/Makefile.am
===================================================================
--- plugins/actions/changeframerate/Makefile.am (révision 478)
+++ plugins/actions/changeframerate/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
changeframerate.cc
libchangeframerate_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libchangeframerate_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libchangeframerate_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = changeframerate.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/italicize/Makefile.am
===================================================================
--- plugins/actions/italicize/Makefile.am (révision 478)
+++ plugins/actions/italicize/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
italicize.cc
libitalicize_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libitalicize_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libitalicize_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = italicize.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/command/Makefile.am
===================================================================
--- plugins/actions/command/Makefile.am (révision 478)
+++ plugins/actions/command/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
command.cc
libcommand_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libcommand_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libcommand_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = command.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/videoplayermanagement/Makefile.am
===================================================================
--- plugins/actions/videoplayermanagement/Makefile.am (révision 478)
+++ plugins/actions/videoplayermanagement/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
videoplayermanagement.cc
libvideoplayermanagement_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libvideoplayermanagement_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libvideoplayermanagement_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = videoplayermanagement.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/configurekeyboardshortcuts/Makefile.am
===================================================================
--- plugins/actions/configurekeyboardshortcuts/Makefile.am (révision 478)
+++ plugins/actions/configurekeyboardshortcuts/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
configurekeyboardshortcuts.cc
libconfigurekeyboardshortcuts_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libconfigurekeyboardshortcuts_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libconfigurekeyboardshortcuts_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = configurekeyboardshortcuts.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/wavefrommanagement/Makefile.am
===================================================================
--- plugins/actions/wavefrommanagement/Makefile.am (révision 478)
+++ plugins/actions/wavefrommanagement/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
waveformmanagement.cc
libwaveformmanagement_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libwaveformmanagement_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libwaveformmanagement_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = waveformmanagement.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/selection/Makefile.am
===================================================================
--- plugins/actions/selection/Makefile.am (révision 478)
+++ plugins/actions/selection/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
selection.cc
libselection_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libselection_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libselection_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = selection.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/editcell/Makefile.am
===================================================================
--- plugins/actions/editcell/Makefile.am (révision 478)
+++ plugins/actions/editcell/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
editcell.cc
libeditcell_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libeditcell_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libeditcell_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = editcell.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/errorchecking/Makefile.am
===================================================================
--- plugins/actions/errorchecking/Makefile.am (révision 478)
+++ plugins/actions/errorchecking/Makefile.am (copie de travail)
@@ -27,7 +27,7 @@
tooshortdisplaytime.h
liberrorchecking_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-liberrorchecking_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+liberrorchecking_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = errorchecking.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/duplicatesubtitle/Makefile.am
===================================================================
--- plugins/actions/duplicatesubtitle/Makefile.am (révision 478)
+++ plugins/actions/duplicatesubtitle/Makefile.am (copie de travail)
@@ -12,7 +12,7 @@
duplicatesubtitle.cc
libduplicatesubtitle_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libduplicatesubtitle_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libduplicatesubtitle_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = duplicatesubtitle.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/externalvideoplayer/Makefile.am
===================================================================
--- plugins/actions/externalvideoplayer/Makefile.am (révision 478)
+++ plugins/actions/externalvideoplayer/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
externalvideoplayer.cc
libexternalvideoplayer_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libexternalvideoplayer_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libexternalvideoplayer_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = externalvideoplayer.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/extendlength/Makefile.am
===================================================================
--- plugins/actions/extendlength/Makefile.am (révision 478)
+++ plugins/actions/extendlength/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
extendlength.cc
libextendlength_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libextendlength_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libextendlength_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = extendlength.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/splitdocument/Makefile.am
===================================================================
--- plugins/actions/splitdocument/Makefile.am (révision 478)
+++ plugins/actions/splitdocument/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
splitdocument.cc
libsplitdocument_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libsplitdocument_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libsplitdocument_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = splitdocument.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/joindocument/Makefile.am
===================================================================
--- plugins/actions/joindocument/Makefile.am (révision 478)
+++ plugins/actions/joindocument/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
joindocument.cc
libjoindocument_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libjoindocument_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libjoindocument_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = joindocument.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/preferences/Makefile.am
===================================================================
--- plugins/actions/preferences/Makefile.am (révision 478)
+++ plugins/actions/preferences/Makefile.am (copie de travail)
@@ -25,7 +25,7 @@
preferencesplugin.cc
libpreferences_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libpreferences_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libpreferences_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = preferences.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/applytranslation/Makefile.am
===================================================================
--- plugins/actions/applytranslation/Makefile.am (révision 478)
+++ plugins/actions/applytranslation/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
applytranslation.cc
libapplytranslation_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libapplytranslation_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libapplytranslation_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = applytranslation.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/viewmanager/Makefile.am
===================================================================
--- plugins/actions/viewmanager/Makefile.am (révision 478)
+++ plugins/actions/viewmanager/Makefile.am (copie de travail)
@@ -18,7 +18,7 @@
viewmanager.cc
libviewmanager_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libviewmanager_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libviewmanager_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = viewmanager.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/splitsubtitle/Makefile.am
===================================================================
--- plugins/actions/splitsubtitle/Makefile.am (révision 478)
+++ plugins/actions/splitsubtitle/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
splitsubtitle.cc
libsplitsubtitle_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libsplitsubtitle_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libsplitsubtitle_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = splitsubtitle.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/plaintext/Makefile.am
===================================================================
--- plugins/actions/plaintext/Makefile.am (révision 478)
+++ plugins/actions/plaintext/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
plaintext.cc
libplaintext_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libplaintext_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libplaintext_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = plaintext.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/about/Makefile.am
===================================================================
--- plugins/actions/about/Makefile.am (révision 478)
+++ plugins/actions/about/Makefile.am (copie de travail)
@@ -14,7 +14,7 @@
about.cc
libabout_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libabout_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libabout_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = about.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/spellchecking/Makefile.am
===================================================================
--- plugins/actions/spellchecking/Makefile.am (révision 478)
+++ plugins/actions/spellchecking/Makefile.am (copie de travail)
@@ -19,7 +19,7 @@
spellchecking.cc
libspellchecking_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libspellchecking_la_LIBADD = $(SUBTITLEEDITOR_LIBS) $(ENCHANT_LIBS)
+libspellchecking_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor $(ENCHANT_LIBS)
plugindescription_in_files = spellchecking.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/actions/combinesubtitles/Makefile.am
===================================================================
--- plugins/actions/combinesubtitles/Makefile.am (révision 478)
+++ plugins/actions/combinesubtitles/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
combinesubtitles.cc
libcombinesubtitles_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libcombinesubtitles_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libcombinesubtitles_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = combinesubtitles.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/substationalpha/Makefile.am
===================================================================
--- plugins/subtitleformats/substationalpha/Makefile.am (révision 478)
+++ plugins/subtitleformats/substationalpha/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
substationalpha.cc
libsubstationalpha_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libsubstationalpha_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libsubstationalpha_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = substationalpha.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/timedtextauthoringformat1/Makefile.am
===================================================================
--- plugins/subtitleformats/timedtextauthoringformat1/Makefile.am (révision 478)
+++ plugins/subtitleformats/timedtextauthoringformat1/Makefile.am (copie de travail)
@@ -15,7 +15,7 @@
libtimedtextauthoringformat1_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
libtimedtextauthoringformat1_la_LIBADD = \
- $(SUBTITLEEDITOR_LIBS) \
+ $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor \
$(LIBXML_LIBS)
plugindescription_in_files = timedtextauthoringformat1.se-plugin.in
Index: plugins/subtitleformats/adobeencoredvd/Makefile.am
===================================================================
--- plugins/subtitleformats/adobeencoredvd/Makefile.am (révision 478)
+++ plugins/subtitleformats/adobeencoredvd/Makefile.am (copie de travail)
@@ -16,7 +16,7 @@
adobeencoredvdntsc.cc
libadobeencoredvdntsc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libadobeencoredvdntsc_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libadobeencoredvdntsc_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
## pal
libadobeencoredvdpal_la_CXXFLAGS = \
@@ -29,7 +29,7 @@
adobeencoredvdpal.cc
libadobeencoredvdpal_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libadobeencoredvdpal_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libadobeencoredvdpal_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = \
adobeencoredvdntsc.se-plugin.in \
Index: plugins/subtitleformats/subrip/Makefile.am
===================================================================
--- plugins/subtitleformats/subrip/Makefile.am (révision 478)
+++ plugins/subtitleformats/subrip/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
subrip.cc
libsubrip_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libsubrip_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libsubrip_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = subrip.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/mpsub/Makefile.am
===================================================================
--- plugins/subtitleformats/mpsub/Makefile.am (révision 478)
+++ plugins/subtitleformats/mpsub/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
mpsub.cc
libmpsub_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libmpsub_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libmpsub_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = mpsub.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/advancedsubstationalpha/Makefile.am
===================================================================
--- plugins/subtitleformats/advancedsubstationalpha/Makefile.am (révision 478)
+++ plugins/subtitleformats/advancedsubstationalpha/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
advancedsubstationalpha.cc
libadvancedsubstationalpha_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libadvancedsubstationalpha_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libadvancedsubstationalpha_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = advancedsubstationalpha.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/microdvd/Makefile.am
===================================================================
--- plugins/subtitleformats/microdvd/Makefile.am (révision 478)
+++ plugins/subtitleformats/microdvd/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
microdvd.cc
libmicrodvd_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libmicrodvd_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libmicrodvd_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = microdvd.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/subtitleeditorproject/Makefile.am
===================================================================
--- plugins/subtitleformats/subtitleeditorproject/Makefile.am (révision 478)
+++ plugins/subtitleformats/subtitleeditorproject/Makefile.am (copie de travail)
@@ -15,7 +15,7 @@
libsubtitleeditorproject_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
libsubtitleeditorproject_la_LIBADD = \
- $(SUBTITLEEDITOR_LIBS) \
+ $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor \
$(LIBXML_LIBS)
plugindescription_in_files = subtitleeditorproject.se-plugin.in
Index: plugins/subtitleformats/mpl2/Makefile.am
===================================================================
--- plugins/subtitleformats/mpl2/Makefile.am (révision 478)
+++ plugins/subtitleformats/mpl2/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
mpl2.cc
libmpl2_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libmpl2_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libmpl2_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = mpl2.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: plugins/subtitleformats/subviewer2/Makefile.am
===================================================================
--- plugins/subtitleformats/subviewer2/Makefile.am (révision 478)
+++ plugins/subtitleformats/subviewer2/Makefile.am (copie de travail)
@@ -13,7 +13,7 @@
subviewer2.cc
libsubviewer2_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-libsubviewer2_la_LIBADD = $(SUBTITLEEDITOR_LIBS)
+libsubviewer2_la_LIBADD = $(SUBTITLEEDITOR_LIBS) -L$(top_builddir)/src -lsubtitleeditor
plugindescription_in_files = subviewer2.se-plugin.in
plugindescription_DATA = $(plugindescription_in_files:.se-plugin.in=.se-plugin)
Index: configure.in
===================================================================
--- configure.in (révision 478)
+++ configure.in (copie de travail)
@@ -213,7 +213,7 @@
# =========================================================================
# Set SUBTITLEEDITOR_LIBS and SUBTITLEEDITOR_CFLAGS
-SUBTITLEEDITOR_LIBS="$GTKMM_LIBS"
+SUBTITLEEDITOR_LIBS="$GTKMM_LIBS $LIBGLADEMM_LIBS"
SUBTITLEEDITOR_CFLAGS="$GTKMM_CFLAGS $LIBGLADEMM_CFLAGS $INTLCFLAGS"
AC_SUBST(SUBTITLEEDITOR_LIBS)
Index: src/main.cc
===================================================================
--- src/main.cc (révision 478)
+++ src/main.cc (copie de travail)
@@ -37,110 +37,7 @@
#include <gtkglmm.h>
#endif//ENABLE_GL
-/*
- *
- */
-void get_default_config(std::map<Glib::ustring, std::map<Glib::ustring, Glib::ustring> > &config)
-{
- //[general]
- //[document]
- config["document"]["format"] = "SubRip";
- config["document"]["newline"] = "Unix";
-
- //[video-player]
- config["video-player"]["display-translated-subtitle"] = "false";
- config["video-player"]["shaded-background"] = "true";
- config["video-player"]["font-desc"] = "Sans 26";
- config["video-player"]["force-aspect-ratio"] = "true";
- config["video-player"]["brightness"] = "0";
- config["video-player"]["contrast"] = "0";
- config["video-player"]["saturation"] = "0";
- config["video-player"]["hue"] = "0";
- config["video-player"]["skip-very-short"] = "3";
- config["video-player"]["skip-short"] = "10";
- config["video-player"]["skip-medium"] = "60";
- config["video-player"]["skip-long"] = "300";
- config["video-player"]["audio-sink"] = "autoaudiosink";
- config["video-player"]["video-sink"] = "xvimagesink";
- config["video-player"]["timeout"] = "100";
- config["video-player"]["repeat"] = "false";
- config["video-player"]["display"] = "false";
- config["video-player"]["automatically-open-video"] = "true";
-
- //[waveform]
- config["waveform"]["zoom"] = "1";
- config["waveform"]["scale"] = "1";
- config["waveform"]["display-background"] = "false";
- config["waveform"]["display-waveform-fill"] = "true";
- config["waveform"]["scrolling-with-player"] = "true";
- config["waveform"]["scrolling-with-selection"] = "true";
- config["waveform"]["respect-timing"] = "true";
- config["waveform"]["display"] = "false";
- config["waveform"]["renderer"] = "cairo";
-
- //[waveform-renderer]
- config["waveform-renderer"]["display-subtitle-text"]="true";
- config["waveform-renderer"]["color-background"]="#4C4C4CFF";
- config["waveform-renderer"]["color-wave"]="#99CC4CFF";
- config["waveform-renderer"]["color-wave-fill"]="#FFFFFFFF";
- config["waveform-renderer"]["color-subtitle"]="#994C1999";
- config["waveform-renderer"]["color-subtitle-selected"]="#E57F4C99";
- config["waveform-renderer"]["color-subtitle-invalid"]="#FFFF00CC";
- config["waveform-renderer"]["color-text"]="#FFFFFFFF";
- config["waveform-renderer"]["color-player-position"]="#FFFFFFFF";
-
- //[interface]
- config["interface"]["use-dynamic-keyboard-shortcuts"] = "true";
- config["interface"]["maximize-window"] = "false";
- config["interface"]["used-autosave"] = "false";
- config["interface"]["ask-to-save-on-exit"] = "false";
- config["interface"]["create-backup-copy"] = "false";
- config["interface"]["autosave-minutes"] = "10";
- config["interface"]["max-undo"] = "20";
-
- //[encodings]
- config["encodings"]["encodings"] = "ISO-8859-15;UTF-8";
- config["encodings"]["used-auto-detected"] = "true";
- config["encodings"]["default"] = "UTF-8";
-
- //[subtitle-view]
- config["subtitle-view"]["property-alignment-center"] = "false";
- config["subtitle-view"]["show-character-per-line"] = "true";
- config["subtitle-view"]["enable-rubberband-selection"] = "false";
- config["subtitle-view"]["columns-displayed"] = "number;start;end;duration;text";
- config["subtitle-view"]["columns-list"] = "cps;duration;effect;end;layer;margin-l;margin-r;margin-v;name;note;number;start;style;text;translation";
- config["subtitle-view"]["used-ctrl-enter-to-confirm-change"] = "false";
-
- //[timing]
- config["timing"]["min-characters-per-second"] = "5";
- config["timing"]["max-characters-per-second"] = "25";
- config["timing"]["min-gap-between-subtitles"] = "100";
- config["timing"]["min-display"] = "1000";
- config["timing"]["max-characters-per-line"] = "40";
- config["timing"]["max-line-per-subtitle"] = "2";
-
- //[external-video-player]
- config["external-video-player"]["command"] = "mplayer \"#video_file\" -noautosub -sub \"#subtitle_file\" -ss #seconds -osdlevel 2";
-
- //[dialog-check-errors]
- config["dialog-check-errors"]["check-overlapping"] = "true";
- config["dialog-check-errors"]["check-too-short-display-time"] = "true";
- config["dialog-check-errors"]["check-too-long-display-time"] = "true";
- config["dialog-check-errors"]["check-too-long-line"] = "true";
- config["dialog-check-errors"]["check-gap-between-subtitles"] = "true";
- config["dialog-check-errors"]["check-max-line-per-subtitle"] = "true";
-
- //[check-error-plugins]
- config["check-error-plugins"]["overlapping-color"] = "#FF0000FF";
- config["check-error-plugins"]["too-short-display-time-color"] = "#B6D2FFFF";
- config["check-error-plugins"]["too-long-display-time-color"] = "#0414FFFF";
- config["check-error-plugins"]["too-long-line-color"] = "#FFDC0AFF";
- config["check-error-plugins"]["max-line-per-subtitle-color"] = "#00BF23FF";
- config["check-error-plugins"]["min-gap-between-subtitles-color"] = "#FF66ECFF";
-}
-
-
#ifdef DEBUG
void parse_debug_options(OptionGroup &op)
Index: src/defaultcfg.h
===================================================================
--- src/defaultcfg.h (révision 0)
+++ src/defaultcfg.h (révision 0)
@@ -0,0 +1,34 @@
+#ifndef _defaultcfg_h
+#define _defaultcfg_h
+
+/*
+ * subtitleeditor -- a tool to create or edit subtitle
+ *
+ * http://home.gna.org/subtitleeditor/
+ * https://gna.org/projects/subtitleeditor/
+ *
+ * Copyright @ 2005-2008, kitone
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glibmm/ustring.h>
+#include <map>
+
+/*
+ *
+ */
+void get_default_config(std::map<Glib::ustring, std::map<Glib::ustring, Glib::ustring> > &config);
+
+#endif//_defaultcfg_h
Index: src/defaultcfg.cc
===================================================================
--- src/defaultcfg.cc (révision 0)
+++ src/defaultcfg.cc (révision 0)
@@ -0,0 +1,128 @@
+/*
+ * subtitleeditor -- a tool to create or edit subtitle
+ *
+ * http://home.gna.org/subtitleeditor/
+ * https://gna.org/projects/subtitleeditor/
+ *
+ * Copyright @ 2005-2008, kitone
+ *
+ * This program 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glibmm/ustring.h>
+#include <map>
+
+/*
+ *
+ */
+void get_default_config(std::map<Glib::ustring, std::map<Glib::ustring, Glib::ustring> > &config)
+{
+ //[general]
+
+ //[document]
+ config["document"]["format"] = "SubRip";
+ config["document"]["newline"] = "Unix";
+
+ //[video-player]
+ config["video-player"]["display-translated-subtitle"] = "false";
+ config["video-player"]["shaded-background"] = "true";
+ config["video-player"]["font-desc"] = "Sans 26";
+ config["video-player"]["force-aspect-ratio"] = "true";
+ config["video-player"]["brightness"] = "0";
+ config["video-player"]["contrast"] = "0";
+ config["video-player"]["saturation"] = "0";
+ config["video-player"]["hue"] = "0";
+ config["video-player"]["skip-very-short"] = "3";
+ config["video-player"]["skip-short"] = "10";
+ config["video-player"]["skip-medium"] = "60";
+ config["video-player"]["skip-long"] = "300";
+ config["video-player"]["audio-sink"] = "autoaudiosink";
+ config["video-player"]["video-sink"] = "xvimagesink";
+ config["video-player"]["timeout"] = "100";
+ config["video-player"]["repeat"] = "false";
+ config["video-player"]["display"] = "false";
+ config["video-player"]["automatically-open-video"] = "true";
+
+ //[waveform]
+ config["waveform"]["zoom"] = "1";
+ config["waveform"]["scale"] = "1";
+ config["waveform"]["display-background"] = "false";
+ config["waveform"]["display-waveform-fill"] = "true";
+ config["waveform"]["scrolling-with-player"] = "true";
+ config["waveform"]["scrolling-with-selection"] = "true";
+ config["waveform"]["respect-timing"] = "true";
+ config["waveform"]["display"] = "false";
+ config["waveform"]["renderer"] = "cairo";
+
+ //[waveform-renderer]
+ config["waveform-renderer"]["display-subtitle-text"]="true";
+ config["waveform-renderer"]["color-background"]="#4C4C4CFF";
+ config["waveform-renderer"]["color-wave"]="#99CC4CFF";
+ config["waveform-renderer"]["color-wave-fill"]="#FFFFFFFF";
+ config["waveform-renderer"]["color-subtitle"]="#994C1999";
+ config["waveform-renderer"]["color-subtitle-selected"]="#E57F4C99";
+ config["waveform-renderer"]["color-subtitle-invalid"]="#FFFF00CC";
+ config["waveform-renderer"]["color-text"]="#FFFFFFFF";
+ config["waveform-renderer"]["color-player-position"]="#FFFFFFFF";
+
+ //[interface]
+ config["interface"]["use-dynamic-keyboard-shortcuts"] = "true";
+ config["interface"]["maximize-window"] = "false";
+ config["interface"]["used-autosave"] = "false";
+ config["interface"]["ask-to-save-on-exit"] = "false";
+ config["interface"]["create-backup-copy"] = "false";
+ config["interface"]["autosave-minutes"] = "10";
+ config["interface"]["max-undo"] = "20";
+
+ //[encodings]
+ config["encodings"]["encodings"] = "ISO-8859-15;UTF-8";
+ config["encodings"]["used-auto-detected"] = "true";
+ config["encodings"]["default"] = "UTF-8";
+
+ //[subtitle-view]
+ config["subtitle-view"]["property-alignment-center"] = "false";
+ config["subtitle-view"]["show-character-per-line"] = "true";
+ config["subtitle-view"]["enable-rubberband-selection"] = "false";
+ config["subtitle-view"]["columns-displayed"] = "number;start;end;duration;text";
+ config["subtitle-view"]["columns-list"] = "cps;duration;effect;end;layer;margin-l;margin-r;margin-v;name;note;number;start;style;text;translation";
+ config["subtitle-view"]["used-ctrl-enter-to-confirm-change"] = "false";
+
+ //[timing]
+ config["timing"]["min-characters-per-second"] = "5";
+ config["timing"]["max-characters-per-second"] = "25";
+ config["timing"]["min-gap-between-subtitles"] = "100";
+ config["timing"]["min-display"] = "1000";
+ config["timing"]["max-characters-per-line"] = "40";
+ config["timing"]["max-line-per-subtitle"] = "2";
+
+ //[external-video-player]
+ config["external-video-player"]["command"] = "mplayer \"#video_file\" -noautosub -sub \"#subtitle_file\" -ss #seconds -osdlevel 2";
+
+ //[dialog-check-errors]
+ config["dialog-check-errors"]["check-overlapping"] = "true";
+ config["dialog-check-errors"]["check-too-short-display-time"] = "true";
+ config["dialog-check-errors"]["check-too-long-display-time"] = "true";
+ config["dialog-check-errors"]["check-too-long-line"] = "true";
+ config["dialog-check-errors"]["check-gap-between-subtitles"] = "true";
+ config["dialog-check-errors"]["check-max-line-per-subtitle"] = "true";
+
+ //[check-error-plugins]
+ config["check-error-plugins"]["overlapping-color"] = "#FF0000FF";
+ config["check-error-plugins"]["too-short-display-time-color"] = "#B6D2FFFF";
+ config["check-error-plugins"]["too-long-display-time-color"] = "#0414FFFF";
+ config["check-error-plugins"]["too-long-line-color"] = "#FFDC0AFF";
+ config["check-error-plugins"]["max-line-per-subtitle-color"] = "#00BF23FF";
+ config["check-error-plugins"]["min-gap-between-subtitles-color"] = "#FF66ECFF";
+}
+
Index: src/Makefile.am
===================================================================
--- src/Makefile.am (révision 478)
+++ src/Makefile.am (copie de travail)
@@ -21,6 +21,8 @@
cfg.h \
debug.cc \
debug.h \
+ defaultcfg.h \
+ defaultcfg.cc \
document.cc \
document.h \
documentsystem.cc \
@@ -109,6 +111,10 @@
$(LIB_SUBTITLEEDITOR_FILES) \
$(LIB_GUI_FILES)
+libsubtitleeditor_la_LIBADD = \
+ $(GTKMM_LIBS) \
+ $(LIBGLADEMM_LIBS)
+
libsubtitleeditor_la_CXXFLAGS = \
$(GTKMM_CFLAGS) \
$(LIBGLADEMM_CFLAGS) \
Index: subtitleeditor.spec
===================================================================
RCS file: /cvs/extras/rpms/subtitleeditor/F-10/subtitleeditor.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- subtitleeditor.spec 6 Dec 2008 13:07:40 -0000 1.6
+++ subtitleeditor.spec 10 Dec 2008 23:53:51 -0000 1.7
@@ -1,12 +1,13 @@
Name: subtitleeditor
Version: 0.30.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GTK+2 tool to edit subtitles for GNU/Linux/*BSD
Group: Applications/Multimedia
License: GPLv3+
URL: http://home.gna.org/subtitleeditor/
Source0: http://download.gna.org/subtitleeditor/0.30/%{name}-%{version}.tar.gz
+Patch0: %{name}-%{version}-bug12649.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -15,6 +16,7 @@
BuildRequires: gstreamer-plugins-good
BuildRequires: gstreamer-plugins-base-devel
BuildRequires: gtkmm24-devel
+BuildRequires: glibmm24-devel >= 2.16.3
BuildRequires: libglademm24-devel
BuildRequires: libxml++-devel
BuildRequires: intltool
@@ -26,6 +28,9 @@
# ISO-CODES 639 + 3166 (Optional)
BuildRequires: iso-codes-devel
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
%description
Subtitle Editor is a GTK+2 tool to edit subtitles for GNU/Linux/*BSD. It can be
used for new subtitles or as a tool to transform, edit, correct and refine
@@ -34,17 +39,25 @@
%prep
%setup -q
+%patch0 -p0
%build
-%configure --enable-gl
+%configure \
+ --disable-debug \
+ --disable-static \
+ --enable-gl \
+ --enable-ccache
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
#remove .la's
-find $RPM_BUILD_ROOT -name "*.la" -exec rm -f '{}' \;
+find $RPM_BUILD_ROOT -name "*.la" -exec %{__rm} -f '{}' \;
+
+#remove useless development files
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
%find_lang %{name}
@@ -55,15 +68,17 @@
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
%post
+/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
+/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -77,11 +92,15 @@
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/man/man1/%{name}.1.gz
-%{_libdir}/libsubtitleeditor.so*
-%{_libdir}/subtitleeditor
+%{_datadir}/man/man1/%{name}.1.*
+%{_libdir}/lib%{name}.so.*
+%{_libdir}/%{name}
%changelog
+* Thu Dec 11 2008 Martin Sourada <mso at fedoraproject.org> - 0.30.0-3
+- Apply patch to upstream bug 12649 (lubek)
+- Various changes to spec file (lubek)
+
* Sat Dec 06 2008 Martin Sourada <mso at fedoraproject.org> - 0.30.0-2
- Add intltool to BuildRequires
More information about the fedora-extras-commits
mailing list