Mon Jan 2 12:04:53 2023 UTC ()
gtk3: fix sincos() portability; define HAVE_ATK_BRIDGE


(adam)
diff -r1.177 -r1.178 pkgsrc/x11/gtk3/Makefile
diff -r1.97 -r1.98 pkgsrc/x11/gtk3/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/gtk3/patches/patch-meson.build
diff -r0 -r1.1 pkgsrc/x11/gtk3/patches/patch-tests_gtkgears.c
cvs diff -r1.177 -r1.178 pkgsrc/x11/gtk3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/Makefile 2023/01/01 21:21:35 1.177
+++ pkgsrc/x11/gtk3/Makefile 2023/01/02 12:04:53 1.178
@@ -1,34 +1,33 @@ @@ -1,34 +1,33 @@
1# $NetBSD: Makefile,v 1.177 2023/01/01 21:21:35 adam Exp $ 1# $NetBSD: Makefile,v 1.178 2023/01/02 12:04:53 adam Exp $
2 2
3DISTNAME= gtk+-3.24.36 3DISTNAME= gtk+-3.24.36
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
14TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools 14TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools
15TOOL_DEPENDS+= gtk-doc>=1.32:../../textproc/gtk-doc 15TOOL_DEPENDS+= gtk-doc>=1.32:../../textproc/gtk-doc
16 16
17# "error: 'for' loop initial declarations are only allowed in C99 mode" 17# "error: 'for' loop initial declarations are only allowed in C99 mode"
18USE_LANGUAGES= c99 c++ 18USE_LANGUAGES= c99 c++
19USE_PKGLOCALEDIR= yes 19USE_PKGLOCALEDIR= yes
20USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge 20USE_TOOLS+= bash gdbus-codegen ggrep msgmerge perl pkg-config xgettext
21USE_TOOLS+= gdbus-codegen 
22PTHREAD_AUTO_VARS= yes 21PTHREAD_AUTO_VARS= yes
23 22
24MESON_ARGS+= -Dgtk_doc=true 23MESON_ARGS+= -Dgtk_doc=true
25MESON_ARGS+= -Dman=true 24MESON_ARGS+= -Dman=true
26MESON_ARGS+= --sysconfdir=${PREFIX}/libdata 25MESON_ARGS+= --sysconfdir=${PREFIX}/libdata
27 26
28# There is no logic in gettext.mk to detect the native version of xgettext, 27# There is no logic in gettext.mk to detect the native version of xgettext,
29# and we do need it to be compiled with Glade support. 28# and we do need it to be compiled with Glade support.
30_TOOLS_USE_PKGSRC.xgettext= yes 29_TOOLS_USE_PKGSRC.xgettext= yes
31 30
32MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 31MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
33TEST_TARGET= check 32TEST_TARGET= check
34 33
cvs diff -r1.97 -r1.98 pkgsrc/x11/gtk3/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/distinfo 2023/01/01 21:21:35 1.97
+++ pkgsrc/x11/gtk3/distinfo 2023/01/02 12:04:53 1.98
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.97 2023/01/01 21:21:35 adam Exp $ 1$NetBSD: distinfo,v 1.98 2023/01/02 12:04:53 adam Exp $
2 2
3BLAKE2s (gtk+-3.24.36.tar.xz) = f15cf26424935a14fec5b539e60ea7dca37d14a9479b71bad1403b8bfe53e50f 3BLAKE2s (gtk+-3.24.36.tar.xz) = f15cf26424935a14fec5b539e60ea7dca37d14a9479b71bad1403b8bfe53e50f
4SHA512 (gtk+-3.24.36.tar.xz) = 76280e847653576e6fd0586d6044ab315f04c3548c211b37612c4ac77f7bbccfcff17459b9d1d3cbddeb74a62a0bcac05f850b89a20d4abc3893c6c387ecb03a 4SHA512 (gtk+-3.24.36.tar.xz) = 76280e847653576e6fd0586d6044ab315f04c3548c211b37612c4ac77f7bbccfcff17459b9d1d3cbddeb74a62a0bcac05f850b89a20d4abc3893c6c387ecb03a
5Size (gtk+-3.24.36.tar.xz) = 12540184 bytes 5Size (gtk+-3.24.36.tar.xz) = 12540184 bytes
6SHA1 (patch-gdk_wayland_gdkdevice-wayland.c) = e283bd6533ea1307b971c524bc05f0d3ee90453d 6SHA1 (patch-gdk_wayland_gdkdevice-wayland.c) = e283bd6533ea1307b971c524bc05f0d3ee90453d
7SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78 7SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78
8SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64 8SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
9SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8 9SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8
10SHA1 (patch-gtk_fallback-c89.c) = eaf5ac8aace9eab673eed0e265d4cb2617bf1fcd 10SHA1 (patch-gtk_fallback-c89.c) = eaf5ac8aace9eab673eed0e265d4cb2617bf1fcd
11SHA1 (patch-gtk_gtkfontchooserwidget.c) = 0f4a47b7260e9227ed7e20613bbe435163afd149 11SHA1 (patch-gtk_gtkfontchooserwidget.c) = 0f4a47b7260e9227ed7e20613bbe435163afd149
12SHA1 (patch-gtk_gtklabel.c) = 8ec7e9df8d2169f15698ff6a29cf8254ca44ea61 12SHA1 (patch-gtk_gtklabel.c) = 8ec7e9df8d2169f15698ff6a29cf8254ca44ea61
13SHA1 (patch-meson.build) = e5e3ca8a42876fae22a2dad5cf63571b28d36812 13SHA1 (patch-meson.build) = d20fc548e048de7a094836359cb22845888438ea
14SHA1 (patch-meson_options.txt) = 8477c12e5a5116ca2eef7be0c272e86451d8d94f 14SHA1 (patch-meson_options.txt) = 8477c12e5a5116ca2eef7be0c272e86451d8d94f
 15SHA1 (patch-tests_gtkgears.c) = f335cbb84d6e254b4feba3b1fe619a41229037e0
