commit: 77950518cddc1e5b7b4cbe23d35eb50d4cb5765c Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Mar 25 18:18:26 2019 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Tue Mar 26 18:52:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77950518
sci-libs/libsigrokdecode: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11501 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> .../libsigrokdecode-0.3.0-configure-test.patch | 28 -------------------- .../libsigrokdecode-0.3.0-no-check-linkage.patch | 30 ---------------------- 2 files changed, 58 deletions(-) diff --git a/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-configure-test.patch b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-configure-test.patch deleted file mode 100644 index 8c3b4020604..00000000000 --- a/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-configure-test.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://sourceforge.net/p/sigrok/mailman/message/32459769/ - -From dc83770847c39934f5cbc63c8652124fafcb8d0b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Sat, 14 Jun 2014 01:37:12 -0400 -Subject: [PATCH 1/2] fix test operator - -The == operator is not in POSIX. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 9527379..3f661ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -125,7 +125,7 @@ AC_SUBST(MODNAME_PYTHON) - # We also need to find the name of the python3 executable (for 'make install'). - # Some OSes call this python3, some call it python3.2, etc. etc. - AC_CHECK_PROGS([PYTHON3], [python3.4 python3.3 python3.2 python3]) --if test "x$PYTHON3" == "x"; then -+if test "x$PYTHON3" = "x"; then - AC_MSG_ERROR([cannot find python3 executable.]) - fi - --- -2.0.0 - diff --git a/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-no-check-linkage.patch b/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-no-check-linkage.patch deleted file mode 100644 index a749a0bb64d..00000000000 --- a/sci-libs/libsigrokdecode/files/libsigrokdecode-0.3.0-no-check-linkage.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://sourceforge.net/p/sigrok/mailman/message/32459770/ - -From 27ecf0c85482786f7617571c690797ab3f07f795 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Sat, 14 Jun 2014 01:38:58 -0400 -Subject: [PATCH 2/2] do not add check to common cflags/libs - -Only the unittests use these flags, so don't go linking them in for -the main library too. ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3f661ec..10213a7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -134,8 +134,7 @@ AC_SEARCH_LIBS([pow], [m]) - - # The Check unit testing framework is optional. Disable if not found. - PKG_CHECK_MODULES([check], [check >= 0.9.4], -- [have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS"; -- LIBS="$LIBS $check_LIBS"], [have_check="no"]) -+ [have_check="yes"], [have_check="no"]) - AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") - - # libsigrok is optional (only used for the protocol decoder test framework). --- -2.0.0 -
