public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-python/reportlab/files: reportlab-2.4-external_libart_lgpl.patch
@ 2010-01-23 21:06 Arfrever Frehtes Taifersar Arahesis (arfrever)
  0 siblings, 0 replies; 2+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis (arfrever) @ 2010-01-23 21:06 UTC (permalink / raw
  To: gentoo-commits

arfrever    10/01/23 21:06:43

  Added:                reportlab-2.4-external_libart_lgpl.patch
  Log:
  Version bump.
  (Portage version: 15206-svn/cvs/Linux x86_64)

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

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

Index: reportlab-2.4-external_libart_lgpl.patch
===================================================================
--- setup.py
+++ setup.py
@@ -306,39 +306,12 @@
         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']
         GT1_DIR=pjoin(RENDERPM,'gt1')
         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'),
-                    pjoin(LIBART_DIR,'art_vpath_bpath.c'),
-                    pjoin(LIBART_DIR,'art_rgb_pixbuf_affine.c'),
-                    pjoin(LIBART_DIR,'art_rgb_svp.c'),
-                    pjoin(LIBART_DIR,'art_svp.c'),
-                    pjoin(LIBART_DIR,'art_svp_vpath.c'),
-                    pjoin(LIBART_DIR,'art_svp_vpath_stroke.c'),
-                    pjoin(LIBART_DIR,'art_svp_ops.c'),
-                    pjoin(LIBART_DIR,'art_vpath.c'),
-                    pjoin(LIBART_DIR,'art_vpath_dash.c'),
-                    pjoin(LIBART_DIR,'art_affine.c'),
-                    pjoin(LIBART_DIR,'art_rect.c'),
-                    pjoin(LIBART_DIR,'art_rgb_affine.c'),
-                    pjoin(LIBART_DIR,'art_rgb_affine_private.c'),
-                    pjoin(LIBART_DIR,'art_rgb.c'),
-                    pjoin(LIBART_DIR,'art_rgb_rgba_affine.c'),
-                    pjoin(LIBART_DIR,'art_svp_intersect.c'),
-                    pjoin(LIBART_DIR,'art_svp_render_aa.c'),
-                    pjoin(LIBART_DIR,'art_misc.c'),
                     pjoin(GT1_DIR,'gt1-parset1.c'),
                     pjoin(GT1_DIR,'gt1-dict.c'),
                     pjoin(GT1_DIR,'gt1-namecontext.c'),
@@ -398,12 +371,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=FT_LIB,
-                                        #extra_objects=['gt1.lib','libart.lib',],
+                                        libraries=FT_LIB+LIBART_LIB,
+                                        #extra_objects=['gt1.lib'],
                                         #extra_compile_args=['/Z7'],
                                         extra_link_args=[]
                                         ),






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-python/reportlab/files: reportlab-2.4-external_libart_lgpl.patch
@ 2013-04-29 10:27 Justin Lecher (jlec)
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2013-04-29 10:27 UTC (permalink / raw
  To: gentoo-commits

jlec        13/04/29 10:27:49

  Modified:             reportlab-2.4-external_libart_lgpl.patch
  Log:
  dev-python/reportlab: Fix detection of libart header on prefix
  
  (Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

Revision  Changes    Path
1.2                  dev-python/reportlab/files/reportlab-2.4-external_libart_lgpl.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/reportlab/files/reportlab-2.4-external_libart_lgpl.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/reportlab/files/reportlab-2.4-external_libart_lgpl.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/reportlab/files/reportlab-2.4-external_libart_lgpl.patch?r1=1.1&r2=1.2

Index: reportlab-2.4-external_libart_lgpl.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/reportlab/files/reportlab-2.4-external_libart_lgpl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reportlab-2.4-external_libart_lgpl.patch	23 Jan 2010 21:06:43 -0000	1.1
+++ reportlab-2.4-external_libart_lgpl.patch	29 Apr 2013 10:27:49 -0000	1.2
@@ -5,7 +5,7 @@
          infoline( '#Attempting install of _renderPM')
          infoline( '#extensions from %r'%RENDERPM)
 -        LIBART_DIR=pjoin(RENDERPM,'libart_lgpl')
-+        LIBART_DIR='/usr/include/libart-2.0'
++        LIBART_DIR='@GENTOO_PORTAGE_EPREFIX@/usr/include/libart-2.0'
 +        LIBART_LIB=['art_lgpl_2']
          GT1_DIR=pjoin(RENDERPM,'gt1')
          MACROS=[('ROBIN_DEBUG',None)]





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-04-29 10:27 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-29 10:27 [gentoo-commits] gentoo-x86 commit in dev-python/reportlab/files: reportlab-2.4-external_libart_lgpl.patch Justin Lecher (jlec)
  -- strict thread matches above, loose matches on Subject: below --
2010-01-23 21:06 Arfrever Frehtes Taifersar Arahesis (arfrever)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox