Received: by mail.netbsd.org (Postfix, from userid 605) id 6C756850CC; Mon, 29 Jul 2019 19:42:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E1A8F84E46 for ; Mon, 29 Jul 2019 19:42:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id G0jmhDZANDo3 for ; Mon, 29 Jul 2019 19:42:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E65E985142 for ; Mon, 29 Jul 2019 19:40:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DE20FFBF4; Mon, 29 Jul 2019 19:40:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1564429251161050" MIME-Version: 1.0 Date: Mon, 29 Jul 2019 19:40:51 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/graphics/gdk-pixbuf2 To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20190729194051.DE20FFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1564429251161050 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Mon Jul 29 19:40:51 UTC 2019 Modified Files: pkgsrc/graphics/gdk-pixbuf2: Makefile distinfo pkgsrc/graphics/gdk-pixbuf2/patches: patch-meson.build Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/gdk-pixbuf2/Makefile cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/gdk-pixbuf2/distinfo cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/graphics/gdk-pixbuf2/patches/patch-meson.build Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1564429251161050 Content-Disposition: inline Content-Length: 2960 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/gdk-pixbuf2/Makefile diff -u pkgsrc/graphics/gdk-pixbuf2/Makefile:1.39 pkgsrc/graphics/gdk-pixbuf2/Makefile:1.40 --- pkgsrc/graphics/gdk-pixbuf2/Makefile:1.39 Thu Jul 25 09:29:31 2019 +++ pkgsrc/graphics/gdk-pixbuf2/Makefile Mon Jul 29 19:40:51 2019 @@ -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-resour _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 Index: pkgsrc/graphics/gdk-pixbuf2/distinfo diff -u pkgsrc/graphics/gdk-pixbuf2/distinfo:1.42 pkgsrc/graphics/gdk-pixbuf2/distinfo:1.43 --- pkgsrc/graphics/gdk-pixbuf2/distinfo:1.42 Mon Jul 22 22:48:47 2019 +++ pkgsrc/graphics/gdk-pixbuf2/distinfo Mon Jul 29 19:40:51 2019 @@ -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 Index: pkgsrc/graphics/gdk-pixbuf2/patches/patch-meson.build diff -u pkgsrc/graphics/gdk-pixbuf2/patches/patch-meson.build:1.2 pkgsrc/graphics/gdk-pixbuf2/patches/patch-meson.build:1.3 --- pkgsrc/graphics/gdk-pixbuf2/patches/patch-meson.build:1.2 Mon Jul 22 22:48:47 2019 +++ pkgsrc/graphics/gdk-pixbuf2/patches/patch-meson.build Mon Jul 29 19:40:51 2019 @@ -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-pixbu 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() --_----------=_1564429251161050--