+++ /dev/null
-commit 9cf2369051fa887bd5f13bf7df80c51bcf040306
-Author: hasufell <hasufell@gentoo.org>
-Date: Sat Jul 13 13:25:42 2013 +0200
-
- BUILD: remove -Werror
-
- It's discouraged to add non-specific Werror flags.
-
-diff --git a/configure.ac b/configure.ac
-index b366337..86c7569 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,7 +11,7 @@ m4_if(2.65, AC_AUTOCONF_VERSION, [m4_fatal([autoconf version 2.65 is broken and
- # FIXME: Update version info on each release
- AC_INIT([XTide], [2.13.1], [dave@flaterco.com])
-
--AM_INIT_AUTOMAKE([-Wall -Werror])
-+AM_INIT_AUTOMAKE([-Wall])
-
- AC_LANG([C++])
- AC_PROG_CXX
+++ /dev/null
-commit 755677baae16fd8772efd523a25b787ea3fc0772
-Author: hasufell <hasufell@gentoo.org>
-Date: Sat Jul 13 13:26:24 2013 +0200
-
- BUILD: add --with-gps switch
-
- We don't want automagic gps detection, but give control
- to the user.
-
-diff --git a/configure.ac b/configure.ac
-index 86c7569..307def4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -156,6 +156,12 @@ if test -z "${SKIP_COMPLICATED}"; then
- fi
- CXXFLAGS="${SAVED_CXXFLAGS}"
-
-+AC_ARG_WITH([gps],
-+ [AS_HELP_STRING([--with-gps],
-+ [use libgpsd (default: no)])],
-+ [gps=$withval],
-+ [gps=no])
-+
- # xttpd configs
- AC_ARG_WITH([xttpd-user],
- [AS_HELP_STRING([--with-xttpd-user=user],
-@@ -381,32 +387,35 @@ AC_CHECK_HEADER([Dstr], [AC_CHECK_LIB([dstr], [DstrCompat20070215Check])])
- AM_CONDITIONAL(NO_LIBDSTR, test "$ac_cv_lib_dstr_DstrCompat20070215Check" != "yes")
-
- # libgps is optional; use it if you have a compatible version.
--AC_CHECK_HEADER([gps.h], [AC_CHECK_LIB([gps], [timestamp], [
-- AC_MSG_CHECKING([if libgps is 3.x or newer, compatible version])
-- AC_COMPILE_IFELSE(
-- [AC_LANG_SOURCE([[
--#include <gps.h>
--#if (GPSD_API_MAJOR_VERSION < 5)
--#FAIL
--#endif
--int main (int argc, char **argv) {
-- struct gps_data_t gpsdata;
-- gps_open ("127.0.0.1", "2947", &gpsdata);
-- gps_stream (&gpsdata, WATCH_ENABLE|WATCH_NEWSTYLE, NULL);
-- gps_read (&gpsdata);
-- return (gpsdata.fix.mode >= MODE_2D);
--}
-- ]])],
-- [
-- AC_MSG_RESULT(yes)
-- AC_DEFINE([GPS_GOOD])
-- AC_SUBST([GPSD_LIBS], ["-lgps"])
-- ],
-- [
-- AC_MSG_RESULT(no)
-- ]
-- )
--])])
-+
-+AS_IF([test "x$gps" = "xyes"], [
-+ AC_CHECK_HEADER([gps.h], [AC_CHECK_LIB([gps], [timestamp], [
-+ AC_MSG_CHECKING([if libgps is 3.x or newer, compatible version])
-+ AC_COMPILE_IFELSE(
-+ [AC_LANG_SOURCE([[
-+ #include <gps.h>
-+ #if (GPSD_API_MAJOR_VERSION < 5)
-+ #FAIL
-+ #endif
-+ int main (int argc, char **argv) {
-+ struct gps_data_t gpsdata;
-+ gps_open ("127.0.0.1", "2947", &gpsdata);
-+ gps_stream (&gpsdata, WATCH_ENABLE|WATCH_NEWSTYLE, NULL);
-+ gps_read (&gpsdata);
-+ return (gpsdata.fix.mode >= MODE_2D);
-+ }
-+ ]])],
-+ [
-+ AC_MSG_RESULT(yes)
-+ AC_DEFINE([GPS_GOOD])
-+ AC_SUBST([GPSD_LIBS], ["-lgps"])
-+ ],
-+ [
-+ AC_MSG_RESULT(no)
-+ ]
-+ )
-+ ], [AC_MSG_ERROR([cannot find libgps])])], [AC_MSG_ERROR([cannot find gps.h])])
-+ ])
-
- AC_TYPE_INT8_T
- AC_TYPE_INT16_T
+++ /dev/null
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon Aug 17 20:15:03 UTC 2015
-Subject: fix build with clang
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,26 +22,6 @@
- AC_SUBST([ADDED_CPPFLAGS])
- AC_SUBST([ADDED_CXXFLAGS])
-
--# Extended initializer lists were added in 4.4.
--AC_MSG_CHECKING([if using a version of GCC older than 4.4])
--AC_PREPROC_IFELSE(
-- [AC_LANG_SOURCE([[
--#ifdef __GNUC__
--#if (__GNUC__ * 100 + __GNUC_MINOR__) < 404
--#FAIL
--#endif
--#endif
-- ]])],
-- [
-- AC_MSG_RESULT(no)
-- ],
-- [
-- AC_MSG_RESULT(yes)
-- AC_MSG_NOTICE([if using GCC, version 4.4 or later is required])
-- AC_MSG_ERROR([GCC too old])
-- ]
--)
--
- # /tmp/ccB6kF2d.s: Assembler messages:
- # /tmp/ccB6kF2d.s:1325: Error: symbol `_ZZN10SafeVectorIdEixEPdS1_jE19__PRETTY_FUNCTION__' is already defined
- # /tmp/ccB6kF2d.s:1330: Error: symbol `_ZZN10SafeVectorI5AngleEixEPS0_S2_jE19__PRETTY_FUNCTION__' is already defined
+++ /dev/null
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats"
-HOMEPAGE="http://www.flaterco.com/xtide/"
-SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gps"
-
-DEPEND="
- media-libs/libpng:0
- >=sci-geosciences/libtcd-2.2.5_p2
- x11-libs/libX11
- x11-libs/libXaw3d
- x11-libs/libXpm
- x11-libs/libXt
- gps? ( sci-geosciences/gpsd )"
-RDEPEND="${DEPEND}
- media-fonts/font-schumacher-misc"
-DEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.13.1-{Werror,gps-switch}.patch \
- "${FILESDIR}"/${P}-clang.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with gps)
-}
-
-src_install() {
- dobin xtide tide xttpd
- doman *.[18]
-
- echo 'HFILE_PATH=/usr/share/harmonics' > 50xtide_harm
- doenvd 50xtide_harm
-
- newicon -s 48 iconsrc/icon_48x48_orig.png ${PN}.png
-
- make_desktop_entry ${PN} 'Tide prediction' ${PN} 'Science'
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
projects / gentoo.git / commitdiff