commit c691dc0d2955f55b1f57b6f86289675e8e85ac67
Author: Marcin Banasiak <marcin.banas...@gmail.com>
Date: Tue Jun 19 22:27:01 2018 +0200
Update to 3.26.1
- removed obsolete -gtk-doc.patch. Now build depends on meson 0.46.1-5
that contains fixed gnome module.
totem-gtk-doc.patch | 37 -------------------------------------
totem.spec | 10 ++++------
2 files changed, 4 insertions(+), 43 deletions(-)
---
diff --git a/totem.spec b/totem.spec
index 090dcf1..6a1690f 100644
--- a/totem.spec
+++ b/totem.spec
@@ -5,13 +5,12 @@
Summary: Movie player for GNOME based on the gstreamer engine
Summary(pl.UTF-8): Odtwarzacz filmów dla GNOME oparty na silniku gstreamer
Name: totem
-Version: 3.26.0
-Release: 3
+Version: 3.26.1
+Release: 1
License: GPL v2
Group: X11/Applications/Multimedia
Source0:
http://ftp.gnome.org/pub/GNOME/sources/totem/3.26/%{name}-%{version}.tar.xz
-# Source0-md5: 70fac11be0ef7da7d6d3ae1abaded8a6
-Patch0: %{name}-gtk-doc.patch
+# Source0-md5: 4d0c750b52bdbdf9b0aaab00e1894afa
# PLD-specific patches
Patch10: %{name}-configure.patch
URL: https://wiki.gnome.org/Apps/Videos
@@ -37,7 +36,7 @@ BuildRequires: libpeas-devel >= 1.1.0
BuildRequires: libpeas-gtk-devel >= 1.1.0
BuildRequires: libxml2-devel >= 1:2.6.31
%{?with_lirc:BuildRequires: lirc-devel}
-BuildRequires: meson >= 0.41.0
+BuildRequires: meson >= 0.46.1-5
BuildRequires: nautilus-devel >= 3.0.0
BuildRequires: pkgconfig
BuildRequires: pylint
@@ -221,7 +220,6 @@ of audio and video files in the properties dialog.
%prep
%setup -q
-%patch0 -p1
%patch10 -p1
%build
diff --git a/totem-gtk-doc.patch b/totem-gtk-doc.patch
deleted file mode 100644
index 871b4cf..0000000
--- a/totem-gtk-doc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6bf1e1d06d1a93b727f2fa7a4ba5c6dae2977199 Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jbi...@ubuntu.com>
-Date: Thu, 19 Oct 2017 10:41:55 -0400
-Subject: [PATCH] build: Fix build with gtk-doc 1.26
-
-https://bugzilla.gnome.org/show_bug.cgi?id=789202
----
- docs/reference/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/reference/meson.build b/docs/reference/meson.build
-index 16f64bb8..ff61274f 100644
---- a/docs/reference/meson.build
-+++ b/docs/reference/meson.build
-@@ -89,7 +89,7 @@ gnome.gtkdoc(
- '--ignore-headers=' + ' '.join(private_headers),
- ],
- mkdb_args: [
-- '--sgml-mode',
-+ '--xml-mode',
- '--output-format=xml',
- '--name-space=' + meson.project_name()
- ],
---
-2.14.3
-
---- totem-3.26.0/docs/reference/meson.build.gtkdoc 2018-03-17
22:59:32.785973378 +0100
-+++ totem-3.26.0/docs/reference/meson.build 2018-03-17 22:59:40.769963377
+0100
-@@ -72,7 +72,7 @@ configure_file(
- configuration: version_conf
- )
-
--doc_path = join_paths(totem_datadir, 'gtk-doc', 'html', meson.project_name())
-+doc_path = join_paths(totem_datadir, 'doc', 'gtk-doc', 'html',
meson.project_name())
-
- gnome.gtkdoc(
- meson.project_name(),
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/totem.git/commitdiff/c691dc0d2955f55b1f57b6f86289675e8e85ac67
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
