From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- .../files/fampp2-7.0.1-fix-buildsystem.patch | 78 ---------------------- dev-libs/fampp2/files/fampp2-7.0.1-fix-gcc6.patch | 67 ------------------- .../fampp2/files/fampp2-7.0.1-libsigc++-2.6.patch | 46 ------------- 3 files changed, 191 deletions(-) delete mode 100644 dev-libs/fampp2/files/fampp2-7.0.1-fix-buildsystem.patch delete mode 100644 dev-libs/fampp2/files/fampp2-7.0.1-fix-gcc6.patch delete mode 100644 dev-libs/fampp2/files/fampp2-7.0.1-libsigc++-2.6.patch (limited to 'dev-libs/fampp2/files') diff --git a/dev-libs/fampp2/files/fampp2-7.0.1-fix-buildsystem.patch b/dev-libs/fampp2/files/fampp2-7.0.1-fix-buildsystem.patch deleted file mode 100644 index 34067ff1f539..000000000000 --- a/dev-libs/fampp2/files/fampp2-7.0.1-fix-buildsystem.patch +++ /dev/null @@ -1,78 +0,0 @@ -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 - diff --git a/dev-libs/fampp2/files/fampp2-7.0.1-fix-gcc6.patch b/dev-libs/fampp2/files/fampp2-7.0.1-fix-gcc6.patch deleted file mode 100644 index 659ecd51bf4c..000000000000 --- a/dev-libs/fampp2/files/fampp2-7.0.1-fix-gcc6.patch +++ /dev/null @@ -1,67 +0,0 @@ -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 - - 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(); diff --git a/dev-libs/fampp2/files/fampp2-7.0.1-libsigc++-2.6.patch b/dev-libs/fampp2/files/fampp2-7.0.1-libsigc++-2.6.patch deleted file mode 100644 index 6b76a1532cbb..000000000000 --- a/dev-libs/fampp2/files/fampp2-7.0.1-libsigc++-2.6.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 - #include --#include --#include - - #include - #include ---- a/examples/gtk/famppgtk.cpp -+++ b/examples/gtk/famppgtk.cpp -@@ -31,8 +31,6 @@ - - #include - #include --#include --#include - - #include - #include ---- a/src/Fampp2.cpp -+++ b/src/Fampp2.cpp -@@ -34,8 +34,6 @@ - - #include - #include --#include --#include - - - using namespace std; ---- a/src/FamppEvents.hh -+++ b/src/FamppEvents.hh -@@ -36,7 +36,6 @@ - - #include - #include --#include - #include - #include - #include -- cgit v1.2.3