From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Fri, 22 Jan 2010 02:56:05 +0300 From: "Dmitry V. Levin" To: ALT Linux Sisyphus mailing list Message-ID: <20100121235605.GF22208@wo.int.altlinux.org> Mail-Followup-To: ALT Linux Sisyphus mailing list , Vitaly Lipatov References: <201001211645.51605.iadzhubey@rics.bwh.harvard.edu> <20100121225336.GB22208@wo.int.altlinux.org> <201001211815.57643.iadzhubey@rics.bwh.harvard.edu> <20100121233525.GD22208@wo.int.altlinux.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="4eRLI4hEmsdu6Npr" Content-Disposition: inline In-Reply-To: <20100121233525.GD22208@wo.int.altlinux.org> X-fingerprint: FE4C 93AB E19A 2E4C CB5D 3E4E 7CAB E6AC 9E35 361E Cc: Vitaly Lipatov Subject: Re: [sisyphus] libpoppler.so.5 backwards incompatibility X-BeenThere: sisyphus@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Sisyphus discussions List-Id: ALT Linux Sisyphus discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2010 23:56:06 -0000 Archived-At: List-Archive: List-Post: --4eRLI4hEmsdu6Npr Content-Type: multipart/mixed; boundary="4VrXvz3cwkc87Wze" Content-Disposition: inline --4VrXvz3cwkc87Wze Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jan 22, 2010 at 02:35:25AM +0300, Dmitry V. Levin wrote: > On Thu, Jan 21, 2010 at 06:15:57PM -0500, Ivan Adzhubey wrote: > > Dmitry, spasibo chto nashli vremja vzgljanut! Est' li shans na=20 > > rabotosposobnuju sborku? Google pokazyvaet chto problema obsuzhdaetsa n= o=20 > > gotovogo reshenija ja ne vizhu. > >=20 > > Proshu proshenija za English i za translit, russkogo na rabote na klavi= ature=20 > > net. No chitat' Cyrillic ja mogu tak chto ne objazatel'no mne otvechat'= =20 > > po-anglijski ;-) >=20 > =F1 =CE=C5 =D3=D0=C5=C3=C9=C1=CC=C9=D3=D4 =CE=C9 =D7 poppler, =CE=C9 =D7 = inkscape. =F0=C1=CB=C5=D4 inkscape-0.47-alt4 =D7 > =F3=C9=DA=C9=C6=C5 =D0=C5=D2=C5=D3=D4=C1=CC =D0=D2=CF=C8=CF=C4=C9=D4=D8 = =D4=C5=D3=D4 =CE=C1 =D0=C5=D2=C5=D3=C2=CF=D2=CB=D5 =D3=D2=C1=DA=D5 =D0=CF= =D3=CC=C5 =D4=CF=C7=CF, =CB=C1=CB =D7 > =F3=C9=DA=C9=C6=C5 =CF=C2=CE=CF=D7=C9=CC=D3=D1 =D0=C1=CB=C5=D4 poppler5 = =D3 =D7=C5=D2=D3=C9=C9 0.12.1 =CE=C1 =C2=CF=CC=C5=C5 =CE=CF=D7=D5=C0: >=20 > extension/internal/pdfinput/pdf-parser.cpp: In member function 'void PdfP= arser::opSetExtGState(Object*, int)': > extension/internal/pdfinput/pdf-parser.cpp:812: error: no matching functi= on for call to 'GfxColorSpace::parse(Object*)' > /usr/include/poppler/GfxState.h:182: note: candidates are: static GfxColo= rSpace* GfxColorSpace::parse(Object*, Gfx*) > (=C9 =C5=DD=A3 =CB=D5=DE=C1 =C1=CE=C1=CC=CF=C7=C9=DE=CE=D9=C8 =CF=DB=C9= =C2=CF=CB =C9=DA-=DA=C1 =D3=CD=C5=CE=D9 API =D5 poppler'=C1) >=20 > =F1 =CE=C1=C4=C5=C0=D3=D8, =DE=D4=CF upstream poppler'=C1 =DC=D4=CF =D3= =CB=CF=D2=CF =C9=D3=D0=D2=C1=D7=C9=D4 (=C5=D3=CC=C9 =C5=DD=A3 =CE=C5 > =C9=D3=D0=D2=C1=D7=C9=CC). =F0=CF=C8=CF=D6=C5 =DE=D4=CF =D5=D6=C5 =C9=D3=D0=D2=C1=D7=C9=CC=C9, =D3=CD. https://bugs.launchpad.net/inkscape/+bug/487038 =C9 =D0=D2=C9=CC=CF=D6=C5=CE=CE=D9=CA =D0=C1=D4=DE =CF=D4=D4=D5=C4=C1. --=20 ldv --4VrXvz3cwkc87Wze Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="inkscape-ubuntu-poppler-API.patch" Content-Transfer-Encoding: quoted-printable #! /bin/sh /usr/share/dpatch/dpatch-run ## 50-poppler-API.patch.dpatch by Kees Cook ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: https://bugs.launchpad.net/inkscape/+bug/487038 @DPATCH@ diff -urNad inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp inksca= pe/src/extension/internal/pdfinput/pdf-parser.cpp --- inkscape~/src/extension/internal/pdfinput/pdf-parser.cpp 2009-10-10 12:= 17:47.000000000 -0700 +++ inkscape/src/extension/internal/pdfinput/pdf-parser.cpp 2009-12-23 22:3= 4:13.000000000 -0800 @@ -809,7 +809,7 @@ blendingColorSpace =3D NULL; isolated =3D knockout =3D gFalse; if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { - blendingColorSpace =3D GfxColorSpace::parse(&obj5); + blendingColorSpace =3D GfxColorSpace::parse(&obj5, NULL); } obj5.free(); if (obj4.dictLookup(const_cast("I"), &obj5)->isBool()) { @@ -1009,9 +1009,9 @@ state->setFillPattern(NULL); res->lookupColorSpace(args[0].getName(), &obj); if (obj.isNull()) { - colorSpace =3D GfxColorSpace::parse(&args[0]); + colorSpace =3D GfxColorSpace::parse(&args[0], NULL); } else { - colorSpace =3D GfxColorSpace::parse(&obj); + colorSpace =3D GfxColorSpace::parse(&obj, NULL); } obj.free(); if (colorSpace) { @@ -1032,9 +1032,9 @@ state->setStrokePattern(NULL); res->lookupColorSpace(args[0].getName(), &obj); if (obj.isNull()) { - colorSpace =3D GfxColorSpace::parse(&args[0]); + colorSpace =3D GfxColorSpace::parse(&args[0], NULL); } else { - colorSpace =3D GfxColorSpace::parse(&obj); + colorSpace =3D GfxColorSpace::parse(&obj, NULL); } obj.free(); if (colorSpace) { @@ -1101,7 +1101,7 @@ builder->updateStyle(state); } if (args[numArgs-1].isName() && - (pattern =3D res->lookupPattern(args[numArgs-1].getName()))) { + (pattern =3D res->lookupPattern(args[numArgs-1].getName(), NULL))) { state->setFillPattern(pattern); builder->updateStyle(state); } @@ -1145,7 +1145,7 @@ builder->updateStyle(state); } if (args[numArgs-1].isName() && - (pattern =3D res->lookupPattern(args[numArgs-1].getName()))) { + (pattern =3D res->lookupPattern(args[numArgs-1].getName(), NULL))) { state->setStrokePattern(pattern); builder->updateStyle(state); } @@ -1543,7 +1543,7 @@ double *matrix =3D NULL; GBool savedState =3D gFalse; =20 - if (!(shading =3D res->lookupShading(args[0].getName()))) { + if (!(shading =3D res->lookupShading(args[0].getName(), NULL))) { return; } =20 @@ -2507,7 +2507,7 @@ } } if (!obj1.isNull()) { - colorSpace =3D GfxColorSpace::parse(&obj1); + colorSpace =3D GfxColorSpace::parse(&obj1, NULL); } else if (csMode =3D=3D streamCSDeviceGray) { colorSpace =3D new GfxDeviceGrayColorSpace(); } else if (csMode =3D=3D streamCSDeviceRGB) { @@ -2592,7 +2592,7 @@ obj2.free(); } } - maskColorSpace =3D GfxColorSpace::parse(&obj1); + maskColorSpace =3D GfxColorSpace::parse(&obj1, NULL); obj1.free(); if (!maskColorSpace || maskColorSpace->getMode() !=3D csDeviceGray) { goto err1; @@ -2767,7 +2767,7 @@ if (obj1.dictLookup(const_cast("S"), &obj2)->isName(const_cast<= char*>("Transparency"))) { transpGroup =3D gTrue; if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) { - blendingColorSpace =3D GfxColorSpace::parse(&obj3); + blendingColorSpace =3D GfxColorSpace::parse(&obj3, NULL); } obj3.free(); if (obj1.dictLookup(const_cast("I"), &obj3)->isBool()) { --4VrXvz3cwkc87Wze-- --4eRLI4hEmsdu6Npr Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAktY6ZUACgkQfKvmrJ41Nh7nggCgoDZzajdnKxcPYMgw5AFfBrby mSEAoLFERm5xzcd+oYL8kkECNzIdbjpU =XQbO -----END PGP SIGNATURE----- --4eRLI4hEmsdu6Npr--