Skip to content

Commit

Permalink
build: update gettext and fix QEMU compiler error
Browse files Browse the repository at this point in the history
Proper fix for the new compiler errors introduced in Xcode 15.3.
  • Loading branch information
osy committed Mar 31, 2024
1 parent 2724075 commit 2fc13ca
Show file tree
Hide file tree
Showing 5 changed files with 117 additions and 87 deletions.
85 changes: 0 additions & 85 deletions patches/gettext-0.21.patch

This file was deleted.

72 changes: 72 additions & 0 deletions patches/gettext-0.22.5.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
diff --color -Naur a/libtextstyle/lib/get_ppid_of.c b/libtextstyle/lib/get_ppid_of.c
--- a/libtextstyle/lib/get_ppid_of.c 2024-02-21 02:45:23
+++ b/libtextstyle/lib/get_ppid_of.c 2024-03-30 20:38:55
@@ -33,6 +33,8 @@
#endif

#if defined __APPLE__ && defined __MACH__ /* Mac OS X */
+# include <TargetConditionals.h>
+# if TARGET_OS_OSX
/* Get MAC_OS_X_VERSION_MIN_REQUIRED, MAC_OS_X_VERSION_MAX_ALLOWED.
The version at runtime satisfies
MAC_OS_X_VERSION_MIN_REQUIRED <= version <= MAC_OS_X_VERSION_MAX_ALLOWED. */
@@ -46,6 +48,7 @@
extern int proc_pidinfo (int, int, uint64_t, void *, int) WEAK_IMPORT_ATTRIBUTE;
# endif
# endif
+# endif
#endif

#if defined _AIX /* AIX */
@@ -238,6 +241,7 @@
#endif

#if defined __APPLE__ && defined __MACH__ /* Mac OS X */
+# if TARGET_OS_OSX
# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050

/* Mac OS X >= 10.7 has PROC_PIDT_SHORTBSDINFO. */
@@ -271,6 +275,7 @@
}
# endif

+# endif
# endif
#endif

diff --color -Naur a/libtextstyle/lib/get_progname_of.c b/libtextstyle/lib/get_progname_of.c
--- a/libtextstyle/lib/get_progname_of.c 2024-02-21 02:45:23
+++ b/libtextstyle/lib/get_progname_of.c 2024-03-30 20:39:22
@@ -41,6 +41,8 @@
#endif

#if defined __APPLE__ && defined __MACH__ /* Mac OS X */
+# include <TargetConditionals.h>
+# if TARGET_OS_OSX
/* Get MAC_OS_X_VERSION_MIN_REQUIRED, MAC_OS_X_VERSION_MAX_ALLOWED.
The version at runtime satisfies
MAC_OS_X_VERSION_MIN_REQUIRED <= version <= MAC_OS_X_VERSION_MAX_ALLOWED. */
@@ -54,6 +56,7 @@
extern int proc_pidinfo (int, int, uint64_t, void *, int) WEAK_IMPORT_ATTRIBUTE;
# endif
# endif
+# endif
#endif

#if defined _AIX /* AIX */
@@ -278,6 +281,7 @@
#endif

#if defined __APPLE__ && defined __MACH__ /* Mac OS X */
+# if TARGET_OS_OSX
# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050

/* Mac OS X >= 10.7 has PROC_PIDT_SHORTBSDINFO. */
@@ -311,6 +315,7 @@
}
# endif

+# endif
# endif
#endif

43 changes: 43 additions & 0 deletions patches/qemu-7.2.0-utm.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7011,3 +7011,46 @@ index 9f6e6279d9..b6cda6e00b 100644
--
2.41.0

From c03d7e35473b57544523ba19975023332567a63d Mon Sep 17 00:00:00 2001
From: osy <[email protected]>
Date: Sat, 30 Mar 2024 20:15:01 -0700
Subject: [PATCH] egl-helpers: incorrect type for native_display

