From 02735d5212fd10c2247b1888ea28a7f4248fda3a Mon Sep 17 00:00:00 2001 From: Thomas Beierlein Date: Mon, 15 Jul 2013 06:12:52 +0000 Subject: Drop forgotten patch files (Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 0x762053D5) --- media-radio/xastir/ChangeLog | 8 +- media-radio/xastir/files/xastir-1.9.8-fortify.diff | 141 --------------------- media-radio/xastir/files/xastir-2.0.0-Destdir.diff | 24 ---- .../files/xastir-2.0.0-no-builtin-shapelib.diff | 52 -------- media-radio/xastir/files/xastir-2.0.0-proj48.diff | 32 ----- media-radio/xastir/files/xastir-2.0.0-scripts.diff | 108 ---------------- 6 files changed, 7 insertions(+), 358 deletions(-) delete mode 100644 media-radio/xastir/files/xastir-1.9.8-fortify.diff delete mode 100644 media-radio/xastir/files/xastir-2.0.0-Destdir.diff delete mode 100644 media-radio/xastir/files/xastir-2.0.0-no-builtin-shapelib.diff delete mode 100644 media-radio/xastir/files/xastir-2.0.0-proj48.diff delete mode 100644 media-radio/xastir/files/xastir-2.0.0-scripts.diff (limited to 'media-radio/xastir') diff --git a/media-radio/xastir/ChangeLog b/media-radio/xastir/ChangeLog index 1060ad06198d..41ea56b848fa 100644 --- a/media-radio/xastir/ChangeLog +++ b/media-radio/xastir/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-radio/xastir # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.36 2013/07/15 06:05:53 tomjbe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.37 2013/07/15 06:12:52 tomjbe Exp $ + + 15 Jul 2013; Thomas Beierlein + -files/xastir-1.9.8-fortify.diff, -files/xastir-2.0.0-Destdir.diff, + -files/xastir-2.0.0-no-builtin-shapelib.diff, + -files/xastir-2.0.0-proj48.diff, -files/xastir-2.0.0-scripts.diff: + Drop forgotten patch files 15 Jul 2013; Thomas Beierlein -xastir-2.0.0-r2.ebuild: Drop old diff --git a/media-radio/xastir/files/xastir-1.9.8-fortify.diff b/media-radio/xastir/files/xastir-1.9.8-fortify.diff deleted file mode 100644 index b9fb4a9f38a5..000000000000 --- a/media-radio/xastir/files/xastir-1.9.8-fortify.diff +++ /dev/null @@ -1,141 +0,0 @@ ---- src/rac_data.c.orig 2010-09-24 15:43:04.000000000 +0000 -+++ src/rac_data.c 2010-09-24 15:57:00.000000000 +0000 -@@ -209,12 +209,13 @@ - char char_offset[16]; - char index[32]; - int found = 0; -- rac_record racdata; -+ char buffer[sizeof(rac_record)]; -+ rac_record *racdata = (rac_record *)buffer; - /*char filler[8];*/ - - - xastir_snprintf(index, sizeof(index)," "); -- xastir_snprintf(racdata.callsign, sizeof(racdata.callsign)," "); -+ xastir_snprintf(racdata->callsign, sizeof(racdata->callsign)," "); - - /* ==================================================================== */ - /* Search thru the index, get the RBA */ -@@ -251,19 +252,19 @@ - if (callsign[5] == '-') - (void)chomp(callsign,5); - -- while (!feof(fdb) && strncmp((char *)&racdata, callsign, 6) < 0) -+ while (!feof(fdb) && strncmp(buffer, callsign, 6) < 0) - - //WE7U - // Problem here: We're sticking 8 bytes too many into racdata! -- rc = fgets((char *)&racdata, sizeof(racdata), fdb); -+ rc = fgets(buffer, sizeof(buffer), fdb); - - } else - fprintf(stderr,"Search:Could not open RAC data base: %s\n", get_data_base_dir("fcc/AMACALL.LST") ); - - /* || (callsign[5] == '-' && strncmp((char *)&racdata,callsign,5) < 0)) */ -- (void)chomp(racdata.callsign, 6); -+ (void)chomp(racdata->callsign, 6); - -- if (!strncmp((char *)racdata.callsign, callsign, 6)) { -+ if (!strncmp(racdata->callsign, callsign, 6)) { - found = 1; - - // Some of these cause problems on 64-bit processors, so commented -@@ -287,82 +288,82 @@ - xastir_snprintf(data->callsign, - sizeof(data->callsign), - "%s", -- racdata.callsign); -+ racdata->callsign); - - xastir_snprintf(data->first_name, - sizeof(data->first_name), - "%s", -- racdata.first_name); -+ racdata->first_name); - - xastir_snprintf(data->last_name, - sizeof(data->last_name), - "%s", -- racdata.last_name); -+ racdata->last_name); - - xastir_snprintf(data->address, - sizeof(data->address), - "%s", -- racdata.address); -+ racdata->address); - - xastir_snprintf(data->city, - sizeof(data->city), - "%s", -- racdata.city); -+ racdata->city); - - xastir_snprintf(data->province, - sizeof(data->province), - "%s", -- racdata.province); -+ racdata->province); - - xastir_snprintf(data->postal_code, - sizeof(data->postal_code), - "%s", -- racdata.postal_code); -+ racdata->postal_code); - - xastir_snprintf(data->qual_a, - sizeof(data->qual_a), - "%s", -- racdata.qual_a); -+ racdata->qual_a); - - xastir_snprintf(data->qual_b, - sizeof(data->qual_b), - "%s", -- racdata.qual_b); -+ racdata->qual_b); - - xastir_snprintf(data->qual_c, - sizeof(data->qual_c), - "%s", -- racdata.qual_c); -+ racdata->qual_c); - - xastir_snprintf(data->qual_d, - sizeof(data->qual_d), - "%s", -- racdata.qual_d); -+ racdata->qual_d); - - xastir_snprintf(data->club_name, - sizeof(data->club_name), - "%s", -- racdata.club_name); -+ racdata->club_name); - - xastir_snprintf(data->club_address, - sizeof(data->club_address), - "%s", -- racdata.club_address); -+ racdata->club_address); - - xastir_snprintf(data->club_city, - sizeof(data->club_city), - "%s", -- racdata.club_city); -+ racdata->club_city); - - xastir_snprintf(data->club_province, - sizeof(data->club_province), - "%s", -- racdata.club_province); -+ racdata->club_province); - - xastir_snprintf(data->club_postal_code, - sizeof(data->club_postal_code), - "%s", -- racdata.club_postal_code); -+ racdata->club_postal_code); - - } - (void)fclose(fdb); diff --git a/media-radio/xastir/files/xastir-2.0.0-Destdir.diff b/media-radio/xastir/files/xastir-2.0.0-Destdir.diff deleted file mode 100644 index 0d65c9e1a864..000000000000 --- a/media-radio/xastir/files/xastir-2.0.0-Destdir.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- config/Makefile.am.orig 2008-06-12 21:30:44.000000000 +0200 -+++ config/Makefile.am 2009-06-06 18:03:32.000000000 +0200 -@@ -93,5 +93,5 @@ - config_DATA = ${EXTRA_DIST} - - install-exec-hook: -- rm -f \$(configdir)/nwsfz_ddmmyy.dbfawk -+ rm -f $(DESTDIR)$(configdir)/nwsfz_ddmmyy.dbfawk - ---- Makefile.am.old 2010-11-19 06:06:16.000000000 +0000 -+++ Makefile.am 2010-11-19 06:07:34.000000000 +0000 -@@ -72,10 +72,10 @@ - # documentation is FHS compliant. - - install-exec-hook: -- -rm -rf ${pkgdatadir}/doc -+ -rm -rf ${DESTDIR}${pkgdatadir}/doc - - install-data-hook: -- cd $(mapdir) && \ -+ cd ${DESTDIR}$(mapdir) && \ - rm -f CC_OpenStreetMap.png && \ - $(LN_S) CC_OpenStreetMap_logo.png CC_OpenStreetMap.png - diff --git a/media-radio/xastir/files/xastir-2.0.0-no-builtin-shapelib.diff b/media-radio/xastir/files/xastir-2.0.0-no-builtin-shapelib.diff deleted file mode 100644 index 919b6aa01d64..000000000000 --- a/media-radio/xastir/files/xastir-2.0.0-no-builtin-shapelib.diff +++ /dev/null @@ -1,52 +0,0 @@ -# Do not use builtin bundled shapelib if sci-libs/shapelib is not -# installed. Drop shapelib support instead (bug #430704) ---- configure.ac.orig 2012-08-27 20:17:30.000000000 +0200 -+++ configure.ac 2012-08-27 20:19:32.000000000 +0200 -@@ -338,24 +338,14 @@ - - # Check for Shapelib - use_shapelib=yes --force_internal_shapelib=no - shapelib_desired=yes - LIBSHP="" - SUBSHP="" --AC_ARG_WITH(internal-shapelib,[ --with-internal-shapelib Force use of internal shapelib library.],force_internal_shapelib=$withval) - AC_ARG_WITH(shapelib,[ --without-shapelib Disable shapelib features.],shapelib_desired=$withval) - if test "${shapelib_desired}" = "no"; then - use_shapelib=no -- force_internal_shapelib=no - fi --if test "${force_internal_shapelib}" = "yes"; then -- AC_MSG_WARN([***************************************************************** ]) -- AC_MSG_WARN([Internal Shapelib library has been forced. ]) -- AC_MSG_WARN([***************************************************************** ]) -- # Temporary setting to get into if block below -- use_shapelib=no --fi --if test "${shapelib_desired}" = "yes" -a "${force_internal_shapelib}" = "no"; then -+if test "${shapelib_desired}" = "yes" ; then - use_shapelib=no - AC_CHECK_HEADERS(shapefil.h libshp/shapefil.h, [AC_CHECK_LIB(shp, DBFOpen, use_shapelib=yes - LIBS="$LIBS -lshp" -@@ -364,21 +354,6 @@ - AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). ) - break)]) - fi --if test "${shapelib_desired}" = "yes" -a "${use_shapelib}" = "no"; then -- AC_MSG_WARN([**************************************************************** ]) -- AC_MSG_WARN([Your system does not have shapelib installed. Using an internal ]) -- AC_MSG_WARN([version. This may lead to a larger filesize for the executable. ]) -- AC_MSG_WARN([Install shapelib on your system to eliminate this warning. ]) -- AC_MSG_WARN([**************************************************************** ]) -- LIBSHP="-Lshapelib -lshape" -- CPPFLAGS="-I\$(top_srcdir)/src/shapelib $CPPFLAGS" -- SUBSHP="shapelib" -- use_shapelib=yes -- force_internal_shapelib=yes -- AC_DEFINE(HAVE_DBFGETFIELDINDEX, , Define to 1 if your `shp' library has DBFGetFieldIndex. ) -- AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). ) -- AC_DEFINE(HAVE_SHAPEFIL_H, , Define to 1 if you have the `shapefil.h' header. ) --fi - AC_SUBST(SUBSHP) - AC_SUBST(LIBSHP) - diff --git a/media-radio/xastir/files/xastir-2.0.0-proj48.diff b/media-radio/xastir/files/xastir-2.0.0-proj48.diff deleted file mode 100644 index ea318d56dcb7..000000000000 --- a/media-radio/xastir/files/xastir-2.0.0-proj48.diff +++ /dev/null @@ -1,32 +0,0 @@ -#Replace include of "projects.h" with "proj_api.h" and remove use of what is -#now considered an internal structure (struct PJ). - -#Proj.4 has removed "projects.h" from the installation of that library, because -#much that's in it is considered private implementation details that should -#not have been exposed. That many packages use those internals directly is -#considered a problem in those other packages, and a bug request in proj.4's -#bug tracker to reinstate projects.h as an installed file was closed with -#the status "wontfix". Codes that use the public API of proj.4 are supposed -#to include "proj_api.h" and use the API calls, not direct access to internal -#data structures or functions that are not intended for use outside the -#library. ---- src/map_tif.c 2010/01/31 02:12:24 1.45 -+++ src/map_tif.c 2012/05/15 15:29:36 1.46 -@@ -93,7 +93,7 @@ - - // Needed for GTIFProj4FromLatLong() replacement below - #ifdef HAVE_LIBGDAL --# include "projects.h" -+# include "proj_api.h" - #endif // HAVE_LIBGDAL - - -@@ -378,7 +378,7 @@ - double *padfY ) { - - char *pszProjection; -- PJ *psPJ; -+ projPJ psPJ; - int i; - - // -------------------------------------------------------------------- diff --git a/media-radio/xastir/files/xastir-2.0.0-scripts.diff b/media-radio/xastir/files/xastir-2.0.0-scripts.diff deleted file mode 100644 index d4de2f6ef949..000000000000 --- a/media-radio/xastir/files/xastir-2.0.0-scripts.diff +++ /dev/null @@ -1,108 +0,0 @@ -# patch scripts location (bug #407185). partially backported from upstream. -diff -Nur -u xastir-2.0.0.orig/scripts/Makefile.am xastir-2.0.0/scripts/Makefile.am ---- xastir-2.0.0.orig/scripts/Makefile.am 2010-07-02 07:08:52.000000000 +0000 -+++ xastir-2.0.0/scripts/Makefile.am 2012-03-07 15:42:34.000000000 +0000 -@@ -3,15 +3,14 @@ - # Copyright (C) 2000-2010 The Xastir Group - # - --pkglib_SCRIPTS = \ -+scriptsdir=${pkgdatadir}/scripts -+dist_scripts_DATA = \ - Coordinate.pm \ - coord-convert.pl \ - get-fcc-rac.pl \ - get-gnis \ - get-pop \ -- get-maptools.sh \ - get-NWSdata \ -- get_shapelib.sh \ - gpx2shape \ - icontable.pl \ - inf2geo.pl \ -@@ -40,9 +39,6 @@ - values \ - values.pl \ - waypoint-get.pl \ -- xastir-fixcfg.sh \ -- xastir-migrate.sh \ - Xastir_tigerpoly.py - --EXTRA_DIST = $(pkglib_SCRIPTS) - -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/ -- cgit v1.2.3-65-gdbad