124881 2006-03-03 15:52 0000 kpdf-3.5.1-r2 builds fail with poppler to 0.5.1 2006-04-02 01:55:36 0000 1 1 1 Unclassified Gentoo Linux KDE 2005.1 All Linux CLOSED FIXED P2 normal --- 1 radfoj@seznam.cz kde@gentoo.org alain.crespo@gmail.com alonbl@gentoo.org bugzilla@lourdas.name clbustos@apsique.com david@watzke.cz desintegr@gmail.com gralves@gmail.com howard_b_golden@yahoo.com jlp.bugs@gmail.com le.petit.fou@web.de matteo-ml@member.fsf.org patrick@gentoo.org polar88bear@hotmail.com printing@gentoo.org spock@gentoo.org Tinitus1@onlinehome.de radfoj@seznam.cz 2006-03-03 15:52:31 0000 Hi, just upgraded poppler and poppler-bindings to version 0.5.1. Afterwards I had to reemerge kpdf-3.5.1-r2 becouse it stopped working and emerge failed: mmon -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -c -o gp_outputdev.lo `test -f 'gp_outputdev.cpp' || echo './'`gp_outputdev.cpp gp_outputdev.cpp: In member function `KPDFLink* KPDFOutputDev::generateLink(LinkAction*)': gp_outputdev.cpp:249: error: no matching function for call to `KPDFOutputDev::decodeViewport(UGooString*, LinkDest*)' gp_outputdev.h:74: note: candidates are: DocumentViewport KPDFOutputDev::decodeViewport(GooString*, LinkDest*) gp_outputdev.cpp:259: error: no matching function for call to `KPDFOutputDev::decodeViewport(UGooString*, LinkDest*)' gp_outputdev.h:74: note: candidates are: DocumentViewport KPDFOutputDev::decodeViewport(GooString*, LinkDest*) gp_outputdev.cpp: In member function `DocumentViewport KPDFOutputDev::decodeViewport(GooString*, LinkDest*)': gp_outputdev.cpp:330: error: no matching function for call to `PDFDoc::findDest(GooString*&)' /usr/include/poppler/PDFDoc.h:127: note: candidates are: LinkDest* PDFDoc::findDest(UGooString*) make[4]: *** [gp_outputdev.lo] Error 1 make[4]: *** Waiting for unfinished jobs.... generator_pdf.cpp: In member function `virtual void PDFGenerator::putFontInfo(KListView*)': generator_pdf.cpp:395: error: no matching function for call to `Dict::lookup(const char[10], Object*)' /usr/include/poppler/Dict.h:52: note: candidates are: Object* Dict::lookup(const UGooString&, Object*) generator_pdf.cpp: In member function `virtual QString PDFGenerator::getMetaData(const QString&, const QString&)': generator_pdf.cpp:496: error: no matching function for call to `PDFDoc::findDest(GooString*&)' /usr/include/poppler/PDFDoc.h:127: note: candidates are: LinkDest* PDFDoc::findDest(UGooString*) generator_pdf.cpp: In member function `void PDFGenerator::scanFonts(Dict*, KListView*, Ref**, int&, int&)': generator_pdf.cpp:556: error: no matching function for call to `Dict::lookupNF(const char[5], Object*)' /usr/include/poppler/Dict.h:53: note: candidates are: Object* Dict::lookupNF(const UGooString&, Object*) generator_pdf.cpp:583: error: no matching function for call to `Dict::lookup(const char[8], Object*)' /usr/include/poppler/Dict.h:52: note: candidates are: Object* Dict::lookup(const UGooString&, Object*) generator_pdf.cpp:591: error: no matching function for call to `Dict::lookup(const char[10], Object*)' /usr/include/poppler/Dict.h:52: note: candidates are: Object* Dict::lookup(const UGooString&, Object*) generator_pdf.cpp: In member function `QString PDFGenerator::getDocumentInfo(const QString&) const': generator_pdf.cpp:691: error: no matching function for call to `Dict::lookup(char*, Object*)' /usr/include/poppler/Dict.h:52: note: candidates are: Object* Dict::lookup(const UGooString&, Object*) generator_pdf.cpp: In member function `QString PDFGenerator::getDocumentDate(const QString&) const': generator_pdf.cpp:749: error: no matching function for call to `Dict::lookup(char*, Object*)' /usr/include/poppler/Dict.h:52: note: candidates are: Object* Dict::lookup(const UGooString&, Object*) generator_pdf.cpp: In member function `void PDFGenerator::addSynopsisChildren(QDomNode*, GooList*)': generator_pdf.cpp:805: error: cannot convert `UGooString*' to `GooString*' in initialization make[4]: *** [generator_pdf.lo] Error 1 make[4]: Leaving directory `/var/tmp/portage/kpdf-3.5.1-r2/work/kpdf-3.5.1/kpdf/core/generator_pdf' make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory `/var/tmp/portage/kpdf-3.5.1-r2/work/kpdf-3.5.1/kpdf/core' make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory `/var/tmp/portage/kpdf-3.5.1-r2/work/kpdf-3.5.1/kpdf' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/var/tmp/portage/kpdf-3.5.1-r2/work/kpdf-3.5.1' make: *** [all] Error 2 !!! ERROR: kde-base/kpdf-3.5.1-r2 failed. Call stack: ebuild.sh, line 1933: Called dyn_compile ebuild.sh, line 971: Called src_compile kpdf-3.5.1-r2.ebuild, line 37: Called kde-meta_src_compile kde-meta.eclass, line 400: Called kde_src_compile kde.eclass, line 111: Called kde_src_compile 'compile' kde.eclass, line 228: Called kde_src_compile 'all' 'myconf' 'configure' !!! died running emake, kde_src_compile:make Here is my emerge info: Portage 2.1_pre5-r2 (default-linux/x86/2005.1, gcc-3.4.5, glibc-2.3.5-r2, 2.6.15-ck1 i686) ================================================================= System uname: 2.6.15-ck1 i686 AMD Athlon(tm) processor Gentoo Base System version 1.6.14 ccache version 2.3 [disabled] dev-lang/python: 2.4.2 sys-apps/sandbox: 1.2.12 sys-devel/autoconf: 2.13, 2.59-r6 sys-devel/automake: 1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r1 sys-devel/binutils: 2.16.1 sys-devel/libtool: 1.5.22 virtual/os-headers: 2.6.11-r2 ACCEPT_KEYWORDS="x86" AUTOCLEAN="yes" CBUILD="i686-pc-linux-gnu" CFLAGS="-O2 -march=athlon -pipe -fomit-frame-pointer" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/kde/3/share/config /usr/share/X11/xkb /usr/share/config /var/qmail/control" CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d" CXXFLAGS="-O2 -march=athlon -pipe -fomit-frame-pointer" DISTDIR="/mnt/mandrake/opt/distfiles" FEATURES="autoconfig distlocks sandbox sfperms strict" GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo" LANG="cs_CZ" LDFLAGS="-Wl,-O1" LINGUAS="cs" MAKEOPTS="-j2" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/local/portage" SYNC="rsync://necropolis.bilovec/gentoo-portage" USE="x86 3dnow X aac acpi alsa apache2 asf audiofile avi bash-completion berkdb bitmap-fonts bzip2 cairo cdparanoia cdr crypt cups curl dbus dts dvd dvdread emboss encode exif expat ffmpeg firefox flac flash foomaticdb fortran ftp gd gdbm gif glut gmp gpm gstreamer gtk gtk2 hal iconv icq idn imagemagick imlib jabber java jpeg kde kdeenablefinal lcms libg++ libwww mad maildir mbox mikmod mime mmx mng motif moznoirc moznomail mozsvg mp3 mpeg msn musepack mysql nas ncurses nls nptl nptlonly nsplugin nvidia ogg oggvorbis openal opengl oss pam pcre pdflib perl php pic png python qt quicktime readline recode ruby sdl slang sndfile speex spell ssl svg tcltk tcpd theora tiff truetype truetype-fonts type1-fonts usb vorbis win32codecs wma xine xml xml2 xosd xprint xv xvid zlib elibc_glibc input_devices_keyboard input_devices_mouse kernel_linux linguas_cs userland_GNU video_cards_nvidia" Unset: ASFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, LC_ALL jakub@gentoo.org 2006-03-04 01:48:18 0000 *** Bug 124910 has been marked as a duplicate of this bug. *** genstef@gentoo.org 2006-03-04 04:00:09 0000 Created an attachment (id=81279) Patch to fix current kpdf genstef@gentoo.org 2006-03-04 04:01:00 0000 I fixed xpdf in version -r8, kpdf patch for kde folks applied. carlo@gentoo.org 2006-03-04 05:20:45 0000 *** Bug 124892 has been marked as a duplicate of this bug. *** chris@realcomputerguy.com 2006-03-04 10:32:28 0000 With patch I get this error: ------------------------------------------------- make[4]: Entering directory `/var/tmp/portage/kpdf-3.5.1-r2/work/kpdf-3.5.1/kpdf/core/generator_pdf' /bin/sh ../../../libtool --silent --mode=compile --tag=CXX i686-pc-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I. -I../../.. -I./../.. -I../../../kpdf -I/usr/kde/3.5/include -I/usr/qt/3/include -I. -I/usr/include/poppler -DQT_THREAD_SUPPORT -D_REENTRANT -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -DNDEBUG -DNO_DEBUG -O2 -O2 -march=i686 -mtune=pentium4 -fomit-frame-pointer -pipe -Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -c -o generator_pdf.lo `test -f 'generator_pdf.cpp' || echo './'`generator_pdf.cpp /bin/sh ../../../libtool --silent --mode=compile --tag=CXX i686-pc-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I. -I../../.. -I./../.. -I../../../kpdf -I/usr/kde/3.5/include -I/usr/qt/3/include -I. -I/usr/include/poppler -DQT_THREAD_SUPPORT -D_REENTRANT -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -DNDEBUG -DNO_DEBUG -O2 -O2 -march=i686 -mtune=pentium4 -fomit-frame-pointer -pipe -Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -c -o gp_outputdev.lo `test -f 'gp_outputdev.cpp' || echo './'`gp_outputdev.cpp generator_pdf.cpp: In member function `virtual void PDFGenerator::putFontInfo(KListView*)': generator_pdf.cpp:396: error: conversion to non-const reference type `class UGooString&' from rvalue of type `const char*' generator_pdf.cpp: In member function `void PDFGenerator::scanFonts(Dict*, KListView*, Ref**, int&, int&)': generator_pdf.cpp:557: error: conversion to non-const reference type `class UGooString&' from rvalue of type `const char*' generator_pdf.cpp:584: error: conversion to non-const reference type `class UGooString&' from rvalue of type `const char*' generator_pdf.cpp:592: error: conversion to non-const reference type `class UGooString&' from rvalue of type `const char*' make[4]: *** [generator_pdf.lo] Error 1 make[4]: Leaving directory `/var/tmp/portage/kpdf-3.5.1-r2/work/kpdf-3.5.1/kpdf/core/generator_pdf' make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory `/var/tmp/portage/kpdf-3.5.1-r2/work/kpdf-3.5.1/kpdf/core' make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory `/var/tmp/portage/kpdf-3.5.1-r2/work/kpdf-3.5.1/kpdf' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/var/tmp/portage/kpdf-3.5.1-r2/work/kpdf-3.5.1' make: *** [all] Error 2 !!! ERROR: kde-base/kpdf-3.5.1-r2 failed. ------------------------------------------------- $ emerge --info Portage 2.1_pre5-r3 (default-linux/x86/2006.0, gcc-3.4.5, glibc-2.3.6-r3, 2.6.15-gentoo-r7 i686) ================================================================= System uname: 2.6.15-gentoo-r7 i686 Intel(R) Pentium(R) 4 CPU 2.53GHz Gentoo Base System version 1.12.0_pre16 dev-lang/python: 2.3.5, 2.4.2-r1 sys-apps/sandbox: 1.2.17 sys-devel/autoconf: 2.13, 2.59-r7 sys-devel/automake: 1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r1 sys-devel/binutils: 2.16.1-r2 sys-devel/libtool: 1.5.22 virtual/os-headers: 2.6.11-r3 ACCEPT_KEYWORDS="x86 ~x86" AUTOCLEAN="yes" CBUILD="i686-pc-linux-gnu" CFLAGS="-O2 -march=i686 -mtune=pentium4 -fomit-frame-pointer -pipe" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/kde/3/share/config /usr/lib/X11/xkb /usr/share/config /var/qmail/control" CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/texmf/web2c /etc/env.d" CXXFLAGS="-O2 -march=i686 -mtune=pentium4 -fomit-frame-pointer -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="autoconfig candy distlocks sandbox sfperms strict" GENTOO_MIRRORS="ftp://gentoo.mirrors.pair.com http://mirrors.tds.net/gentoo http://open-systems.ufl.edu/mirrors/gentoo" LC_ALL="en_US.utf8" MAKEOPTS="-j2" PKGDIR="/usr/portage/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/local/portage" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="x86 X a52 aac aalib acl acpi alsa apache2 arts audiofile avi bash-completion berkdb bitmap-fonts bzip2 cairo cdparanoia cdr crypt cups curl dlloader dts dv dvb dvd dvdr dvdread emboss encode exif ffmpeg flac fortran gdbm ggvorbis gif gphoto2 gpm gstreamer gtk gtk2 hal imagemagick imap imlib ipv6 jack java jpeg jpeg2k kde kdeenablefinal lcd lcms ldap libg++ libwww mad mikmod mmx motif mozcalendar mozilla mp3 mpeg musicbrainz ncurses nls nodrm nptl nvidia ofx ogg openexr opengl oss pam pda pdf pdflib perl png ppds python qt quicktime readline samba sasl scanner sdl slp sndfile spell sse ssl subversion svg svga tcltk tcpd theora threads tiff truetype truetype-fonts type1-fonts udev unicode usb utf8 v4l v4l2 vcd vorbis win32codecs wmf xcomposite xine xml xmms xscreensaver xv xvid zlib elibc_glibc kernel_linux userland_GNU video_cards_nvidia video_cards_vmware" Unset: ASFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, LANG, LDFLAGS, LINGUAS gralves@gmail.com 2006-03-04 12:06:15 0000 I can confirm this on my system. patrick@gentoo.org 2006-03-05 00:54:35 0000 also affects kdegraphics for monolithic KDE users :-) genstef@gentoo.org 2006-03-05 01:19:51 0000 http://genstef.homelinux.org/kpdf-poppler-0.5.1.patch better patch, please try it out renewieben@home.nl 2006-03-05 02:23:41 0000 the patch in #8 works for me. Thanks! jakubpol@poczta.onet.pl 2006-03-05 02:25:46 0000 Patch in #8 also works for me. Thanks. le.petit.fou@web.de 2006-03-05 05:47:38 0000 (In reply to comment #8) > http://genstef.homelinux.org/kpdf-poppler-0.5.1.patch Works for me, too. Thanks. (I never understood why API changes were made in a x.x.1 release.) flameeyes@gentoo.org 2006-03-05 05:58:35 0000 Both those patches ARE NO FIXES. They unbreak compilation, but are forcing stuff that works only out of sheer luck and that is likely to break. If I'm able to have the system stable for more than 20 minutes without GCC 4.1.0 to bite me, I'll see to provide a working one, in the mean time PLEASE DON'T APPLY THIS PATCH! REALLY! flameeyes@gentoo.org 2006-03-05 07:07:24 0000 Okay I have a patch that should work without being evil. Leave me a bit of time that I rebuild it and I'll apply it. flameeyes@gentoo.org 2006-03-05 11:28:17 0000 *** Bug 125096 has been marked as a duplicate of this bug. *** flameeyes@gentoo.org 2006-03-05 11:33:39 0000 Okay now that I solved my connectivity problems, the patch is now merged for both kpdf and kdegraphics 3.5.1-r2, that would solve. jakub@gentoo.org 2006-03-05 12:13:31 0000 *** Bug 125109 has been marked as a duplicate of this bug. *** flameeyes@gentoo.org 2006-03-05 14:52:16 0000 *** Bug 125139 has been marked as a duplicate of this bug. *** rumen@qrypto.org 2006-03-06 00:56:32 0000 Hi, Coming from Bug-125109, which is Solved for me, even before reading this one. Found two patched: kpdf-3.5.1-poppler-0.5.1.patch(.bz2) and kpdf-3.5.1-poppler-0.5.1-bis.patch(.bz2). In kpdf-3.5.1-r2.ebuild there's a line to do "epatch ${DISTDIR}/patch-name", but as of 6-mar-06 there's no such patch in $DISTDIR although a emessage says it's applied ;) Maybe epatch doesn't check if a file/patch exists, haven't checked. So made an overlay, put "kpdf-3.5.1-poppler-0.5.1.patch" in ${FILESDIR} and all went OK. Could attach the patches if necessary, but don't think it'll be needed ;) PS:don't know what's the difference between the two patches (-bis part). Thanks.Rumen jakub@gentoo.org 2006-03-06 12:50:15 0000 *** Bug 125287 has been marked as a duplicate of this bug. *** jakub@gentoo.org 2006-03-12 00:32:53 0000 *** Bug 125891 has been marked as a duplicate of this bug. *** bugreports@tittel.net 2006-04-02 01:09:11 0000 Shouldn't the xpdf-3.01-r7 ebuild be modified accordingly, so it also depends on poppler < 0.51? From my understanding the dependencies of xpdf-3.01-r7 are just wrong at the moment, because even if >=app-text/poppler-0.5.0-r4 is installed xpdf won't compile due to the wrong poppler version. In my opinion you shouldn't let people have to visit Bugzilla to find out why their packages don't build, if this can be solved properly by providing the correct depend statements in the ebuild. genstef@gentoo.org 2006-04-02 01:55:36 0000 done, please open new bugs for such issues in future 81279 2006-03-04 04:00 0000 Patch to fix current kpdf patch text/plain ZGlmZiAtdXIga3BkZi0zLjUuMS5vcmlnL2twZGYvY29yZS9nZW5lcmF0b3JfcGRmL2dlbmVyYXRv cl9wZGYuY3BwIGtwZGYtMy41LjEva3BkZi9jb3JlL2dlbmVyYXRvcl9wZGYvZ2VuZXJhdG9yX3Bk Zi5jcHAKLS0tIGtwZGYtMy41LjEub3JpZy9rcGRmL2NvcmUvZ2VuZXJhdG9yX3BkZi9nZW5lcmF0 b3JfcGRmLmNwcAkyMDA2LTAzLTA0IDEyOjMwOjU4LjAwMDAwMDAwMCArMDEwMAorKysga3BkZi0z LjUuMS9rcGRmL2NvcmUvZ2VuZXJhdG9yX3BkZi9nZW5lcmF0b3JfcGRmLmNwcAkyMDA2LTAzLTA0 IDEyOjU1OjAyLjAwMDAwMDAwMCArMDEwMApAQCAtMzcsNiArMzcsNyBAQAogI2luY2x1ZGUgInBv cHBsZXIvVW5pY29kZU1hcC5oIgogI2luY2x1ZGUgInBvcHBsZXIvT3V0bGluZS5oIgogI2luY2x1 ZGUgInBvcHBsZXIvZ29vL0dvb1N0cmluZy5oIgorI2luY2x1ZGUgInBvcHBsZXIvVUdvb1N0cmlu Zy5oIgogI2luY2x1ZGUgInBvcHBsZXIvZ29vL0dvb0xpc3QuaCIKIC8vI2luY2x1ZGUgInBvcHBs ZXIvcG9wcGxlci1xdC5oIgogCkBAIC0zOTIsNyArMzkzLDcgQEAKICAgICAgICAgewogICAgICAg ICAgICAgaWYgKGFubm90cy0+Z2V0QW5ub3QoaSktPmdldEFwcGVhcmFuY2UoJm9iajEpLT5pc1N0 cmVhbSgpKQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIG9iajEuc3RyZWFtR2V0RGlj dCgpLT5sb29rdXAoIlJlc291cmNlcyIsICZvYmoyKTsKKyAgICAgICAgICAgICAgICBvYmoxLnN0 cmVhbUdldERpY3QoKS0+bG9va3VwKChVR29vU3RyaW5nJikgIlJlc291cmNlcyIsICZvYmoyKTsK ICAgICAgICAgICAgICAgICBpZiAob2JqMi5pc0RpY3QoKSkKICAgICAgICAgICAgICAgICB7CiAg ICAgICAgICAgICAgICAgICAgIHNjYW5Gb250cyhvYmoyLmdldERpY3QoKSwgbGlzdCwgJmZvbnRz LCBmb250c0xlbiwgZm9udHNTaXplKTsKQEAgLTQ5Myw3ICs0OTQsNyBAQAogICAgICAgICBEb2N1 bWVudFZpZXdwb3J0IHZpZXdwb3J0OwogICAgICAgICBHb29TdHJpbmcgKiBuYW1lZERlc3QgPSBR U3RyaW5nVG9VR1N0cmluZyggb3B0aW9uICk7CiAgICAgICAgIGRvY0xvY2subG9jaygpOwotICAg ICAgICBMaW5rRGVzdCAqIGRlc3RpbmF0aW9uID0gcGRmZG9jLT5maW5kRGVzdCggbmFtZWREZXN0 ICk7CisgICAgICAgIExpbmtEZXN0ICogZGVzdGluYXRpb24gPSBwZGZkb2MtPmZpbmREZXN0KChV R29vU3RyaW5nKikgbmFtZWREZXN0ICk7CiAgICAgICAgIGlmICggZGVzdGluYXRpb24gKQogICAg ICAgICB7CiAgICAgICAgICAgICBmaWxsVmlld3BvcnRGcm9tTGluayggdmlld3BvcnQsIGRlc3Rp bmF0aW9uICk7CkBAIC01NTMsNyArNTU0LDcgQEAKIAogICAgIC8vIHNjYW4gdGhlIGZvbnRzIGlu IHRoaXMgcmVzb3VyY2UgZGljdGlvbmFyeQogICAgIGdmeEZvbnREaWN0ID0gTlVMTDsKLSAgICBy ZXNEaWN0LT5sb29rdXBORigiRm9udCIsICZvYmoxKTsKKyAgICByZXNEaWN0LT5sb29rdXBORigo VUdvb1N0cmluZyYpICJGb250IiwgJm9iajEpOwogICAgIGlmIChvYmoxLmlzUmVmKCkpCiAgICAg ewogICAgICAgICBvYmoxLmZldGNoKHBkZmRvYy0+Z2V0WFJlZigpLCAmb2JqMik7CkBAIC01ODAs NyArNTgxLDcgQEAKIAogICAgIC8vIHJlY3Vyc2l2ZWx5IHNjYW4gYW55IHJlc291cmNlIGRpY3Rp b25hcmllcyBpbiBvYmplY3RzIGluIHRoaXMKICAgICAvLyByZXNvdXJjZSBkaWN0aW9uYXJ5Ci0g ICAgcmVzRGljdC0+bG9va3VwKCJYT2JqZWN0IiwgJnhPYmpEaWN0KTsKKyAgICByZXNEaWN0LT5s b29rdXAoKFVHb29TdHJpbmcmKSAiWE9iamVjdCIsICZ4T2JqRGljdCk7CiAgICAgaWYgKHhPYmpE aWN0LmlzRGljdCgpKQogICAgIHsKICAgICAgICAgZm9yIChpID0gMDsgaSA8IHhPYmpEaWN0LmRp Y3RHZXRMZW5ndGgoKTsgKytpKQpAQCAtNTg4LDcgKzU4OSw3IEBACiAgICAgICAgICAgICB4T2Jq RGljdC5kaWN0R2V0VmFsKGksICZ4T2JqKTsKICAgICAgICAgICAgIGlmICh4T2JqLmlzU3RyZWFt KCkpCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgeE9iai5zdHJlYW1HZXREaWN0KCkt Pmxvb2t1cCgiUmVzb3VyY2VzIiwgJnJlc09iaik7CisgICAgICAgICAgICAgICAgeE9iai5zdHJl YW1HZXREaWN0KCktPmxvb2t1cCgoVUdvb1N0cmluZyYpICJSZXNvdXJjZXMiLCAmcmVzT2JqKTsK ICAgICAgICAgICAgICAgICBpZiAocmVzT2JqLmlzRGljdCgpKSBzY2FuRm9udHMocmVzT2JqLmdl dERpY3QoKSwgbGlzdCwgZm9udHMsIGZvbnRzTGVuLCBmb250c1NpemUpOwogICAgICAgICAgICAg ICAgIHJlc09iai5mcmVlKCk7CiAgICAgICAgICAgICB9CkBAIC02ODgsNyArNjg5LDcgQEAKICAg ICBpbnQgaTsKICAgICBEaWN0ICppbmZvRGljdCA9IGluZm8uZ2V0RGljdCgpOwogCi0gICAgaWYg KCBpbmZvRGljdC0+bG9va3VwKCAoY2hhciopIGRhdGEubGF0aW4xKCksICZvYmogKS0+aXNTdHJp bmcoKSApCisgICAgaWYgKCBpbmZvRGljdC0+bG9va3VwKFVHb29TdHJpbmcoZGF0YS5sYXRpbjEo KSksICZvYmogKS0+aXNTdHJpbmcoKSApCiAgICAgewogICAgICAgICBzMSA9IG9iai5nZXRTdHJp bmcoKTsKICAgICAgICAgaWYgKCAoIHMxLT5nZXRDaGFyKDApICYgMHhmZiApID09IDB4ZmUgJiYg KCBzMS0+Z2V0Q2hhcigxKSAmIDB4ZmYgKSA9PSAweGZmICkKQEAgLTc0Niw3ICs3NDcsNyBAQAog ICAgIGlmICggIXVNYXAgKQogICAgICAgICByZXR1cm4gaTE4biggIlVua25vd24gRGF0ZSIgKTsK IAotICAgIGlmICggaW5mb0RpY3QtPmxvb2t1cCggKGNoYXIqKSBkYXRhLmxhdGluMSgpLCAmb2Jq ICktPmlzU3RyaW5nKCkgKQorICAgIGlmICggaW5mb0RpY3QtPmxvb2t1cChVR29vU3RyaW5nKGRh dGEubGF0aW4xKCkpLCAmb2JqICktPmlzU3RyaW5nKCkgKQogICAgIHsKICAgICAgICAgcyA9IG9i ai5nZXRTdHJpbmcoKS0+Z2V0Q1N0cmluZygpOwogICAgICAgICBpZiAoIHNbMF0gPT0gJ0QnICYm IHNbMV0gPT0gJzonICkKQEAgLTgwMiw3ICs4MDMsNyBAQAogICAgICAgICAgICAgICAgIC8vIGdl dCB0aGUgZGVzdGluYXRpb24gZm9yIHRoZSBwYWdlIG5vdywgYnV0IGl0J3MgVkVSWSB0aW1lIGNv bnN1bWluZywKICAgICAgICAgICAgICAgICAvLyBzbyBiZXR0ZXIgc3RvcmluZyB0aGUgcmVmZXJl bmNlIGFuZCBwcm92aWRlIHRoZSB2aWV3cG9ydCBhcyBtZXRhZGF0YQogICAgICAgICAgICAgICAg IC8vIG9uIGRlbWFuZAotICAgICAgICAgICAgICAgIEdvb1N0cmluZyAqcyA9IGctPmdldE5hbWVk RGVzdCgpOworICAgICAgICAgICAgICAgIEdvb1N0cmluZyAqcyA9IChHb29TdHJpbmcqKSBnLT5n ZXROYW1lZERlc3QoKTsKICAgICAgICAgICAgICAgICBRU3RyaW5nIGF1eCA9IFFTdHJpbmcocy0+ Z2V0Q1N0cmluZygpKTsKICAgICAgICAgICAgICAgICBpdGVtLnNldEF0dHJpYnV0ZSggIlZpZXdw b3J0TmFtZSIsIGF1eCApOwogICAgICAgICAgICAgfQpkaWZmIC11ciBrcGRmLTMuNS4xLm9yaWcv a3BkZi9jb3JlL2dlbmVyYXRvcl9wZGYvZ3Bfb3V0cHV0ZGV2LmNwcCBrcGRmLTMuNS4xL2twZGYv Y29yZS9nZW5lcmF0b3JfcGRmL2dwX291dHB1dGRldi5jcHAKLS0tIGtwZGYtMy41LjEub3JpZy9r cGRmL2NvcmUvZ2VuZXJhdG9yX3BkZi9ncF9vdXRwdXRkZXYuY3BwCTIwMDYtMDMtMDQgMTI6MzA6 NTguMDAwMDAwMDAwICswMTAwCisrKyBrcGRmLTMuNS4xL2twZGYvY29yZS9nZW5lcmF0b3JfcGRm L2dwX291dHB1dGRldi5jcHAJMjAwNi0wMy0wNCAxMjo1Njo1OS4wMDAwMDAwMDAgKzAxMDAKQEAg LTI0Niw3ICsyNDYsNyBAQAogICAgICAgICAgICAgewogICAgICAgICAgICAgTGlua0dvVG8gKiBn ID0gKExpbmtHb1RvICopIGE7CiAgICAgICAgICAgICAvLyBjZWF0ZSBsaW5rOiBubyBleHQgZmls ZSwgbmFtZWREZXN0LCBvYmplY3QgcG9pbnRlcgotICAgICAgICAgICAgbGluayA9IG5ldyBLUERG TGlua0dvdG8oIFFTdHJpbmc6Om51bGwsIGRlY29kZVZpZXdwb3J0KCBnLT5nZXROYW1lZERlc3Qo KSwgZy0+Z2V0RGVzdCgpICkgKTsKKyAgICAgICAgICAgIGxpbmsgPSBuZXcgS1BERkxpbmtHb3Rv KCBRU3RyaW5nOjpudWxsLCBkZWNvZGVWaWV3cG9ydCgoR29vU3RyaW5nKikgZy0+Z2V0TmFtZWRE ZXN0KCksIGctPmdldERlc3QoKSApICk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVh azsKIApAQCAtMjU2LDcgKzI1Niw3IEBACiAgICAgICAgICAgICAvLyBjb3B5IGxpbmsgZmlsZQog ICAgICAgICAgICAgY29uc3QgY2hhciAqIGZpbGVOYW1lID0gZy0+Z2V0RmlsZU5hbWUoKS0+Z2V0 Q1N0cmluZygpOwogICAgICAgICAgICAgLy8gY2VhdGUgbGluazogZmlsZU5hbWUsIG5hbWVkRGVz dCwgb2JqZWN0IHBvaW50ZXIKLSAgICAgICAgICAgIGxpbmsgPSBuZXcgS1BERkxpbmtHb3RvKCAo UVN0cmluZylmaWxlTmFtZSwgZGVjb2RlVmlld3BvcnQoIGctPmdldE5hbWVkRGVzdCgpLCBnLT5n ZXREZXN0KCkgKSApOworICAgICAgICAgICAgbGluayA9IG5ldyBLUERGTGlua0dvdG8oIChRU3Ry aW5nKWZpbGVOYW1lLCBkZWNvZGVWaWV3cG9ydCgoR29vU3RyaW5nKikgZy0+Z2V0TmFtZWREZXN0 KCksIGctPmdldERlc3QoKSApICk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsK IApAQCAtMzI3LDcgKzMyNyw3IEBACiAgICAgRG9jdW1lbnRWaWV3cG9ydCB2cCggLTEgKTsKIAog ICAgIGlmICggbmFtZWREZXN0ICYmICFkZXN0ICkKLSAgICAgICAgZGVzdCA9IG1fZG9jLT5maW5k RGVzdCggbmFtZWREZXN0ICk7CisgICAgICAgIGRlc3QgPSBtX2RvYy0+ZmluZERlc3QoKFVHb29T dHJpbmcqKSBuYW1lZERlc3QgKTsKIAogICAgIGlmICggIWRlc3QgfHwgIWRlc3QtPmlzT2soKSAp CiAgICAgICAgIHJldHVybiB2cDsK