Date: Sunday, November 17, 2019 @ 04:30:45 Author: anatolik Revision: 368970
upgpkg: talloc 2.3.0-1 Modified: talloc/trunk/PKGBUILD Deleted: talloc/trunk/wafsamba-use-native-waf-timer.patch -------------------------------------+ PKGBUILD | 24 +------ wafsamba-use-native-waf-timer.patch | 114 ---------------------------------- 2 files changed, 5 insertions(+), 133 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-17 02:59:13 UTC (rev 368969) +++ PKGBUILD 2019-11-17 04:30:45 UTC (rev 368970) @@ -2,8 +2,8 @@ # Contributor: Tobias Powalowski <tp...@archlinux.org> pkgname=talloc -pkgver=2.2.0 -pkgrel=3 +pkgver=2.3.0 +pkgrel=1 pkgdesc="Hierarchical pool based memory allocator with destructors" arch=('x86_64') license=('GPL3') @@ -11,25 +11,11 @@ depends=('glibc') makedepends=('python' 'docbook-xsl') optdepends=('python: for python bindings') -source=(https://www.samba.org/ftp/talloc/talloc-$pkgver.tar.{gz,asc} - samba-update-waf-for-py38.patch::https://gitlab.com/samba-team/samba/commit/aabdcc9151.patch - wafsamba-use-native-waf-timer.patch) -sha1sums=('d806e2e4e9b973e8ab6521d1dd20a03abae32c99' - 'SKIP' - 'ab8f8bd63c722e2e3b709e89fa3c1e222daac988' - '2e688ce37d2f5027ba6e4eb52503353d9707fdae') +source=(https://www.samba.org/ftp/talloc/talloc-$pkgver.tar.{gz,asc}) +sha1sums=('338b81ceda18101b3b977223693c41552161999d' + 'SKIP') validpgpkeys=(9147A339719518EE9011BCB54793916113084025) # samba-b...@samba.org -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # https://bugzilla.samba.org/show_bug.cgi?id=13960 - patch -Np1 -i ../samba-update-waf-for-py38.patch - - # https://bugzilla.samba.org/show_bug.cgi?id=13998 - patch -Np1 -i ../wafsamba-use-native-waf-timer.patch -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ Deleted: wafsamba-use-native-waf-timer.patch =================================================================== --- wafsamba-use-native-waf-timer.patch 2019-11-17 02:59:13 UTC (rev 368969) +++ wafsamba-use-native-waf-timer.patch 2019-11-17 04:30:45 UTC (rev 368970) @@ -1,114 +0,0 @@ -From dc27ff44de578b0b429a24b0e42e243d8bf481a8 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik <lsleb...@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 <lsleb...@fedoraproject.org> -Reviewed-by: Andreas Schneider <a...@samba.org> -Reviewed-by: Alexander Bokovoy <a...@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 -