Attachment #566102 for bug #678584

View | Details | Raw Unified | Return to bug 678584
Collapse All | Expand All

Lines 42-47 Link Here

(-)kitinerary-18.08.3.orig/CMakeLists.txt (+14 lines)
42	if (${Poppler_VERSION} VERSION_GREATER 0.57)	42	if (${Poppler_VERSION} VERSION_GREATER 0.57)
43	set(HAVE_POPPLER_0_58 ON)	43	set(HAVE_POPPLER_0_58 ON)
44	endif()	44	endif()
		45	if (${Poppler_VERSION} VERSION_GREATER 0.71)
		46	set(HAVE_POPPLER_0_72 ON)
		47	endif()
45	endif()	48	endif()
46	if (TARGET zxing::libzxing)	49	if (TARGET zxing::libzxing)
47	set(HAVE_ZXING ON)	50	set(HAVE_ZXING ON)
48		51
Lines 81-83 Link Here
81	)	84	)
82	install(FILES org_kde_kitinerary.categories DESTINATION ${KDE_INSTALL_CONFDIR})	85	install(FILES org_kde_kitinerary.categories DESTINATION ${KDE_INSTALL_CONFDIR})
83	ki18n_install(po)	86	ki18n_install(po)
		87
		88	MESSAGE(STATUS "<<< Gentoo configuration >>>
		89	Build type ${CMAKE_BUILD_TYPE}
		90	Install path ${CMAKE_INSTALL_PREFIX}
		91	Compiler flags:
		92	C ${CMAKE_C_FLAGS}
		93	C++ ${CMAKE_CXX_FLAGS}
		94	Linker flags:
		95	Executable ${CMAKE_EXE_LINKER_FLAGS}
		96	Module ${CMAKE_MODULE_LINKER_FLAGS}
		97	Shared ${CMAKE_SHARED_LINKER_FLAGS}\n")

Lines 22-27 Link Here

(-)kitinerary-18.08.3.orig/src/config-kitinerary.h.cmake (+1 lines)
22		22
23	#cmakedefine HAVE_POPPLER	23	#cmakedefine HAVE_POPPLER
24	#cmakedefine HAVE_POPPLER_0_58	24	#cmakedefine HAVE_POPPLER_0_58
		25	#cmakedefine HAVE_POPPLER_0_72
25	#cmakedefine HAVE_ZXING	26	#cmakedefine HAVE_ZXING
26	#cmakedefine HAVE_KCAL	27	#cmakedefine HAVE_KCAL
27	#cmakedefine HAVE_KCONTACTS	28	#cmakedefine HAVE_KCONTACTS

Lines 306-312 Link Here

(-)kitinerary-18.08.3.orig/src/pdfdocument.cpp (-1 / +10 lines)
306	const auto pageRect = d->m_doc->m_popplerDoc->getPage(d->m_pageNum + 1)->getCropBox();	306	const auto pageRect = d->m_doc->m_popplerDoc->getPage(d->m_pageNum + 1)->getCropBox();
307	std::unique_ptr<GooString> s(device->getText(ratio(pageRect->x1, pageRect->x2, left), ratio(pageRect->y1, pageRect->y2, top),	307	std::unique_ptr<GooString> s(device->getText(ratio(pageRect->x1, pageRect->x2, left), ratio(pageRect->y1, pageRect->y2, top),
308	ratio(pageRect->x1, pageRect->x2, right), ratio(pageRect->y1, pageRect->y2, bottom)));	308	ratio(pageRect->x1, pageRect->x2, right), ratio(pageRect->y1, pageRect->y2, bottom)));
309	return QString::fromUtf8(s->getCString());	309	#ifdef HAVE_POPPLER_0_72
		310	return QString::fromUtf8(s->c_str());
		311	#else
		312	return QString::fromUtf8(s->getCString());
		313	#endif
		314
310	#else	315	#else
311	Q_UNUSED(left);	316	Q_UNUSED(left);
312	Q_UNUSED(top);	317	Q_UNUSED(top);
Lines 440-446 Link Here
440	PdfPage page;	445	PdfPage page;
441	page.d->m_pageNum = i;	446	page.d->m_pageNum = i;
442	page.d->m_doc = doc->d.get();	447	page.d->m_doc = doc->d.get();
		448	#ifdef HAVE_POPPLER_0_72
		449	page.d->m_text = QString::fromUtf8(s->c_str());
		450	#else
443	page.d->m_text = QString::fromUtf8(s->getCString());	451	page.d->m_text = QString::fromUtf8(s->getCString());
		452	#endif
444	page.d->m_images = std::move(device->m_images);	453	page.d->m_images = std::move(device->m_images);
445	for (auto it = page.d->m_images.begin(); it != page.d->m_images.end(); ++it) {	454	for (auto it = page.d->m_images.begin(); it != page.d->m_images.end(); ++it) {
446	(*it).d->m_page = page.d.data();	455	(*it).d->m_page = page.d.data();

Return to bug 678584