cvs diff -r1.1 -r1.2 pkgsrc/x11/gtk3/patches/patch-meson.build (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/patches/patch-meson.build 2023/01/01 21:21:35 1.1
+++ pkgsrc/x11/gtk3/patches/patch-meson.build 2023/01/02 12:04:53 1.2
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1$NetBSD: patch-meson.build,v 1.1 2023/01/01 21:21:35 adam Exp $ 1$NetBSD: patch-meson.build,v 1.2 2023/01/02 12:04:53 adam Exp $
2 2
3Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. 3Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
4 4
5--- meson.build.orig 2023-01-01 19:10:33.000000000 +0000 5--- meson.build.orig 2022-12-22 14:01:18.000000000 +0000
6+++ meson.build 6+++ meson.build
7@@ -137,6 +137,7 @@ wayland_enabled = get_option('way 7@@ -137,6 +137,7 @@ wayland_enabled = get_option('way
8 broadway_enabled = get_option('broadway_backend') 8 broadway_enabled = get_option('broadway_backend')
9 quartz_enabled = get_option('quartz_backend') 9 quartz_enabled = get_option('quartz_backend')
10 win32_enabled = get_option('win32_backend') 10 win32_enabled = get_option('win32_backend')
11+atkbridge_enabled = get_option('atk_bridge') 11+atkbridge_enabled = get_option('atk_bridge')
12  12
13 os_unix = false 13 os_unix = false
14 os_linux = false 14 os_linux = false
15@@ -564,7 +565,9 @@ if x11_enabled 15@@ -564,7 +565,10 @@ if x11_enabled
16 xfixes_dep = dependency('xfixes', required: false) 16 xfixes_dep = dependency('xfixes', required: false)
17 xcomposite_dep = dependency('xcomposite', required: false) 17 xcomposite_dep = dependency('xcomposite', required: false)
18 fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) 18 fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep'])
19+ if atkbridge_enabled 19+ if atkbridge_enabled
20 atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) 20 atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req)
 21+ cdata.set('HAVE_ATK_BRIDGE', 1)
21+ endif 22+ endif
22  23
23 backend_immodules += ['xim'] 24 backend_immodules += ['xim']
24  25
File Added: pkgsrc/x11/gtk3/patches/patch-tests_gtkgears.c
$NetBSD: patch-tests_gtkgears.c,v 1.1 2023/01/02 12:04:53 adam Exp $

sincos() is problematic, because it is built-in GCC, gets detected by meson,
but then making docs fails.

--- tests/gtkgears.c.orig	2023-01-02 11:39:17.817427476 +0000
+++ tests/gtkgears.c
@@ -48,14 +48,12 @@
 #define VERTICES_PER_TOOTH 34
 #define GEAR_VERTEX_STRIDE 6
 
-#ifndef HAVE_SINCOS
 static void
-sincos (double x, double *_sin, double *_cos)
+my_sincos (double x, double *_sin, double *_cos)
 {
   *_sin = sin (x);
   *_cos = cos (x);
 }
-#endif
 
 /**
  * Struct describing the vertices in triangle strip
@@ -306,11 +304,11 @@ create_gear (GLfloat inner_radius,
     struct point p[7];
 
     /* Calculate needed sin/cos for varius angles */
-    sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
-    sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
-    sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
-    sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
-    sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
+    my_sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
+    my_sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
+    my_sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
+    my_sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
+    my_sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
 
     GEAR_POINT(p[0], r2, 1);
     GEAR_POINT(p[1], r2, 2);
@@ -519,7 +517,7 @@ void perspective(GLfloat *m, GLfloat fov
    identity(tmp);
 
    deltaZ = zFar - zNear;
-   sincos(radians, &sine, &cosine);
+   my_sincos(radians, &sine, &cosine);
 
    if ((deltaZ == 0) || (sine == 0) || (aspect == 0))
       return;