[patch] proposed patch to flatten the Unicode

0002-sci-geosciences-gpsd-address-796476-by-flattening-un.patch (text/plain), 4.18 KB, created by James Browning on 2022-04-12 19:04:02 UTC

From f49baab81ca8047c055a2083da2c3a268098d38f Mon Sep 17 00:00:00 2001
From: James Browning <[e-mail]>
Date: Tue, 12 Apr 2022 12:00:25 -0700
Subject: [PATCH 2/2] sci-geosciences/gpsd: address #796476 by flattening
 unicode

Signed-off-by: James T Browning <[e-mail]>
tested: no
---
 .../gpsd/files/0001-flaten-unicode.patch      | 40 +++++++++++++++++++
 .../gpsd/files/0002-flaten-more-unicode.patch | 26 ++++++++++++
 sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild    |  5 +++
 3 files changed, 71 insertions(+)
 create mode 100644 sci-geosciences/gpsd/files/0001-flaten-unicode.patch
 create mode 100644 sci-geosciences/gpsd/files/0002-flaten-more-unicode.patch

diff --git a/sci-geosciences/gpsd/files/0001-flaten-unicode.patch b/sci-geosciences/gpsd/files/0001-flaten-unicode.patch
new file mode 100644
index 000000000..6196ade2d
--- /dev/null
+++ b/sci-geosciences/gpsd/files/0001-flaten-unicode.patch
@@ -0,0 +1,40 @@
+From 950d028661ba1bd845dc4f700500e5028526056e Mon Sep 17 00:00:00 2001
+From: "Gary E. Miller" <[e-mail]>
+Date: Wed, 30 Dec 2020 14:37:53 -0800
+Subject: [PATCH 1/2] packaging/rpm/gpsd.spec.in; remove unicode that confuse
+ substfile.
+
+Other FreeBSD breaks.
+---
+ packaging/rpm/gpsd.spec.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/packaging/rpm/gpsd.spec.in b/packaging/rpm/gpsd.spec.in
+index b665df06b..b3b5c90ec 100644
+--- a/packaging/rpm/gpsd.spec.in
++++ b/packaging/rpm/gpsd.spec.in
+@@ -279,10 +279,10 @@ desktop-file-install \
+ * Thu Aug 06 2020 James Browning <[e-mail]> - 3.21-0
+ - Rebuilt for upstream inclusion
+ 
+-* Thu Oct 03 2019 Miro Hrončok <[e-mail]> - 3.19-4
++* Thu Oct 03 2019 Miro Hroncok <[e-mail]> - 3.19-4
+ - Rebuilt for Python 3.8.0rc1 (#1748018)
+ 
+-* Mon Aug 19 2019 Miro Hrončok <[e-mail]> - 3.19-3
++* Mon Aug 19 2019 Miro Hroncok <[e-mail]> - 3.19-3
+ - Rebuilt for Python 3.8
+ 
+ * Thu Jul 25 2019 Fedora Release Engineering <[e-mail]> - 3.19-2
+@@ -311,7 +311,7 @@ desktop-file-install \
+ * Fri Jul 13 2018 Fedora Release Engineering <[e-mail]> - 3.17-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+ 
+-* Tue Jun 19 2018 Miro Hrončok <[e-mail]> - 3.17-4
++* Tue Jun 19 2018 Miro Hroncok <[e-mail]> - 3.17-4
+ - Rebuilt for Python 3.7
+ 
+ * Wed Feb 07 2018 Fedora Release Engineering <[e-mail]> - 3.17-3
+-- 
+2.32.0
+
diff --git a/sci-geosciences/gpsd/files/0002-flaten-more-unicode.patch b/sci-geosciences/gpsd/files/0002-flaten-more-unicode.patch
new file mode 100644
index 000000000..460a9f5e8
--- /dev/null
+++ b/sci-geosciences/gpsd/files/0002-flaten-more-unicode.patch
@@ -0,0 +1,26 @@
+From 33e797ed7f52f5c1d4a4735479c81bd9a9e8cde3 Mon Sep 17 00:00:00 2001
+From: "Gary E. Miller" <[e-mail]>
+Date: Wed, 30 Dec 2020 17:05:39 -0800
+Subject: [PATCH 2/2] packaging/rpm/gpsd.spec.in: Another UTF8 char killing
+ FreeBSD.
+
+---
+ packaging/rpm/gpsd.spec.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packaging/rpm/gpsd.spec.in b/packaging/rpm/gpsd.spec.in
+index b3b5c90ec..263fc907e 100644
+--- a/packaging/rpm/gpsd.spec.in
++++ b/packaging/rpm/gpsd.spec.in
+@@ -452,7 +452,7 @@ desktop-file-install \
+ * Tue Sep 14 2010 Miroslav Lichvar <[e-mail]> - 2.95-4
+ - don't crash in gpscat when started without arguments (#633117)
+ 
+-* Fri Aug 27 2010 Dan Horák <dan[at]danny.cz> - 2.95-3
++* Fri Aug 27 2010 Dan Horak <dan[at]danny.cz> - 2.95-3
+ - no USB on s390(x)
+ 
+ * Wed Jul 21 2010 David Malcolm <[e-mail]> - 2.95-2
+-- 
+2.32.0
+
diff --git a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
index 3440cbae4..b4709d2a6 100644
--- a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
@@ -79,6 +79,11 @@ python_check_deps() {
 }
 
 src_prepare() {
+
+	PATCHES=(
+		"0001-flaten-unicode.patch"
+		"0002-flaten-more-unicode.patch"
+	)
 	# Make sure our list matches the source.
 	local src_protocols=$(echo $(
 		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort
-- 
2.32.0