external/cairo/UnpackedTarball_pixman.mk | 3 external/cairo/configs/wnt_pixman_config.h | 195 --------------------- external/cairo/configs/wnt_pixman_pixman-config.h | 57 ++++++ external/cairo/configs/wnt_pixman_pixman-version.h | 56 ++++++ solenv/clang-format/excludelist | 2 5 files changed, 116 insertions(+), 197 deletions(-)
New commits: commit 7feb6ec87e3b51fc9f80f944734b10ab4122d96f Author: Tor Lillqvist <[email protected]> AuthorDate: Sun Jan 11 00:40:12 2026 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Sun Jan 11 16:54:22 2026 +0100 Update the Windows build of cairo for pixman 0.46.4 (for CODA-W) Change-Id: I03f1010c0f15e9cc226c02daa529cec30888d5de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196988 Reviewed-by: Tor Lillqvist <[email protected]> Tested-by: Jenkins diff --git a/external/cairo/UnpackedTarball_pixman.mk b/external/cairo/UnpackedTarball_pixman.mk index ec8334638818..4bd37903807e 100644 --- a/external/cairo/UnpackedTarball_pixman.mk +++ b/external/cairo/UnpackedTarball_pixman.mk @@ -14,7 +14,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL),,cairo)) $(eval $(call gb_UnpackedTarball_set_patchlevel,pixman,2)) ifeq ($(OS)-$(ENABLE_HEADLESS),WNT-TRUE) -$(eval $(call gb_UnpackedTarball_add_file,pixman,config.h,external/cairo/configs/wnt_pixman_config.h)) +$(eval $(call gb_UnpackedTarball_add_file,pixman,pixman/pixman-config.h,external/cairo/configs/wnt_pixman_pixman-config.h)) +$(eval $(call gb_UnpackedTarball_add_file,pixman,pixman/pixman-version.h,external/cairo/configs/wnt_pixman_pixman-version.h)) endif $(eval $(call gb_UnpackedTarball_add_patches,pixman,\ diff --git a/external/cairo/configs/wnt_pixman_config.h b/external/cairo/configs/wnt_pixman_config.h deleted file mode 100644 index 180a8f93df15..000000000000 --- a/external/cairo/configs/wnt_pixman_config.h +++ /dev/null @@ -1,195 +0,0 @@ -/* config.h for Windows build of pixman, manually created from one for Linux: */ - -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if building universal (internal helper macro) */ -/* #undef AC_APPLE_UNIVERSAL_BUILD */ - -/* Whether we have alarm() */ -/* #undef HAVE_ALARM */ - -/* Whether the compiler supports __builtin_clz */ -/* #undef HAVE_BUILTIN_CLZ */ - -/* Define to 1 if you have the <dlfcn.h> header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Whether we have FE_DIVBYZERO */ -/* #undef HAVE_FEDIVBYZERO */ - -/* Whether we have feenableexcept() */ -/* #undef HAVE_FEENABLEEXCEPT */ - -/* Define to 1 if we have <fenv.h> */ -/* #undef HAVE_FENV_H 1 - -/* Whether the tool chain supports __float128 */ -/* #undef HAVE_FLOAT128 */ - -/* Whether the compiler supports GCC vector extensions */ -/* #undef HAVE_GCC_VECTOR_EXTENSIONS */ - -/* Define to 1 if you have the `getisax' function. */ -/* #undef HAVE_GETISAX */ - -/* Whether we have getpagesize() */ -/* #undef HAVE_GETPAGESIZE */ - -/* Whether we have gettimeofday() */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `pixman-1' library (-lpixman-1). */ -/* #undef HAVE_LIBPIXMAN_1 */ - -/* Whether we have libpng */ -/* #undef HAVE_LIBPNG */ - -/* Whether we have mmap() */ -/* #undef HAVE_MMAP */ - -/* Whether we have mprotect() */ -/* #undef HAVE_MPROTECT */ - -/* Whether we have posix_memalign() */ -/* #undef HAVE_POSIX_MEMALIGN */ - -/* Whether pthreads is supported */ -/* #undef HAVE_PTHREADS */ - -/* Whether we have sigaction() */ -/* #undef HAVE_SIGACTION */ - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the <stdio.h> header file. */ -#define HAVE_STDIO_H 1 - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the <strings.h> header file. */ -/* #undef HAVE_STRINGS_H */ - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if we have <sys/mman.h> */ -/* #undef HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/types.h> header file. */ -/* #undef HAVE_SYS_TYPES_H */ - -/* Define to 1 if you have the <unistd.h> header file. */ -/* #undef HAVE_UNISTD_H */ - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "pixman" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "[email protected]" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "pixman" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pixman 0.42.2" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "pixman" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "0.42.2" - -/* enable output that can be piped to gnuplot */ -/* #undef PIXMAN_GNUPLOT */ - -/* enable TIMER_BEGIN/TIMER_END macros */ -/* #undef PIXMAN_TIMERS */ - -/* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 - -/* 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 - backward compatibility; new code need not use it. */ -#define STDC_HEADERS 1 - -/* The compiler supported TLS storage class */ -#define TLS __declspec(thread) - -/* Whether the tool chain supports __attribute__((constructor)) */ -/* #undef TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR */ - -/* use ARM A64_NEON assembly optimizations */ -/* #undef USE_ARM_A64_NEON */ - -/* use ARM IWMMXT compiler intrinsics */ -/* #undef USE_ARM_IWMMXT */ - -/* use ARM NEON assembly optimizations */ -/* #undef USE_ARM_NEON */ - -/* use ARM SIMD assembly optimizations */ -/* #undef USE_ARM_SIMD */ - -/* use GNU-style inline assembler */ -/* #undef USE_GCC_INLINE_ASM */ - -/* use Loongson Multimedia Instructions */ -/* #undef USE_LOONGSON_MMI */ - -/* use MIPS DSPr2 assembly optimizations */ -/* #undef USE_MIPS_DSPR2 */ - -/* use OpenMP in the test suite */ -/* #undef USE_OPENMP */ - -/* use SSE2 compiler intrinsics */ -#define USE_SSE2 1 - -/* use SSSE3 compiler intrinsics */ -#define USE_SSSE3 1 - -/* use VMX compiler intrinsics */ -/* #undef USE_VMX */ - -/* use x86 MMX compiler intrinsics */ -/* #undef USE_X86_MMX */ - -/* Version number of package */ -#define VERSION "0.42.2" - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif -#endif - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -/* Define to sqrt if you do not have the `sqrtf' function. */ -/* #undef sqrtf */ diff --git a/external/cairo/configs/wnt_pixman_pixman-config.h b/external/cairo/configs/wnt_pixman_pixman-config.h new file mode 100644 index 000000000000..bbd58e37f8a9 --- /dev/null +++ b/external/cairo/configs/wnt_pixman_pixman-config.h @@ -0,0 +1,57 @@ +/* pixman-config.h for Windows build of pixman, manually created from one for Linux */ + +/* + * *Not* autogenerated by the Meson build system. + */ + +#pragma once + +#undef ASM_HAVE_FUNC_DIRECTIVE + +#undef HAVE_ALARM + +#undef HAVE_BUILTIN_CLZ + +#undef HAVE_FEDIVBYZERO + +#undef HAVE_FEENABLEEXCEPT + +#undef HAVE_FENV_H + +#undef HAVE_GCC_VECTOR_EXTENSIONS + +#undef HAVE_GETPAGESIZE + +#undef HAVE_GETTIMEOFDAY + +#undef HAVE_LIBPNG /* We have it but not sure whether we would want to use it */ + +#undef HAVE_MMAP + +#undef HAVE_MPROTECT + +#undef HAVE_POSIX_MEMALIGN + +#undef HAVE_PTHREADS + +#undef HAVE_SIGACTION + +#undef HAVE_SYS_MMAN_H + +#undef HAVE_UNISTD_H + +#define PACKAGE "pixman" + +#define SIZEOF_LONG 4 + +#define TLS __declspec(thread) + +#undef TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR + +#undef TOOLCHAIN_SUPPORTS_ATTRIBUTE_DESTRUCTOR + +#undef USE_ARM_A64_NEON + +#undef USE_GCC_INLINE_ASM + +#undef USE_OPENMP diff --git a/external/cairo/configs/wnt_pixman_pixman-version.h b/external/cairo/configs/wnt_pixman_pixman-version.h new file mode 100644 index 000000000000..38dc38b18fab --- /dev/null +++ b/external/cairo/configs/wnt_pixman_pixman-version.h @@ -0,0 +1,56 @@ +/* pixman-version.h for Windows build of pixman, manually created from one for Linux */ + +/* + * Copyright © 2008 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Author: Carl D. Worth <[email protected]> + */ + +#ifndef PIXMAN_VERSION_H__ +#define PIXMAN_VERSION_H__ + +#ifndef PIXMAN_H__ +# error pixman-version.h should only be included by pixman.h +#endif + +#define PIXMAN_VERSION_MAJOR 0 +#define PIXMAN_VERSION_MINOR 46 +#define PIXMAN_VERSION_MICRO 4 + +#define PIXMAN_VERSION_STRING "0.46.4" + +#define PIXMAN_VERSION_ENCODE(major, minor, micro) ( \ + ((major) * 10000) \ + + ((minor) * 100) \ + + ((micro) * 1)) + +#define PIXMAN_VERSION PIXMAN_VERSION_ENCODE( \ + PIXMAN_VERSION_MAJOR, \ + PIXMAN_VERSION_MINOR, \ + PIXMAN_VERSION_MICRO) + +#ifndef PIXMAN_API +# define PIXMAN_API +#endif + +#endif /* PIXMAN_VERSION_H__ */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index bc7ccc1791a3..a8e19710c395 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -3650,7 +3650,7 @@ extensions/test/ole/unoTocomCalls/XCallback_Impl/resource.h external/bluez_bluetooth/inc/bluetooth/bluetooth.h external/cairo/configs/wnt_cairo_config.h external/cairo/configs/wnt_cairo_features.h -external/cairo/configs/wnt_pixman_config.h +external/cairo/configs/wnt_pixman_pixman-version.h external/clew/source/clew.c external/clew/source/include/clew/clew.h external/clucene/configs/_clucene-config-LINUX.h
