[arch-commits] Commit in tdb/repos/extra-x86_64 (3 files)
Levente Polyak
anthraxx at archlinux.org
Sat Mar 28 17:42:15 UTC 2020
Date: Saturday, March 28, 2020 @ 17:42:14
Author: anthraxx
Revision: 378618
archrelease: copy trunk to extra-x86_64
Added:
tdb/repos/extra-x86_64/PKGBUILD
(from rev 378617, tdb/trunk/PKGBUILD)
Deleted:
tdb/repos/extra-x86_64/PKGBUILD
tdb/repos/extra-x86_64/wafsamba-use-native-waf-timer.patch
-------------------------------------+
PKGBUILD | 69 ++++++++++----------
wafsamba-use-native-waf-timer.patch | 114 ----------------------------------
2 files changed, 34 insertions(+), 149 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-28 17:42:05 UTC (rev 378617)
+++ PKGBUILD 2020-03-28 17:42:14 UTC (rev 378618)
@@ -1,35 +0,0 @@
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: eric <eric at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=tdb
-pkgver=1.4.3
-pkgrel=1
-pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits"
-arch=(x86_64)
-license=('GPL3')
-url="https://tdb.samba.org/"
-makedepends=('python' 'libxslt' 'docbook-xsl')
-optdepends=('python: for python bindings')
-source=(https://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz
- https://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.asc
- samba-update-waf-for-py38.patch::https://gitlab.com/samba-team/samba/commit/aabdcc9151.patch
- wafsamba-use-native-waf-timer.patch)
-validpgpkeys=('9147A339719518EE9011BCB54793916113084025') #Samba Library Distribution Key <samba-bugs at samba.org>
-sha512sums=('99488839e7da396f04df60412d21a7d3e09efeab52772d6cb5e9470a3dfd585d73ef2422c51cd0d8ccc123a65d455de400d5d6b24a21a2a50d3da60d9a70e67a'
- 'SKIP'
- 'fc15527eb901620dfa90c7bd91ebffc57c143f67db18377ac5129f8edc3db61b0e4149d3d793559bc5f9ebbe4f040231d12db45bd5cfb3a46df2e73f02f370b2'
- '22ebd9a15833ed2a4eaa8f9a71dc71c55465f2c7a1d5c0afcd211a202b7c11dd7d43fc4848863cbcc69206f0815afc411367c007032dd1aaa3edba81238729b0')
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --localstatedir=/var \
- --sysconfdir=/etc/samba
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="$pkgdir/" install
-}
Copied: tdb/repos/extra-x86_64/PKGBUILD (from rev 378617, tdb/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-28 17:42:14 UTC (rev 378618)
@@ -0,0 +1,34 @@
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: eric <eric at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=tdb
+pkgver=1.4.3
+pkgrel=2
+pkgdesc='Trivial Database similar to GDBM but allows simultaneous commits'
+arch=(x86_64)
+license=('GPL3')
+url="https://tdb.samba.org/"
+depends=('glibc')
+makedepends=('python' 'libxslt' 'docbook-xsl')
+optdepends=('python: for python bindings')
+provides=(libtdb.so)
+source=(https://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar{.gz,.asc})
+validpgpkeys=('9147A339719518EE9011BCB54793916113084025') # Samba Library Distribution Key <samba-bugs at samba.org>
+sha512sums=('99488839e7da396f04df60412d21a7d3e09efeab52772d6cb5e9470a3dfd585d73ef2422c51cd0d8ccc123a65d455de400d5d6b24a21a2a50d3da60d9a70e67a'
+ 'SKIP')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --localstatedir=/var \
+ --sysconfdir=/etc/samba
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="$pkgdir" install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: wafsamba-use-native-waf-timer.patch
===================================================================
--- wafsamba-use-native-waf-timer.patch 2020-03-28 17:42:05 UTC (rev 378617)
+++ wafsamba-use-native-waf-timer.patch 2020-03-28 17:42:14 UTC (rev 378618)
@@ -1,114 +0,0 @@
-From dc27ff44de578b0b429a24b0e42e243d8bf481a8 Mon Sep 17 00:00:00 2001
-From: Lukas Slebodnik <lslebodn at fedoraproject.org>
-Date: Wed, 12 Jun 2019 12:27:04 +0200
-Subject: [PATCH] wafsamba: Use native waf timer
-
- __main__:1: DeprecationWarning: time.clock has been deprecated in Python 3.3
- and will be removed from Python 3.8: use time.perf_counter
- or time.process_time instead
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=13998
-
-Signed-off-by: Lukas Slebodnik <lslebodn at fedoraproject.org>
-Reviewed-by: Andreas Schneider <asn at samba.org>
-Reviewed-by: Alexander Bokovoy <ab at samba.org>
----
- buildtools/wafsamba/samba_deps.py | 25 ++++++++++++-------------
- 1 file changed, 12 insertions(+), 13 deletions(-)
-
-diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
-index f8c38809bd2..03c37079a8c 100644
---- a/buildtools/wafsamba/samba_deps.py
-+++ b/buildtools/wafsamba/samba_deps.py
-@@ -1,6 +1,6 @@
- # Samba automatic dependency handling and project rules
-
--import os, sys, re, time
-+import os, sys, re
-
- from waflib import Build, Options, Logs, Utils, Errors
- from waflib.Logs import debug
-@@ -1102,8 +1102,7 @@ def check_project_rules(bld):
- if not force_project_rules and load_samba_deps(bld, tgt_list):
- return
-
-- global tstart
-- tstart = time.clock()
-+ timer = Utils.Timer()
-
- bld.new_rules = True
- Logs.info("Checking project rules ...")
-@@ -1112,26 +1111,26 @@ def check_project_rules(bld):
-
- expand_subsystem_deps(bld)
-
-- debug("deps: expand_subsystem_deps: %f" % (time.clock() - tstart))
-+ debug("deps: expand_subsystem_deps: %s" % str(timer))
-
- replace_grouping_libraries(bld, tgt_list)
-
-- debug("deps: replace_grouping_libraries: %f" % (time.clock() - tstart))
-+ debug("deps: replace_grouping_libraries: %s" % str(timer))
-
- build_direct_deps(bld, tgt_list)
-
-- debug("deps: build_direct_deps: %f" % (time.clock() - tstart))
-+ debug("deps: build_direct_deps: %s" % str(timer))
-
- break_dependency_loops(bld, tgt_list)
-
-- debug("deps: break_dependency_loops: %f" % (time.clock() - tstart))
-+ debug("deps: break_dependency_loops: %s" % str(timer))
-
- if Options.options.SHOWDEPS:
- show_dependencies(bld, Options.options.SHOWDEPS, set())
-
- calculate_final_deps(bld, tgt_list, loops)
-
-- debug("deps: calculate_final_deps: %f" % (time.clock() - tstart))
-+ debug("deps: calculate_final_deps: %s" % str(timer))
-
- if Options.options.SHOW_DUPLICATES:
- show_object_duplicates(bld, tgt_list)
-@@ -1140,7 +1139,7 @@ def check_project_rules(bld):
- for f in [ build_dependencies, build_includes, add_init_functions ]:
- debug('deps: project rules checking %s', f)
- for t in tgt_list: f(t)
-- debug("deps: %s: %f" % (f, time.clock() - tstart))
-+ debug("deps: %s: %s" % (f, str(timer)))
-
- debug('deps: project rules stage1 completed')
-
-@@ -1148,17 +1147,17 @@ def check_project_rules(bld):
- Logs.error("Duplicate sources present - aborting")
- sys.exit(1)
-
-- debug("deps: check_duplicate_sources: %f" % (time.clock() - tstart))
-+ debug("deps: check_duplicate_sources: %s" % str(timer))
-
- if not bld.check_group_ordering(tgt_list):
- Logs.error("Bad group ordering - aborting")
- sys.exit(1)
-
-- debug("deps: check_group_ordering: %f" % (time.clock() - tstart))
-+ debug("deps: check_group_ordering: %s" % str(timer))
-
- show_final_deps(bld, tgt_list)
-
-- debug("deps: show_final_deps: %f" % (time.clock() - tstart))
-+ debug("deps: show_final_deps: %s" % str(timer))
-
- debug('deps: project rules checking completed - %u targets checked',
- len(tgt_list))
-@@ -1166,7 +1165,7 @@ def check_project_rules(bld):
- if not bld.is_install:
- save_samba_deps(bld, tgt_list)
-
-- debug("deps: save_samba_deps: %f" % (time.clock() - tstart))
-+ debug("deps: save_samba_deps: %s" % str(timer))
-
- Logs.info("Project rules pass")
-
---
-2.22.0
-
More information about the arch-commits
mailing list