Hello community,
here is the log from the commit of package talloc for openSUSE:Factory checked in at 2019-10-25 18:41:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/talloc (Old)
and /work/SRC/openSUSE:Factory/.talloc.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "talloc"
Fri Oct 25 18:41:01 2019 rev:35 rq:742241 version:2.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/talloc/talloc-man.changes 2019-10-14 12:34:55.591731984 +0200
+++ /work/SRC/openSUSE:Factory/.talloc.new.2990/talloc-man.changes 2019-10-25 18:41:02.783835609 +0200
@@ -1,0 +2,7 @@
+Mon Oct 21 14:36:01 CEST 2019 - Matej Cepl
+
+- Add two patches making build compatible with Python 3.8.0:
+ - waf_upgrade.patch
+ - waf_use_native_waf_timer.patch
+
+-------------------------------------------------------------------
talloc.changes: same change
New:
----
waf_upgrade.patch
waf_use_native_waf_timer.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ talloc-man.spec ++++++
--- /var/tmp/diff_new_pack.daqClN/_old 2019-10-25 18:41:05.719838399 +0200
+++ /var/tmp/diff_new_pack.daqClN/_new 2019-10-25 18:41:05.723838403 +0200
@@ -44,6 +44,9 @@
Source1: https://download.samba.org/pub/talloc/talloc-%{version}.tar.asc
Source4: baselibs.conf
Patch0: talloc-python3.5-fix-soabi_name.patch
+# Originally from https://git.samba.org/samba.git/?p=samba.git;a=patch;h=aabdcc91513e242c4f191...
+Patch1: waf_upgrade.patch
+Patch2: waf_use_native_waf_timer.patch
Source50: talloc.keyring
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -111,7 +114,7 @@
%prep
%setup -n talloc-%{version} -q
-%patch0 -p1
+%autopatch -p1
sed -i 's;../../buildtools/bin/waf;./buildtools/bin/waf;g' Makefile
%build
++++++ talloc.spec ++++++
--- /var/tmp/diff_new_pack.daqClN/_old 2019-10-25 18:41:05.751838430 +0200
+++ /var/tmp/diff_new_pack.daqClN/_new 2019-10-25 18:41:05.751838430 +0200
@@ -44,6 +44,8 @@
Source1: https://download.samba.org/pub/talloc/talloc-%{version}.tar.asc
Source4: baselibs.conf
Patch0: talloc-python3.5-fix-soabi_name.patch
+Patch1: waf_upgrade.patch
+Patch2: waf_use_native_waf_timer.patch
Source50: talloc.keyring
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -111,7 +113,7 @@
%prep
%setup -n talloc-%{version} -q
-%patch0 -p1
+%autopatch -p1
%build
%if ! %{build_man}
++++++ waf_upgrade.patch ++++++
++++ 3299 lines (skipped)
++++++ waf_use_native_waf_timer.patch ++++++
From dc27ff44de578b0b429a24b0e42e243d8bf481a8 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik
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
Reviewed-by: Andreas Schneider
Reviewed-by: Alexander Bokovoy
---
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.23.0