Page MenuHomeSolus
Differential D11318 Diff 27312 files/patches/0001-Unset-xlocale-macro-in-media-and-web.patch

Changeset View

Standalone View

View Options

files/patches/0001-Unset-xlocale-macro-in-media-and-web.patch

  • This file was moved from files/0002-Fix-build-errors.patch.
From 048a5ff439bd6e969fd9ccda56d3a74447850090 Mon Sep 17 00:00:00 2001 From cc9ea3c44468e72817a30a17b798f61b5903fb79 Mon Sep 17 00:00:00 2001
From: Philipp Trulson <philipp@trulson.de> From: Campbell Jones <git@serebit.com>
Date: Tue, 23 Oct 2018 11:04:08 +0200 Date: Sat, 19 Jun 2021 13:15:15 -0400
Subject: [PATCH] Fix build errors. Disabling xlocale, because it's missing in Subject: [PATCH] Unset xlocale macro in media and web
newer glibc.
--- ---
.../3rd_party/glib/glib-2.56.1/build/linux/x64/config.h | 2 +- .../3rd_party/glib/glib-2.56.1/build/linux/x64/config.h | 2 +-
.../src/main/native/Source/ThirdParty/libxslt/linux/config.h | 2 +- .../src/main/native/Source/ThirdParty/libxslt/linux/config.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/build/linux/x64/config.h b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/build/linux/x64/config.h diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/build/linux/x64/config.h b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/build/linux/x64/config.h
index 1359356..c448395 100644 index 13593560..9b6eb4e8 100644
--- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/build/linux/x64/config.h --- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/build/linux/x64/config.h
+++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/build/linux/x64/config.h +++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/build/linux/x64/config.h
@@ -646,7 +646,7 @@ @@ -646,7 +646,7 @@
/* #undef HAVE_XATTR_NOFOLLOW */ /* #undef HAVE_XATTR_NOFOLLOW */
/* Define to 1 if you have the <xlocale.h> header file. */ /* Define to 1 if you have the <xlocale.h> header file. */
-#define HAVE_XLOCALE_H 1 -#define HAVE_XLOCALE_H 1
+/* #undef HAVE_XLOCALE_H */ +/* #define HAVE_XLOCALE_H 1 */
/* Define to 1 if you have the `_NSGetEnviron' function. */ /* Define to 1 if you have the `_NSGetEnviron' function. */
/* #undef HAVE__NSGETENVIRON */ /* #undef HAVE__NSGETENVIRON */
diff --git a/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h b/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h diff --git a/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h b/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h
index bd44c16..566bf64 100644 index bd44c163..b19b45f4 100644
--- a/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h --- a/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h
+++ b/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h +++ b/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
#define HAVE_VSPRINTF 1 #define HAVE_VSPRINTF 1
/* Define to 1 if you have the <xlocale.h> header file. */ /* Define to 1 if you have the <xlocale.h> header file. */
-#define HAVE_XLOCALE_H 1 -#define HAVE_XLOCALE_H 1
+/* #undef HAVE_XLOCALE_H */ +/* #define HAVE_XLOCALE_H 1 */
/* Define to 1 if you have the `_stat' function. */ /* Define to 1 if you have the `_stat' function. */
/* #undef HAVE__STAT */ /* #undef HAVE__STAT */
-- --
2.19.1 2.30.2
Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.