head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.60 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.58 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.56 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.54 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.52 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.50 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.48 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.46 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.44 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.42 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.40 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.38 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.36 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.34 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.32 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.30 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.28 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.26 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.24 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.22 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.20 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.18 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.16 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.14 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.10 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.12 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.8 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.6 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.4 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.2 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.4.0.26 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.24 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.22 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.20 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.18 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.14 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.12 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.10 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.8 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.6 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.4 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.2 pkgsrc-2015Q4-base:1.4 pkgsrc-2014Q3:1.1.0.12 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.10 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.8 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.6 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.4 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.2 pkgsrc-2013Q2-base:1.1; locks; strict; comment @# @; 1.5 date 2018.10.25.09.47.19; author jperkin; state Exp; branches; next 1.4; commitid gf32HzTD2Hk2akXA; 1.4 date 2015.10.17.09.50.48; author tnn; state Exp; branches; next 1.3; commitid uTgvFXXqXMLoFrFy; 1.3 date 2015.10.15.09.47.56; author wiz; state Exp; branches; next 1.2; commitid N1qsRttD6EYnIbFy; 1.2 date 2014.10.01.08.50.33; author obache; state dead; branches; next 1.1; commitid pT8npqmfbi1VztSx; 1.1 date 2013.04.13.11.10.04; author obache; state Exp; branches; next ; desc @@ 1.5 log @pkg-config: Fix build on SunOS C99. @ text @$NetBSD: patch-glib_configure,v 1.4 2015/10/17 09:50:48 tnn Exp $ Fix unportable test construct. Disable Carbon support in the bundled glib. It does not link correctly with the Frameworks and pkg-config should not need any of those features. --- glib/configure.orig 2017-03-19 14:57:03.000000000 +0000 +++ glib/configure @@@@ -5306,6 +5306,7 @@@@ $as_echo_n "checking for Mac OS X Carbon cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#error don't build this #include #include @@@@ -5893,7 +5894,7 @@@@ else ENABLE_ALWAYS_BUILD_TESTS_FALSE= fi - if test "$ENABLE_INSTALLED_TESTS" == "1"; then + if test "$ENABLE_INSTALLED_TESTS" = "1"; then installed_test_metadir=${datadir}/installed-tests/glib installed_testdir=${libexecdir}/installed-tests/glib @@@@ -23334,16 +23335,34 @@@@ fi case $host in *-*-solaris* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SunOS C99" >&5 + $as_echo_n "checking for SunOS C99... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +#if __STDC_VERSION__-0 < 199901L +#error not C99 +#endif -$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h - - -$as_echo "#define _XOPEN_SOURCE 2" >>confdefs.h - - -$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h - - ;; +int main() +{ + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO"; then + g_have_sunos_c99=yes + else + g_have_sunos_c99=no + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $g_have_sunos_c99" >&5 + $as_echo "$g_have_sunos_c99" >&6; } + if test $g_have_sunos_c99 = yes; then + $as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h + else + $as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h + $as_echo "#define _XOPEN_SOURCE 2" >>confdefs.h + fi + $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h + ;; esac if test "$ac_cv_func_statfs" = yes; then : @ 1.4 log @fix build on OS X @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 --- glib/configure.orig 2015-09-27 14:07:16.000000000 +0000 d9 1 a9 1 @@@@ -5298,6 +5298,7 @@@@ $as_echo_n "checking for Mac OS X Carbon d17 1 a17 1 @@@@ -5885,7 +5886,7 @@@@ else d26 44 @ 1.3 log @Update to 0.29. Regen patches. pkg-config 0.29 === - Fixed a regression from 0.28 in system -L flag handling. If the pc file has multiple system -L flags, every other flag will be left as is. Thanks to Andrew Oakley for the fix. (#78077) - Quoting of variables queried through --variable is removed so that the output can be used verbatim in subsequent shell commands. Thanks to Marek Kasik for the fix. (#67904) - Fixed a regression from 0.28 in -L flag handling on Windows. A .libs suffix was inadvertantly being added to the library path. - Added a --validate option to check pc file syntax. This works just like --exists, but package dependencies are disabled. (#7000) - Added the PKG_PREREQ autoconf macro. Whereas PKG_PROG_PKG_CONFIG is used to check the version of the pkg-config tool, this is used to check the version of the pkg-config autoconf macros in use. - Added the PKG_CHECK_MODULES_STATIC autoconf macro. This will temporarily add --static to the pkg-config calls while invoking PKG_CHECK_MODULES. (#19541) - Many fixes to the testsuite for Windows. It should now pass for a MinGW, Cygwin, and cross-compiled MinGW using Wine for test execution. (#66939) - More consistent handling of prefix redefinition. On Windows, the prefix was always being redefined based on the pc file path. This feature can now be enabled or disabled at runtime on all platforms using the --define-prefix and --dont-define-prefix options. (#63602) - Continue listing packages with --list-all even if there are errors in pc files. (#26615) - Various documentation improvements. (#62018, #62374, #66155) - Fixed a bug when multiple -isystem arguments are used. (#72584) - pkg-config is now built with largefile support to ensure that it works correctly on filesystems with 64 bit inodes. Thanks to Peter Jones for the fix. (#90078) - Bugs fixed: 7000, 19541, 26615, 62018, 62374, 63602, 66155, 66939, 67904, 70690, 72584, 78077, 80378, 80380, 89267, 90078, 90437, 92002. @ text @d4 2 d9 9 a17 1 @@@@ -5885,7 +5885,7 @@@@ else @ 1.2 log @drop cygwin-izm. @ text @d1 1 a1 1 $NetBSD: patch-glib_configure,v 1.1 2013/04/13 11:10:04 obache Exp $ d3 1 a3 1 * from glib2.0.cygport 2.32.1-not-win32.patch d5 1 a5 1 --- glib/configure.orig 2013-01-22 13:13:56.000000000 +0000 d7 3 a9 1 @@@@ -25733,9 +25733,6 @@@@ $as_echo "$broken_poll" >&6; } d11 3 d15 1 a15 7 case $host in - *-*-cygwin*) - G_LIBS_EXTRA="-luser32 -lkernel32" - ;; *-*-mingw*) G_LIBS_EXTRA="-lws2_32 -lole32 -lwinmm -lshlwapi" ;; @ 1.1 log @Apply cygport glib2 2.32.1-not-win32.patch to fix build on Cygwin. @ text @d1 1 a1 1 $NetBSD$ @