@img/sharp-libvips-dev 1.1.0-rc4 → 1.1.0

package/include/archive.h

@@ -34,7 +34,7 @@
  * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
  */
 /* Note: Compiler will complain if this does not match archive_entry.h! */
-#define	ARCHIVE_VERSION_NUMBER 3007007
+#define	ARCHIVE_VERSION_NUMBER 3007009
 
 #include <sys/stat.h>
 #include <stddef.h>  /* for wchar_t */
@@ -132,7 +132,7 @@ typedef ssize_t la_ssize_t;
 #define	__LA_PRINTF(fmtarg, firstvararg)	/* nothing */
 #endif
 
-#if defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >= 1
+#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
 # define __LA_DEPRECATED __attribute__((deprecated))
 #else
 # define __LA_DEPRECATED
@@ -155,7 +155,7 @@ __LA_DECL int		archive_version_number(void);
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define	ARCHIVE_VERSION_ONLY_STRING "3.7.7"
+#define	ARCHIVE_VERSION_ONLY_STRING "3.7.9"
 #define	ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
 __LA_DECL const char *	archive_version_string(void);
 

package/include/archive_entry.h

@@ -28,7 +28,7 @@
 #define	ARCHIVE_ENTRY_H_INCLUDED
 
 /* Note: Compiler will complain if this does not match archive.h! */
-#define	ARCHIVE_VERSION_NUMBER 3007007
+#define	ARCHIVE_VERSION_NUMBER 3007009
 
 /*
  * Note: archive_entry.h is for use outside of libarchive; the
@@ -127,7 +127,8 @@ typedef ssize_t la_ssize_t;
 # define __LA_DECL
 #endif
 
-#if defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >= 1
+#if defined(__GNUC__) && (__GNUC__ > 3 || \
+    (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
 # define __LA_DEPRECATED __attribute__((deprecated))
 #else
 # define __LA_DEPRECATED

package/include/expat.h

@@ -11,7 +11,7 @@
    Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
    Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
    Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
-   Copyright (c) 2016-2024 Sebastian Pipping <sebastian@pipping.org>
+   Copyright (c) 2016-2025 Sebastian Pipping <sebastian@pipping.org>
    Copyright (c) 2016      Cristian Rodríguez <crrodriguez@opensuse.org>
    Copyright (c) 2016      Thomas Beutlich <tc@tbeu.de>
    Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
@@ -1067,8 +1067,8 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
    See https://semver.org
 */
 #define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 6
-#define XML_MICRO_VERSION 4
+#define XML_MINOR_VERSION 7
+#define XML_MICRO_VERSION 1
 
 #ifdef __cplusplus
 }

package/include/expat_config.h

@@ -83,7 +83,7 @@
 #define PACKAGE_NAME "expat"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "expat 2.6.4"
+#define PACKAGE_STRING "expat 2.7.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "expat"
@@ -92,7 +92,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.6.4"
+#define PACKAGE_VERSION "2.7.1"
 
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
@@ -100,7 +100,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "2.6.4"
+#define VERSION "2.7.1"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

package/include/fontconfig/fcfreetype.h

@@ -28,7 +28,7 @@
 #include FT_FREETYPE_H
 
 #ifndef FcPublic
-#define FcPublic
+#  define FcPublic
 #endif
 
 _FCFUNCPROTOBEGIN
@@ -38,7 +38,7 @@ FcFreeTypeCharIndex (FT_Face face, FcChar32 ucs4);
 
 FcPublic FcCharSet *
 FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing);
-    
+
 FcPublic FcCharSet *
 FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks);
 
@@ -50,9 +50,9 @@ FcPatternAddFTFace (FcPattern *p, const char *object, const FT_Face f);
 
 FcPublic FcPattern *
 FcFreeTypeQueryFace (const FT_Face  face,
-		     const FcChar8  *file,
-		     unsigned int   id,
-		     FcBlanks	    *blanks);
+                     const FcChar8 *file,
+                     unsigned int   id,
+                     FcBlanks      *blanks);
 
 _FCFUNCPROTOEND
 

package/include/fontconfig/fcprivate.h

@@ -31,104 +31,98 @@
  * into macros (sigh).
  */
 
-#define FcPatternVapBuild(result, orig, va)			    \
-{								    \
-    FcPattern	*__p__ = (orig);				    \
-    const char	*__o__;						    \
-    FcValue	__v__;						    \
-								    \
-    if (!__p__)							    \
-    {								    \
-	__p__ = FcPatternCreate ();				    \
-	if (!__p__)		    				    \
-	    goto _FcPatternVapBuild_bail0;			    \
-    }				    				    \
-    for (;;)			    				    \
-    {				    				    \
-	__o__ = va_arg (va, const char *);			    \
-	if (!__o__)		    				    \
-	    break;		    				    \
-	__v__.type = va_arg (va, int);				    \
-	switch (__v__.type) {	    				    \
-	case FcTypeUnknown:					    \
-	case FcTypeVoid:					    \
-	    goto _FcPatternVapBuild_bail1;       		    \
-	case FcTypeInteger:	    				    \
-	    __v__.u.i = va_arg (va, int);			    \
-	    break;						    \
-	case FcTypeDouble:					    \
-	    __v__.u.d = va_arg (va, double);			    \
-	    break;						    \
-	case FcTypeString:					    \
-	    __v__.u.s = va_arg (va, const FcChar8 *);		    \
-	    break;						    \
-	case FcTypeBool:					    \
-	    __v__.u.b = va_arg (va, FcBool);			    \
-	    break;						    \
-	case FcTypeMatrix:					    \
-	    __v__.u.m = va_arg (va, const FcMatrix *);		    \
-	    break;						    \
-	case FcTypeCharSet:					    \
-	    __v__.u.c = va_arg (va, const FcCharSet *); 	    \
-	    break;						    \
-	case FcTypeFTFace:					    \
-	    __v__.u.f = va_arg (va, FT_Face);			    \
-	    break;						    \
-	case FcTypeLangSet:					    \
-	    __v__.u.l = va_arg (va, const FcLangSet *);		    \
-	    break;						    \
-	case FcTypeRange:					    \
-	    __v__.u.r = va_arg (va, const FcRange *);		    \
-	    break;						    \
-	}							    \
-	if (!FcPatternAdd (__p__, __o__, __v__, FcTrue))	    \
-	    goto _FcPatternVapBuild_bail1;			    \
-    }								    \
-    result = __p__;						    \
-    goto _FcPatternVapBuild_return;				    \
-								    \
-_FcPatternVapBuild_bail1:					    \
-    if (!orig)							    \
-	FcPatternDestroy (__p__);				    \
-_FcPatternVapBuild_bail0:					    \
-    result = (void*)0;						    \
-								    \
-_FcPatternVapBuild_return:					    \
-    ;								    \
-}
+#define FcPatternVapBuild(result, orig, va)                  \
+    {                                                        \
+	FcPattern  *__p__ = (orig);                          \
+	const char *__o__;                                   \
+	FcValue     __v__;                                   \
+                                                             \
+	if (!__p__) {                                        \
+	    __p__ = FcPatternCreate();                       \
+	    if (!__p__)                                      \
+		goto _FcPatternVapBuild_bail0;               \
+	}                                                    \
+	for (;;) {                                           \
+	    __o__ = va_arg (va, const char *);               \
+	    if (!__o__)                                      \
+		break;                                       \
+	    __v__.type = va_arg (va, int);                   \
+	    switch (__v__.type) {                            \
+	    case FcTypeUnknown:                              \
+	    case FcTypeVoid:                                 \
+		goto _FcPatternVapBuild_bail1;               \
+	    case FcTypeInteger:                              \
+		__v__.u.i = va_arg (va, int);                \
+		break;                                       \
+	    case FcTypeDouble:                               \
+		__v__.u.d = va_arg (va, double);             \
+		break;                                       \
+	    case FcTypeString:                               \
+		__v__.u.s = va_arg (va, const FcChar8 *);    \
+		break;                                       \
+	    case FcTypeBool:                                 \
+		__v__.u.b = va_arg (va, FcBool);             \
+		break;                                       \
+	    case FcTypeMatrix:                               \
+		__v__.u.m = va_arg (va, const FcMatrix *);   \
+		break;                                       \
+	    case FcTypeCharSet:                              \
+		__v__.u.c = va_arg (va, const FcCharSet *);  \
+		break;                                       \
+	    case FcTypeFTFace:                               \
+		__v__.u.f = va_arg (va, FT_Face);            \
+		break;                                       \
+	    case FcTypeLangSet:                              \
+		__v__.u.l = va_arg (va, const FcLangSet *);  \
+		break;                                       \
+	    case FcTypeRange:                                \
+		__v__.u.r = va_arg (va, const FcRange *);    \
+		break;                                       \
+	    }                                                \
+	    if (!FcPatternAdd (__p__, __o__, __v__, FcTrue)) \
+		goto _FcPatternVapBuild_bail1;               \
+	}                                                    \
+	result = __p__;                                      \
+	goto _FcPatternVapBuild_return;                      \
+                                                             \
+    _FcPatternVapBuild_bail1:                                \
+	if (!orig)                                           \
+	    FcPatternDestroy (__p__);                        \
+    _FcPatternVapBuild_bail0:                                \
+	result = (void *)0;                                  \
+                                                             \
+    _FcPatternVapBuild_return:;                              \
+    }
 
