head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.12 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.10 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.8 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.6 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.4 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.2 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.4.0.128 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.126 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.124 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.122 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.120 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.118 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.116 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.114 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.112 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.110 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.108 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.106 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.104 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.102 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.100 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.98 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.96 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.92 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.72 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.94 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.90 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.88 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.86 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.84 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.82 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.80 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.78 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.76 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.74 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.70 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.68 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.66 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.64 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.62 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.60 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.58 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.56 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.54 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.52 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.50 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.48 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.46 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.44 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.42 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.40 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.38 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.36 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.34 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.32 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.30 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.28 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.26 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.24 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.22 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.20 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.18 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.16 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.14 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.12 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.10 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.8 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.6 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.4 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.2 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.2.0.26 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.24 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.22 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.20 pkgsrc-2008Q1:1.2.0.18 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.16 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.14 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.12 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.10 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.8 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.6 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.0.14 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.12 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.10 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.8 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.6 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.4 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.2 pkgsrc-2004Q2-base:1.1; locks; strict; comment @# @; 1.5 date 2024.10.01.10.56.41; author nia; state Exp; branches; next 1.4; commitid oKzldfa1ZkOZQWrF; 1.4 date 2008.11.18.17.59.02; author chuck; state Exp; branches 1.4.128.1; next 1.3; 1.3 date 2008.11.18.17.57.38; author chuck; state Exp; branches; next 1.2; 1.2 date 2006.01.12.19.49.15; author joerg; state Exp; branches; next 1.1; 1.1 date 2004.06.01.08.03.10; author shannonjr; state Exp; branches; next ; 1.4.128.1 date 2024.10.02.06.56.10; author bsiegert; state Exp; branches; next ; commitid TA0qxbLpQIhLu3sF; desc @@ 1.5 log @glib: Remove old and crusty (i386-only) inline assembler. It doesn't build with GCC 10 - let's just assume that GCC 10 knows better about optimizing byte-swaps than this old code. @ text @$NetBSD: patch-aj,v 1.4 2008/11/18 17:59:02 chuck Exp $ --- glib.h.orig 2001-02-27 03:44:38.000000000 +0000 +++ glib.h @@@@ -119,8 +119,12 @@@@ extern "C" { * defined then the current definition is correct. */ #ifndef NULL +#ifdef __cplusplus +#define NULL (0L) +#else #define NULL ((void*) 0) #endif +#endif #ifndef FALSE #define FALSE (0) @@@@ -204,7 +208,7 @@@@ extern "C" { #ifndef G_INLINE_FUNC # ifdef __GNUC__ # ifdef __OPTIMIZE__ -# define G_INLINE_FUNC extern inline +# define G_INLINE_FUNC static inline # else # undef G_CAN_INLINE # define G_INLINE_FUNC extern @@@@ -271,14 +275,18 @@@@ extern "C" { /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with * macros, so we can refer to them as strings unconditionally. + * + * NB: GLib requires that these expand to string literals so that + * they're concatenable. Therefore, they're only useful for GCC < 3.0 + * because since GCC 3.0 these macros expand to const pointers. */ -#ifdef __GNUC__ +#if defined(__GNUC__) && (__GNUC__ < 3) #define G_GNUC_FUNCTION __FUNCTION__ #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ -#else /* !__GNUC__ */ +#else /* !(__GNUC__ < 3) */ #define G_GNUC_FUNCTION "" #define G_GNUC_PRETTY_FUNCTION "" -#endif /* !__GNUC__ */ +#endif /* !(__GNUC__ < 3) */ /* we try to provide a usefull equivalent for ATEXIT if it is * not defined, but use is actually abandoned. people should @@@@ -526,51 +534,8 @@@@ typedef gint32 GTime; (((guint32) (val) & (guint32) 0x00ff0000U) >> 8) | \ (((guint32) (val) & (guint32) 0xff000000U) >> 24))) -/* Intel specific stuff for speed - */ -#if defined (__i386__) && defined (__GNUC__) && __GNUC__ >= 2 -# define GUINT16_SWAP_LE_BE_X86(val) \ - (__extension__ \ - ({ register guint16 __v; \ - if (__builtin_constant_p (val)) \ - __v = GUINT16_SWAP_LE_BE_CONSTANT (val); \ - else \ - __asm__ __const__ ("rorw $8, %w0" \ - : "=r" (__v) \ - : "0" ((guint16) (val))); \ - __v; })) -# define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_X86 (val)) -# if !defined(__i486__) && !defined(__i586__) \ - && !defined(__pentium__) && !defined(__i686__) && !defined(__pentiumpro__) -# define GUINT32_SWAP_LE_BE_X86(val) \ - (__extension__ \ - ({ register guint32 __v; \ - if (__builtin_constant_p (val)) \ - __v = GUINT32_SWAP_LE_BE_CONSTANT (val); \ - else \ - __asm__ __const__ ("rorw $8, %w0\n\t" \ - "rorl $16, %0\n\t" \ - "rorw $8, %w0" \ - : "=r" (__v) \ - : "0" ((guint32) (val))); \ - __v; })) -# else /* 486 and higher has bswap */ -# define GUINT32_SWAP_LE_BE_X86(val) \ - (__extension__ \ - ({ register guint32 __v; \ - if (__builtin_constant_p (val)) \ - __v = GUINT32_SWAP_LE_BE_CONSTANT (val); \ - else \ - __asm__ __const__ ("bswap %0" \ - : "=r" (__v) \ - : "0" ((guint32) (val))); \ - __v; })) -# endif /* processor specific 32-bit stuff */ -# define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_X86 (val)) -#else /* !__i386__ */ # define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val)) # define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val)) -#endif /* __i386__ */ #ifdef G_HAVE_GINT64 # define GUINT64_SWAP_LE_BE_CONSTANT(val) ((guint64) ( \ @@@@ -590,26 +555,7 @@@@ typedef gint32 GTime; (guint64) G_GINT64_CONSTANT(0x00ff000000000000U)) >> 40) | \ (((guint64) (val) & \ (guint64) G_GINT64_CONSTANT(0xff00000000000000U)) >> 56))) -# if defined (__i386__) && defined (__GNUC__) && __GNUC__ >= 2 -# define GUINT64_SWAP_LE_BE_X86(val) \ - (__extension__ \ - ({ union { guint64 __ll; \ - guint32 __l[2]; } __r; \ - if (__builtin_constant_p (val)) \ - __r.__ll = GUINT64_SWAP_LE_BE_CONSTANT (val); \ - else \ - { \ - union { guint64 __ll; \ - guint32 __l[2]; } __w; \ - __w.__ll = ((guint64) val); \ - __r.__l[0] = GUINT32_SWAP_LE_BE (__w.__l[1]); \ - __r.__l[1] = GUINT32_SWAP_LE_BE (__w.__l[0]); \ - } \ - __r.__ll; })) -# define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_X86 (val)) -# else /* !__i386__ */ # define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT(val)) -# endif #endif #define GUINT16_SWAP_LE_PDP(val) ((guint16) (val)) @ 1.4 log @add missing NetBSD cvs tag to patch file @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- glib.h.orig 2001-02-26 22:44:38.000000000 -0500 +++ glib.h 2008-11-18 12:51:35.000000000 -0500 @@@@ -119,8 +119,12 @@@@ d18 1 a18 1 @@@@ -204,7 +208,7 @@@@ d27 1 a27 1 @@@@ -271,14 +275,18 @@@@ d49 79 @ 1.4.128.1 log @Pullup ticket #6895 - requested by nia devel/glib: build fix Revisions pulled up: - devel/glib/distinfo 1.27 - devel/glib/patches/patch-aj 1.5 --- Module Name: pkgsrc Committed By: nia Date: Tue Oct 1 10:56:41 UTC 2024 Modified Files: pkgsrc/devel/glib: distinfo pkgsrc/devel/glib/patches: patch-aj Log Message: glib: Remove old and crusty (i386-only) inline assembler. It doesn't build with GCC 10 - let's just assume that GCC 10 knows better about optimizing byte-swaps than this old code. @ text @d3 3 a5 3 --- glib.h.orig 2001-02-27 03:44:38.000000000 +0000 +++ glib.h @@@@ -119,8 +119,12 @@@@ extern "C" { d18 1 a18 1 @@@@ -204,7 +208,7 @@@@ extern "C" { d27 1 a27 1 @@@@ -271,14 +275,18 @@@@ extern "C" { a48 79 @@@@ -526,51 +534,8 @@@@ typedef gint32 GTime; (((guint32) (val) & (guint32) 0x00ff0000U) >> 8) | \ (((guint32) (val) & (guint32) 0xff000000U) >> 24))) -/* Intel specific stuff for speed - */ -#if defined (__i386__) && defined (__GNUC__) && __GNUC__ >= 2 -# define GUINT16_SWAP_LE_BE_X86(val) \ - (__extension__ \ - ({ register guint16 __v; \ - if (__builtin_constant_p (val)) \ - __v = GUINT16_SWAP_LE_BE_CONSTANT (val); \ - else \ - __asm__ __const__ ("rorw $8, %w0" \ - : "=r" (__v) \ - : "0" ((guint16) (val))); \ - __v; })) -# define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_X86 (val)) -# if !defined(__i486__) && !defined(__i586__) \ - && !defined(__pentium__) && !defined(__i686__) && !defined(__pentiumpro__) -# define GUINT32_SWAP_LE_BE_X86(val) \ - (__extension__ \ - ({ register guint32 __v; \ - if (__builtin_constant_p (val)) \ - __v = GUINT32_SWAP_LE_BE_CONSTANT (val); \ - else \ - __asm__ __const__ ("rorw $8, %w0\n\t" \ - "rorl $16, %0\n\t" \ - "rorw $8, %w0" \ - : "=r" (__v) \ - : "0" ((guint32) (val))); \ - __v; })) -# else /* 486 and higher has bswap */ -# define GUINT32_SWAP_LE_BE_X86(val) \ - (__extension__ \ - ({ register guint32 __v; \ - if (__builtin_constant_p (val)) \ - __v = GUINT32_SWAP_LE_BE_CONSTANT (val); \ - else \ - __asm__ __const__ ("bswap %0" \ - : "=r" (__v) \ - : "0" ((guint32) (val))); \ - __v; })) -# endif /* processor specific 32-bit stuff */ -# define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_X86 (val)) -#else /* !__i386__ */ # define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val)) # define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val)) -#endif /* __i386__ */ #ifdef G_HAVE_GINT64 # define GUINT64_SWAP_LE_BE_CONSTANT(val) ((guint64) ( \ @@@@ -590,26 +555,7 @@@@ typedef gint32 GTime; (guint64) G_GINT64_CONSTANT(0x00ff000000000000U)) >> 40) | \ (((guint64) (val) & \ (guint64) G_GINT64_CONSTANT(0xff00000000000000U)) >> 56))) -# if defined (__i386__) && defined (__GNUC__) && __GNUC__ >= 2 -# define GUINT64_SWAP_LE_BE_X86(val) \ - (__extension__ \ - ({ union { guint64 __ll; \ - guint32 __l[2]; } __r; \ - if (__builtin_constant_p (val)) \ - __r.__ll = GUINT64_SWAP_LE_BE_CONSTANT (val); \ - else \ - { \ - union { guint64 __ll; \ - guint32 __l[2]; } __w; \ - __w.__ll = ((guint64) val); \ - __r.__l[0] = GUINT32_SWAP_LE_BE (__w.__l[1]); \ - __r.__l[1] = GUINT32_SWAP_LE_BE (__w.__l[0]); \ - } \ - __r.__ll; })) -# define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_X86 (val)) -# else /* !__i386__ */ # define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT(val)) -# endif #endif #define GUINT16_SWAP_LE_PDP(val) ((guint16) (val)) @ 1.3 log @do not use "extern inline", use "static inline" instead, as suggested by joerg. see discussion here: http://mail-index.netbsd.org/tech-toolchain/2008/11/17/msg000501.html @ text @d1 2 @ 1.2 log @Fix glib.h's NULL definition for C++: it MUST be 0 there, not (void *)0. Bump revision. @ text @d1 3 a3 5 $NetBSD$ --- glib.h.orig 2001-02-27 03:44:38.000000000 +0000 +++ glib.h @@@@ -119,8 +119,12 @@@@ extern "C" { d16 10 a25 1 @@@@ -271,14 +275,18 @@@@ extern "C" { @ 1.1 log @Re: PR 25706 Syntax error prevents compilation with gcc 3.4.0 Applied patch provided by Christian Biere The patch ensures that G_GNUC_FUNCTION and G_GNUC_PRETTY_FUNCTION always expand to string literals - necessary since they will be concatenated (the source of the compilation error). This closes the PR. @ text @d3 1 a3 1 --- glib.h.orig 2001-02-26 20:44:38.000000000 -0700 d5 14 a18 1 @@@@ -271,14 +271,18 @@@@ extern "C" { @