[gentoo-commits] gentoo-x86 commit in dev-python/reportlab/files: reportlab-2.3-external_libart_lgpl.patch

[gentoo-commits] gentoo-x86 commit in dev-python/reportlab/files: reportlab-2.3-external_libart_lgpl.patch

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    09/09/17 20:04:33

  Added:                reportlab-2.3-external_libart_lgpl.patch
  Log:
  Use external media-libs/libart_lgpl (bug #252927).
  (Portage version: 14278-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-python/reportlab/files/reportlab-2.3-external_libart_lgpl.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/reportlab/files/reportlab-2.3-external_libart_lgpl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/reportlab/files/reportlab-2.3-external_libart_lgpl.patch?rev=1.1&content-type=text/plain

Index: reportlab-2.3-external_libart_lgpl.patch
===================================================================
--- setup.py
+++ setup.py
@@ -260,21 +260,11 @@
         infoline( '################################################')
         infoline( '#Attempting install of _renderPM')
         infoline( '#extensions from %r'%RENDERPM)
-        LIBART_DIR=pjoin(RENDERPM,'libart_lgpl')
+        LIBART_DIR='/usr/include/libart-2.0'
+        LIBART_LIB=['art_lgpl_2']
         MACROS=[('ROBIN_DEBUG',None)]
         MACROS=[]
-        def libart_version():
-            K = ('LIBART_MAJOR_VERSION','LIBART_MINOR_VERSION','LIBART_MICRO_VERSION')
-            D = {}
-            for l in open(pjoin(LIBART_DIR,'configure.in'),'r').readlines():
-                l = l.strip().split('=')
-                if len(l)>1 and l[0].strip() in K:
-                    D[l[0].strip()] = l[1].strip()
-                    if len(D)==3: break
-            return (sys.platform == 'win32' and '\\"%s\\"' or '"%s"') % '.'.join(map(lambda k,D=D: D.get(k,'?'),K))
-        LIBART_VERSION = libart_version()
         SOURCES=[pjoin(RENDERPM,'_renderPM.c')]
-        LIBART_SRCS=glob.glob(pjoin(LIBART_DIR, 'art_*.c'))
         GT1_DIR=pjoin(RENDERPM,'gt1')
         LIBS = []       #assume empty libraries list
 
@@ -319,18 +309,10 @@
             infoline('# installing without freetype no ttf, sorry!')
 
         LIBRARIES+= [
-                    ('_renderPM_libart',
-                    {
-                    'sources':  LIBART_SRCS,
-                    'include_dirs': [RENDERPM,LIBART_DIR,],
-                    'macros': [('LIBART_COMPILATION',None),]+BIGENDIAN('WORDS_BIGENDIAN')+MACROS,
-                    #'extra_compile_args':['/Z7'],
-                    }
-                    ),
                     ('_renderPM_gt1',
                     {
                     'sources':  pfxJoin(GT1_DIR,'gt1-dict.c','gt1-namecontext.c','gt1-parset1.c','gt1-region.c','parseAFM.c'),
-                    'include_dirs': [RENDERPM,GT1_DIR,],
+                    'include_dirs': [RENDERPM,GT1_DIR,LIBART_DIR],
                     'macros': MACROS,
                     #'extra_compile_args':['/Z7'],
                     }
@@ -340,12 +322,12 @@
         EXT_MODULES +=  [Extension( '_renderPM',
                                         SOURCES,
                                         include_dirs=[RENDERPM,LIBART_DIR,GT1_DIR]+FT_INC_DIR,
-                                        define_macros=FT_MACROS+[('LIBART_COMPILATION',None)]+MACROS+[('LIBART_VERSION',LIBART_VERSION)],
+                                        define_macros=FT_MACROS+MACROS,
                                         library_dirs=[]+FT_LIB_DIR,
 
                                         # libraries to link against
-                                        libraries=LIBS+FT_LIB,
-                                        #extra_objects=['gt1.lib','libart.lib',],
+                                        libraries=LIBS+FT_LIB+LIBART_LIB,
+                                        #extra_objects=['gt1.lib'],
                                         #extra_compile_args=['/Z7'],
                                         extra_link_args=[]
                                         ),

[gentoo-commits] gentoo-x86 commit in dev-python/reportlab/files: reportlab-2.3-external_libart_lgpl.patch

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    10/05/13 12:54:27

  Removed:              reportlab-2.3-external_libart_lgpl.patch
  Log:
  Delete older ebuild.