+++ /dev/null
-DIST fampp2-7.0.1.tar.bz2 288073 BLAKE2B f74659c83af82eeed6c5f711a9273f2d8c7704f04c8407992bee7478d2ef20b6d2ecf37c5d292be35c126474052341c49f8a0d30d056c24e2404b17d0123dfd7 SHA512 317a5cfd383418265cafea0840af8b7c714a04b34265ebfba73230ff2492df8f7884797529916693ab489bdbc94799ca83e015cf0bcfffaea6b28b3a7f9ccbd0
+++ /dev/null
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="C++ wrapper for fam"
-HOMEPAGE="https://sourceforge.net/projects/fampp/"
-SRC_URI="mirror://sourceforge/fampp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
- >=dev-libs/ferrisloki-2.0.3
- dev-libs/glib:2
- >=dev-libs/libsigc++-2.6:2
- virtual/fam
- x11-libs/gtk+:2"
-DEPEND="${DEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- # Fix compat with libsigc++-2.6, #569700
- "${FILESDIR}/${PN}-7.0.1-libsigc++-2.6.patch"
- # Fix completely broken buildsystem
- "${FILESDIR}/${PN}-7.0.1-fix-buildsystem.patch"
- # Fix noexcept(true) for dtors in >=C++11 with GCC 6, #595308
- "${FILESDIR}/${PN}-7.0.1-fix-gcc6.patch"
-)
-
-src_prepare() {
- default
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_configure() {
- # libsigc++-2.6 requires building with C++11
- append-cxxflags -std=c++11
-
- # glib and gtk+ are only required for some examples
- econf \
- --disable-static \
- --disable-glibtest \
- --disable-gtktest \
- --disable-stlport \
- $(use_with examples)
-}
-
-src_install() {
- default
-
- # package provides .pc files
- find "${D}" -name '*.la' -delete || die
-}
+++ /dev/null
-Fix buildsystem, to avoid ugly and extremely brittle patching
-of the configure script and Makefile.in in the main ebuild.
-
---- a/configure.in
-+++ b/configure.in
-@@ -1,8 +1,8 @@
-+AC_PREREQ([2.69])
-+AC_INIT([fampp2],[7.0.1])
-
--# require autoconf 2.13
--AC_PREREQ(2.13)
--
--AC_INIT(src/Fampp2.hh)
-+AC_CONFIG_MACRO_DIR([macros])
-+AC_CONFIG_SRCDIR([src/Fampp2.hh])
-
- FAMPPTWO_MAJOR=7
- FAMPPTWO_MINOR=0
-@@ -22,9 +22,8 @@
- VERSION=$FAMPP_VERSION
- PACKAGE=fampp2
-
--AM_CONFIG_HEADER(config.h)
--AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
--AM_MAINTAINER_MODE
-+AC_CONFIG_HEADERS([config.h])
-+AM_INIT_AUTOMAKE
-
- AC_CANONICAL_HOST
- AC_ISC_POSIX
-@@ -33,11 +32,7 @@
- AC_PROG_CPP
- AC_PROG_CXX
-
--AC_STDC_HEADERS
--#AC_ARG_PROGRAM
--AC_DISABLE_FAST_INSTALL
--AC_DISABLE_STATIC
--AM_PROG_LIBTOOL
-+LT_INIT
-
-
- dnl Checks for libraries.
-@@ -58,15 +53,12 @@
- ###############################################################################
-
-
--CFLAGS=" $STLPORT_CFLAGS $LOKI_CFLAGS $SIGC_CFLAGS $CFLAGS -O0 -g "
--CXXFLAGS=" $STLPORT_CFLAGS $CXXFLAGS -O0 -g $LOKI_LIBS $SIGC_CFLAGS "
--LDFLAGS=" $STLPORT_LIBS $SIGC_LIBS $LDFLAGS -Wl,-O1 -Wl,--hash-style=both"
--AC_SUBST(CFLAGS)
--AC_SUBST(CPPFLAGS)
--AC_SUBST(LDFLAGS)
--AC_SUBST(CXXFLAGS)
--AC_SUBST(CXXCPPFLAGS)
-+CFLAGS="${CFLAGS} ${STLPORT_CFLAGS} ${LOKI_CFLAGS} ${SIGC_CFLAGS}"
-+CXXFLAGS="${CXXFLAGS} ${STLPORT_CFLAGS} ${LOKI_CFLAGS} ${SIGC_CFLAGS}"
-+LIBS="${LIBS} ${STLPORT_LIBS} ${LOKI_LIBS} ${SIGC_LIBS}"
-
-+AC_ARG_WITH([examples], [install examples])
-+AM_CONDITIONAL([EXAMPLES], [test "x$with_examples" = "xyes"])
-
- dnl if test "x${prefix}" = 'xNONE'; then
- dnl prefix=${ac_default_prefix};
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,10 @@
- AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects
-
- NULL=
--SUBDIRS = src examples
-+SUBDIRS = src
-+if EXAMPLES
-+SUBDIRS += examples
-+endif
-
- EXTRA_DIST = fampp.spec fampp.spec.in fampp2.pc.in fampp2.pc
-
+++ /dev/null
-C++11 changed destructor semantics to be noexcept(true)
-by default, leading to potentially changed semantics.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=595308
-
---- a/src/Fampp2.cpp
-+++ b/src/Fampp2.cpp
-@@ -105,6 +105,9 @@
- // #include <unistd.h>
-
- FamppRequest::~FamppRequest()
-+#if __cplusplus >= 201103L
-+ noexcept(false)
-+#endif
- {
- // cerr << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << endl;
- // cerr << "FamppRequest::~FamppRequest() this:" << (void*)this << endl;
-@@ -245,6 +248,9 @@
-
-
- FamppImplMethods::~FamppImplMethods()
-+#if __cplusplus >= 201103L
-+ noexcept(false)
-+#endif
- {
- if(0 != FAMClose( &theFAMConnection )) {
- throw FamppCloseFailedException();
---- a/src/Fampp2.hh
-+++ b/src/Fampp2.hh
-@@ -168,7 +168,11 @@
- public:
-
-
-- ~FamppRequest();
-+ ~FamppRequest()
-+#if __cplusplus >= 201103L
-+ noexcept(false)
-+#endif
-+ ;
-
-
- void suspend();
-@@ -216,7 +220,11 @@
- protected:
-
- FamppImplMethods();
-- virtual ~FamppImplMethods();
-+ virtual ~FamppImplMethods()
-+#if __cplusplus >= 201103L
-+ noexcept(false)
-+#endif
-+ ;
-
-
- public:
-@@ -251,7 +259,11 @@
- public:
- FamppSingletonClass();
- FamppSingletonClass(const std::string appName);
-- ~FamppSingletonClass();
-+ ~FamppSingletonClass()
-+#if __cplusplus >= 201103L
-+ noexcept(false)
-+#endif
-+ ;
-
-
- void NextEvent();
+++ /dev/null
-Remove inclusion of libsigc++ headers obsoleted with version 2.6
-See also: https://bugs.gentoo.org/show_bug.cgi?id=569700
-
---- a/examples/console_test/famppct.cpp
-+++ b/examples/console_test/famppct.cpp
-@@ -30,8 +30,6 @@
-
- #include <sigc++/sigc++.h>
- #include <sigc++/slot.h>
--#include <sigc++/object.h>
--#include <sigc++/object_slot.h>
-
- #include <gtk/gtk.h>
- #include <stdio.h>
---- a/examples/gtk/famppgtk.cpp
-+++ b/examples/gtk/famppgtk.cpp
-@@ -31,8 +31,6 @@
-
- #include <sigc++/sigc++.h>
- #include <sigc++/slot.h>
--#include <sigc++/object.h>
--#include <sigc++/object_slot.h>
-
- #include <gtk/gtk.h>
- #include <stdio.h>
---- a/src/Fampp2.cpp
-+++ b/src/Fampp2.cpp
-@@ -34,8 +34,6 @@
-
- #include <sigc++/sigc++.h>
- #include <sigc++/slot.h>
--#include <sigc++/object.h>
--#include <sigc++/object_slot.h>
-
-
- using namespace std;
---- a/src/FamppEvents.hh
-+++ b/src/FamppEvents.hh
-@@ -36,7 +36,6 @@
-
- #include <fam.h>
- #include <sigc++/signal.h>
--#include <sigc++/object.h>
- #include <SmartPtr.h>
- #include <Singleton.h>
- #include <Factory.h>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">fampp</remote-id>
- </upstream>
-</pkgmetadata>
# Removal in 30 days. Bug #694174.
dev-libs/hashit
-# Michał Górny <mgorny@gentoo.org> (2019-09-12)
-# Unmaintained. Last release from 2010. No reverse dependencies.
-# Removal in 30 days. Bug #694170.
-dev-libs/fampp2
-
# Lars Wendler <polynomial-c@gentoo.org> (2019-09-04)
# Unofficial build. Superseded by official 2.49.5 release.
# Masked for removal.
projects / gentoo.git / commitdiff