---
ui/egl-helpers.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
index 0df9dd8fd5..0e9a3e469d 100644
--- a/ui/egl-helpers.c
+++ b/ui/egl-helpers.c
@@ -505,7 +505,7 @@ static int qemu_egl_init_dpy_platform(EGLNativeDisplayType native,
PFNEGLGETPLATFORMDISPLAYEXTPROC getPlatformDisplayEXT =
(void *) eglGetProcAddress("eglGetPlatformDisplayEXT");
if (getPlatformDisplayEXT && platform != 0) {
- dpy = getPlatformDisplayEXT(platform, native, NULL);
+ dpy = getPlatformDisplayEXT(platform, (void *)native, NULL);
}
}

@@ -526,7 +526,7 @@ static int qemu_egl_init_dpy_platform(EGLNativeDisplayType native,

int qemu_egl_init_dpy_surfaceless(DisplayGLMode mode)
{
- return qemu_egl_init_dpy_platform(NULL, EGL_PLATFORM_SURFACELESS_MESA, mode);
+ return qemu_egl_init_dpy_platform(EGL_DEFAULT_DISPLAY, EGL_PLATFORM_SURFACELESS_MESA, mode);
}

#if defined(CONFIG_X11) || defined(CONFIG_GBM)
@@ -555,7 +555,7 @@ int qemu_egl_init_dpy_mesa(EGLNativeDisplayType dpy, DisplayGLMode mode)

int qemu_egl_init_dpy_angle(DisplayGLMode mode)
{
- return qemu_egl_init_dpy_platform(NULL, EGL_PLATFORM_ANGLE_ANGLE, mode);
+ return qemu_egl_init_dpy_platform(EGL_DEFAULT_DISPLAY, EGL_PLATFORM_ANGLE_ANGLE, mode);
}

#endif
--
2.41.0

2 changes: 1 addition & 1 deletion patches/sources
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PKG_CONFIG_SRC="https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar
# Source files for qemu
FFI_SRC="https://sourceware.org/ftp/libffi/libffi-3.3.tar.gz"
ICONV_SRC="https://ftp.gnu.org/gnu/libiconv/libiconv-1.16.tar.gz"
GETTEXT_SRC="https://ftp.gnu.org/gnu/gettext/gettext-0.21.tar.gz"
GETTEXT_SRC="https://ftp.gnu.org/gnu/gettext/gettext-0.22.5.tar.gz"
PNG_SRC="https://ftp.osuosl.org/pub/blfs/conglomeration/libpng/libpng-1.6.37.tar.xz"
JPEG_TURBO_SRC="https://ftp.osuosl.org/pub/blfs/conglomeration/libjpeg-turbo/libjpeg-turbo-1.5.3.tar.gz"
GLIB_SRC="https://download.gnome.org/sources/glib/2.69/glib-2.69.0.tar.xz"
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ export STRIP
export PREFIX

# Flags
CFLAGS="$CFLAGS -arch $ARCH -isysroot $SDKROOT -I$PREFIX/include -F$PREFIX/Frameworks $CFLAGS_MINVER $CFLAGS_TARGET -Wno-error=incompatible-function-pointer-types -Wno-error=int-conversion"
CFLAGS="$CFLAGS -arch $ARCH -isysroot $SDKROOT -I$PREFIX/include -F$PREFIX/Frameworks $CFLAGS_MINVER $CFLAGS_TARGET"
CPPFLAGS="$CPPFLAGS -arch $ARCH -isysroot $SDKROOT -I$PREFIX/include -F$PREFIX/Frameworks $CFLAGS_MINVER $CFLAGS_TARGET"
CXXFLAGS="$CXXFLAGS -arch $ARCH -isysroot $SDKROOT -I$PREFIX/include -F$PREFIX/Frameworks $CFLAGS_MINVER $CFLAGS_TARGET"
OBJCFLAGS="$OBJCFLAGS -arch $ARCH -isysroot $SDKROOT -I$PREFIX/include -F$PREFIX/Frameworks $CFLAGS_MINVER $CFLAGS_TARGET"
Expand Down

0 comments on commit 2fc13ca

Please sign in to comment.