[gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/files/, sci-chemistry/coot/

["Justin Lecher" <jlec@gentoo.org>]

commit:     d858ac3b7a4d7f28e524ddaf398a3c39532e7907
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 15:24:24 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 15:24:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d858ac3b

sci-chemistry/coot: Drop libpng-1.5 patch, included upstream

(Portage version: 2.2.0_alpha101/git/Linux x86_64, unsigned Manifest commit)

---
 sci-chemistry/coot/ChangeLog                   |    7 +++++
 sci-chemistry/coot/coot-9999.ebuild            |    1 -
 sci-chemistry/coot/files/9999-libpng-1.5.patch |   29 ------------------------
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
index d281af2..0b2d8a9 100644
--- a/sci-chemistry/coot/ChangeLog
+++ b/sci-chemistry/coot/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Apr 2012; Justin Lecher <jlec@gentoo.org> -files/9999-libpng-1.5.patch,
+  coot-9999.ebuild:
+  Drop libpng-1.5 patch, included upstream
+
+  25 Apr 2012; Justin Lecher <jlec@gentoo.org> coot-9999.ebuild:
+  Add fix for >glib-2.32
+
   16 Mar 2012; Justin Lecher <jlec@gentoo.org> -files/9999-gl.patch,
   -files/9999-test.patch, coot-9999.ebuild:
   Drop gl and test patch -> included upstream

diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
index f5bd086..fc6ca94 100644
--- a/sci-chemistry/coot/coot-9999.ebuild
+++ b/sci-chemistry/coot/coot-9999.ebuild
@@ -85,7 +85,6 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-goocanvas.patch
 	"${FILESDIR}"/${PV}-mmdb-config.patch
 	"${FILESDIR}"/${PV}-ssm.patch
-	"${FILESDIR}"/${PV}-libpng-1.5.patch
 	)
 
 src_unpack() {

diff --git a/sci-chemistry/coot/files/9999-libpng-1.5.patch b/sci-chemistry/coot/files/9999-libpng-1.5.patch
deleted file mode 100644
index bddd251..0000000
--- a/sci-chemistry/coot/files/9999-libpng-1.5.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- ccp4mg-utils/ppmutil.cc
-+++ ccp4mg-utils/ppmutil.cc
-@@ -2494,15 +2494,21 @@
- 
-   pixels = new unsigned char[width*height*colourspace];
- 
-+  png_colorp palette;
-+  int num_trans;
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >=4
-+  png_bytep trans_alpha;
-+#endif
-+
-   for (int i=0; i<height; i++){
-     if(color_type==PNG_COLOR_TYPE_PALETTE){
-       for (int j=0; j<width; j++){
--        pixels[i*width*colourspace+j*colourspace] = png_ptr->palette[row_pointers[i][j]].red;
--        pixels[i*width*colourspace+j*colourspace+1] = png_ptr->palette[row_pointers[i][j]].green;
--        pixels[i*width*colourspace+j*colourspace+2] = png_ptr->palette[row_pointers[i][j]].blue;
--        if(row_pointers[i][j]<png_ptr->num_trans){
-+        pixels[i*width*colourspace+j*colourspace] = palette[row_pointers[i][j]].red;
-+        pixels[i*width*colourspace+j*colourspace+1] = palette[row_pointers[i][j]].green;
-+        pixels[i*width*colourspace+j*colourspace+2] = palette[row_pointers[i][j]].blue;
-+        if(row_pointers[i][j]<num_trans){
- #if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >=4
--         pixels[i*width*colourspace+j*colourspace+3] = png_ptr->trans_alpha[row_pointers[i][j]];
-+         pixels[i*width*colourspace+j*colourspace+3] = trans_alpha[row_pointers[i][j]];
- #else
-          pixels[i*width*colourspace+j*colourspace+3] = png_ptr->trans[row_pointers[i][j]];
- #endif