Fri Apr 9 21:22:29 2021 UTC ()
gtk3: now assumes compiler defaults to c99


(nia)
diff -r1.160 -r1.161 pkgsrc/x11/gtk3/Makefile
cvs diff -r1.160 -r1.161 pkgsrc/x11/gtk3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/Makefile 2021/04/01 07:02:23 1.160
+++ pkgsrc/x11/gtk3/Makefile 2021/04/09 21:22:29 1.161
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.160 2021/04/01 07:02:23 adam Exp $ 1# $NetBSD: Makefile,v 1.161 2021/04/09 21:22:29 nia Exp $
2 2
3DISTNAME= gtk+-3.24.28 3DISTNAME= gtk+-3.24.28
4PKGNAME= ${DISTNAME:S/gtk/gtk3/} 4PKGNAME= ${DISTNAME:S/gtk/gtk3/}
5CATEGORIES= x11 gnome 5CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.gtk.org/ 10HOMEPAGE= https://www.gtk.org/
11COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces 11COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
 14# "error: 'for' loop initial declarations are only allowed in C99 mode"
14USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
15USE_LIBTOOL= yes 16USE_LIBTOOL= yes
16USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
17USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge 18USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge
18GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
19PTHREAD_AUTO_VARS= yes 20PTHREAD_AUTO_VARS= yes
20TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen 21TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
21TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools 22TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools
22 23
23# There is no logic in gettext.mk to detect the native version of xgettext, 24# There is no logic in gettext.mk to detect the native version of xgettext,
24# and we do need it to be compiled with Glade support. 25# and we do need it to be compiled with Glade support.
25_TOOLS_USE_PKGSRC.xgettext= yes 26_TOOLS_USE_PKGSRC.xgettext= yes
26 27
@@ -42,27 +43,28 @@ PKGCONFIG_OVERRIDE+= gail-3.0.pc.in @@ -42,27 +43,28 @@ PKGCONFIG_OVERRIDE+= gail-3.0.pc.in
42INSTALLATION_DIRS+= lib/gtk-3.0/immodules 43INSTALLATION_DIRS+= lib/gtk-3.0/immodules
43INSTALLATION_DIRS+= lib/gtk-3.0/modules 44INSTALLATION_DIRS+= lib/gtk-3.0/modules
44INSTALLATION_DIRS+= lib/gtk-3.0/3.0.0/filesystems 45INSTALLATION_DIRS+= lib/gtk-3.0/3.0.0/filesystems
45 46
46BUILD_DIRS= . demos/gtk-demo 47BUILD_DIRS= . demos/gtk-demo
47 48
48.include "../../mk/bsd.prefs.mk" 49.include "../../mk/bsd.prefs.mk"
49 50
50# isnan and isinf are part of libc, not libm on DragonFly 51# isnan and isinf are part of libc, not libm on DragonFly
51# conf tests fail detection due to conflicting definitions, just skip them 52# conf tests fail detection due to conflicting definitions, just skip them
52CONFIGURE_ENV.DragonFly+= ac_cv_func_isinf=yes 53CONFIGURE_ENV.DragonFly+= ac_cv_func_isinf=yes
53CONFIGURE_ENV.DragonFly+= ac_cv_func_isnan=yes 54CONFIGURE_ENV.DragonFly+= ac_cv_func_isnan=yes
54 55
55CFLAGS.SunOS+= -std=gnu99 56# "error: 'for' loop initial declarations are only allowed in C99 mode"
 57CFLAGS+= -std=gnu99
56 58
57CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" 59CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
58 60
59# We remove the module databases during post-install since we create them 61# We remove the module databases during post-install since we create them
60# anew in the +INSTALL script as part of the POST-INSTALL action. 62# anew in the +INSTALL script as part of the POST-INSTALL action.
61# 63#
62post-install: 64post-install:
63 ${RM} -f ${DESTDIR}${GTK3_IMMODULES_DB} 65 ${RM} -f ${DESTDIR}${GTK3_IMMODULES_DB}
64 66
65FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk-update-icon-cache" 67FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk-update-icon-cache"
66FILES_SUBST+= ICON_THEME_DIR="${PREFIX}/share/icons" 68FILES_SUBST+= ICON_THEME_DIR="${PREFIX}/share/icons"
67INSTALL_TEMPLATES+= ../../x11/gtk2/files/icon-cache.tmpl 69INSTALL_TEMPLATES+= ../../x11/gtk2/files/icon-cache.tmpl
68 70