diff options
| author | joerg <joerg> | 2014-10-24 21:10:21 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2014-10-24 21:10:21 +0000 |
| commit | 6fa60724e200680febad2984ff3f144ae70f01aa (patch) | |
| tree | 11e1908878b7a96eb4e9709111313628e59bea71 | |
| parent | ccb6b4f4b15bbc33fb7fc4563797fed655428c80 (diff) | |
| download | pkgsrc-6fa60724e200680febad2984ff3f144ae70f01aa.tar.gz | |
Half of the patch is obviously outdated as the function returns void
now. The other half is also in a place that is bogus, so drop the patch
completely.
| -rw-r--r-- | x11/xcb-util-image/distinfo | 3 | ||||
| -rw-r--r-- | x11/xcb-util-image/patches/patch-image_xcb__image.c | 26 |
2 files changed, 1 insertions, 28 deletions
diff --git a/x11/xcb-util-image/distinfo b/x11/xcb-util-image/distinfo index a148165ad45..646f08cb2b4 100644 --- a/x11/xcb-util-image/distinfo +++ b/x11/xcb-util-image/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.3 2014/10/20 11:15:38 wiz Exp $ +$NetBSD: distinfo,v 1.4 2014/10/24 21:10:21 joerg Exp $ SHA1 (xcb-util-image-0.4.0.tar.bz2) = c9c9361781911a47b28f74fc6ebe0abd1273fae4 RMD160 (xcb-util-image-0.4.0.tar.bz2) = 7f36f7aae35194866d36b064061ed6c8abd8cf50 Size (xcb-util-image-0.4.0.tar.bz2) = 327891 bytes -SHA1 (patch-image_xcb__image.c) = 38c251282e64eaa4ababfee7250190f4ded3babf diff --git a/x11/xcb-util-image/patches/patch-image_xcb__image.c b/x11/xcb-util-image/patches/patch-image_xcb__image.c deleted file mode 100644 index 41987ada935..00000000000 --- a/x11/xcb-util-image/patches/patch-image_xcb__image.c +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-image_xcb__image.c,v 1.2 2014/10/20 11:15:38 wiz Exp $ - -gcc44 complains "control reaches end of non-void function" on DragonFly -Apparently gcc45+ recognizes the assert, but for those compilers that don't, -putting a dummy return value won't hurt anything. - ---- image/xcb_image.c.orig 2014-06-11 08:49:48.000000000 +0000 -+++ image/xcb_image.c -@@ -187,6 +187,8 @@ xcb_image_create_native (xcb_connection_ - setup->image_byte_order, - XCB_IMAGE_ORDER_MSB_FIRST, - base, bytes, data); -+/* gcc44 complains "control reaches end of non-void function", fix below */ -+ return (-1); - default: - assert(0); - } -@@ -658,6 +660,8 @@ xcb_image_put_pixel (xcb_image_t *image, - break; - default: - assert(0); -+/* gcc44 complains "control reaches end of non-void function", fix below */ -+ return (-1); - } - } - |