diff options
| author | maya <maya@pkgsrc.org> | 2017-01-23 13:52:06 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2017-01-23 13:52:06 +0000 |
| commit | 7a4b3e2367d5717a7d7d15ff36b494941ab11ddf (patch) | |
| tree | 94dd3972466582b99d514e34b1b5d458f992a900 /x11 | |
| parent | 4c679a73bd860c230314093ae24a2c1049fc53a0 (diff) | |
| download | pkgsrc-7a4b3e2367d5717a7d7d15ff36b494941ab11ddf.tar.gz | |
gtk3: avoid redefining GdkX11Monitor. should help centos builds which
are currently failing.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gtk3/distinfo | 3 | ||||
| -rw-r--r-- | x11/gtk3/patches/patch-gdk_x11_gdkscreen-x11.h | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo index 7b0ff84906a..83a34f77dfe 100644 --- a/x11/gtk3/distinfo +++ b/x11/gtk3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.41 2017/01/11 21:49:13 prlw1 Exp $ +$NetBSD: distinfo,v 1.42 2017/01/23 13:52:06 maya Exp $ SHA1 (gtk+-3.22.6.tar.xz) = f16494bca63ac417dc91cb1ff62e2ed7dbb69f33 RMD160 (gtk+-3.22.6.tar.xz) = 8bf2dc33f3d6ca2df4656cc0183699558b33287f @@ -8,6 +8,7 @@ SHA1 (patch-aj) = cbfab43f27352f7c6bc57a7c562c2d84c69da07a SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f SHA1 (patch-configure) = 1dca87c6a85ee927b85d4edc14b0985c5130c0d9 SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5 +SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78 SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64 SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8 SHA1 (patch-gtk_fallback-c89.c) = 18b752f47e88ef2c052c48ddaeed51f130bce85b diff --git a/x11/gtk3/patches/patch-gdk_x11_gdkscreen-x11.h b/x11/gtk3/patches/patch-gdk_x11_gdkscreen-x11.h new file mode 100644 index 00000000000..ba4a0d88e13 --- /dev/null +++ b/x11/gtk3/patches/patch-gdk_x11_gdkscreen-x11.h @@ -0,0 +1,18 @@ +$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 + { |