diff options
| author | jperkin <jperkin@pkgsrc.org> | 2019-07-29 19:40:51 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2019-07-29 19:40:51 +0000 |
| commit | 6e7d1849cb3116ec20691035e00bc9b5b1111754 (patch) | |
| tree | 65e5900917504f1a5c378d15367208bfa56c9997 | |
| parent | e730bec3f2ba244872407c4bce930789eb9b4f8c (diff) | |
| download | pkgsrc-6e7d1849cb3116ec20691035e00bc9b5b1111754.tar.gz | |
gdk-pixbuf2: Couple of SunOS fixes.
Using _XOPEN_SOURCE=500 is insufficient when compiling in C99 mode that this
package specifies. 600 is the minimum required for C99, so bump to that.
Meson expects the files in build-aux to be executable, but they aren't as
shipped in the source. I don't understand how nobody else is seeing this,
but explicitly marking them as executable fixes SunOS and won't hurt others.
| -rw-r--r-- | graphics/gdk-pixbuf2/Makefile | 5 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf2/distinfo | 4 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf2/patches/patch-meson.build | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index 812febd5635..5806be88bfd 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2019/07/25 09:29:31 nia Exp $ +# $NetBSD: Makefile,v 1.40 2019/07/29 19:40:51 jperkin Exp $ DISTNAME= gdk-pixbuf-${PIXBUF2_VERSION} PKGNAME= ${DISTNAME:S/pixbuf/pixbuf2/} @@ -38,6 +38,9 @@ REPLACE_FILES.py3+= build-aux/gen-resources.py _BUILDING_GTK2= yes .include "loaders.mk" +pre-build: + ${CHMOD} +x ${WRKSRC}/build-aux/*.{py,sh} + .include "../../devel/py-meson/build.mk" .include "../../databases/shared-mime-info/buildlink3.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.2 diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo index b1cfe5918b5..243f8d56423 100644 --- a/graphics/gdk-pixbuf2/distinfo +++ b/graphics/gdk-pixbuf2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.42 2019/07/22 22:48:47 wiz Exp $ +$NetBSD: distinfo,v 1.43 2019/07/29 19:40:51 jperkin Exp $ SHA1 (gdk-pixbuf-2.38.1.tar.xz) = 52a3ac673ec558e3eabb611256b74432b29945d7 RMD160 (gdk-pixbuf-2.38.1.tar.xz) = 4404509b3d51958afbba6bb2c3e8a10671622092 SHA512 (gdk-pixbuf-2.38.1.tar.xz) = e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920 Size (gdk-pixbuf-2.38.1.tar.xz) = 5509328 bytes SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = 486db8d3f352b0d72b7074ba48f14ccbfa09deda -SHA1 (patch-meson.build) = f1c3e17647ed59706228ef97aecdb62a4c5d427b +SHA1 (patch-meson.build) = e98fcafc3a123e4af8f26ba93c3a21af5fa37e2b diff --git a/graphics/gdk-pixbuf2/patches/patch-meson.build b/graphics/gdk-pixbuf2/patches/patch-meson.build index c019da06c07..ab70d01b841 100644 --- a/graphics/gdk-pixbuf2/patches/patch-meson.build +++ b/graphics/gdk-pixbuf2/patches/patch-meson.build @@ -1,4 +1,4 @@ -$NetBSD: patch-meson.build,v 1.2 2019/07/22 22:48:47 wiz Exp $ +$NetBSD: patch-meson.build,v 1.3 2019/07/29 19:40:51 jperkin Exp $ -D_XOPEN_SOURCE=1 implies POSIX.1 but we need at least 500 (SUSv2) for struct timeval. Fixes build on SunOS. @@ -11,7 +11,7 @@ https://gitlab.gnome.org/GNOME/gdk-pixbuf/issues/128 meson_version: '>= 0.46.0') -add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_DEFAULT_SOURCE', '-D_XOPEN_SOURCE' ], language: 'c') -+add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_DEFAULT_SOURCE', '-D_XOPEN_SOURCE=500' ], language: 'c') ++add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_DEFAULT_SOURCE', '-D_XOPEN_SOURCE=600' ], language: 'c') cc = meson.get_compiler('c') host_system = host_machine.system() |