-
-#define FcObjectSetVapBuild(__ret__, __first__, __va__) 		\
-{									\
-    FcObjectSet    *__os__;						\
-    const char	    *__ob__;						\
-									\
-    __ret__ = 0;						    	\
-    __os__ = FcObjectSetCreate ();					\
-    if (!__os__)							\
-	goto _FcObjectSetVapBuild_bail0;				\
-    __ob__ = __first__;							\
-    while (__ob__)							\
-    {									\
-	if (!FcObjectSetAdd (__os__, __ob__))				\
-	    goto _FcObjectSetVapBuild_bail1;				\
-	__ob__ = va_arg (__va__, const char *);				\
-    }									\
-    __ret__ = __os__;							\
-									\
-_FcObjectSetVapBuild_bail1:						\
-    if (!__ret__ && __os__)					    	\
-	FcObjectSetDestroy (__os__);					\
-_FcObjectSetVapBuild_bail0:						\
-    ;									\
-}
+#define FcObjectSetVapBuild(__ret__, __first__, __va__) \
+    {                                                   \
+	FcObjectSet *__os__;                            \
+	const char  *__ob__;                            \
+                                                        \
+	__ret__ = 0;                                    \
+	__os__ = FcObjectSetCreate();                   \
+	if (!__os__)                                    \
+	    goto _FcObjectSetVapBuild_bail0;            \
+	__ob__ = __first__;                             \
+	while (__ob__) {                                \
+	    if (!FcObjectSetAdd (__os__, __ob__))       \
+		goto _FcObjectSetVapBuild_bail1;        \
+	    __ob__ = va_arg (__va__, const char *);     \
+	}                                               \
+	__ret__ = __os__;                               \
+                                                        \
+    _FcObjectSetVapBuild_bail1:                         \
+	if (!__ret__ && __os__)                         \
+	    FcObjectSetDestroy (__os__);                \
+    _FcObjectSetVapBuild_bail0:;                        \
+    }
 
 #ifndef FC_ATTRIBUTE_VISIBILITY_HIDDEN
-#define FC_ATTRIBUTE_VISIBILITY_HIDDEN __attribute((visibility("hidden")))
+#  define FC_ATTRIBUTE_VISIBILITY_HIDDEN __attribute ((visibility ("hidden")))
 #endif
 
 #ifndef FC_ATTRIBUTE_VISIBILITY_EXPORT
-#define FC_ATTRIBUTE_VISIBILITY_EXPORT __attribute((visibility("default")))
+#  define FC_ATTRIBUTE_VISIBILITY_EXPORT __attribute ((visibility ("default")))
 #endif
 
 #endif /* _FCPRIVATE_H_ */