* [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/
@ 2018-12-08 14:12 Thomas Beierlein
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Beierlein @ 2018-12-08 14:12 UTC (permalink / raw
To: gentoo-commits
commit: ae2ff5064c5bc47cea0ba85337b9d74bec47285a
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 8 14:04:12 2018 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Dec 8 14:04:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae2ff506
media-radio/xastir: Drop also forgotten patch file
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/xastir/files/xastir-2.0.4-scripts.diff | 101 ---------------------
1 file changed, 101 deletions(-)
diff --git a/media-radio/xastir/files/xastir-2.0.4-scripts.diff b/media-radio/xastir/files/xastir-2.0.4-scripts.diff
deleted file mode 100644
index 369295b07f8..00000000000
--- a/media-radio/xastir/files/xastir-2.0.4-scripts.diff
+++ /dev/null
@@ -1,101 +0,0 @@
-# patch scripts location (bug #407185). partially backported from upstream.
---- xastir-2.0.0-orig/scripts/Makefile.am.orig 2012-11-27 05:41:23.000000000 +0100
-+++ xastir-2.0.0/scripts/Makefile.am 2012-12-05 06:21:59.000000000 +0100
-@@ -12,9 +12,7 @@
- get-fcc-rac.pl \
- get-gnis \
- get-pop \
-- get-maptools.sh \
- get-NWSdata \
-- get_shapelib.sh \
- gpx2shape \
- icontable.pl \
- inf2geo.pl \
-@@ -43,10 +41,8 @@
- values \
- values.pl \
- waypoint-get.pl \
-- xastir-fixcfg.sh \
-- xastir-migrate.sh \
- Xastir_tigerpoly.py
-
- install-data-hook:
- cd $(DESTDIR)$(scriptsdir) && \
-- chmod a+x *.sh *.pl *.py get-* gpx2* *.bash
-+ chmod a+x *.pl *.py get-* gpx2* *.bash
-diff -Nur -u xastir-2.0.0.orig/scripts/coord-convert.pl xastir-2.0.0/scripts/coord-convert.pl
---- xastir-2.0.0.orig/scripts/coord-convert.pl 2010-07-03 22:09:48.000000000 +0000
-+++ xastir-2.0.0/scripts/coord-convert.pl 2012-03-07 15:46:01.000000000 +0000
-@@ -26,7 +26,7 @@
- #
-
-
--use lib "${prefix}/lib";
-+use lib /usr/share/xastir/scripts;
- use Coordinate; # WE7U's Coordinate.pm module
-
-
-diff -Nur -u xastir-2.0.0.orig/scripts/permutations.pl xastir-2.0.0/scripts/permutations.pl
---- xastir-2.0.0.orig/scripts/permutations.pl 2010-07-03 22:09:48.000000000 +0000
-+++ xastir-2.0.0/scripts/permutations.pl 2012-03-07 15:42:34.000000000 +0000
-@@ -34,7 +34,7 @@
- #
-
-
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate; # WE7U's Coordinate.pm module
-
-
-diff -Nur -u xastir-2.0.0.orig/scripts/test_coord.pl xastir-2.0.0/scripts/test_coord.pl
---- xastir-2.0.0.orig/scripts/test_coord.pl 2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/test_coord.pl 2012-03-07 15:42:34.000000000 +0000
-@@ -33,7 +33,7 @@
-
- #------------------------------------------------------------------------------------------------
-
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate; # Snag WE7U's Coordinate module
-
-
-diff -Nur -u xastir-2.0.0.orig/scripts/toporama250k.pl xastir-2.0.0/scripts/toporama250k.pl
---- xastir-2.0.0.orig/scripts/toporama250k.pl 2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/toporama250k.pl 2012-03-07 15:46:49.000000000 +0000
-@@ -28,14 +28,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- # by becoming root using the "su" command, using "sudo", or
- # temporarily changing ownership and/or privileges on the
- # "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama250k.pl"
-+# - "/usr/share/xastir/scripts/toporama250k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- # .../maps/toporama/images/
-diff -Nur -u xastir-2.0.0.orig/scripts/toporama50k.pl xastir-2.0.0/scripts/toporama50k.pl
---- xastir-2.0.0.orig/scripts/toporama50k.pl 2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/toporama50k.pl 2012-03-07 15:47:01.000000000 +0000
-@@ -27,14 +27,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- # by becoming root using the "su" command, using "sudo", or
- # temporarily changing ownership and/or privileges on the
- # "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama50k.pl"
-+# - "/usr/share/xastir/scripts/toporama50k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- # .../maps/toporama/images/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/
@ 2019-11-13 1:05 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2019-11-13 1:05 UTC (permalink / raw
To: gentoo-commits
commit: 1a69a17cc3c1a96b4689fd19f077f11212ec44d4
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Nov 12 17:22:49 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 01:05:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a69a17c
media-radio/xastir: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13622
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
media-radio/xastir/files/xastir-2.1.0-scripts.diff | 92 ----------------------
1 file changed, 92 deletions(-)
diff --git a/media-radio/xastir/files/xastir-2.1.0-scripts.diff b/media-radio/xastir/files/xastir-2.1.0-scripts.diff
deleted file mode 100644
index de8a461bcea..00000000000
--- a/media-radio/xastir/files/xastir-2.1.0-scripts.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-# patch scripts location (bug #407185). partially backported from upstream.
-diff -u Xastir-Release-2.1.0/scripts.orig/Makefile.am Xastir-Release-2.1.0/scripts/Makefile.am
---- Xastir-Release-2.1.0/scripts.orig/Makefile.am 2018-12-08 12:14:51.881373754 +0100
-+++ Xastir-Release-2.1.0/scripts/Makefile.am 2018-12-08 12:15:53.206401168 +0100
-@@ -45,10 +45,8 @@
- waypoint-get.pl \
- wms.pl \
- wxnowsrv.pl \
-- xastir-fixcfg.sh \
-- xastir-migrate.sh \
- Xastir_tigerpoly.py
-
- install-data-hook:
- cd $(DESTDIR)$(scriptsdir) && \
-- chmod a+x *.sh *.pl *.py get-* gpx2* *.bash
-+ chmod a+x *.pl *.py get-* gpx2* *.bash
-diff -Nur -u xastir-2.0.0.orig/scripts/coord-convert.pl xastir-2.0.0/scripts/coord-convert.pl
---- xastir-2.0.0.orig/scripts/coord-convert.pl 2010-07-03 22:09:48.000000000 +0000
-+++ xastir-2.0.0/scripts/coord-convert.pl 2012-03-07 15:46:01.000000000 +0000
-@@ -26,7 +26,7 @@
- #
-
-
--use lib "${prefix}/lib";
-+use lib /usr/share/xastir/scripts;
- use Coordinate; # WE7U's Coordinate.pm module
-
-
-diff -Nur -u xastir-2.0.0.orig/scripts/permutations.pl xastir-2.0.0/scripts/permutations.pl
---- xastir-2.0.0.orig/scripts/permutations.pl 2010-07-03 22:09:48.000000000 +0000
-+++ xastir-2.0.0/scripts/permutations.pl 2012-03-07 15:42:34.000000000 +0000
-@@ -34,7 +34,7 @@
- #
-
-
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate; # WE7U's Coordinate.pm module
-
-
-diff -Nur -u xastir-2.0.0.orig/scripts/test_coord.pl xastir-2.0.0/scripts/test_coord.pl
---- xastir-2.0.0.orig/scripts/test_coord.pl 2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/test_coord.pl 2012-03-07 15:42:34.000000000 +0000
-@@ -33,7 +33,7 @@
-
- #------------------------------------------------------------------------------------------------
-
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate; # Snag WE7U's Coordinate module
-
-
-diff -Nur -u xastir-2.0.0.orig/scripts/toporama250k.pl xastir-2.0.0/scripts/toporama250k.pl
---- xastir-2.0.0.orig/scripts/toporama250k.pl 2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/toporama250k.pl 2012-03-07 15:46:49.000000000 +0000
-@@ -28,14 +28,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- # by becoming root using the "su" command, using "sudo", or
- # temporarily changing ownership and/or privileges on the
- # "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama250k.pl"
-+# - "/usr/share/xastir/scripts/toporama250k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- # .../maps/toporama/images/
-diff -Nur -u xastir-2.0.0.orig/scripts/toporama50k.pl xastir-2.0.0/scripts/toporama50k.pl
---- xastir-2.0.0.orig/scripts/toporama50k.pl 2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/toporama50k.pl 2012-03-07 15:47:01.000000000 +0000
-@@ -27,14 +27,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- # by becoming root using the "su" command, using "sudo", or
- # temporarily changing ownership and/or privileges on the
- # "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama50k.pl"
-+# - "/usr/share/xastir/scripts/toporama50k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- # .../maps/toporama/images/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/
@ 2020-07-28 18:20 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2020-07-28 18:20 UTC (permalink / raw
To: gentoo-commits
commit: 2958e55e617197713da52ca46d5b2f7b44414541
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jul 28 13:34:31 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 18:19:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2958e55e
media-radio/xastir: remove unused patch
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16875
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../xastir/files/xastir-2.1.4-fno-common.diff | 63 ----------------------
1 file changed, 63 deletions(-)
diff --git a/media-radio/xastir/files/xastir-2.1.4-fno-common.diff b/media-radio/xastir/files/xastir-2.1.4-fno-common.diff
deleted file mode 100644
index f2580b5977e..00000000000
--- a/media-radio/xastir/files/xastir-2.1.4-fno-common.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-# Fixes build with -fno-common (bug #706952)
-
-diff --git a/src/objects.h b/src/objects.h
-index b1bf8b5..ef5b9b1 100644
---- a/src/objects.h
-+++ b/src/objects.h
-@@ -95,7 +95,7 @@ if (debug_level & 4) { fprintf(stderr, "Changing euid to %d and egid to %d\n", (
- //
- // number_of_predefined_objects holds the actual number of predefined
- // objects available to display on the Create/Move popup menu.
--int number_of_predefined_objects;
-+extern int number_of_predefined_objects;
- // File name of ~/.xastir/config file containing definitions for
- // a predefined object menu.
- extern char predefined_object_definition_filename[256];
-diff --git a/src/x_spider.c b/src/x_spider.c
-index a1fabc4..e5a0bc3 100644
---- a/src/x_spider.c
-+++ b/src/x_spider.c
-@@ -185,6 +185,7 @@ extern void split_string( char *data, char *cptr[], int max, char search_char );
- // From database.h
- extern char my_callsign[];
-
-+extern char *pname;
-
- typedef struct _pipe_object
- {
-diff --git a/src/x_spider.h b/src/x_spider.h
-index d8af8e9..a168b1f 100644
---- a/src/x_spider.h
-+++ b/src/x_spider.h
-@@ -31,7 +31,7 @@
- #define SERV_UDP_PORT 2023
-
-
--char *pname;
-+extern char *pname;
- extern int pipe_xastir_to_tcp_server;
- extern int pipe_tcp_server_to_xastir;
- extern int pipe_xastir_to_udp_server;
-diff --git a/src/xa_config.c b/src/xa_config.c
-index 9a6f1f3..2ded26c 100644
---- a/src/xa_config.c
-+++ b/src/xa_config.c
-@@ -65,7 +65,7 @@
-
- #define MAX_VALUE 300
-
--//extern char xa_config_dir[];
-+char xa_config_dir[1000]; /* cmdline option user config dir */
-
-
-
-diff --git a/src/xa_config.h b/src/xa_config.h
-index 9947145..530fc06 100644
---- a/src/xa_config.h
-+++ b/src/xa_config.h
-@@ -31,4 +31,4 @@ char *get_data_base_dir(char *dir);
- void save_data(void);
- void load_data_or_default(void);
-
--char xa_config_dir[1000]; /* cmdline option user config dir */
-+extern char xa_config_dir[1000]; /* cmdline option user config dir */
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-28 18:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-13 1:05 [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/files/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2020-07-28 18:20 Aaron Bauman
2018-12-08 14:12 Thomas Beierlein
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox