Attachment #770444 for bug #796476

View | Details | Raw Unified | Return to bug 796476
Collapse All | Expand All




From 950d028661ba1bd845dc4f700500e5028526056e Mon Sep 17 00:00:00 2001
From: "Gary E. Miller" <gem@rellim.com>
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 <jamesb.fe80@gmail.com> - 3.21-0
 - Rebuilt for upstream inclusion
 
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.19-4
+* Thu Oct 03 2019 Miro Hroncok <mhroncok@redhat.com> - 3.19-4
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.19-3
+* Mon Aug 19 2019 Miro Hroncok <mhroncok@redhat.com> - 3.19-3
 - Rebuilt for Python 3.8
 
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.19-2
@@ -311,7 +311,7 @@ desktop-file-install \
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.17-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.17-4
+* Tue Jun 19 2018 Miro Hroncok <mhroncok@redhat.com> - 3.17-4
 - Rebuilt for Python 3.7
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.17-3
-- 
2.32.0





From 33e797ed7f52f5c1d4a4735479c81bd9a9e8cde3 Mon Sep 17 00:00:00 2001
From: "Gary E. Miller" <gem@rellim.com>
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 <mlichvar@redhat.com> - 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 <dmalcolm@redhat.com> - 2.95-2
-- 
2.32.0


Lines 79-84 python_check_deps() { Link Here

(-)a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild (-1 / +5 lines)
79	}	79	}
80		80
81	src_prepare() {	81	src_prepare() {
		82
		83	PATCHES=(
		84	"0001-flaten-unicode.patch"
		85	"0002-flaten-more-unicode.patch"
		86	)
82	# Make sure our list matches the source.	87	# Make sure our list matches the source.
83	local src_protocols=$(echo $(	88	local src_protocols=$(echo $(
84	sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript \| awk '{print $1}' \| LC_ALL=C sort	89	sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript \| awk '{print $1}' \| LC_ALL=C sort
85	-

Return to bug 796476

Line 0 Link Here

(-)a/sci-geosciences/gpsd/files/0001-flaten-unicode.patch (+40 lines)
	1	From 950d028661ba1bd845dc4f700500e5028526056e Mon Sep 17 00:00:00 2001
	2	From: "Gary E. Miller" <gem@rellim.com>
	3	Date: Wed, 30 Dec 2020 14:37:53 -0800
	4	Subject: [PATCH 1/2] packaging/rpm/gpsd.spec.in; remove unicode that confuse
	5	substfile.
	6
	7	Other FreeBSD breaks.
	8	---
	9	packaging/rpm/gpsd.spec.in \| 6 +++---
	10	1 file changed, 3 insertions(+), 3 deletions(-)
	11
	12	diff --git a/packaging/rpm/gpsd.spec.in b/packaging/rpm/gpsd.spec.in
	13	index b665df06b..b3b5c90ec 100644
	14	--- a/packaging/rpm/gpsd.spec.in
	15	+++ b/packaging/rpm/gpsd.spec.in
	16	@@ -279,10 +279,10 @@ desktop-file-install \
	17	* Thu Aug 06 2020 James Browning <jamesb.fe80@gmail.com> - 3.21-0
	18	- Rebuilt for upstream inclusion
	19
	20	-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.19-4
	21	+* Thu Oct 03 2019 Miro Hroncok <mhroncok@redhat.com> - 3.19-4
	22	- Rebuilt for Python 3.8.0rc1 (#1748018)
	23
	24	-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.19-3
	25	+* Mon Aug 19 2019 Miro Hroncok <mhroncok@redhat.com> - 3.19-3
	26	- Rebuilt for Python 3.8
	27
	28	* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.19-2
	29	@@ -311,7 +311,7 @@ desktop-file-install \
	30	* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.17-5
	31	- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
	32
	33	-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.17-4
	34	+* Tue Jun 19 2018 Miro Hroncok <mhroncok@redhat.com> - 3.17-4
	35	- Rebuilt for Python 3.7
	36
	37	* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.17-3
	38	--
	39	2.32.0
	40

Line 0 Link Here

(-)a/sci-geosciences/gpsd/files/0002-flaten-more-unicode.patch (+26 lines)
	1	From 33e797ed7f52f5c1d4a4735479c81bd9a9e8cde3 Mon Sep 17 00:00:00 2001
	2	From: "Gary E. Miller" <gem@rellim.com>
	3	Date: Wed, 30 Dec 2020 17:05:39 -0800
	4	Subject: [PATCH 2/2] packaging/rpm/gpsd.spec.in: Another UTF8 char killing
	5	FreeBSD.
	6
	7	---
	8	packaging/rpm/gpsd.spec.in \| 2 +-
	9	1 file changed, 1 insertion(+), 1 deletion(-)
	10
	11	diff --git a/packaging/rpm/gpsd.spec.in b/packaging/rpm/gpsd.spec.in
	12	index b3b5c90ec..263fc907e 100644
	13	--- a/packaging/rpm/gpsd.spec.in
	14	+++ b/packaging/rpm/gpsd.spec.in
	15	@@ -452,7 +452,7 @@ desktop-file-install \
	16	* Tue Sep 14 2010 Miroslav Lichvar <mlichvar@redhat.com> - 2.95-4
	17	- don't crash in gpscat when started without arguments (#633117)
	18
	19	-* Fri Aug 27 2010 Dan Horák <dan[at]danny.cz> - 2.95-3
	20	+* Fri Aug 27 2010 Dan Horak <dan[at]danny.cz> - 2.95-3
	21	- no USB on s390(x)
	22
	23	* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 2.95-2
	24	--
	25	2.32.0
	26