diff options
| author | jperkin <jperkin> | 2013-10-16 10:59:13 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2013-10-16 10:59:13 +0000 |
| commit | b7519a932208c27bbad68a7ac87dcc03bf5cc2ed (patch) | |
| tree | 0c0203782f6beb5c942976c84d11aaa107f82636 | |
| parent | 09718384eb553862dddb05cca4d0580dac81056d (diff) | |
| download | pkgsrc-b7519a932208c27bbad68a7ac87dcc03bf5cc2ed.tar.gz | |
Avoid multi-line comments after #define, they confuse g-ir-scanner from
gobject-introspection on OSX Snow Leopard. Fixes build.
| -rw-r--r-- | x11/gtk2/distinfo | 3 | ||||
| -rw-r--r-- | x11/gtk2/patches/patch-gtk_gtktooltips.c | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index c8c6c8e1f87..12d23bf2452 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.150 2013/07/04 21:29:05 adam Exp $ +$NetBSD: distinfo,v 1.151 2013/10/16 10:59:13 jperkin Exp $ SHA1 (gtk+-2.24.20.tar.xz) = 89315bf05dd3d626a50bae5417942ee4428012c9 RMD160 (gtk+-2.24.20.tar.xz) = 893c5db6a269184b2462ae8aa45f6e755394abc7 @@ -6,3 +6,4 @@ Size (gtk+-2.24.20.tar.xz) = 13387180 bytes SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3 SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3 +SHA1 (patch-gtk_gtktooltips.c) = 593e43bb0aacc0b07c24959f2ac6d84dfd04a780 diff --git a/x11/gtk2/patches/patch-gtk_gtktooltips.c b/x11/gtk2/patches/patch-gtk_gtktooltips.c new file mode 100644 index 00000000000..d7a7cbaa3db --- /dev/null +++ b/x11/gtk2/patches/patch-gtk_gtktooltips.c @@ -0,0 +1,21 @@ +$NetBSD: patch-gtk_gtktooltips.c,v 1.1 2013/10/16 10:59:13 jperkin Exp $ + +Avoid multi-line comments after macros, it can confuse parsers. + +--- gtk/gtktooltips.c.orig 2011-08-16 02:30:52.000000000 +0000 ++++ gtk/gtktooltips.c +@@ -45,12 +45,8 @@ + + + #define DEFAULT_DELAY 500 /* Default delay in ms */ +-#define STICKY_DELAY 0 /* Delay before popping up next tip +- * if we're sticky +- */ +-#define STICKY_REVERT_DELAY 1000 /* Delay before sticky tooltips revert +- * to normal +- */ ++#define STICKY_DELAY 0 /* Delay before popping up next tip if we're sticky */ ++#define STICKY_REVERT_DELAY 1000 /* Delay before sticky tooltips revert to normal */ + #define GTK_TOOLTIPS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TOOLTIPS, GtkTooltipsPrivate)) + + typedef struct _GtkTooltipsPrivate GtkTooltipsPrivate; |