Hi, On Wed, Jun 15, 2022 at 12:10:27PM -0300, Nathan Pratta Teodosio wrote: > Since Poppler 22.06 made its way into experimental, Scribus will need > compatibility changes that are already in upstream to build. > > I cherry-picked the relevant changes in the attached patches. However, > although > they apply fine with `patch` on the .orig, the patches won't apply with > `debuild`, and I couldn't figure out why. I'm hoping you will spot it faster > than I.
Well, you also included one patch ("#16734: Build break with poppler 22.2.0") that is already included in the package, there is little surprise there. And extra problem is that one patch has broken newlines, messing with the new patches (I don't know if that's a quirk of the svn→git export, or what, but I don't care so I replaced it with the proper SVN patch instead). And one change (the one bumping the required poppler version) is not needed. I guess you picked changes from the master branch instead of v15x branch? Also, note that scribus' original VCS is SVN, so please at least point out where those commits where coming from. And it would probably be best to attach them in the form of patches, not plain diffs (so at least they get authorship information, comments, probably also the svn-git connection that would have made my life easier in finding the original svn commits). I'll soon be uploading a version with these changes, however I'd appreciate if somebody else could test-build against poppler 22.06, as I'm kind of overloaded at this time. And if you are involved in poppler, I'd also appreciate if you could work on https://bugs.debian.org/969907 (or point it to somebody (jbicha?)), as it's IMHO being underestimated. -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. More about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
signature.asc
Description: PGP signature