diff --git a/NULL-pointer.patch b/NULL-pointer.patch new file mode 100644 index 0000000..9b4e876 --- /dev/null +++ b/NULL-pointer.patch @@ -0,0 +1,11 @@ +--- subtitlecomposer-0.5.7.orig/src/services/gstreamer/gstreamerdecoderbackend.cpp 2014-09-26 12:33:30.000000000 +0200 ++++ subtitlecomposer-0.5.7/src/services/gstreamer/gstreamerdecoderbackend.cpp 2014-11-15 18:26:01.075684697 +0100 +@@ -294,7 +294,7 @@ GStreamerDecoderBackend::decodebinNoMore + { + GStreamerDecoderBackend *backend = (GStreamerDecoderBackend *)userData; + +- GstStructure *structure = gst_structure_new("app_message", "type", G_TYPE_INT, MESSAGE_INFO_INIT_DISPOSE, 0); ++ GstStructure *structure = gst_structure_new("app_message", "type", G_TYPE_INT, MESSAGE_INFO_INIT_DISPOSE, NULL); + GstMessage *msg = gst_message_new_application(GST_OBJECT(backend->m_infoPipeline), structure); + + gst_element_post_message(GST_ELEMENT(backend->m_infoPipeline), msg); diff --git a/subtitlecomposer-0.5.6.tar.gz b/subtitlecomposer-0.5.6.tar.gz deleted file mode 100644 index 345d484..0000000 --- a/subtitlecomposer-0.5.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f55f3330e72a9a9f19f00674651d7d4c6cd7e19993a14d1deedfa6d34737cf0f -size 1489710 diff --git a/subtitlecomposer.changes b/subtitlecomposer.changes index 18e73aa..18e4dd8 100644 --- a/subtitlecomposer.changes +++ b/subtitlecomposer.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Nov 16 23:30:51 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 0.5.7 + * GStreamer 1.0 API support +- Switch BuildRequires to reflect above change +- Added NULL-pointer.patch from upstream, to resolve post-buid-check + failure + ------------------------------------------------------------------- Wed Dec 4 20:34:36 UTC 2013 - asterios.dramis@gmail.com diff --git a/subtitlecomposer.spec b/subtitlecomposer.spec index 2741b0d..f9c5589 100644 --- a/subtitlecomposer.spec +++ b/subtitlecomposer.spec @@ -1,7 +1,7 @@ # # spec file for package subtitlecomposer # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,21 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: subtitlecomposer -Version: 0.5.6 +Version: 0.5.7 Release: 0 -License: GPL-2.0+ Summary: A text-based subtitle editor -Url: https://github.com/maxrd2/subtitlecomposer/ +License: GPL-2.0+ Group: Productivity/Multimedia/Video/Editors and Convertors -# https://github.com/maxrd2/subtitlecomposer/archive/v0.5.6.tar.gz -Source0: %{name}-%{version}.tar.gz +Url: https://github.com/maxrd2/subtitlecomposer/ +Source: https://github.com/maxrd2/%{name}/archive/v%{version}.tar.gz +# PATCH-FIX-UPSTREAM NULL-pointer.patch +Patch0: NULL-pointer.patch BuildRequires: fdupes -BuildRequires: gstreamer-0_10-plugins-base-devel +BuildRequires: gstreamer-plugins-base-devel BuildRequires: libicu-devel BuildRequires: libkde4-devel BuildRequires: libxine-devel -BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(libxml-2.0) %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -47,7 +50,8 @@ every platform supported by KDE. %lang_package %prep -%setup -q +%setup -q -n %{name}-%{version} +%patch0 -p1 # Fix permissions chmod 644 ChangeLog @@ -92,8 +96,8 @@ perl -pi -e "s|'api'|'/usr/share/doc/packages/subtitlecomposer/api'|" %{buildroo %{_kde4_applicationsdir}/%{name}.desktop %{_kde4_appsdir}/%{name}/ %{_kde4_configdir}/%{name}rc -%dir %{_kde4_iconsdir}/hicolor/96x96 -%dir %{_kde4_iconsdir}/hicolor/96x96/apps +%dir %{_kde4_iconsdir}/hicolor/* +%dir %{_kde4_iconsdir}/hicolor/*/apps %{_kde4_iconsdir}/hicolor/*/*/* %{_datadir}/mime/packages/%{name}.xml diff --git a/v0.5.7.tar.gz b/v0.5.7.tar.gz new file mode 100644 index 0000000..afc9b3d --- /dev/null +++ b/v0.5.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6a901bccf535c306ec7c72e46ceaeb4c33a64f11c190ebc1502835bc38f0564 +size 1594102