[dvdisaster] add libpng15 patch

Dmitry Butskoy buc at fedoraproject.org
Thu Nov 24 17:47:25 UTC 2011


commit a37ba42cdc2f5d9e38d1fa6176bf1685956fd65f
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Thu Nov 24 21:47:03 2011 +0400

    add libpng15 patch

 dvdisaster-0.72.3-glib.patch |   13 ++++++-------
 dvdisaster-0.72.3-png.patch  |   11 +++++++++++
 dvdisaster.spec              |    2 ++
 3 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/dvdisaster-0.72.3-glib.patch b/dvdisaster-0.72.3-glib.patch
index 7d7ff84..0d17f0a 100644
--- a/dvdisaster-0.72.3-glib.patch
+++ b/dvdisaster-0.72.3-glib.patch
@@ -1,7 +1,7 @@
 diff -Nrbu dvdisaster-0.72.3/dvdisaster.h dvdisaster-0.72.3-OK/dvdisaster.h
 --- dvdisaster-0.72.3/dvdisaster.h	2011-10-02 22:31:44.000000000 +0400
-+++ dvdisaster-0.72.3-OK/dvdisaster.h	2011-11-24 21:08:06.000000000 +0400
-@@ -37,11 +37,9 @@
++++ dvdisaster-0.72.3-OK/dvdisaster.h	2011-11-24 21:37:31.000000000 +0400
+@@ -37,11 +37,10 @@
  
  #define _GNU_SOURCE
  
@@ -9,19 +9,18 @@ diff -Nrbu dvdisaster-0.72.3/dvdisaster.h dvdisaster-0.72.3-OK/dvdisaster.h
 +#include <glib.h>
  
  #include <gtk/gtk.h>
--#include <glib/gprintf.h>
+ #include <glib/gprintf.h>
 -#include <glib/gstrfuncs.h>
  
  #include <ctype.h>
  #include <errno.h>
 diff -Nrbu dvdisaster-0.72.3/memtrack.c dvdisaster-0.72.3-OK/memtrack.c
 --- dvdisaster-0.72.3/memtrack.c	2011-10-02 22:32:04.000000000 +0400
-+++ dvdisaster-0.72.3-OK/memtrack.c	2011-11-24 21:08:21.000000000 +0400
-@@ -29,8 +29,6 @@
- #include <string.h>
++++ dvdisaster-0.72.3-OK/memtrack.c	2011-11-24 21:37:42.000000000 +0400
+@@ -30,7 +30,6 @@
  
  #include <glib.h>
--#include <glib/gprintf.h>
+ #include <glib/gprintf.h>
 -#include <glib/gstrfuncs.h>
  
  /*
diff --git a/dvdisaster-0.72.3-png.patch b/dvdisaster-0.72.3-png.patch
new file mode 100644
index 0000000..3b2e7a5
--- /dev/null
+++ b/dvdisaster-0.72.3-png.patch
@@ -0,0 +1,11 @@
+diff -Nrbu dvdisaster-0.72.3/tools/pngio.h dvdisaster-0.72.3-OK/tools/pngio.h
+--- dvdisaster-0.72.3/tools/pngio.h	2011-09-27 21:15:53.000000000 +0400
++++ dvdisaster-0.72.3-OK/tools/pngio.h	2011-11-24 21:44:55.000000000 +0400
+@@ -20,6 +20,7 @@
+ #ifndef PNGIO_H
+ #define PNGIO_H
+ 
++#include <zlib.h>
+ #include <png.h>
+ 
+ typedef struct
diff --git a/dvdisaster.spec b/dvdisaster.spec
index ac89a76..4217151 100644
--- a/dvdisaster.spec
+++ b/dvdisaster.spec
@@ -7,6 +7,7 @@ License: GPLv2+
 URL: http://www.dvdisaster.com
 Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0: dvdisaster-0.72.3-glib.patch
+Patch1: dvdisaster-0.72.3-png.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,6 +44,7 @@ poškodí.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build


More information about the scm-commits mailing list