all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed

blob 1a3a70286f78a48ada45b0fba0b371ba9097c2bd 982 bytes (raw)
name: gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.patch 	 # note: path name is non-authoritative(*)

Stub out some glibc-specific functions

This allows support for alternative libcs like musl

diff --git a/base/platform/linux/base_info_linux.cpp b/base/platform/linux/base_info_linux.cpp
index 714d8dc..b70cc23 100644
--- a/base/platform/linux/base_info_linux.cpp
+++ b/base/platform/linux/base_info_linux.cpp
@@ -22,7 +22,7 @@

 #include <sys/utsname.h>

-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
 #include <gnu/libc-version.h>
 #endif // Q_OS_LINUX

@@ -200,7 +200,7 @@ QString AutoUpdateKey() {
 }

 QString GetLibcName() {
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
 	return "glibc";
 #endif // Q_OS_LINUX

@@ -208,7 +208,7 @@ QString GetLibcName() {
 }

 QString GetLibcVersion() {
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
 	static const auto result = [&] {
 		const auto version = QString::fromLatin1(gnu_get_libc_version());
 		return QVersionNumber::fromString(version).isNull() ? QString() : version;

debug log:

solving 1a3a70286f ...
found 1a3a70286f in https://yhetil.org/guix/y76sfl28yw8.wl-hako@ultrarare.space/ ||
	https://yhetil.org/guix/y76pmg68ssd.wl-hako@ultrarare.space/ ||
	https://yhetil.org/guix/y768rmu6nqr.wl-hako@ultrarare.space/

applying [1/1] https://yhetil.org/guix/y76sfl28yw8.wl-hako@ultrarare.space/
diff --git a/gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.patch b/gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.patch
new file mode 100644
index 0000000000..1a3a70286f

1:30: space before tab in indent.
 	return "glibc";
1:39: space before tab in indent.
 	static const auto result = [&] {
1:40: space before tab in indent.
 		const auto version = QString::fromLatin1(gnu_get_libc_version());
1:41: space before tab in indent.
 		return QVersionNumber::fromString(version).isNull() ? QString() : version;
Checking patch gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.patch...
Applied patch gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.patch cleanly.
warning: 4 lines add whitespace errors.

skipping https://yhetil.org/guix/y76pmg68ssd.wl-hako@ultrarare.space/ for 1a3a70286f
skipping https://yhetil.org/guix/y768rmu6nqr.wl-hako@ultrarare.space/ for 1a3a70286f
index at:
100644 1a3a70286f78a48ada45b0fba0b371ba9097c2bd	gnu/packages/patches/lib-base-for-telegram-desktop-support-musl.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.