rpms/mkvtoolnix/devel mkvtoolnix-gcc43.patch, NONE, 1.1 mkvtoolnix.spec, 1.5, 1.6

Dominik Mierzejewski (rathann) fedora-extras-commits at redhat.com
Thu Feb 14 23:20:30 UTC 2008


Author: rathann

Update of /cvs/pkgs/rpms/mkvtoolnix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3511

Modified Files:
	mkvtoolnix.spec 
Added Files:
	mkvtoolnix-gcc43.patch 
Log Message:
- fixed build with gcc-4.3, take 1

mkvtoolnix-gcc43.patch:

--- NEW FILE mkvtoolnix-gcc43.patch ---
diff -up mkvtoolnix-2.1.0/src/common/common.h.gcc43 mkvtoolnix-2.1.0/src/common/common.h
--- mkvtoolnix-2.1.0/src/common/common.h.gcc43	2007-08-19 11:24:10.000000000 +0200
+++ mkvtoolnix-2.1.0/src/common/common.h	2008-02-15 00:16:36.000000000 +0100
@@ -19,7 +19,7 @@
 #include "os.h"
 
 #include <stdarg.h>
-
+#include <cstring>
 #include <string>
 #include <vector>
 


Index: mkvtoolnix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mkvtoolnix/devel/mkvtoolnix.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mkvtoolnix.spec	26 Aug 2007 17:12:28 -0000	1.5
+++ mkvtoolnix.spec	14 Feb 2008 23:19:52 -0000	1.6
@@ -1,12 +1,13 @@
 Summary: Matroska container manipulation utilities
 Name: mkvtoolnix
 Version: 2.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source0: http://www.bunkus.org/videotools/mkvtoolnix/sources/%{name}-%{version}.tar.bz2
 Source1: mmg.desktop
 Source2: mkvinfo.desktop
+Patch0: %{name}-gcc43.patch
 URL: http://www.bunkus.org/videotools/mkvtoolnix/index.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc43
 sed -i -e 's/"-O3"/""/' configure*
 
 %build
@@ -101,6 +103,9 @@
 %{_datadir}/icons/hicolor/32x32/apps/mmg.xpm
 
 %changelog
+* Fri Feb 15 2008 Dominik Mierzejewski <rpm at greysector.net> 2.1.0-2
+- fixed build with gcc-4.3
+
 * Sun Aug 26 2007 Dominik Mierzejewski <rpm at greysector.net> 2.1.0-1
 - updated to 2.1.0
 - updated license tag




More information about the fedora-extras-commits mailing list