Mon Jan 23 13:52:06 2017 UTC ()
gtk3: avoid redefining GdkX11Monitor. should help centos builds which
are currently failing.


(maya)
diff -r1.41 -r1.42 pkgsrc/x11/gtk3/distinfo
diff -r0 -r1.1 pkgsrc/x11/gtk3/patches/patch-gdk_x11_gdkscreen-x11.h
cvs diff -r1.41 -r1.42 pkgsrc/x11/gtk3/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/distinfo 2017/01/11 21:49:13 1.41
+++ pkgsrc/x11/gtk3/distinfo 2017/01/23 13:52:06 1.42
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.41 2017/01/11 21:49:13 prlw1 Exp $ 1$NetBSD: distinfo,v 1.42 2017/01/23 13:52:06 maya Exp $
2 2
3SHA1 (gtk+-3.22.6.tar.xz) = f16494bca63ac417dc91cb1ff62e2ed7dbb69f33 3SHA1 (gtk+-3.22.6.tar.xz) = f16494bca63ac417dc91cb1ff62e2ed7dbb69f33
4RMD160 (gtk+-3.22.6.tar.xz) = 8bf2dc33f3d6ca2df4656cc0183699558b33287f 4RMD160 (gtk+-3.22.6.tar.xz) = 8bf2dc33f3d6ca2df4656cc0183699558b33287f
5SHA512 (gtk+-3.22.6.tar.xz) = 1db9d165bffa6543f58fdc704c6f3faa1a69bf9aa8c4dde5cf594633b6b4b5fe1b1fe8bb2ae30ffac7b069631f7f48c2406ed7a91e365d52519f1a42127c07d6 5SHA512 (gtk+-3.22.6.tar.xz) = 1db9d165bffa6543f58fdc704c6f3faa1a69bf9aa8c4dde5cf594633b6b4b5fe1b1fe8bb2ae30ffac7b069631f7f48c2406ed7a91e365d52519f1a42127c07d6
6Size (gtk+-3.22.6.tar.xz) = 18247052 bytes 6Size (gtk+-3.22.6.tar.xz) = 18247052 bytes
7SHA1 (patch-aj) = cbfab43f27352f7c6bc57a7c562c2d84c69da07a 7SHA1 (patch-aj) = cbfab43f27352f7c6bc57a7c562c2d84c69da07a
8SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f 8SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f
9SHA1 (patch-configure) = 1dca87c6a85ee927b85d4edc14b0985c5130c0d9 9SHA1 (patch-configure) = 1dca87c6a85ee927b85d4edc14b0985c5130c0d9
10SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5 10SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5
 11SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78
11SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64 12SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
12SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8 13SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8
13SHA1 (patch-gtk_fallback-c89.c) = 18b752f47e88ef2c052c48ddaeed51f130bce85b 14SHA1 (patch-gtk_fallback-c89.c) = 18b752f47e88ef2c052c48ddaeed51f130bce85b
File Added: pkgsrc/x11/gtk3/patches/patch-gdk_x11_gdkscreen-x11.h
$NetBSD: patch-gdk_x11_gdkscreen-x11.h,v 1.1 2017/01/23 13:52:06 maya Exp $

Don't redefine GdkX11Monitor (it's also defined in gdkx11monitor.h:37)

--- gdk/x11/gdkscreen-x11.h.orig	2016-12-30 14:55:56.000000000 +0000
+++ gdk/x11/gdkscreen-x11.h
@@ -29,8 +29,10 @@
 #include <X11/Xlib.h>
 
 G_BEGIN_DECLS
-  
+ 
+#if 0
 typedef struct _GdkX11Monitor GdkX11Monitor;
+#endif
 
 struct _GdkX11Screen
 {