[gentoo-commits] gentoo-x86 commit in dev-python/pycairo/files: pycairo-1.10.0-xpyb.patch py2cairo-1.10.0-xpyb.patch

[gentoo-commits] gentoo-x86 commit in dev-python/pycairo/files: pycairo-1.10.0-xpyb.patch py2cairo-1.10.0-xpyb.patch

[Tim Harder (radhermit)]

radhermit    12/11/13 04:41:16

  Added:                pycairo-1.10.0-xpyb.patch
                        py2cairo-1.10.0-xpyb.patch
  Log:
  Revision bump. Add xcb use flag which enables support for xpyb (bug #416565, patch slightly modified from upstream to avoid automagic deps).
  
  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

Revision  Changes    Path
1.1                  dev-python/pycairo/files/pycairo-1.10.0-xpyb.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/files/pycairo-1.10.0-xpyb.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/files/pycairo-1.10.0-xpyb.patch?rev=1.1&content-type=text/plain

Index: pycairo-1.10.0-xpyb.patch
===================================================================
--- pycairo-1.10.0/wscript
+++ pycairo-1.10.0/wscript
@@ -10,6 +10,7 @@
 APPNAME='pycairo'
 VERSION='1.10.0'
 cairo_version_required = '1.10.0'
+xpyb_version_required  = '1.3'    # optional
 
 
 def check_svg():
@@ -23,6 +24,17 @@
     return False
 
 
+def check_xpyb():
+  if os.environ.get('PYCAIRO_DISABLE_XPYB', None) is None:
+    return_code = subprocess.call(['pkg-config', '--exists', 'xpyb'])
+    if return_code == 0:
+      return True
+    else:
+      return False
+  else:
+    return False
+
+
 def options(ctx):
   print('  %s/options()' %d)
   ctx.tool_options('gnu_dirs')
@@ -42,6 +54,12 @@
   ctx.check_cfg(package='cairo', atleast_version=cairo_version_required,
                 args='--cflags --libs')
 
+# xpyb for Python 3 is not available yet.
+# the Python 3 version should probably have a different name than 'xpyb'
+#  if check_xpyb():
+#    ctx.check_cfg(package='xpyb', atleast_version=xpyb_version_required,
+#                  args='--cflags --libs', mandatory=False)
+
   # add gcc options
   if env['CC_NAME'] == 'gcc':
     env.append_unique('CCFLAGS', ['-std=c99', '-Wall'])



1.1                  dev-python/pycairo/files/py2cairo-1.10.0-xpyb.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/files/py2cairo-1.10.0-xpyb.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/files/py2cairo-1.10.0-xpyb.patch?rev=1.1&content-type=text/plain

Index: py2cairo-1.10.0-xpyb.patch
===================================================================
--- py2cairo-1.10.0/wscript
+++ py2cairo-1.10.0/wscript
@@ -10,6 +10,7 @@
 APPNAME='py2cairo'
 VERSION='1.10.0'
 cairo_version_required = '1.10.0'
+xpyb_version_required  = '1.3'
 
 
 def check_svg():
@@ -23,6 +24,17 @@
     return False
 
 
+def check_xpyb():
+  if os.environ.get('PYCAIRO_DISABLE_XPYB', None) is None:
+    return_code = subprocess.call(['pkg-config', '--exists', 'xpyb'])
+    if return_code == 0:
+      return True
+    else:
+      return False
+  else:
+    return False
+
+
 def options(ctx):
   print('  %s/options()' %d)
   ctx.tool_options('gnu_dirs')
@@ -41,6 +53,9 @@
   ctx.check_python_headers()
   ctx.check_cfg(package='cairo', atleast_version=cairo_version_required,
                  args='--cflags --libs')
+  if check_xpyb():
+    ctx.check_cfg(package='xpyb', atleast_version=xpyb_version_required,
+                  args='--cflags --libs', mandatory=False)
 
   # add gcc options
   if env['CC_NAME'] == 'gcc':