Attachment 116597 Details for Bug 158563 – file.diff

[patch] file.diff

file.diff (text/plain), 4.74 KB, created by Barbara on 2011-07-01 12:10:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Barbara

Created: 2011-07-01 12:10:05 UTC

Size: 4.74 KB

patch

obsolete

>--- Makefile.orig	2011-03-05 13:05:28.000000000 +0100
>+++ Makefile	2011-07-01 12:30:27.000000000 +0200
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	libkate
>-PORTVERSION=	0.3.7
>-PORTREVISION=	2
>+PORTVERSION=	0.3.8
> CATEGORIES=	multimedia
> MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
> 
>@@ -22,6 +21,7 @@
> USE_GMAKE=	yes
> USE_GNOME=	pkgconfig
> USE_LDCONFIG=	yes
>+USE_PYTHON=	yes
> 
> CFLAGS+=	"-I${LOCALBASE}/include"
> 
>--- distinfo.orig	2010-04-14 10:46:09.000000000 +0200
>+++ distinfo	2011-07-01 12:23:46.000000000 +0200
>@@ -1,3 +1,2 @@
>-MD5 (libkate-0.3.7.tar.gz) = e5c287b4f40498e5bde48c0a52225292
>-SHA256 (libkate-0.3.7.tar.gz) = b9af203bb731de961807ad13820911fab57230d42da877336cf98c12c11c3c51
>-SIZE (libkate-0.3.7.tar.gz) = 728239
>+SHA256 (libkate-0.3.8.tar.gz) = 56e8990f44a8494d61437e825279f4c7c49d093d2b258cd64a8a86f18229a601
>+SIZE (libkate-0.3.8.tar.gz) = 745633
>--- pkg-plist.orig	2010-04-14 10:46:09.000000000 +0200
>+++ pkg-plist	2011-07-01 12:46:59.000000000 +0200
>@@ -1,17 +1,53 @@
>+bin/KateDJ
> bin/katalyzer
> bin/katedec
> bin/kateenc
> include/kate/kate.h
> include/kate/kate_config.h
> include/kate/oggkate.h
>-lib/libkate.so.3
>-lib/libkate.so
>-lib/libkate.la
> lib/libkate.a
>+lib/libkate.la
>+lib/libkate.so
>+lib/libkate.so.3
> lib/liboggkate.a
> lib/liboggkate.la
>-lib/liboggkate.so.3
> lib/liboggkate.so
>+lib/liboggkate.so.3
> libdata/pkgconfig/kate.pc
> libdata/pkgconfig/oggkate.pc
>+%%PYTHON_SITELIBDIR%%/kdj/__init__.py
>+%%PYTHON_SITELIBDIR%%/kdj/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/kdj/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/kdj/constants.py
>+%%PYTHON_SITELIBDIR%%/kdj/constants.pyc
>+%%PYTHON_SITELIBDIR%%/kdj/constants.pyo
>+%%PYTHON_SITELIBDIR%%/kdj/demuxer.py
>+%%PYTHON_SITELIBDIR%%/kdj/demuxer.pyc
>+%%PYTHON_SITELIBDIR%%/kdj/demuxer.pyo
>+%%PYTHON_SITELIBDIR%%/kdj/finder.py
>+%%PYTHON_SITELIBDIR%%/kdj/finder.pyc
>+%%PYTHON_SITELIBDIR%%/kdj/finder.pyo
>+%%PYTHON_SITELIBDIR%%/kdj/muxer.py
>+%%PYTHON_SITELIBDIR%%/kdj/muxer.pyc
>+%%PYTHON_SITELIBDIR%%/kdj/muxer.pyo
>+%%PYTHON_SITELIBDIR%%/kdj/options.py
>+%%PYTHON_SITELIBDIR%%/kdj/options.pyc
>+%%PYTHON_SITELIBDIR%%/kdj/options.pyo
>+%%PYTHON_SITELIBDIR%%/kdj/tester.py
>+%%PYTHON_SITELIBDIR%%/kdj/tester.pyc
>+%%PYTHON_SITELIBDIR%%/kdj/tester.pyo
>+%%PYTHON_SITELIBDIR%%/kdj/tools.py
>+%%PYTHON_SITELIBDIR%%/kdj/tools.pyc
>+%%PYTHON_SITELIBDIR%%/kdj/tools.pyo
>+%%PYTHON_SITELIBDIR%%/kdj/ui_editor.py
>+%%PYTHON_SITELIBDIR%%/kdj/ui_editor.pyc
>+%%PYTHON_SITELIBDIR%%/kdj/ui_editor.pyo
>+%%PYTHON_SITELIBDIR%%/kdj/ui_main.py
>+%%PYTHON_SITELIBDIR%%/kdj/ui_main.pyc
>+%%PYTHON_SITELIBDIR%%/kdj/ui_main.pyo
>+%%PYTHON_SITELIBDIR%%/kdj/ui_options.py
>+%%PYTHON_SITELIBDIR%%/kdj/ui_options.pyc
>+%%PYTHON_SITELIBDIR%%/kdj/ui_options.pyo
>+@dirrm %%PYTHON_SITELIBDIR%%/kdj
>+@dirrmtry %%PYTHON_SITELIBDIR%%
> @dirrm include/kate
>--- files/patch-doc-Makefile.in.orig	2008-10-18 19:33:44.000000000 +0200
>+++ files/patch-doc-Makefile.in	2011-07-01 12:29:07.000000000 +0200
>@@ -1,12 +1,12 @@
>---- doc/Makefile.in.orig	Tue Sep  9 08:52:20 2008
>-+++ doc/Makefile.in	Sat Oct 18 17:51:51 2008
>-@@ -447,8 +447,7 @@
>+--- doc/Makefile.in.orig	2010-08-10 15:19:04.000000000 +0200
>++++ doc/Makefile.in	2011-07-01 12:28:47.000000000 +0200
>+@@ -519,8 +519,7 @@
>  @HAVE_DOXYGEN_TRUE@	doxygen kate.doxygen
>  @HAVE_DOXYGEN_TRUE@	touch .doc-dummy-target
>  @HAVE_DOXYGEN_FALSE@.doc-dummy-target:
> -@HAVE_DOXYGEN_FALSE@	echo "doxygen not found, cannot build docs"
> -@HAVE_DOXYGEN_FALSE@	/bin/false
>-+@HAVE_DOXYGEN_FALSE@	echo "doxygen not found, oops"
>++@HAVE_DOXYGEN_FALSE@   echo "doxygen not found, oops"
>  
>  dist-hook: .doc-dummy-target
>  	cp -fR * $(distdir)
>--- files/patch-tools-kpng.c.orig	2010-04-03 07:06:14.000000000 +0200
>+++ files/patch-tools-kpng.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,36 +0,0 @@
>---- tools/kpng.c.orig	2008-08-06 09:06:13.000000000 +0200
>-+++ tools/kpng.c	2010-03-29 09:32:32.000000000 +0200
>-@@ -179,13 +179,13 @@
>-     }
>-   }
>- 
>--  png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL);
>-+  png_destroy_read_struct(&png_ptr,&info_ptr,NULL);
>-   fclose(f);
>- 
>-   return 0;
>- 
>- error:
>--  if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL);
>-+  if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL);
>-   if (f) fclose(f);
>-   return -1;
>- }
>-@@ -224,7 +224,7 @@
>-   if (w) *w=png_get_image_width(png_ptr,info_ptr);
>-   if (h) *h=png_get_image_height(png_ptr,info_ptr);
>- 
>--  png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL);
>-+  png_destroy_read_struct(&png_ptr,&info_ptr,NULL);
>- 
>-   /* now read the whole file as a binary blob */
>-   fseek(f,0,SEEK_END);
>-@@ -241,7 +241,7 @@
>-   return 0;
>- 
>- error:
>--  if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL);
>-+  if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL);
>-   if (f) fclose(f);
>-   return -1;
>- }

Actions: View | Diff

Attachments on bug 158563: 116597