[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: dd49289fe331179328b326d3fc6a83bc1c54d94b
Author: Thomas Beierlein gentoo org>
AuthorDate: Tue Jan 16 08:44:01 2024 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Tue Jan 16 08:44:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd49289f
media-radio/xastir: drop 2.1.8-r3, 2.1.8-r4
Signed-off-by: Thomas Beierlein gentoo.org>
media-radio/xastir/Manifest| 1 -
.../xastir/files/xastir-2.1.8-configure.diff | 16 -
media-radio/xastir/xastir-2.1.8-r3.ebuild | 79 -
media-radio/xastir/xastir-2.1.8-r4.ebuild | 82 --
4 files changed, 178 deletions(-)
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index eedf37811bbc..7289a2bfedba 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,2 +1 @@
-DIST xastir-2.1.8.tar.gz 586 BLAKE2B
4cd623c2db7a06c2499bf73a0df8c8f07b6a3072d177d370b76f54cb4caa4cf03f2b5c511149eaefc26f1aa7e8fe3a89e1c42e26a20066dd3337ad41dd5300b6
SHA512
361c92381b385035af160578dcfc4c800edcfabdbaebc5eda1c4fd9a78e934f289a54813577d5b765bbed6eae50cb772735defec6f489dc65326941d2492850d
DIST xastir-2.2.0.tar.gz 2232411 BLAKE2B
901a22ee9db6f2c416807dd11f532975bbaf38314224327a43acff0d7164200456e373cefd852b4022187a6c0c4d2182c2088c12bac93d0fc6ed6771c957c11f
SHA512
d420118e9118ff837d72f17e78563c7e9d39cfcaf05fe12cbf51b50ed36b9307e4b33b0e8a0d056c504a280683c6eb97637e9c4fec3bf1f0d920cb46f6e2cc0b
diff --git a/media-radio/xastir/files/xastir-2.1.8-configure.diff
b/media-radio/xastir/files/xastir-2.1.8-configure.diff
deleted file mode 100644
index 0340f00e241e..
--- a/media-radio/xastir/files/xastir-2.1.8-configure.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-# Fix implicit function declaration in configure.ac
-# bug 899846
-diff --git a/configure.ac b/configure.ac
-index 687bbe9..c137c80 100644
a/configure.ac
-+++ b/configure.ac
-@@ -646,7 +646,8 @@ fi
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="-Wl,--no-keep-memory $LDFLAGS"
- AC_LINK_IFELSE(
-- [AC_LANG_PROGRAM([[#include ]],
-+ [AC_LANG_PROGRAM([[#include
-+ #include ]],
- [[/* Stupid useless test for linker flags */
- exit(0);]])],
- [xa_cv_no_keep_memory=yes],
diff --git a/media-radio/xastir/xastir-2.1.8-r3.ebuild
b/media-radio/xastir/xastir-2.1.8-r3.ebuild
deleted file mode 100644
index 01d7d4d56c52..
--- a/media-radio/xastir/xastir-2.1.8-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_P=${PN/x/X}-Release-${PV}
-
-DESCRIPTION="X Amateur Station Tracking and Information Reporting"
-HOMEPAGE="https://xastir.org/;
-SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="geotiff"
-
-DEPEND=">=x11-libs/motif-2.3:0
- x11-libs/libXt
- x11-libs/libX11
- x11-libs/libXpm
- x11-apps/xfontsel
- dev-libs/libpcre
- net-misc/curl
- sys-libs/db:=
- sci-libs/shapelib
- media-gfx/graphicsmagick:=[-q32]
- geotiff? ( sci-libs/proj
- sci-libs/libgeotiff:=
- media-libs/tiff:= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
- eapply_user
-
- # fix script location (bug #407185)
- eapply "${FILESDIR}"/${PN}-2.1.8-scripts.diff
-
- # do not filter duplicate flags (see bug #411095)
- eapply -p0 "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
-
- eautoreconf
-}
-
-src_configure() {
- # provide include path to GraphicsMagic for configure stage
- append-cflags -I/usr/include/GraphicsMagick
- econf \
- --with-shapelib \
- --without-ax25 \
- --without-festival \
- --without-gpsman \
- --without-imagemagick \
- --with-graphicsmagick \
- $(use_with geotiff libproj) \
- $(use_with geotiff)
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- rm -rf "${D}"/usr/share/doc/${PN}
- dodoc AUTHORS ChangeLog CONTRIBUTING.md FAQ README \
- README.Getting-Started README.MAPS README.OSM_maps
-}
-
-pkg_postinst() {
- elog "Kernel mode AX.25 and GPSman library not supported."
- elog
- elog "Remember you have to be root to add addditional scripts,"
- elog "maps and other configuration data under /usr/share/xastir."
-}
diff --git a/media-radio/xastir/xastir-2.1.8-r4.ebuild
b/media-radio/xastir/xastir-2.1.8-r4.ebuild
deleted file mode 100644
index 321686006d1b..
--- a/media-radio/xastir/xastir-2.1.8-r4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: 1fb04c6812477a865bddc158842f24377a6eaa43
Author: Thomas Beierlein gentoo org>
AuthorDate: Tue Mar 7 17:02:33 2023 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Tue Mar 7 17:03:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb04c68
media-radio/xastir: Fix implicit function declaration in configure.ac
Closes: https://bugs.gentoo.org/899846
Signed-off-by: Thomas Beierlein gentoo.org>
.../xastir/files/xastir-2.1.8-configure.diff | 16 +
media-radio/xastir/xastir-2.1.8-r4.ebuild | 82 ++
2 files changed, 98 insertions(+)
diff --git a/media-radio/xastir/files/xastir-2.1.8-configure.diff
b/media-radio/xastir/files/xastir-2.1.8-configure.diff
new file mode 100644
index ..0340f00e241e
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.1.8-configure.diff
@@ -0,0 +1,16 @@
+# Fix implicit function declaration in configure.ac
+# bug 899846
+diff --git a/configure.ac b/configure.ac
+index 687bbe9..c137c80 100644
+--- a/configure.ac
b/configure.ac
+@@ -646,7 +646,8 @@ fi
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="-Wl,--no-keep-memory $LDFLAGS"
+ AC_LINK_IFELSE(
+- [AC_LANG_PROGRAM([[#include ]],
++ [AC_LANG_PROGRAM([[#include
++ #include ]],
+ [[/* Stupid useless test for linker flags */
+ exit(0);]])],
+ [xa_cv_no_keep_memory=yes],
diff --git a/media-radio/xastir/xastir-2.1.8-r4.ebuild
b/media-radio/xastir/xastir-2.1.8-r4.ebuild
new file mode 100644
index ..321686006d1b
--- /dev/null
+++ b/media-radio/xastir/xastir-2.1.8-r4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_P=${PN/x/X}-Release-${PV}
+
+DESCRIPTION="X Amateur Station Tracking and Information Reporting"
+HOMEPAGE="https://xastir.org/;
+SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="geotiff"
+
+DEPEND=">=x11-libs/motif-2.3:0
+ x11-libs/libXt
+ x11-libs/libX11
+ x11-libs/libXpm
+ x11-apps/xfontsel
+ dev-libs/libpcre
+ net-misc/curl
+ sys-libs/db:=
+ sci-libs/shapelib
+ media-gfx/graphicsmagick:=[-q32]
+ geotiff? ( sci-libs/proj
+ sci-libs/libgeotiff:=
+ media-libs/tiff:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.1.8-configure.diff )
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+ eapply_user
+ eapply ${PATCHES}
+
+ # fix script location (bug #407185)
+ eapply "${FILESDIR}"/${PN}-2.1.8-scripts.diff
+
+ # do not filter duplicate flags (see bug #411095)
+ eapply -p0 "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
+
+ eautoreconf
+}
+
+src_configure() {
+ # provide include path to GraphicsMagic for configure stage
+ append-cflags -I/usr/include/GraphicsMagick
+ econf \
+ --with-shapelib \
+ --without-ax25 \
+ --without-festival \
+ --without-gpsman \
+ --without-imagemagick \
+ --with-graphicsmagick \
+ $(use_with geotiff libproj) \
+ $(use_with geotiff)
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ rm -rf "${D}"/usr/share/doc/${PN}
+ dodoc AUTHORS ChangeLog CONTRIBUTING.md FAQ README \
+ README.Getting-Started README.MAPS README.OSM_maps
+}
+
+pkg_postinst() {
+ elog "Kernel mode AX.25 and GPSman library not supported."
+ elog
+ elog "Remember you have to be root to add addditional scripts,"
+ elog "maps and other configuration data under /usr/share/xastir."
+}
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: 0a1dcb42dc36ca5c96cb87a16a56fc10cbd84d0b
Author: Thomas Beierlein gentoo org>
AuthorDate: Sat Feb 8 07:53:46 2020 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Sat Feb 8 07:55:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a1dcb42
media-radio/xastir: Fix build with -fno-common
Closes: https://bugs.gentoo.org/706952
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Thomas Beierlein gentoo.org>
.../xastir/files/xastir-2.1.4-fno-common.diff | 63 ++
media-radio/xastir/xastir-2.1.4.ebuild | 5 +-
2 files changed, 67 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000..f2580b5977e
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.1.4-fno-common.diff
@@ -0,0 +1,63 @@
+# 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 */
diff --git a/media-radio/xastir/xastir-2.1.4.ebuild
b/media-radio/xastir/xastir-2.1.4.ebuild
index c3f29e3674c..d779bc0c568 100644
--- a/media-radio/xastir/xastir-2.1.4.ebuild
+++ b/media-radio/xastir/xastir-2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -43,6 +43,9 @@ src_prepare() {
# do not filter duplicate flags (see bug 411095)
eapply -p0 "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
+ # build with -fno-common (bug #706952)
+ eapply "${FILESDIR}"/${P}-fno-common.diff
+
eautoreconf
}
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: 0e7062f23983725a502804b4b83a618620fd88a4
Author: Thomas Beierlein gentoo org>
AuthorDate: Sat Feb 8 07:28:01 2020 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Sat Feb 8 07:29:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e7062f2
media-radio/xastir: Drop old
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Thomas Beierlein gentoo.org>
media-radio/xastir/Manifest| 1 -
media-radio/xastir/files/xastir-2.0.4-fortify.diff | 144 -
.../files/xastir-2.0.8-fix-graphicsmagick.diff | 32 -
.../files/xastir-2.0.8-no-builtin-shapelib.diff| 58 -
media-radio/xastir/files/xastir-2.0.8-scripts.diff | 91 -
media-radio/xastir/metadata.xml| 1 -
media-radio/xastir/xastir-2.0.8-r1.ebuild | 86
7 files changed, 413 deletions(-)
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 6fd1281880e..48be224f00b 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,2 +1 @@
-DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B
12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123
SHA512
fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f
DIST xastir-2.1.4.tar.gz 2694124 BLAKE2B
90fd8ef340fc5bad43c9501c6530dcd4bd60eaab9c04638c68f80add46f0df24c45db334549915edaee95cbdcc9b7580d6343d81d84cb819f4ef5a76c9f79242
SHA512
e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1
diff --git a/media-radio/xastir/files/xastir-2.0.4-fortify.diff
b/media-radio/xastir/files/xastir-2.0.4-fortify.diff
deleted file mode 100644
index e2c34b00747..000
--- a/media-radio/xastir/files/xastir-2.0.4-fortify.diff
+++ /dev/null
@@ -1,144 +0,0 @@
src/rac_data.c.orig2012-09-23 18:19:22.0 +0200
-+++ src/rac_data.c 2012-11-29 21:00:53.0 +0100
-@@ -212,7 +212,8 @@
- char char_offset[16];
- char index[32];
- int found = 0;
--rac_record racdata;
-+char buffer[sizeof(rac_record)];
-+rac_record *racdata = (rac_record *)buffer;
- /*charfiller[8];*/
- char amacall_path[MAX_VALUE];
-
-@@ -220,7 +221,7 @@
-
-
- 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*/
-@@ -257,19 +258,19 @@
- if (callsign[5] == '-')
- (void)chomp(callsign,5);
-
--while (!feof(fdb) && strncmp((char *), 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 *), 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 *),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
-@@ -293,82 +294,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,
-
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: 93a4241e7cb9e23bed3025dd678f654ad6e9a98a
Author: Thomas Beierlein gentoo org>
AuthorDate: Fri Jul 26 14:06:46 2019 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Fri Jul 26 14:06:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a4241e
media-radio/xastir: Fix for compile error with newer Graphicsmagick
Backport from xastir-2.1.4 for stable version
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Thomas Beierlein gentoo.org>
.../files/xastir-2.0.8-fix-graphicsmagick.diff | 32 ++
media-radio/xastir/xastir-2.0.8-r1.ebuild | 5 +++-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff
b/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff
new file mode 100644
index 000..8919239fbfd
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff
@@ -0,0 +1,32 @@
+# backported from xastir-2.1.4 (see bug #688444)
+--- a/src/map_geo.c2019-07-26 15:54:19.534488550 +0200
b/src/map_geo.c2019-07-26 15:56:47.779713950 +0200
+@@ -125,20 +125,7 @@
+ #undef PACKAGE_TARNAME
+ #define XASTIR_PACKAGE_VERSION PACKAGE_VERSION
+ #undef PACKAGE_VERSION
+-#ifdef HAVE_GRAPHICSMAGICK
+-/*#include */
+-/* Define MAGICK_IMPLEMENTATION to access private interfaces
+- * such as DestroyImagePixels(). This may not be a good thing,
+- * but DestroyImagePixels() has been in this code for a long
+- * time. Defining MAGIC_IMPLEMENTATION eliminates the warning that is
+- * now (9/28/2010) being seen on some distros (Ubuntu 10.04 and
+- * OpenSuSE-11.3)
+- */
+-#define MAGICK_IMPLEMENTATION
+ #include
+-#else // HAVE_GRAPHICSMAGICK
+-#include
+-#endif // HAVE_GRAPHICSMAGICK
+ #undef PACKAGE_BUGREPORT
+ #define PACKAGE_BUGREPORT XASTIR_PACKAGE_BUGREPORT
+ #undef XASTIR_PACKAGE_BUGREPORT
+@@ -2030,7 +2017,6 @@
+ if (!SyncImagePixels(image))
+ fprintf(stderr, "SyncImagePixels Failed\n");
+ }
+-DestroyImagePixels(image);
+ }
+
+ // If were are drawing to a low bpp display (typically < 8bpp)
diff --git a/media-radio/xastir/xastir-2.0.8-r1.ebuild
b/media-radio/xastir/xastir-2.0.8-r1.ebuild
index d4421c5da9b..c16d857f5d6 100644
--- a/media-radio/xastir/xastir-2.0.8-r1.ebuild
+++ b/media-radio/xastir/xastir-2.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -45,6 +45,9 @@ src_prepare() {
# do not filter duplicate flags (see bug 411095)
epatch "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
+ # fix compile problem with newer graphicsmagic
+ epatch "${FILESDIR}"/${PN}-2.0.8-fix-graphicsmagick.diff
+
eautoreconf
}
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: a918142dc97bd41a33d038b6242c1d3e287f4e70
Author: Thomas Beierlein gentoo org>
AuthorDate: Fri May 31 12:10:02 2019 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Fri May 31 12:10:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a918142d
media-radio/xastir: Version bump
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Thomas Beierlein gentoo.org>
media-radio/xastir/Manifest| 1 +
media-radio/xastir/files/xastir-2.1.2-scripts.diff | 89 ++
media-radio/xastir/xastir-2.1.2.ebuild | 82
3 files changed, 172 insertions(+)
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 9b0fbe3e783..b011e2bc3b5 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,2 +1,3 @@
DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B
12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123
SHA512
fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f
DIST xastir-2.1.0.tar.gz 2996246 BLAKE2B
c4b607f09a5cc52daa18ac5ac8c761cf99adc7ae7d61c481d56383ac8a62302b8ec96593a24a8f5870ec7b6aa12ca619f1b93954d120cceaa1126343e080517f
SHA512
32c1297d6399c34078158853beba32a4d018d060088b014be004b0837a887c6360e417e1d59ed7865ea1caa3c07f59d7bb4ee3cf9c035e2aabf6ba4783e3d288
+DIST xastir-2.1.2.tar.gz 2724737 BLAKE2B
4b3fe45fb666b1c66f07f57b93f09ab0118daa266e5120ce089b3f95686fc7dc4e10148a2518f0bea9f4411a316db4f1137c898594489bda6c9198b4f34a95ef
SHA512
6bfa759df34e68b6431cf5a5c2fe3a501284fac4039af2242c745645d6ccb3476d2f42bd4a8889c3ea01d70cad52d39aac3949d9d5b6cf2c0deff5aa06ffbe93
diff --git a/media-radio/xastir/files/xastir-2.1.2-scripts.diff
b/media-radio/xastir/files/xastir-2.1.2-scripts.diff
new file mode 100644
index 000..7b52c689560
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.1.2-scripts.diff
@@ -0,0 +1,89 @@
+# patch scripts location (bug #407185). partially backported from upstream.
+diff -Nur -u Xastir-Release-2.1.2.orig/scripts/coord-convert.pl
Xastir-Release-2.1.2/scripts/coord-convert.pl
+--- Xastir-Release-2.1.2.orig/scripts/coord-convert.pl 2010-07-03
22:09:48.0 +
Xastir-Release-2.1.2/scripts/coord-convert.pl 2012-03-07
15:46:01.0 +
+@@ -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-Release-2.1.2.orig/scripts/permutations.pl
Xastir-Release-2.1.2/scripts/permutations.pl
+--- Xastir-Release-2.1.2.orig/scripts/permutations.pl 2010-07-03
22:09:48.0 +
Xastir-Release-2.1.2/scripts/permutations.pl 2012-03-07
15:42:34.0 +
+@@ -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-Release-2.1.2.orig/scripts/test_coord.pl
Xastir-Release-2.1.2/scripts/test_coord.pl
+--- Xastir-Release-2.1.2.orig/scripts/test_coord.pl2010-01-31
02:12:23.0 +
Xastir-Release-2.1.2/scripts/test_coord.pl 2012-03-07 15:42:34.0
+
+@@ -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-Release-2.1.2.orig/scripts/toporama250k.pl
Xastir-Release-2.1.2/scripts/toporama250k.pl
+--- Xastir-Release-2.1.2.orig/scripts/toporama250k.pl 2010-01-31
02:12:23.0 +
Xastir-Release-2.1.2/scripts/toporama250k.pl 2012-03-07
15:46:49.0 +
+@@ -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-Release-2.1.2.orig/scripts/toporama50k.pl
Xastir-Release-2.1.2/scripts/toporama50k.pl
+--- Xastir-Release-2.1.2.orig/scripts/toporama50k.pl 2010-01-31
02:12:23.0 +
Xastir-Release-2.1.2/scripts/toporama50k.pl2012-03-07
15:47:01.0 +
+@@ -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
[gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/
commit: dbae9a64201ff5546f5cd3e56d7623eb5fc8a115
Author: Thomas Beierlein gentoo org>
AuthorDate: Tue Jul 12 05:25:01 2016 +
Commit: Thomas Beierlein gentoo org>
CommitDate: Tue Jul 12 05:25:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbae9a64
media-radio/xastir: Version bump
Package-Manager: portage-2.3.0
media-radio/xastir/Manifest| 1 +
.../files/xastir-2.0.8-no-builtin-shapelib.diff| 58 ++
media-radio/xastir/files/xastir-2.0.8-scripts.diff | 91 ++
media-radio/xastir/xastir-2.0.8.ebuild | 85
4 files changed, 235 insertions(+)
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index b630719..bdf87d5 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1 +1,2 @@
DIST xastir-2.0.6.tar.gz 2662042 SHA256
e46debd3f67ea5c08e2f85f03e26653871a9cdd6d692c8436c3bc8a8dd43 SHA512
422bfd5c243ce2761279908b2294f94598df4e51e8dc9eea1eede12c460934c97392e8d99d40d67d92b4e31fe09806e9c33190e146696a49d968df6562e858f3
WHIRLPOOL
39a097dba585d5bcdcdb880ddb5e530eb118bd1645abf911948ed2c0b562a4b12cf4b453b0295db1f37d00380873440e251466f7b12440cd41f50578ae90f170
+DIST xastir-2.0.8.tar.gz 2697256 SHA256
775db0e3c4355051a9030b8398a1d995d48b3b721fa1c9bce5e3010300c1ebb6 SHA512
fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f
WHIRLPOOL
970750a3cc0d1ab51bd754450ab348a88efba26d6e8e3c3ced95b9885e63dffbc2d4ed94ced42d1a309b2fa8d23f203fb98bae6021c5556d3e39bcc79835be89
diff --git a/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff
b/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff
new file mode 100644
index 000..8cbdbc2
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff
@@ -0,0 +1,58 @@
+--- configure.ac.orig 2016-07-12 07:08:17.988160777 +0200
configure.ac 2016-07-12 07:11:42.591138389 +0200
+@@ -382,27 +382,17 @@
+
+ # Check for Shapelib
+ use_shapelib=yes
+-force_internal_shapelib=no
+ shapelib_desired=yes
+ LIBSHP=""
+ SUBSHP=""
+ # This symbol will be blank if the proj library hasn't been found, and will
+ # have the three programs that need proj if it has
+ CONTSHP=""
+-AC_ARG_WITH(internal-shapelib,[ --with-internal-shapelib Force use of
internal shapelib library.],force_internal_shapelib=$withval)
+ AC_ARG_WITH(shapelib,[ --without-shapelibDisable 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"
+@@ -411,26 +401,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. )
+-
+- if test $use_proj = "yes"
+- then
+- CONTSHP="shpcentrd$(EXEEXT) shpproj$(EXEEXT) shpdata$(EXEEXT)
shpwkb$(EXEEXT)"
+- fi
+-fi
+ AC_SUBST(SUBSHP)
+ AC_SUBST(CONTSHP)
+ AC_SUBST(LIBSHP)
diff --git a/media-radio/xastir/files/xastir-2.0.8-scripts.diff
b/media-radio/xastir/files/xastir-2.0.8-scripts.diff
new file mode 100644
index 000..35c7324
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.0.8-scripts.diff
@@ -0,0 +1,91 @@
+# patch scripts location (bug #407185). partially backported from upstream.
+--- xastir-2.0.0-orig/scripts/Makefile.am.orig 2012-11-27
