| [proaudio] [2168] python-poppler-qt4-0.16.2-r1 with poppler-0.20.0 patch |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2168
Author: dominique
Date: 2012-07-16 00:21:08 +0200 (Mon, 16 Jul 2012)
Log Message:
-----------
python-poppler-qt4-0.16.2-r1 with poppler-0.20.0 patch
Modified Paths:
--------------
trunk/overlays/proaudio/dev-python/python-poppler-qt4/ChangeLog
trunk/overlays/proaudio/dev-python/python-poppler-qt4/Manifest
Added Paths:
-----------
trunk/overlays/proaudio/dev-python/python-poppler-qt4/files/
trunk/overlays/proaudio/dev-python/python-poppler-qt4/files/python-poppler-qt4-0.16.2-poppler-0.20.0.patch
trunk/overlays/proaudio/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.2-r1.ebuild
Modified: trunk/overlays/proaudio/dev-python/python-poppler-qt4/ChangeLog
===================================================================
--- trunk/overlays/proaudio/dev-python/python-poppler-qt4/ChangeLog 2012-07-15 10:15:41 UTC (rev 2167)
+++ trunk/overlays/proaudio/dev-python/python-poppler-qt4/ChangeLog 2012-07-15 22:21:08 UTC (rev 2168)
@@ -2,6 +2,15 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*python-poppler-qt4-0.16.2 (16 Jul 2012)
+
+ 16 Jul 2010; Dominique Michel <dominique@xxxxxxxxxxxxx>
+ +python-poppler-qt4-0.16.2-r1.ebuild,
+ +files/python-poppler-qt4-0.16.2-poppler-0.20.0.patch:
+ Added minimal patch that fix compilation with poppler-0.20.0,
+ it doesn't solve the other API changes. See
+ https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=822412
+
*python-poppler-qt4-0.16.2 (01 Mar 2012)
01 Mar 2012; Hakan Demiralp <keenblade@xxxxxxxxxxxxx>
Modified: trunk/overlays/proaudio/dev-python/python-poppler-qt4/Manifest
===================================================================
--- trunk/overlays/proaudio/dev-python/python-poppler-qt4/Manifest 2012-07-15 10:15:41 UTC (rev 2167)
+++ trunk/overlays/proaudio/dev-python/python-poppler-qt4/Manifest 2012-07-15 22:21:08 UTC (rev 2168)
@@ -1,4 +1,6 @@
-DIST python-poppler-qt4-0.16.2.tar.gz 13513 RMD160 04cc9ec8226ffae478b263ba9e3587aa52fb0ccd SHA1 48867d203ba83d4e818730f6ddcdbbf567b450cf SHA256 a37cf5f946633cf1d513d9f3c96d40fbc7e069f8d0ffe191e09196fb774efca5
-EBUILD python-poppler-qt4-0.16.2.ebuild 668 RMD160 3b941a099c1bd704d7d15cf0f101be6b585d7b6a SHA1 c96667a02e77489c5a41c375cbe2918e6cbccbaf SHA256 bd2842578bb98bdb467d00c38950aa044eb4b2cb8e8560bb62dd409d53aeaa81
-MISC ChangeLog 379 RMD160 384c4c299d5b51ef8f1d580c7e8b62cc8fb2ec2a SHA1 e9ae613c1026959e2a8bcb591d59a2eaae90896b SHA256 8360f41a189f409a3bf8e1db015a047ae466f06d840f2e80ed09089215140754
-MISC metadata.xml 246 RMD160 cdd725771833663c8cfa684c4c71e57d86d9993d SHA1 973be5799e631fd26fb4abcfc8da942f2f759d06 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f
+AUX python-poppler-qt4-0.16.2-poppler-0.20.0.patch 11426 SHA256 ac5b3de2e35626be45af4d41cf0816bdcbc19d0d6920d184e196ed1e93910b33 SHA512 b0cc1b134986c60230d8178a558d8d38057986797cb426ac9bfa9344a128966de1a26e68fb327d089e7bb84bccdc7ea844a2a85d46257c291e8e2c7eefef91e8 WHIRLPOOL 144fb66e51088f4cd5d708c28d932bc7006824a0ea8a26244e39c7dc85675398751ebf1b2019689e2ed36e478d0ee5d40cce8ef9b66d870012b971a8d4b18473
+DIST python-poppler-qt4-0.16.2.tar.gz 13513 SHA256 a37cf5f946633cf1d513d9f3c96d40fbc7e069f8d0ffe191e09196fb774efca5 SHA512 7a3c3556d089a721a7f2b542a2bec19171252aa96f27612de3d13c25b0bed0fdeab25b4b6041cbd29558ee79104f86394f3de0a7a57f7d323936721a3bc0c0d3 WHIRLPOOL 3c1c83701e04b0829c3998e5e561bb120c560c705fd7bcf37cc7248a67239863465dc112836f018501fd84c416fbb9c82ed6a463b400be4bfb265423d5335cbf
+EBUILD python-poppler-qt4-0.16.2-r1.ebuild 756 SHA256 d85b43bc9705dad9f6b78937a640c717ad8c1e7bd7b6e2aa558b4c7376419e04 SHA512 1d20ad0ed3ad79f3533f23e449ba246d24f33216a5ba729ae9a4e4a695a3b173935331f2b7c1d3603e80258969acec5c4c2f7f7beca77147358a92903a544105 WHIRLPOOL bcbb30ea6b3a8d12bb6e521c9ccc5c1d3e8a032d17289398588e0ad55a193b377efd1cdf4c407ec4b217ff479100597e545be1bab1f2d85336cbcca109c8d807
+EBUILD python-poppler-qt4-0.16.2.ebuild 668 SHA256 bd2842578bb98bdb467d00c38950aa044eb4b2cb8e8560bb62dd409d53aeaa81 SHA512 e3ed29878a1cc3f09771b2e4e1dba7001868ace4edc8bac390c3e5252a708734492b1b89d92b86dcfe2e4fe90420e6ff4b39505bfd9c53bbc30380025a93bf25 WHIRLPOOL cb0533443fa1475fbf4cef376f555c346d13129394cc3901893bf98dd5e608f90570770f940b0fe618b690aa0013a1dd2fd40aba3237c9fc079be575897a0333
+MISC ChangeLog 756 SHA256 b1b09a057056c143ff3c7432bb356573d7235083b1d5b323c965c4f9a3850c3e SHA512 1b178dca76748bedd327a6f890d3b73ed6466860f84740d1ebeda56713956750ecee361f1f46c6abb0b584157437e68fd275a61a6d3929b475a6919abfa77d96 WHIRLPOOL ec1be6b3bac532d6688c4bc178917d64543225e448e31ffeab2c779bdb5298c15018c343ca0280db9e5b4f701f3ca226ba2301ac26e375f7c4c3de7a3e717a94
+MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
Added: trunk/overlays/proaudio/dev-python/python-poppler-qt4/files/python-poppler-qt4-0.16.2-poppler-0.20.0.patch
===================================================================
--- trunk/overlays/proaudio/dev-python/python-poppler-qt4/files/python-poppler-qt4-0.16.2-poppler-0.20.0.patch (rev 0)
+++ trunk/overlays/proaudio/dev-python/python-poppler-qt4/files/python-poppler-qt4-0.16.2-poppler-0.20.0.patch 2012-07-15 22:21:08 UTC (rev 2168)
@@ -0,0 +1,383 @@
+--- python-poppler-qt4-0.16.2/poppler-annotation.sip 2010-10-28 11:49:32.000000000 +0200
++++ python-poppler-qt4-0.16.2/poppler-annotation.sip 2012-05-18 13:38:21.000000000 +0200
+@@ -45,6 +45,7 @@ public:
+ void setFlags( int flags );
+ QRectF boundary() const;
+ void setBoundary( const QRectF &boundary );
++%If(- POPPLER_V0_18_0)
+ struct Style {
+ // appearance properties
+ QColor color; // black
+@@ -92,12 +93,18 @@ public:
+
+ // QLinkedList< Poppler::Annotation::Revision >& revisions();
+ const QLinkedList< Poppler::Annotation::Revision >& revisions() const;
++%End
+ virtual SubType subType() const = 0;
++%If(- POPPLER_V0_18_0)
+ virtual void store( QDomNode & parentNode, QDomDocument & document ) const;
++%End
+ virtual ~Annotation();
+
+ private:
+ Annotation(const Poppler::Annotation&);
++%If(POPPLER_V0_20_0 -)
++ virtual void store( QDomNode & parentNode, QDomDocument & document ) const;
++%End
+
+ %ConvertToSubClassCode
+ switch (sipCpp->subType()) {
+@@ -151,17 +158,23 @@ class TextAnnotation : Poppler::Annotati
+ %End
+
+ public:
++%If(- POPPLER_V0_18_0)
+ TextAnnotation();
+ TextAnnotation( const QDomNode &node );
++%End
+ virtual ~TextAnnotation();
++%If(- POPPLER_V0_18_0)
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ virtual SubType subType() const;
+
+ enum TextType { Linked, InPlace };
+ enum InplaceIntent { Unknown, Callout, TypeWriter };
+
+ TextType textType() const;
++%If(- POPPLER_V0_18_0)
+ void setTextType( TextType type );
++%End
+
+ QString textIcon() const;
+ void setTextIcon( const QString &icon );
+@@ -176,12 +189,20 @@ public:
+ void setInplaceText( const QString &text );
+
+ QPointF calloutPoint( int id ) const;
++%If(- POPPLER_V0_18_0)
+ void setCalloutPoint( int id, const QPointF &point );
++%End
+
+ InplaceIntent inplaceIntent() const;
+ void setInplaceIntent( InplaceIntent intent );
+
+ private:
++%If(POPPLER_V0_20_0 -)
++ TextAnnotation();
++ TextAnnotation( const QDomNode &node );
++ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++ void setTextType( TextType type );
++%End
+ TextAnnotation(const Poppler::TextAnnotation&);
+
+ }; // class TextAnnotation
+@@ -194,10 +215,14 @@ class LineAnnotation : Poppler::Annotati
+ %End
+
+ public:
++%If(- POPPLER_V0_18_0)
+ LineAnnotation();
+ LineAnnotation( const QDomNode &node );
++%End
+ virtual ~LineAnnotation();
++%If(- POPPLER_V0_18_0)
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ virtual SubType subType() const;
+
+ enum TermStyle { Square, Circle, Diamond, OpenArrow, ClosedArrow, None,
+@@ -232,6 +257,11 @@ public:
+ void setLineIntent( LineIntent intent );
+
+ private:
++%If(POPPLER_V0_20_0 -)
++ LineAnnotation();
++ LineAnnotation( const QDomNode &node );
++ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ LineAnnotation(const Poppler::LineAnnotation&);
+
+ }; // class LineAnnotation
+@@ -244,10 +274,14 @@ class GeomAnnotation : Poppler::Annotati
+ %End
+
+ public:
++%If(- POPPLER_V0_18_0)
+ GeomAnnotation();
+ GeomAnnotation( const QDomNode &node );
++%End
+ virtual ~GeomAnnotation();
++%If(- POPPLER_V0_18_0)
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ virtual SubType subType() const;
+
+ enum GeomType { InscribedSquare, InscribedCircle };
+@@ -258,10 +292,17 @@ public:
+ QColor geomInnerColor() const;
+ void setGeomInnerColor( const QColor &color );
+
++%If(- POPPLER_V0_18_0)
+ int geomPointWidth() const;
+ void setGeomPointWidth( int width );
++%End
+
+ private:
++%If(POPPLER_V0_20_0 -)
++ GeomAnnotation();
++ GeomAnnotation( const QDomNode &node );
++ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ GeomAnnotation(const Poppler::GeomAnnotation&);
+
+ }; // class GeomAnnotation
+@@ -274,10 +315,14 @@ class HighlightAnnotation : Poppler::Ann
+ %End
+
+ public:
++%If(- POPPLER_V0_18_0)
+ HighlightAnnotation();
+ HighlightAnnotation( const QDomNode &node );
++%End
+ virtual ~HighlightAnnotation();
++%If(- POPPLER_V0_18_0)
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ virtual SubType subType() const;
+ enum HighlightType {
+ Highlight,
+@@ -341,6 +386,11 @@ public:
+ void setHighlightQuads( const QList< Poppler::HighlightAnnotation::Quad > &quads );
+
+ private:
++%If(POPPLER_V0_20_0 -)
++ HighlightAnnotation();
++ HighlightAnnotation( const QDomNode &node );
++ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ HighlightAnnotation(const Poppler::HighlightAnnotation&);
+
+ }; // class HighlightAnnotation
+@@ -353,13 +403,25 @@ class StampAnnotation : Poppler::Annotat
+ %End
+
+ public:
++%If(- POPPLER_V0_18_0)
+ StampAnnotation();
+ StampAnnotation( const QDomNode &node );
++%End
+ virtual ~StampAnnotation();
++%If(- POPPLER_V0_18_0)
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ virtual SubType subType() const;
+ QString stampIconName() const;
+ void setStampIconName( const QString &name );
++
++private:
++%If(POPPLER_V0_20_0 -)
++ StampAnnotation();
++ StampAnnotation( const QDomNode &node );
++ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
++
+ }; // class StampAnnotation
+
+
+@@ -370,15 +432,24 @@ class InkAnnotation : Poppler::Annotatio
+ %End
+
+ public:
++%If(- POPPLER_V0_18_0)
+ InkAnnotation();
+ InkAnnotation( const QDomNode &node );
++%End
+ virtual ~InkAnnotation();
++%If(- POPPLER_V0_18_0)
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ virtual SubType subType() const;
+ QList< QLinkedList<QPointF> > inkPaths() const;
+ void setInkPaths( const QList< QLinkedList<QPointF> > &paths );
+
+ private:
++%If(POPPLER_V0_20_0 -)
++ InkAnnotation();
++ InkAnnotation( const QDomNode &node );
++ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ InkAnnotation(const Poppler::InkAnnotation&);
+
+ }; // class InkAnnotation
+@@ -391,15 +462,24 @@ class LinkAnnotation : Poppler::Annotati
+ %End
+
+ public:
++%If(- POPPLER_V0_18_0)
+ LinkAnnotation();
+ LinkAnnotation( const QDomNode &node );
++%End
+ virtual ~LinkAnnotation();
++%If(- POPPLER_V0_18_0)
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ virtual SubType subType() const;
+
+ enum HighlightMode { None, Invert, Outline, Push };
+
++%If(- POPPLER_V0_18_0)
+ Poppler::Link* linkDestionation() const;
++%End
++%If(POPPLER_V0_20_0 -)
++ Poppler::Link* linkDestination() const;
++%End
+ void setLinkDestination( Poppler::Link *link );
+
+ HighlightMode linkHighlightMode() const;
+@@ -409,6 +489,11 @@ public:
+ void setLinkRegionPoint( int id, const QPointF &point );
+
+ private:
++%If(POPPLER_V0_20_0 -)
++ LinkAnnotation();
++ LinkAnnotation( const QDomNode &node );
++ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ LinkAnnotation(const Poppler::LinkAnnotation&);
+
+ }; // class LinkAnnotation
+@@ -421,16 +506,25 @@ class CaretAnnotation : Poppler::Annotat
+ %End
+
+ public:
++%If(- POPPLER_V0_18_0)
+ CaretAnnotation();
+ CaretAnnotation( const QDomNode &node );
++%End
+ virtual ~CaretAnnotation();
++%If(- POPPLER_V0_18_0)
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ virtual SubType subType() const;
+ enum CaretSymbol { None, P };
+ CaretSymbol caretSymbol() const;
+ void setCaretSymbol( CaretSymbol symbol );
+
+ private:
++%If(POPPLER_V0_20_0 -)
++ CaretAnnotation();
++ CaretAnnotation( const QDomNode &node );
++ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ CaretAnnotation(const Poppler::CaretAnnotation&);
+
+ }; // class CaretAnnotation
+@@ -443,10 +537,14 @@ class FileAttachmentAnnotation : Poppler
+ %End
+
+ public:
++%If(- POPPLER_V0_18_0)
+ FileAttachmentAnnotation();
+ FileAttachmentAnnotation( const QDomNode &node );
++%End
+ virtual ~FileAttachmentAnnotation();
++%If(- POPPLER_V0_18_0)
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ virtual SubType subType() const;
+ QString fileIconName() const;
+ void setFileIconName( const QString &icon );
+@@ -454,6 +552,11 @@ public:
+ void setEmbeddedFile( Poppler::EmbeddedFile *ef );
+
+ private:
++%If(POPPLER_V0_20_0 -)
++ FileAttachmentAnnotation();
++ FileAttachmentAnnotation( const QDomNode &node );
++ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ FileAttachmentAnnotation(const Poppler::FileAttachmentAnnotation&);
+
+ }; // class FileAttachmentAnnotation
+@@ -466,10 +569,14 @@ class SoundAnnotation : Poppler::Annotat
+ %End
+
+ public:
++%If(- POPPLER_V0_18_0)
+ SoundAnnotation();
+ SoundAnnotation( const QDomNode &node );
++%End
+ virtual ~SoundAnnotation();
++%If(- POPPLER_V0_18_0)
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ virtual SubType subType() const;
+ QString soundIconName() const;
+ void setSoundIconName( const QString &icon );
+@@ -477,6 +584,11 @@ public:
+ void setSound( Poppler::SoundObject *ef );
+
+ private:
++%If(POPPLER_V0_20_0 -)
++ SoundAnnotation();
++ SoundAnnotation( const QDomNode &node );
++ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ SoundAnnotation(const Poppler::SoundAnnotation&);
+
+ }; // class SoundAnnotation
+@@ -489,10 +601,14 @@ class MovieAnnotation : Poppler::Annotat
+ %End
+
+ public:
++%If(- POPPLER_V0_18_0)
+ MovieAnnotation();
+ MovieAnnotation( const QDomNode &node );
++%End
+ virtual ~MovieAnnotation();
++%If(- POPPLER_V0_18_0)
+ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ virtual SubType subType() const;
+
+ Poppler::MovieObject* movie() const;
+@@ -501,6 +617,11 @@ public:
+ void setMovieTitle( const QString &title );
+
+ private:
++%If(POPPLER_V0_20_0 -)
++ MovieAnnotation();
++ MovieAnnotation( const QDomNode &node );
++ virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
++%End
+ MovieAnnotation(const Poppler::MovieAnnotation&);
+
+ }; // class MovieAnnotation
+--- python-poppler-qt4-0.16.2/poppler-qt4.sip 2011-04-22 23:45:22.000000000 +0200
++++ python-poppler-qt4-0.16.2/poppler-qt4.sip 2012-05-18 12:54:23.000000000 +0200
+@@ -9,6 +9,8 @@
+ POPPLER_V0_12_1
+ POPPLER_V0_14_0
+ POPPLER_V0_16_0
++ POPPLER_V0_18_0
++ POPPLER_V0_20_0
+ }
+
+ %Include types.sip
+--- python-poppler-qt4-0.16.2/setup.py 2011-05-20 11:41:55.000000000 +0200
++++ python-poppler-qt4-0.16.2/setup.py 2012-05-18 12:54:45.000000000 +0200
+@@ -125,8 +125,12 @@ class build_ext(build_ext_base):
+ tag = 'POPPLER_V0_12_1'
+ elif ver < (0, 16, 0):
+ tag = 'POPPLER_V0_14_0'
+- else:
++ elif ver < (0, 18, 0):
+ tag = 'POPPLER_V0_16_0'
++ elif ver < (0, 20, 0):
++ tag = 'POPPLER_V0_18_0'
++ else:
++ tag = 'POPPLER_V0_20_0'
+
+ cmd = [sip_bin]
+ if hasattr(self, 'sip_opts'):
Added: trunk/overlays/proaudio/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.2-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.2-r1.ebuild (rev 0)
+++ trunk/overlays/proaudio/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.2-r1.ebuild 2012-07-15 22:21:08 UTC (rev 2168)
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils python
+
+DESCRIPTION="Python bindings to the poppler-qt4"
+HOMEPAGE="http://code.google.com/p/python-poppler-qt4";
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz";
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=app-text/poppler-0.20.0
+ dev-python/sip
+ dev-python/PyQt4"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/python-poppler-qt4-0.16.2-poppler-0.20.0.patch"
+}
+
+src_install() {
+ python setup.py install --root "${D}" \
+ || die "failed to install package"
+ python_clean_installation_image -q
+}