summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch47
-rw-r--r--dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch57
-rw-r--r--dev-util/dropwatch/files/dropwatch-1.4-makefile.patch21
-rw-r--r--dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild2
-rw-r--r--dev-util/radare2/files/radare2-4.5.1-docdir.patch12
5 files changed, 1 insertions, 138 deletions
diff --git a/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch b/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch
deleted file mode 100644
index fa29f8bbac97..000000000000
--- a/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -1271,7 +1271,7 @@ if test x$use_pkgconfig = xyes; then
- BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
- fi
- if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
-- PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)])
-+ PKG_CHECK_MODULES([EVENT], [libevent], [use_libevent=yes], [AC_MSG_ERROR(libevent not found.)])
- if test x$TARGET_OS != xwindows; then
- PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)])
- fi
-@@ -1291,7 +1291,7 @@ if test x$use_pkgconfig = xyes; then
- else
-
- if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
-- AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),)
-+ AC_CHECK_HEADER([event2/event.h], [use_libevent=yes], AC_MSG_ERROR(libevent headers missing),)
- AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing))
- if test x$TARGET_OS != xwindows; then
- AC_CHECK_LIB([event_pthreads],[main],EVENT_PTHREADS_LIBS=-levent_pthreads,AC_MSG_ERROR(libevent_pthreads missing))
-@@ -1545,6 +1545,7 @@ AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$BUILD_TEST_QT = xyes])
- AM_CONDITIONAL([ENABLE_BENCH],[test x$use_bench = xyes])
- AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes])
- AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
-+AM_CONDITIONAL([USE_LIBEVENT],[test x$use_libevent = xyes])
- AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
- AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
- AM_CONDITIONAL([ENABLE_SSE42],[test x$enable_sse42 = xyes])
-diff --git a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -523,10 +523,13 @@ libbitcoin_util_a_SOURCES = \
- util/strencodings.cpp \
- util/string.cpp \
- util/time.cpp \
-- util/url.cpp \
- util/validation.cpp \
- $(BITCOIN_CORE_H)
-
-+if USE_LIBEVENT
-+libbitcoin_util_a_SOURCES += util/url.cpp
-+endif
-+
- if GLIBC_BACK_COMPAT
- libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
- AM_LDFLAGS += $(COMPAT_LDFLAGS)
diff --git a/dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch b/dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
deleted file mode 100644
index e625ba814d8e..000000000000
--- a/dev-util/ccls/files/ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 7e795e9b9ec20f02cab23e63d1e52189aa33ab4e Mon Sep 17 00:00:00 2001
-From: Fangrui Song <i@maskray.me>
-Date: Fri, 1 Nov 2019 10:36:38 -0700
-Subject: [PATCH] cmake: support CLANG_LINK_CLANG_DYLIB
-
----
- CMakeLists.txt | 34 +++++++++++++++++++---------------
- 1 file changed, 19 insertions(+), 15 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 278e0735..092f178f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -70,21 +70,25 @@ endif()
-
- find_package(Clang REQUIRED)
-
--target_link_libraries(ccls PRIVATE
-- clangIndex
-- clangFormat
-- clangTooling
-- clangToolingInclusions
-- clangToolingCore
-- clangFrontend
-- clangParse
-- clangSerialization
-- clangSema
-- clangAST
-- clangLex
-- clangDriver
-- clangBasic
--)
-+if(CLANG_LINK_CLANG_DYLIB)
-+ target_link_libraries(ccls PRIVATE clang-cpp)
-+else()
-+ target_link_libraries(ccls PRIVATE
-+ clangIndex
-+ clangFormat
-+ clangTooling
-+ clangToolingInclusions
-+ clangToolingCore
-+ clangFrontend
-+ clangParse
-+ clangSerialization
-+ clangSema
-+ clangAST
-+ clangLex
-+ clangDriver
-+ clangBasic
-+ )
-+endif()
-
- if(LLVM_LINK_LLVM_DYLIB)
- target_link_libraries(ccls PRIVATE LLVM)
---
-2.26.2
-
diff --git a/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch b/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch
deleted file mode 100644
index 14ffcc83513e..000000000000
--- a/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/Makefile.orig 2012-10-24 13:27:12.000000000 +0400
-+++ src/Makefile 2012-10-24 13:27:47.000000000 +0400
-@@ -1,14 +1,14 @@
- all: dropwatch
--CFLAGS+=-c -g -D_GNU_SOURCE -Wall -Werror `pkg-config --cflags libnl-3.0`
--LDFLAGS=-lbfd -lreadline -lnl-3 -lnl-genl-3
-+CFLAGS+=-c -D_GNU_SOURCE -Wall `pkg-config --cflags libnl-3.0`
-+LIBS=-lbfd -lreadline -lnl-3 -lnl-genl-3
- OBJFILES := main.o lookup.o\
- lookup_bfd.o lookup_kas.o
-
- dropwatch: $(OBJFILES)
-- gcc -g -o dropwatch $(OBJFILES) $(LDFLAGS)
-+ $(CC) -o dropwatch $(LDFLAGS) $(OBJFILES) $(LIBS)
-
- %.o: %.c
-- gcc $(CFLAGS) $<
-+ $(CC) $(CFLAGS) $<
- clean:
- rm -f dropwatch *.o
-
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
index a9ec8abef865..2115b409c1cb 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# man page was previously installed by gtk+:3 ebuild
RDEPEND="
diff --git a/dev-util/radare2/files/radare2-4.5.1-docdir.patch b/dev-util/radare2/files/radare2-4.5.1-docdir.patch
deleted file mode 100644
index 51dcd7b16e1b..000000000000
--- a/dev-util/radare2/files/radare2-4.5.1-docdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Be closer to ${PF} than ${PN}.
---- a/libr/include/r_userconf.h.acr
-+++ b/libr/include/r_userconf.h.acr
-@@ -53,7 +53,7 @@
- #define R2_ZIGNS R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "zigns")
- #define R2_THEMES R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "cons")
- #define R2_FLAGS R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "flag")
--#define R2_FORTUNES R_JOIN_3_PATHS ("share", "doc", "radare2")
-+#define R2_FORTUNES R_JOIN_3_PATHS ("share", "doc", "radare2-" R2_VERSION)
- #define R2_HUD R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "hud")
- #endif
-