commit: 722353895e521507cc3ac5dd14c8480cd9be24b9
Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 22 19:49:07 2025 +0000
Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
CommitDate: Sat Nov 22 19:49:07 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72235389
sys-libs/ldb: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org>
sys-libs/ldb/files/cmocka-config_h.patch | 23 -------------
.../ldb/files/ldb-1.5.2-optional_packages.patch | 40 ----------------------
2 files changed, 63 deletions(-)
diff --git a/sys-libs/ldb/files/cmocka-config_h.patch
b/sys-libs/ldb/files/cmocka-config_h.patch
deleted file mode 100644
index 124928450cd6..000000000000
--- a/sys-libs/ldb/files/cmocka-config_h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./third_party/cmocka/cmocka.h.orig 2024-03-26 10:23:03.378410042 +0100
-+++ ./third_party/cmocka/cmocka.h 2024-03-26 10:24:51.526922405 +0100
-@@ -14,6 +14,11 @@
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #ifndef CMOCKA_H_
- #define CMOCKA_H_
-
-@@ -111,7 +114,7 @@
- ((LargestIntegralType)(value))
-
- /* Smallest integral type capable of holding a pointer. */
--#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
-+#if !defined(HAVE_UINTPTR_T) && !defined(_UINTPTR_T) &&
!defined(_UINTPTR_T_DEFINED) && !defined(__DEFINED_uintptr_t)
- # if defined(_WIN32)
- /* WIN32 is an ILP32 platform */
- typedef unsigned int uintptr_t;
diff --git a/sys-libs/ldb/files/ldb-1.5.2-optional_packages.patch
b/sys-libs/ldb/files/ldb-1.5.2-optional_packages.patch
deleted file mode 100644
index bdceeb3c4344..000000000000
--- a/sys-libs/ldb/files/ldb-1.5.2-optional_packages.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- ldb-1.5.2/wscript
-+++ ldb-1.5.2/wscript
-@@ -33,6 +33,10 @@
- opt.RECURSE('lib/tevent')
- opt.RECURSE('lib/replace')
- opt.load('python') # options for disabling pyc or pyo compilation
-+ if opt.IN_LAUNCH_DIR():
-+ opt.add_option('--disable-ldap',
-+ help=("disable ldap support"),
-+ action="store_true", dest='disable_ldap', default=False)
-
- opt.add_option('--without-ldb-lmdb',
- help='disable new LMDB backend for LDB',
-@@ -40,6 +44,10 @@
-
-
- def configure(conf):
-+ conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
-+
-+ conf.env.disable_ldap = getattr(Options.options, 'disable_ldap', False)
-+
- conf.RECURSE('lib/tdb')
- conf.RECURSE('lib/tevent')
-
-@@ -157,9 +165,12 @@
- if conf.env.standalone_ldb:
- conf.CHECK_XSLTPROC_MANPAGES()
-
-- # we need this for the ldap backend
-- if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber
ldap', headers='lber.h ldap.h'):
-- conf.env.ENABLE_LDAP_BACKEND = True
-+ if not conf.env.disable_ldap:
-+ # we need this for the ldap backend
-+ if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize',
'lber ldap', headers='lber.h ldap.h'):
-+ conf.env.ENABLE_LDAP_BACKEND = True
-+ else:
-+ conf.env.ENABLE_LDAP_BACKEND = False
-
- # we don't want any libraries or modules to rely on runtime
- # resolution of symbols
