Fixing object system definitions, patch thanks to <tbartdev@gmx-topmail.de> bug 247733

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 58 insertions, 7 deletions

diff --git a/media-gfx/pornview/ChangeLog b/media-gfx/pornview/ChangeLog
index 8a067c1d81a9..22cfbaa5d687 100644
--- a/media-gfx/pornview/ChangeLog
+++ b/media-gfx/pornview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/pornview
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.34 2008/04/27 21:35:01 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.35 2009/09/28 23:40:36 vostorga Exp $
+
+  28 Sep 2009; Víctor Ostorga <vostorga@gentoo.org>
+  pornview-0.2.0_pre1-r1.ebuild,
+  +files/pornview-0.2.0_pre1-new-gtk-object-system.diff:
+  Fixing object system definitions, patch thanks to
+  <tbartdev@gmx-topmail.de> bug 247733
 
   27 Apr 2008; Jeroen Roovers <jer@gentoo.org>
   pornview-0.2.0_pre1-r1.ebuild:
diff --git a/media-gfx/pornview/Manifest b/media-gfx/pornview/Manifest
index b478ad7677c6..4c378fc85057 100644
--- a/media-gfx/pornview/Manifest
+++ b/media-gfx/pornview/Manifest
@@ -1,7 +1,8 @@
 AUX pornview-0.2.0_pre1-4.diff 1613 RMD160 ff0ee5a7c4abb9a8ab77fec31dba0af2cae4c56e SHA1 ab1f851e71cc66f05adecea4d34f9513c30809c3 SHA256 2880da98fde9caad8c422558d9f85b30eaa854a85444417e8336430b673fa121
 AUX pornview-0.2.0_pre1-desktop-entry.patch 442 RMD160 e88c992f7fc53c731cd7800c52192ca3a6d07df9 SHA1 70a36d18947a562950bf8c53fefd622da6adf875 SHA256 03a67f65a122afcded52dc3e539e77ba591879069b83274d928a5d995726cb04
+AUX pornview-0.2.0_pre1-new-gtk-object-system.diff 2320 RMD160 dda1df23ba548e5d8e75e8d80ef9d36becb9608c SHA1 b5650b0d60e81da6bcbd6df0e6bbddc1f9d35481 SHA256 3ee556ad01d27f3166deed82bd2b14c42ef61548ee8dfe75c8541b7177920b60
 AUX traypatch.diff 15710 RMD160 5cdc5e7ad329eeac0a9359b1e0536f28b0d146ea SHA1 09a2bb140c672e499d2267dca0524d5f07a6ba13 SHA256 828f175a4942b795b131e4aa56966b1261a4899beb2e8a2f22ca137e533fffd7
 DIST pornview-0.2.0pre1.tar.gz 608864 RMD160 03a9d01235fafbfb9825da43e79fbfb66a2ecbfa SHA1 3a26412affac6e211da928cc471a4b1bbc55b2a0 SHA256 66502f936f743489dcff14e429a80e4670a60221187c34f58f87530229874fb9
-EBUILD pornview-0.2.0_pre1-r1.ebuild 1263 RMD160 29e6b4c74cdb60f82f2fc400fe21a1df690e38c0 SHA1 e7401123a76393712b1eeefdd1a9c724450cf86f SHA256 412cf1c6be23a12022d3bd1f0801b7c6db1b3d98e010dd6189a1d55c0adffdc4
-MISC ChangeLog 4086 RMD160 df03692785ddc055536b3ce23ace71e244436999 SHA1 4018751514d9867ce62ffed83b65869236d6be32 SHA256 76e97c603b5191b7ebd081517798dac72c2533f3d2d21f89d81eb0415e078abb
+EBUILD pornview-0.2.0_pre1-r1.ebuild 1318 RMD160 550f69b2166be855217a2d5fefd2283d20caad40 SHA1 a9156f035d43c66bd36bd2c4aef81c325fbfd81d SHA256 92db39a91d13182d23c30f128be0862b244fd92aead4f3c6cf24cc01ea87646d
+MISC ChangeLog 4326 RMD160 b77f0ec1a435dea8a77a4550e3f0833566eeec77 SHA1 adbdc6959ab7f9b5b7a76d04e3e75d7a65b66c0e SHA256 38b25572de05e18179c90278aea1ed6642fb094b3e25a058415b6abc3f70c2bf
 MISC metadata.xml 224 RMD160 0205a791be455cc2f0e431f9a51c9b1eecc9a42f SHA1 3ecfb3b313bd690ef75876aa22b6d07eff29d8b0 SHA256 86b3339d98bcf668311512e51a0826f35ca7787c099e6351c75690e20825b8fd
diff --git a/media-gfx/pornview/files/pornview-0.2.0_pre1-new-gtk-object-system.diff b/media-gfx/pornview/files/pornview-0.2.0_pre1-new-gtk-object-system.diff
new file mode 100644
index 000000000000..6812e92836d8
--- /dev/null
+++ b/media-gfx/pornview/files/pornview-0.2.0_pre1-new-gtk-object-system.diff
@@ -0,0 +1,43 @@
+--- pornview-0.2pre1.orig/src/support/widgets/gtkcellrendererpixmap.c
++++ pornview-0.2pre1/src/support/widgets/gtkcellrendererpixmap.c
+@@ -59,10 +59,10 @@
+     PROP_MASK_EXPANDER_CLOSED
+ };
+
+-GtkType
++GType
+ gtk_cell_renderer_pixmap_get_type (void)
+ {
+-    static GtkType cell_pixmap_type = 0;
++    static GType cell_pixmap_type = 0;
+
+     if (!cell_pixmap_type)
+     {
+--- pornview-0.2pre1.orig/src/support/widgets/gtkcellrendererpixmap.h
++++ pornview-0.2pre1/src/support/widgets/gtkcellrendererpixmap.h
+@@ -32,11 +32,11 @@
+ 
+ 
+ #define GTK_TYPE_CELL_RENDERER_PIXMAP			    (gtk_cell_renderer_pixmap_get_type ())
+-#define GTK_CELL_RENDERER_PIXMAP(obj)			    (GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmap))
+-#define GTK_CELL_RENDERER_PIXMAP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
+-#define GTK_IS_CELL_RENDERER_PIXMAP(obj)		    (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP))
+-#define GTK_IS_CELL_RENDERER_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP))
+-#define GTK_CELL_RENDERER_PIXMAP_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
++#define GTK_CELL_RENDERER_PIXMAP(obj)			    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmap))
++#define GTK_CELL_RENDERER_PIXMAP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
++#define GTK_IS_CELL_RENDERER_PIXMAP(obj)		    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP))
++#define GTK_IS_CELL_RENDERER_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP))
++#define GTK_CELL_RENDERER_PIXMAP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
+ 
+     typedef struct GtkCellRendererPixmap_Tag GtkCellRendererPixmap;
+     typedef struct GtkCellRendererPixmapClass_Tag GtkCellRendererPixmapClass;
+@@ -66,7 +66,7 @@
+ 	void            (*_gtk_reserved4) (void);
+     };
+ 
+-    GtkType         gtk_cell_renderer_pixmap_get_type (void);
++    GType         gtk_cell_renderer_pixmap_get_type (void);
+     GtkCellRenderer *gtk_cell_renderer_pixmap_new (void);
+ 
+ #ifdef __cplusplus
diff --git a/media-gfx/pornview/pornview-0.2.0_pre1-r1.ebuild b/media-gfx/pornview/pornview-0.2.0_pre1-r1.ebuild
index 5ab7a74a0066..f8932270338c 100644
--- a/media-gfx/pornview/pornview-0.2.0_pre1-r1.ebuild
+++ b/media-gfx/pornview/pornview-0.2.0_pre1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1-r1.ebuild,v 1.6 2008/04/27 21:35:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1-r1.ebuild,v 1.7 2009/09/28 23:40:36 vostorga Exp $
 
 inherit eutils toolchain-funcs
 
@@ -28,7 +28,8 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-4.diff \
 		"${FILESDIR}"/traypatch.diff \
-		"${FILESDIR}"/${P}-desktop-entry.patch
+		"${FILESDIR}"/${P}-desktop-entry.patch \
+		"${FILESDIR}"/${P}-new-gtk-object-system.diff
 }
 
 src_compile() {