From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/xrootd/files/
Date: Fri, 5 Jul 2024 17:41:54 +0000 (UTC) [thread overview]
Message-ID: <1720201276.8b5a2b71ab808b739348ce28cde6df4f7c768a39.conikost@gentoo> (raw)
commit: 8b5a2b71ab808b739348ce28cde6df4f7c768a39
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Jul 4 06:58:36 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jul 5 17:41:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b5a2b71
net-libs/xrootd: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-libs/xrootd/files/xrootd-4.8.3-crc32.patch | 58 ----------------------
.../files/xrootd-5.4.3-cmake_no_python.patch | 15 ------
2 files changed, 73 deletions(-)
diff --git a/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch b/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch
deleted file mode 100644
index 9f27c4369880..000000000000
--- a/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 64f81b7fad227097f5e135d25a5574cfecf4d50d Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Fri, 18 May 2018 11:30:58 +0200
-Subject: [PATCH] Remove declarations of crc32 and adler32
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-These break compilation with the error below:
-
-xrootd-4.8.3/tests/XrdSsiTests/XrdShMap.cc:
- In function ‘int DoA32(const char*)’:
-xrootd-4.8.3/tests/XrdSsiTests/XrdShMap.cc:418:34:
- error: expected initializer before ‘OF’
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
- ^^
----
- src/XrdSsi/XrdSsiShMam.cc | 2 +-
- tests/XrdSsiTests/XrdShMap.cc | 3 ---
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/XrdSsi/XrdSsiShMam.cc b/src/XrdSsi/XrdSsiShMam.cc
-index 013dc855..a4803d71 100644
---- a/src/XrdSsi/XrdSsiShMam.cc
-+++ b/src/XrdSsi/XrdSsiShMam.cc
-@@ -882,7 +882,7 @@ bool XrdSsiShMam::GetItem(void *data, const char *key, int hash)
- /******************************************************************************/
-
- int XrdSsiShMam::HashVal(const char *key)
--{ ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
-+{
- uLong crc;
- int hval, klen = strlen(key);
-
-diff --git a/tests/XrdSsiTests/XrdShMap.cc b/tests/XrdSsiTests/XrdShMap.cc
-index bb642ac3..860fa7ad 100644
---- a/tests/XrdSsiTests/XrdShMap.cc
-+++ b/tests/XrdSsiTests/XrdShMap.cc
-@@ -415,7 +415,6 @@ void Explain(const char *what)
-
- int DoA32(const char *buff)
- {
-- ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
- uLong adler = adler32(0L, Z_NULL, 0);
-
- // Check for ID request now
-@@ -438,8 +437,6 @@ int DoA32(const char *buff)
-
- int DoC32(const char *buff)
- {
-- ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
--
- // Check for ID request now
- //
- if (!buff) {int myID; memcpy(&myID, "c32 ", sizeof(int)); return myID;}
---
-2.17.0
-
diff --git a/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch b/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch
deleted file mode 100644
index 04607cdd7b04..000000000000
--- a/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/bindings/python/CMakeLists.txt
-+++ b/bindings/python/CMakeLists.txt
-@@ -32,6 +32,7 @@
-
- configure_file(${SETUP_PY_IN} ${SETUP_PY})
-
-+if (0)
- string(FIND "${PIP_OPTIONS}" "--prefix" PIP_OPTIONS_PREFIX_POSITION)
- if( "${PIP_OPTIONS_PREFIX_POSITION}" EQUAL "-1" )
- string(APPEND PIP_OPTIONS " --prefix \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}")
-@@ -100,3 +101,4 @@
- )"
- )
- endif()
-+endif()
next reply other threads:[~2024-07-05 17:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-05 17:41 Conrad Kostecki [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-27 8:28 [gentoo-commits] repo/gentoo:master commit in: net-libs/xrootd/files/ Sam James
2023-07-05 8:35 Guilherme Amadio
2019-03-26 16:45 Patrice Clement
2017-01-03 21:22 Andrew Savchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1720201276.8b5a2b71ab808b739348ce28cde6df4f7c768a39.conikost@gentoo \
--to=conikost@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox