From 546e114798492e7c17d9b72057b4984cbde09bf5 Mon Sep 17 00:00:00 2001 From: Andrew Udvare Date: Tue, 3 Dec 2024 20:16:13 -0500 Subject: [PATCH] net-misc/curl-impersonate: remove unused patch Remove unnecessary eautoreconf Signed-off-by: Andrew Udvare --- net-misc/curl-impersonate/Manifest | 3 +- .../curl-impersonate-0.8.2.ebuild | 2 - .../curl-impersonate-0001-build-fixes.patch | 135 ------------------ 3 files changed, 1 insertion(+), 139 deletions(-) delete mode 100644 net-misc/curl-impersonate/files/curl-impersonate-0001-build-fixes.patch diff --git a/net-misc/curl-impersonate/Manifest b/net-misc/curl-impersonate/Manifest index d422da7d..46284007 100644 --- a/net-misc/curl-impersonate/Manifest +++ b/net-misc/curl-impersonate/Manifest @@ -1,6 +1,5 @@ -AUX curl-impersonate-0001-build-fixes.patch 5274 BLAKE2B 22541249dbb8efc0797f114f53dd2a791d672357db573623af691dba8ab00e44dc456d4c3fb15071bd9db4a60217b7e72759ca9339755ab4c86a0ee6076bf061 SHA512 3f5bb8e9c61ebf7be6ec142554b51828fdf4fea4201b7a202b2f450ae530496bd519b355104fb072d71e7ea8b2fb176306a635d62c619b1a30dc5af2a740d051 DIST boringssl-cd95210465496ac2337b313cf49f607762abe286.tar.gz 45424925 BLAKE2B b20cfe533ee2aede704b9475e37bd11f55e04c89818e3ea2cd0f937ba2571a125469c65547909e5781d1aee859951667e7da3f51d5f95b9194cf2dd5c9958863 SHA512 ac6b4cb0e08b429bc9d3be90c076d2e654fb6ffd21450b78d9313bd60e8d5ede7198f6e0d3e71dc7e069788129662809dd16d287bb75d6007fe173023314f079 DIST curl-8.7.1.tar.gz 3324062 BLAKE2B 59d1a484f68d0d5de622e6a1c4200766e6e095eacca8716df70aa6fc97145f241aa9a1181932ea8c5502809e8593198f27e9cba26bf848623fcf0ee92bef7117 SHA512 38a1f7d7f5c83922cd4e0a858ac803d230d691c8f4df7e5086062c6991da740e626aa86675683282bc8555fc4cb962a08ba1a7ce817d78961d749d6d580fb9fa DIST curl-impersonate-0.8.2.tar.gz 148340 BLAKE2B e6f90acac75558490dc1438694abf5cad21bcd5dc31609e88af83c98d7842b6fbd55a8e7e51fd78d1512b07ee42a9ebcceb86ea8b1da81f008e40cdf1272d766 SHA512 852f6ca48164bdb370a8d832f6dea9d6825c882e5b02761ddf871b77a0cb20144576b8ec863069f3da6d91eaf18d666fe6e9041f96a414696bf4a8d904dbf8af -EBUILD curl-impersonate-0.8.2.ebuild 3052 BLAKE2B 6043b5e10d1b294e0a6b7b930c8146bbfe150752f193009992ff3fb14e09fc7ffa7d52bfa519c8bc8bdde0f101cc593ad54eac6b2abafa8fb71480eb0fea4ac3 SHA512 0973a14eee4c253437f5dddd841e2038a986db931af37342a153628bfd1c15a8a59ea5c31ea5d58e4a95d32824af5b8780b12f7e12c23c3fa7cff7960f07eb30 +EBUILD curl-impersonate-0.8.2.ebuild 2988 BLAKE2B 89a86ba32ea1bbae876aa695b80be05b2e7415742fdbc2910e4a5f0c922a9720710c7f0d0845b0930bcaccb97459f363d942b6974244c855f0c52782697cf7eb SHA512 1c8a493c69437418411574d59ee73f422e89eb0eafce292ccc9a7c87f85226a51200ad6a4828faa080e0a2f5adb50f3532827efb81a9588e963cfdfd9ff429da MISC metadata.xml 416 BLAKE2B 1d7b6295f889c5438130c25cabfc6ff021c59bc75cf02f5b9829c05b330c3662754be11016d475bf9fd013d696af8ef2fa1168baededea37da4aa746ec3332a6 SHA512 8362e4f37612d47285ffc83c04e4299efaad5f9ba9a9ee1d50ebc9867c2b63d4df3df85aee31db9f94a9e9305add1abb42d133bdd69d5c753439936d6f3c5d33 diff --git a/net-misc/curl-impersonate/curl-impersonate-0.8.2.ebuild b/net-misc/curl-impersonate/curl-impersonate-0.8.2.ebuild index 7b99d236..75d3fe57 100644 --- a/net-misc/curl-impersonate/curl-impersonate-0.8.2.ebuild +++ b/net-misc/curl-impersonate/curl-impersonate-0.8.2.ebuild @@ -44,8 +44,6 @@ src_prepare() { eautoreconf touch .patched-chrome || die popd || die - eapply "${FILESDIR}/${PN}-0001-build-fixes.patch" - eautoreconf default } diff --git a/net-misc/curl-impersonate/files/curl-impersonate-0001-build-fixes.patch b/net-misc/curl-impersonate/files/curl-impersonate-0001-build-fixes.patch deleted file mode 100644 index eb085c59..00000000 --- a/net-misc/curl-impersonate/files/curl-impersonate-0001-build-fixes.patch +++ /dev/null @@ -1,135 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 1ed44b3..b322f5e 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -17,16 +17,12 @@ NGHTTP2_URL := https://github.com/nghttp2/nghttp2/releases/download/v1.63.0/nght - CURL_VERSION := curl-8_7_1 - - # https://github.com/google/brotli/commit/641bec0e30bea648b3da1cd90fc6b44deb429f71 --brotli_install_dir := $(abspath brotli-$(BROTLI_VERSION)/out/installed) --brotli_static_libs := $(brotli_install_dir)/lib/libbrotlicommon.a $(brotli_install_dir)/lib/libbrotlidec.a - boringssl_dir := $(abspath boringssl-$(BORING_SSL_COMMIT)) - boringssl_install_dir := $(boringssl_dir)/build - boringssl_static_libs := $(boringssl_dir)/lib/libssl.a $(boringssl_dir)/lib/libcrypto.a --nghttp2_install_dir := $(abspath $(NGHTTP2_VERSION)/installed) --nghttp2_static_libs := $(nghttp2_install_dir)/lib/libnghttp2.a - - # Dependencies needed to compile the Chrome version --chrome_libs := $(brotli_static_libs) $(boringssl_static_libs) $(nghttp2_static_libs) -+chrome_libs := - - # The following variables will be set by the configure script. - prefix = @prefix@ -@@ -108,62 +104,7 @@ chrome-clean: ## Clean build artifacts of the Chrome version. Use after re-runni - rm -f .chrome - .PHONY: chrome-clean - --clean: ## Remove all build artifacts, including dependencies -- rm -Rf brotli-$(BROTLI_VERSION).tar.gz brotli-$(BROTLI_VERSION) -- rm -Rf boringssl-$(BORING_SSL_COMMIT).zip boringssl-$(BORING_SSL_COMMIT) -- rm -Rf $(NGHTTP2_VERSION).tar.bz2 $(NGHTTP2_VERSION) -- rm -Rf $(CURL_VERSION).tar.gz $(CURL_VERSION) -- --brotli-$(BROTLI_VERSION).tar.gz: -- curl -L "https://github.com/google/brotli/archive/refs/tags/v${BROTLI_VERSION}.tar.gz" \ -- -o "brotli-${BROTLI_VERSION}.tar.gz" -- --$(brotli_static_libs): brotli-$(BROTLI_VERSION).tar.gz -- tar xf brotli-$(BROTLI_VERSION).tar.gz -- cd brotli-$(BROTLI_VERSION) -- mkdir -p out -- cd out -- -- # Convert autoconf style os name to CMake style os name. -- case $(host_os) in \ -- linux*) \ -- system_name=Linux \ -- ;; \ -- darwin*) \ -- system_name=Darwin \ -- ;; \ -- *) \ -- system_name=$(host_os) \ -- ;; \ -- esac -- -- @cmake@ -DCMAKE_BUILD_TYPE=Release \ -- -DCMAKE_INSTALL_PREFIX=./installed \ -- -DCMAKE_INSTALL_LIBDIR=lib \ -- -DCMAKE_CXX_COMPILER=$(CXX) \ -- -DCMAKE_C_COMPILER=$(CC) \ -- -DCMAKE_C_FLAGS="$(CFLAGS)" \ -- -DCMAKE_SYSTEM_NAME=$$system_name \ -- -DCMAKE_SYSTEM_PROCESSOR=$(host_cpu) \ -- -DBUILD_SHARED_LIBS=OFF \ -- .. -- -- @cmake@ --build . --config Release --target install --parallel $(SUBJOBS) -- -- --boringssl-$(BORING_SSL_COMMIT).zip: -- curl -L https://github.com/google/boringssl/archive/$(BORING_SSL_COMMIT).zip \ -- -o boringssl-$(BORING_SSL_COMMIT).zip -- --# Patch boringssl and use a dummy '.patched' file to mark it patched --boringssl-$(BORING_SSL_COMMIT)/.patched: $(srcdir)/chrome/patches/boringssl.patch -- unzip -q -o boringssl-$(BORING_SSL_COMMIT).zip -- # mv boringssl boringssl-$(BORING_SSL_COMMIT) -- cd boringssl-$(BORING_SSL_COMMIT)/ -- for p in $^; do patch -p1 < $$p; done -- touch .patched -- --$(boringssl_static_libs): boringssl-$(BORING_SSL_COMMIT).zip boringssl-$(BORING_SSL_COMMIT)/.patched -+$(boringssl_static_libs): boringssl-$(BORING_SSL_COMMIT)/.patched - mkdir -p $(boringssl_install_dir) - cd $(boringssl_install_dir) - -@@ -201,47 +142,8 @@ $(boringssl_static_libs): boringssl-$(BORING_SSL_COMMIT).zip boringssl-$(BORING_ - cp ssl/libssl.a $(boringssl_dir)/lib - cp crypto/libcrypto.a $(boringssl_dir)/lib - -- --$(NGHTTP2_VERSION).tar.bz2: -- curl -L $(NGHTTP2_URL) -o $(NGHTTP2_VERSION).tar.bz2 -- --$(nghttp2_static_libs): $(NGHTTP2_VERSION).tar.bz2 -- tar -xf $(NGHTTP2_VERSION).tar.bz2 -- cd $(NGHTTP2_VERSION) -- -- # Set up the configure flags to nghttp2. -- # If the user provided the --host flag to our configure script -- # (for cross compilation), then pass it on to nghttp2. -- { \ -- config_flags="--prefix=$(nghttp2_install_dir)"; \ -- config_flags="$$config_flags --with-pic --enable-lib-only"; \ -- config_flags="$$config_flags --disable-shared --disable-python-bindings"; \ -- if test -n "$(host_alias)"; then \ -- config_flags="$$config_flags --host=$(host_alias)"; \ -- fi; \ -- } -- -- ./configure $$config_flags -- $(MAKE) MAKEFLAGS=-j$(SUBJOBS) -- $(MAKE) install MAKEFLAGS= -- --$(CURL_VERSION).tar.gz: -- curl -L "https://github.com/curl/curl/archive/$(CURL_VERSION).tar.gz" \ -- -o "$(CURL_VERSION).tar.gz" -- --# Apply the "Chorme version" patches and mark using a dummy file --$(CURL_VERSION)/.patched-chrome: $(srcdir)/chrome/patches/curl-*.patch -- rm -Rf $(CURL_VERSION) -- tar -xf $(CURL_VERSION).tar.gz -- mv curl-$(CURL_VERSION) $(CURL_VERSION) # fix directory name -- cd $(CURL_VERSION) -- for p in $^; do patch -p1 < $$p; done -- # Re-generate the configure script -- autoreconf -fi -- touch .patched-chrome -- - # This is a small hack that flags that curl was patched and configured in the "chrome" version --$(CURL_VERSION)/.chrome: $(chrome_libs) $(CURL_VERSION).tar.gz $(CURL_VERSION)/.patched-chrome -+$(CURL_VERSION)/.chrome: $(chrome_libs) $(CURL_VERSION)/.patched-chrome - cd $(CURL_VERSION) - - # Set up the configure flags to curl.