[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1bb3a6381becf87907f8ab1cbddec951be4a639d - IPFire-SCM

17 Oct 2015

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
       via  1bb3a6381becf87907f8ab1cbddec951be4a639d (commit)
       via  d0873e09f08dfc3c33a3f5d2c28a54c83027a936 (commit)
       via  33619ff612376d4ba5a1f9d8b1fcb4191ffae40d (commit)
       via  c06e7bf480f0410ea5eb68b444e41e5b257c92d0 (commit)
       via  f0389604a0acbbfe4961e256679483ef33b9e000 (commit)
      from  b5563ff993c041c5fc6f93cc7a4fa08188abea7e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1bb3a6381becf87907f8ab1cbddec951be4a639d
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 17 21:25:15 2015 +0200
pygobject3: Update to version 3.18.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d0873e09f08dfc3c33a3f5d2c28a54c83027a936
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 17 21:22:42 2015 +0200
python3-cairo: Rebuild against Python 3.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 33619ff612376d4ba5a1f9d8b1fcb4191ffae40d
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 17 20:53:29 2015 +0200
python-dbus: Rebuild against Python 3.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c06e7bf480f0410ea5eb68b444e41e5b257c92d0
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 17 20:51:45 2015 +0200
python-tornado: Update to version 4.2.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f0389604a0acbbfe4961e256679483ef33b9e000
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 17 20:51:10 2015 +0200
python-rrdtool: Rebuild against Python 3.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 pygobject3/pygobject3.nm                               | 11 ++++-------
 python-dbus/python-dbus.nm                             |  4 ++--
 python-rrdtool/python-rrdtool.nm                       |  4 ++--
 python-tornado/python-tornado.nm                       |  5 ++---
 .../cairo-waf-use-python-config-as-shell-script.patch0 | 11 +++++++++++
 .../patches/pycairo-1.10.0-test-python3.patch          | 12 ++++++++++++
 python3-cairo/python3-cairo.nm                         | 18 ++++++++++++++++--
 7 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0
 create mode 100644 python3-cairo/patches/pycairo-1.10.0-test-python3.patch
Difference in files:

diff --git a/pygobject3/pygobject3.nm b/pygobject3/pygobject3.nm
index c72a874..bc92035 100644
--- a/pygobject3/pygobject3.nm
+++ b/pygobject3/pygobject3.nm
@@ -5,9 +5,9 @@
name       = pygobject3
 version    = %{ver_major}.%{ver_minor}
-ver_major  = 3.7
-ver_minor  = 4
-release    = 2
+ver_major  = 3.18
+ver_minor  = 0
+release    = 1
groups     = Development/Tools
 url        = http://www.pygtk.org/
@@ -27,14 +27,13 @@ sources    = %{thisapp}.tar.xz
 build
    requires
    	cairo-gobject-devel >= 1.12.12
-		chrpath
    	glib2-devel >= 2.34.2
    	gobject-introspection-devel >= 1.34.2
    	pkg-config
    	python-cairo-devel
    	python3-cairo-devel
    	python-devel
-		python3-devel
+		python3-devel >= 3.4
    end
DIR_APP3 = %{DIR_APP}-python3
@@ -65,12 +64,10 @@ build
    	pushd %{DIR_APP3}
    	export PYTHON=%{python3}
    	make install DESTDIR=%{BUILDROOT}
-		chrpath --delete %{BUILDROOT}%{python3_sitearch}/gi/{*.so,*/*.so}
    	popd
export PYTHON=%{python}
    	make install DESTDIR=%{BUILDROOT}
-		chrpath --delete %{BUILDROOT}%{python_sitearch}/gi/{*.so,*/*.so}
    end
 end
diff --git a/python-dbus/python-dbus.nm b/python-dbus/python-dbus.nm
index c5e31fc..ba57719 100644
--- a/python-dbus/python-dbus.nm
+++ b/python-dbus/python-dbus.nm
@@ -5,7 +5,7 @@
name       = python-dbus
 version    = 1.1.1
-release    = 1
+release    = 2
groups     = System/Libraries
 url        = http://www.freedesktop.org/software/dbus/
@@ -26,7 +26,7 @@ build
    	dbus-glib-devel
    	pkg-config
    	python-devel
-		python3-devel
+		python3-devel >= 3.4
    end
configure_options += \
diff --git a/python-rrdtool/python-rrdtool.nm b/python-rrdtool/python-rrdtool.nm
index 9b43172..6d3d49a 100644
--- a/python-rrdtool/python-rrdtool.nm
+++ b/python-rrdtool/python-rrdtool.nm
@@ -5,7 +5,7 @@
name       = python-rrdtool
 version    = 0.1.1
-release    = 1
+release    = 2
 thisapp    = rrdtool-%{version}
groups     = System/Libraries
@@ -22,7 +22,7 @@ source_dl  = https://pypi.python.org/packages/source/r/rrdtool/
build
    requires
-		python3-devel
+		python3-devel >= 3.4
    	rrdtool-devel
    end
diff --git a/python-tornado/python-tornado.nm b/python-tornado/python-tornado.nm
index 0610edb..2f83bac 100644
--- a/python-tornado/python-tornado.nm
+++ b/python-tornado/python-tornado.nm
@@ -4,9 +4,8 @@
 ###############################################################################
name       = python-tornado
-version    = 3.0
+version    = 4.2.1
 release    = 1
-arch       = noarch
 thisapp    = tornado-%{version}
maintainer = Michael Tremer michael.tremer@ipfire.org
@@ -28,7 +27,7 @@ build
    requires
    	pakfire-builder >= 0.9.23-2
    	python-devel
-		python3-devel
+		python3-devel >= 3.4
    end
DIR_APP3 = %{DIR_APP}-python3
diff --git a/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0 b/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0
new file mode 100644
index 0000000..b8cd856
--- /dev/null
+++ b/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0
@@ -0,0 +1,11 @@
+--- .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py.orig	2014-05-12 12:36:46.776004776 +0200
++++ .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py	2014-05-12 12:36:53.994995779 +0200
+@@ -169,7 +169,7 @@
+ 		conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
+ 	includes=[]
+ 	if conf.env.PYTHON_CONFIG:
+-		for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
++		for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
+ 			if(incstr.startswith('-I')or incstr.startswith('/I')):
+ 				incstr=incstr[2:]
+ 			if incstr not in includes:
diff --git a/python3-cairo/patches/pycairo-1.10.0-test-python3.patch b/python3-cairo/patches/pycairo-1.10.0-test-python3.patch
new file mode 100644
index 0000000..32e398f
--- /dev/null
+++ b/python3-cairo/patches/pycairo-1.10.0-test-python3.patch
@@ -0,0 +1,12 @@
+diff -up pycairo-1.10.0/test/examples_test.py~ pycairo-1.10.0/test/examples_test.py
+--- pycairo-1.10.0/test/examples_test.py~	2010-05-29 08:28:35.000000000 +0300
++++ pycairo-1.10.0/test/examples_test.py	2013-12-20 22:53:07.806217741 +0200
+@@ -14,7 +14,7 @@ def test_snippets():
+   examples/cairo_snippets/snippets/
+   '''
+   def doSnippets(name):
+-    retcode = subprocess.call('python %s -s' % name, shell=True)
++    retcode = subprocess.call('python3 %s -s' % name, shell=True)
+     assert retcode == 0, 'Error: retcode == {0}'.format(retcode)
+ 
+   os.chdir(os.path.join(os.path.dirname(__file__), '..', 'examples',
diff --git a/python3-cairo/python3-cairo.nm b/python3-cairo/python3-cairo.nm
index c8f04b1..a360e7a 100644
--- a/python3-cairo/python3-cairo.nm
+++ b/python3-cairo/python3-cairo.nm
@@ -5,7 +5,7 @@
name       = python3-cairo
 version    = 1.10.0
-release    = 1
+release    = 2
groups     = Development/Tools
 url        = http://cairographics.org/pycairo
@@ -25,7 +25,21 @@ build
    requires
    	cairo-devel
    	pkg-config
-		python3-devel
+		python3-devel >= 3.4
+	end
+
+	prepare
+		# Extract source tarball.
+		%{MACRO_EXTRACT_TARBALL}
+
+		# Ensure that ./waf has created the cached unpacked version
+		# of the wafadmin source tree.
+		# This will be created to a subdirectory like
+		#    .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
+		python3 ./waf --version
+
+		# Apply all patches.
+		%{MACRO_PATCHES}
    end
build
hooks/post-receive
--
IPFire 3.x development tree

    