void-packages/srcpkgs/osmid/patches/musl.patch
Đoàn Trần Công Danh 2fd8d4df94 srcpkgs/o*: convert patches to -Np1
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
	for p in ${template%/template}/patches/*; do
		sed -i '
			\,^[+-][+-][+-] /dev/null,b
			/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
			s,^[*][*][*] ,&a/,
			/^--- /{
				s,\(^--- \)\(./\)*,\1a/,
				s,[.-][Oo][Rr][Ii][Gg]\([	/]\),\1,
				s/[.-][Oo][Rr][Ii][Gg]$//
				s/[.]patched[.]\([^.]\)/.\1/
				h
			}
			/^+++ -/{
				g
				s/^--- a/+++ b/
				b
			}
			s,\(^+++ \)\(./\)*,\1b/,
		' "$p"
	done
	sed -i '/^patch_args=/d' $template
done
```
2021-06-20 13:17:29 +07:00

29 lines
1.5 KiB
Diff

--- a/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2018-03-27 16:52:31.000000000 +0200
+++ b/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2018-06-26 02:41:16.728143943 +0200
@@ -126,9 +126,15 @@
return result;
}
+#if defined(__GLIBC__)
String SystemStats::getUserLanguage() { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
String SystemStats::getUserRegion() { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); }
+#else
+String SystemStats::getUserLanguage() { return "en"; }
+String SystemStats::getUserRegion() { return "US"; }
+String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); }
+#endif
//==============================================================================
void CPUInformation::initialise() noexcept
--- a/external_libs/spdlog-0.11.0/include/spdlog/details/os.h 2018-03-27 16:52:31.000000000 +0200
+++ b/external_libs/spdlog-0.11.0/include/spdlog/details/os.h 2018-06-26 02:45:39.903133450 +0200
@@ -343,7 +343,7 @@
return "Unkown error";
#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || \
- ((_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE) // posix version
+ !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE) // posix version
if (strerror_r(err_num, buf, buf_size) == 0)
return std::string(buf);