summaryrefslogtreecommitdiff
path: root/app-text
diff options
context:
space:
mode:
Diffstat (limited to 'app-text')
-rw-r--r--app-text/Manifest.gzbin50120 -> 50114 bytes
-rw-r--r--app-text/diffpdf/Manifest3
-rw-r--r--app-text/diffpdf/diffpdf-2.1.3-r2.ebuild40
-rw-r--r--app-text/diffpdf/diffpdf-2.1.3-r3.ebuild37
-rw-r--r--app-text/diffpdf/files/diffpdf-2.1.3-qt6.patch407
-rw-r--r--app-text/pandoc-bin/Manifest2
-rw-r--r--app-text/pandoc-bin/pandoc-bin-3.6.2.ebuild2
-rw-r--r--app-text/poppler/Manifest3
-rw-r--r--app-text/poppler/poppler-25.01.0.ebuild157
9 files changed, 448 insertions, 203 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 4666ca26146b..6b8fd4caf895 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
Binary files differ
diff --git a/app-text/diffpdf/Manifest b/app-text/diffpdf/Manifest
index 9086a4e6824a..ef28be4588e0 100644
--- a/app-text/diffpdf/Manifest
+++ b/app-text/diffpdf/Manifest
@@ -1,5 +1,6 @@
AUX diffpdf-2.1.3-qt5.patch 6240 BLAKE2B c4f522b41e4b036222f832e194088d2377f5063d35e8eb73714745db7a993d9b38fd9e5111eee69d7f2d86710a45289a8e54d25b8a3217b1ddd2fe53bd59b468 SHA512 96ae465bb5b27ff0b26a7c4686e7656af025669b418b755878627b1baf4b91bf14833e951f80c6510d907419efdb8759dffca3f5b7fb517b5bf20ae1ee6b3406
+AUX diffpdf-2.1.3-qt6.patch 13064 BLAKE2B ba50eb84bdfd31ec44aca89e7de115a69b87ba4a72bfb6b933a79ced1d0b7896b5aa202366062bcda723bc1158a5199572d068a99ee7b9225dde15d7c7146099 SHA512 1e2f99c3257580bbf650468b096a326eb612ad99fb5c08857a5b161d7948a752f3b2a43627277a806991b68f1d467d815ca4f9320b722ef861e84942d2b76568
AUX diffpdf.desktop 152 BLAKE2B e85754380c3e607d6bfe0f4db875983596f8e562d48b8bb732e26a23f9cb6137d7ec700ac2d0596fa3a13d79b6c527de671f46825646e266cf5579f33a1a1511 SHA512 3568a49e3fdcb2fa47688fce4d818cb01545d854890806e4508f228b18b712cbb5641a6e173927990e81c9086bdb49f5b4ffd870e5f0345f26de1b4e799eb0d7
DIST diffpdf-2.1.3.tar.gz 91856 BLAKE2B a94b710674508a5b77ca1e18b48e906568b49ecf10ce5f96d425fceb91746922fdf454ee20ec77913cf3d7467e559e59257e7415bf96c44b9c136e1708d4e73f SHA512 137e00f7c1d696b097f271c51fa5f19d471efb85fb3d5381c096c32f1ff824083b1122bbefa758fb9320ac8e0c9c16e6b88c8b6286bd98388d88c45c714a948d
-EBUILD diffpdf-2.1.3-r2.ebuild 850 BLAKE2B ec4d1a2b8e8c9f0565d528c96f221c012a3d7855c2484fb96b1ca9274dd4aeea5e1c9f66f635242421fa6749035907927fca24a8f09df3e3b6616d8d0fe97e7b SHA512 cc56361bfa53763b7e9198f9c817c257a5ec5956c2b3e34132cc184c95f013360b6fdb324ad8123c044b9e11a1cf100cf2954a1e8a3fd8b1b6601a3dd421647f
+EBUILD diffpdf-2.1.3-r3.ebuild 822 BLAKE2B 349bdd464bc3264180e643f17c6e425458b9c15a66366b7dc65f9a24d3be7257325a5a0396208b591bea697e975d15527650ff85a57789ba9c171b59c4aef164 SHA512 6a844eed527b197e7a1420a7902800e72a2855be7b7587c403ee4e4fb647610abecf9853a101cb53dc3021b7f43637921e08d5e52728a55502e1bb4460955ebb
MISC metadata.xml 248 BLAKE2B ef5873747105ead87c67c434cced8bb3e3785064a37e487a6826c04d707e360f2ca2549d77bf5e7ec4ed7352c2fb5e671afab1873d1ed6cdbc64b83a31711a0b SHA512 9104044b707b65732e34a1d4f25636b881711b6e64cb61be90e69722785e0cd7b4110379eb6051107805469b9d16c772855b09f34e51814e254a0b8a08a6e202
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild b/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
deleted file mode 100644
index 4ac979ae0a43..000000000000
--- a/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils
-
-DESCRIPTION="Program that textually or visually compares two PDF files"
-HOMEPAGE="https://www.qtrac.eu/diffpdf.html"
-SRC_URI="http://www.qtrac.eu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-BDEPEND="dev-qt/linguist-tools:5"
-RDEPEND="
- app-text/poppler[qt5]
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
-
-src_configure() {
- $(qt5_get_bindir)/lrelease diffpdf.pro || die "Generating translations failed"
- eqmake5 PREFIX="${EPREFIX}/usr" diffpdf.pro
-}
-
-src_install() {
- einstalldocs
- dobin diffpdf
- doman diffpdf.1
- domenu "${FILESDIR}"/${PN}.desktop
- newicon images/icon.png ${PN}.png
-}
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r3.ebuild b/app-text/diffpdf/diffpdf-2.1.3-r3.ebuild
new file mode 100644
index 000000000000..3aa2d346d900
--- /dev/null
+++ b/app-text/diffpdf/diffpdf-2.1.3-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop
+
+DESCRIPTION="Program that textually or visually compares two PDF files"
+HOMEPAGE="https://web.archive.org/web/20250102202818/https://www.qtrac.eu/diffpdf-foss.html"
+SRC_URI="https://web.archive.org/web/20201229194512/http://www.qtrac.eu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+ >=dev-build/cmake-3.16
+ >=dev-qt/qttools-6.4.2:6[linguist]
+"
+RDEPEND="
+ >=app-text/poppler-22.12[qt6]
+ >=dev-qt/qtbase-6.4.2:6[gui,widgets]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-qt5.patch
+ "${FILESDIR}"/${P}-qt6.patch
+)
+
+src_install() {
+ cmake_src_install
+ einstalldocs
+ doman diffpdf.1
+ domenu "${FILESDIR}"/${PN}.desktop
+ newicon images/icon.png ${PN}.png
+}
diff --git a/app-text/diffpdf/files/diffpdf-2.1.3-qt6.patch b/app-text/diffpdf/files/diffpdf-2.1.3-qt6.patch
new file mode 100644
index 000000000000..6f15202e0e72
--- /dev/null
+++ b/app-text/diffpdf/files/diffpdf-2.1.3-qt6.patch
@@ -0,0 +1,407 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..fbaf333
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,25 @@
++cmake_minimum_required(VERSION 3.16)
++project(diffpdf CXX)
++
++find_package(Qt6 REQUIRED COMPONENTS Gui LinguistTools PrintSupport Widgets)
++find_package(PkgConfig REQUIRED)
++pkg_search_module(PopplerQt6 REQUIRED IMPORTED_TARGET poppler-qt6>=22.12.0)
++
++qt_standard_project_setup(REQUIRES 6.4.2 I18N_TRANSLATED_LANGUAGES cz de es fr)
++
++file(GLOB DiffPDF_SOURCES CONFIGURE_DEPENDS
++ "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
++ "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp"
++)
++qt_add_executable(diffpdf ${DiffPDF_SOURCES})
++target_link_libraries(diffpdf
++ PRIVATE
++ PkgConfig::PopplerQt6
++ Qt6::Core
++ Qt6::PrintSupport
++ Qt6::Widgets
++)
++qt_add_translations(diffpdf RESOURCE_PREFIX "/")
++qt_add_binary_resources(diffpdf_resources resources.qrc)
++add_dependencies(diffpdf diffpdf_resources)
++install(TARGETS diffpdf)
+diff --git a/diffpdf_cz.ts b/diffpdf_cz.ts
+index 66f718c..36b313f 100644
+--- a/diffpdf_cz.ts
++++ b/diffpdf_cz.ts
+@@ -1,7 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <!DOCTYPE TS>
+ <TS version="2.0" language="cs_CZ">
+-<defaultcodec>UTF-8</defaultcodec>
+ <context>
+ <name>AboutForm</name>
+ <message>
+diff --git a/diffpdf_de.ts b/diffpdf_de.ts
+index 6b8ee47..3daf0cc 100644
+--- a/diffpdf_de.ts
++++ b/diffpdf_de.ts
+@@ -1,7 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <!DOCTYPE TS>
+ <TS version="2.0" language="de_DE">
+-<defaultcodec>UTF-8</defaultcodec>
+ <context>
+ <name>AboutForm</name>
+ <message>
+diff --git a/diffpdf_es.ts b/diffpdf_es.ts
+index a35941f..e8c9d8f 100644
+--- a/diffpdf_es.ts
++++ b/diffpdf_es.ts
+@@ -1,7 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <!DOCTYPE TS>
+ <TS version="2.0" language="es_ES">
+-<defaultcodec>UTF-8</defaultcodec>
+ <context>
+ <name>AboutForm</name>
+ <message>
+diff --git a/diffpdf_fr.ts b/diffpdf_fr.ts
+index 815e9c4..3e3d5e7 100644
+--- a/diffpdf_fr.ts
++++ b/diffpdf_fr.ts
+@@ -1,7 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <!DOCTYPE TS>
+ <TS version="2.0">
+-<defaultcodec>UTF-8</defaultcodec>
+ <context>
+ <name>AboutForm</name>
+ <message>
+diff --git a/generic.cpp b/generic.cpp
+index 13603e3..ba4ea7a 100644
+--- a/generic.cpp
++++ b/generic.cpp
+@@ -17,6 +17,7 @@
+ #include <QPen>
+ #include <QPixmapCache>
+ #include <QUrl>
++#include <utility>
+
+ const QSize SwatchSize(24, 24);
+
+@@ -149,8 +150,8 @@ QPixmap penStyleSwatch(const Qt::PenStyle style, const QColor &color)
+ const TextBoxList getTextBoxes(PdfPage page, const QRectF &rect)
+ {
+ TextBoxList boxes;
+- foreach (Poppler::TextBox *box, page->textList()) {
+- PdfTextBox box_ptr(box);
++ for (auto & box : page->textList()) {
++ PdfTextBox box_ptr(std::move(box));
+ if (rect.isEmpty() || rect.contains(box_ptr->boundingBox()))
+ boxes.append(box_ptr);
+ }
+diff --git a/generic.hpp b/generic.hpp
+index 1e9afce..fd48163 100644
+--- a/generic.hpp
++++ b/generic.hpp
+@@ -12,7 +12,8 @@
+ for more details.
+ */
+
+-#include <poppler-qt5.h>
++#include <poppler-qt6.h>
++#include <memory>
+ #include <QMetaType>
+ #include <QPair>
+ #include <QPixmap>
+@@ -22,15 +23,9 @@ class QColor;
+ class QMimeData;
+ class QRectF;
+
+-#if QT_VERSION >= 0x040600
+-typedef QSharedPointer<Poppler::Document> PdfDocument;
+-typedef QSharedPointer<Poppler::Page> PdfPage;
+-typedef QSharedPointer<Poppler::TextBox> PdfTextBox;
+-#else
+-typedef std::tr1::shared_ptr<Poppler::Document> PdfDocument;
+-typedef std::tr1::shared_ptr<Poppler::Page> PdfPage;
+-typedef std::tr1::shared_ptr<Poppler::TextBox> PdfTextBox;
+-#endif
++using PdfDocument = std::shared_ptr<Poppler::Document>;
++using PdfPage = std::shared_ptr<Poppler::Page>;
++using PdfTextBox = std::shared_ptr<Poppler::TextBox>;
+ typedef QList<PdfTextBox> TextBoxList;
+
+ enum InitialComparisonMode{CompareAppearance=0, CompareCharacters=1,
+@@ -50,9 +45,9 @@ struct PagePair
+
+ bool isNull() { return left == -1 || right == -1; }
+
+- const int left;
+- const int right;
+- const bool hasVisualDifference;
++ int left;
++ int right;
++ bool hasVisualDifference;
+ };
+ Q_DECLARE_METATYPE(PagePair)
+
+diff --git a/helpform.cpp b/helpform.cpp
+index 7a8269f..6354ee4 100644
+--- a/helpform.cpp
++++ b/helpform.cpp
+@@ -16,6 +16,7 @@
+ #include <QKeySequence>
+ #include <QSettings>
+ #include <QShortcut>
++#include <QStringConverter>
+ #include <QTextBrowser>
+ #include <QTextStream>
+
+@@ -31,7 +32,7 @@ HelpForm::HelpForm(const QString &language, QWidget *parent)
+ QFile file(filename);
+ file.open(QIODevice::ReadOnly|QIODevice::Text);
+ QTextStream in(&file);
+- in.setCodec("UTF-8");
++ in.setEncoding(QStringConverter::Utf8);
+ viewer->setHtml(in.readAll());
+ viewer->setReadOnly(true);
+ setCentralWidget(viewer);
+diff --git a/main.cpp b/main.cpp
+index 321ecc4..a6063d3 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -16,7 +16,6 @@
+ #include <QLibraryInfo>
+ #include <QLocale>
+ #include <QSettings>
+-#include <QTextCodec>
+ #include <QTextStream>
+ #include <QTranslator>
+
+@@ -101,12 +100,12 @@ int main(int argc, char *argv[])
+ }
+
+ QTranslator qtTranslator;
+- qtTranslator.load("qt_" + language,
+- QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+- app.installTranslator(&qtTranslator);
++ if (qtTranslator.load("qt_" + language,
++ QLibraryInfo::path(QLibraryInfo::TranslationsPath)))
++ app.installTranslator(&qtTranslator);
+ QTranslator appTranslator;
+- appTranslator.load("diffpdf_" + language, ":/");
+- app.installTranslator(&appTranslator);
++ if (appTranslator.load("diffpdf_" + language, ":/"))
++ app.installTranslator(&appTranslator);
+
+ MainWindow window(debug, comparisonMode, filename1, filename2,
+ language.left(2)); // We want de not de_DE etc.
+diff --git a/mainwindow.cpp b/mainwindow.cpp
+index c9dac53..bcdc390 100644
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -27,18 +27,21 @@
+ #include <QComboBox>
+ #include <QDir>
+ #include <QDockWidget>
++#include <QElapsedTimer>
+ #include <QEvent>
+ #include <QFileDialog>
+ #include <QGroupBox>
+ #include <QLabel>
+ #include <QLineEdit>
+ #include <QMessageBox>
++#include <QPageLayout>
+ #include <QPainter>
+ #include <QPixmapCache>
+ #include <QPlainTextEdit>
+ #include <QPrinter>
+ #include <QPushButton>
+ #include <QRadioButton>
++#include <QRegularExpression>
+ #include <QScrollArea>
+ #include <QScrollBar>
+ #include <QSettings>
+@@ -1249,11 +1252,7 @@ PdfDocument MainWindow::getPdf(const QString &filename)
+ else if (pdf->isLocked()) {
+ QMessageBox::warning(this, tr("DiffPDF — Error"),
+ tr("Cannot read a locked PDF ('%1').").arg(filename));
+-#if QT_VERSION >= 0x040600
+- pdf.clear();
+-#else
+- pdf.reset();
+-#endif
++ return {};
+ }
+ return pdf;
+ }
+@@ -1319,7 +1318,8 @@ QList<int> MainWindow::getPageList(int which, PdfDocument pdf)
+ bool error = false;
+ QList<int> pages;
+ QString page_string = pagesEdit->text();
+- page_string = page_string.replace(QRegExp("\\s+"), "");
++ static QRegularExpression const spaces("\\s+");
++ page_string = page_string.replace(spaces, "");
+ QStringList page_list = page_string.split(",");
+ bool ok;
+ foreach (const QString &page, page_list) {
+@@ -1387,7 +1387,7 @@ void MainWindow::compare()
+ }
+
+ comparePrepareUi();
+- QTime time;
++ QElapsedTimer time;
+ time.start();
+ const QPair<int, int> pair = comparePages(filename1, pdf1, filename2,
+ pdf2);
+@@ -1685,8 +1685,8 @@ void MainWindow::saveAsPdf(const int start, const int end,
+ printer.setOutputFormat(QPrinter::PdfFormat);
+ printer.setColorMode(QPrinter::Color);
+ printer.setCreator(tr("DiffPDF"));
+- printer.setOrientation(savePages == SaveBothPages
+- ? QPrinter::Landscape : QPrinter::Portrait);
++ printer.setPageOrientation(savePages == SaveBothPages
++ ? QPageLayout::Landscape : QPageLayout::Portrait);
+ QPainter painter(&printer);
+ painter.setRenderHints(QPainter::Antialiasing|
+ QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform);
+@@ -1802,7 +1802,7 @@ void MainWindow::showZones()
+ void MainWindow::showZones(const int Width, const TextBoxList &list,
+ QLabel *label)
+ {
+- if (!label || !label->pixmap() || label->pixmap()->isNull())
++ if (!label || label->pixmap().isNull())
+ return;
+ const bool ComparingWords = compareComboBox->currentIndex() ==
+ CompareWords;
+@@ -1815,7 +1815,7 @@ void MainWindow::showZones(const int Width, const TextBoxList &list,
+ columnsSpinBox->value());
+ const int DPI = static_cast<int>(POINTS_PER_INCH *
+ (zoomSpinBox->value() / 100.0));
+- QPixmap pixmap = label->pixmap()->copy();
++ QPixmap pixmap = label->pixmap().copy();
+ QPainter painter(&pixmap);
+ painter.setPen(Qt::green);
+ for (int i = 0; i < paths.count(); ++i) {
+@@ -1844,11 +1844,11 @@ void MainWindow::showMargins()
+
+ void MainWindow::showMargins(QLabel *label)
+ {
+- if (!label || !label->pixmap() || label->pixmap()->isNull())
++ if (!label || label->pixmap().isNull())
+ return;
+ const int DPI = static_cast<int>(POINTS_PER_INCH *
+ (zoomSpinBox->value() / 100.0));
+- QPixmap pixmap = label->pixmap()->copy();
++ QPixmap pixmap = label->pixmap().copy();
+ QPainter painter(&pixmap);
+ painter.setPen(Qt::cyan);
+ int left = leftMarginSpinBox->value();
+@@ -1880,12 +1880,11 @@ void MainWindow::showMargins(QLabel *label)
+
+ void MainWindow::setAMargin(const QPoint &pos)
+ {
+- if (!marginsGroupBox->isChecked() || !page1Label->pixmap() ||
+- page1Label->pixmap()->isNull())
++ if (!marginsGroupBox->isChecked() || page1Label->pixmap().isNull())
+ return;
+ const int DPI = static_cast<int>(POINTS_PER_INCH *
+ (zoomSpinBox->value() / 100.0));
+- const QSize &size = page1Label->pixmap()->size();
++ const QSize &size = page1Label->pixmap().size();
+ int x = pos.x();
+ int y = pos.y();
+ const int HorizontalMiddle = size.width() / 2;
+diff --git a/mainwindow.hpp b/mainwindow.hpp
+index 448d21c..6a04179 100644
+--- a/mainwindow.hpp
++++ b/mainwindow.hpp
+@@ -14,12 +14,7 @@
+
+ #include "generic.hpp"
+ #include "saveform.hpp"
+-#if QT_VERSION >= 0x040600
+-#include <QSharedPointer>
+-#else
+-#include <tr1/memory>
+-#endif
+-#include <poppler-qt5.h>
++#include <poppler-qt6.h>
+ #include <QBrush>
+ #include <QList>
+ #include <QMainWindow>
+diff --git a/resources.qrc b/resources.qrc
+index 5464869..aa0f6be 100644
+--- a/resources.qrc
++++ b/resources.qrc
+@@ -3,9 +3,6 @@
+ <file alias="icon.png">images/icon.png</file>
+ <file alias="left.png">images/left.png</file>
+ <file alias="right.png">images/right.png</file>
+-<file>diffpdf_cz.qm</file>
+-<file>diffpdf_de.qm</file>
+-<file>diffpdf_fr.qm</file>
+ <file>help.html</file>
+ <file>help_cz.html</file>
+ <file>help_de.html</file>
+diff --git a/sequence_matcher.cpp b/sequence_matcher.cpp
+index cc65425..9dc5d98 100644
+--- a/sequence_matcher.cpp
++++ b/sequence_matcher.cpp
+@@ -11,6 +11,7 @@
+ */
+
+ #include "sequence_matcher.hpp"
++#include <algorithm>
+ #include <QSet>
+
+
+@@ -136,7 +137,7 @@ QList<Match> SequenceMatcher::get_matching_blocks()
+ offsets.append(Offsets(i + k, a_high, j + k, b_high));
+ }
+ }
+- qSort(matching_blocks.begin(), matching_blocks.end(), matchLessThan);
++ std::sort(matching_blocks.begin(), matching_blocks.end(), matchLessThan);
+
+ int i1 = 0;
+ int j1 = 0;
+diff --git a/textitem.cpp b/textitem.cpp
+index f7ce133..728cbb3 100644
+--- a/textitem.cpp
++++ b/textitem.cpp
+@@ -14,6 +14,7 @@
+
+ #include <QDir>
+ #include <QFile>
++#include <QStringConverter>
+ #include <QTextStream>
+
+
+@@ -130,7 +131,7 @@ const QList<QPainterPath> TextItems::generateZones(const int Width,
+ const int Column = ((Columns == 1) ? 0
+ : (rect.width() > Span) ? Columns : rect.right() / Span);
+ const int y = normalizedY(static_cast<int>(rect.y()), ToleranceY);
+- zonesForColumn.insertMulti(Key(Column, y, rect.x()), zone);
++ zonesForColumn.insert(Key(Column, y, rect.x()), zone);
+ }
+ return zonesForColumn.values();
+ }
+@@ -152,7 +153,7 @@ void TextItems::debug(const int page, const int ToleranceY,
+ .arg(file.errorString())));
+ }
+ QTextStream out(&file);
+- out.setCodec("UTF-8");
++ out.setEncoding(QStringConverter::Utf8);
+ out << "Page #" << page << ": "
+ << (ComparingWords ? "Words" : "Characters") << " mode\n";
+ for (int i = 0; i < items.count(); ++i) {
+@@ -202,7 +203,7 @@ const TextItems getCharacters(const TextBoxList &list)
+ TextItems items;
+ foreach (const PdfTextBox &box, list) {
+ const QString word = box->text();
+- int limit = word.count() - 1;
++ int limit = word.size() - 1;
+ for (int i = limit; i >= 0; --i)
+ if (!word[i].isSpace())
+ break;
diff --git a/app-text/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest
index 9c410b72ee89..7153c0942cdb 100644
--- a/app-text/pandoc-bin/Manifest
+++ b/app-text/pandoc-bin/Manifest
@@ -7,7 +7,7 @@ DIST pandoc-3.6.2-linux-arm64.tar.gz 35654724 BLAKE2B 60a6daf64bc366b696fafdc9f7
DIST pandoc-3.6.3-linux-amd64.tar.gz 32925438 BLAKE2B c731c287b0b66b74b14fb46941d8598531aa3d2ee5c60f214c9d7da2ed8d5106b76584a9d56ec5fa9254f3402d559b21a013bd66f10f13850b52abb4de6be911 SHA512 ecfc11b743344fdcd30db31c008ea9456b6f25255d7295ef84b64faaf7c944edee9241823157158ba81628cdb861f2e6de800b143f45cc56a4bae44594258bea
DIST pandoc-3.6.3-linux-arm64.tar.gz 35687915 BLAKE2B 01531b0b1771ad320610558a0580052940cf2cdb2c9cb459bb116399546e2a5196d1728a3f99a9265333bbf33fa29499a6cb8a88ff415b09e175b271a6451dff SHA512 714d5430efe55ee4c94406ef957ff3c8a02bd8728dfe1be7330a9944948d9a6688eac6073229f320b7ec7dfb04df3c0a7aa21c07d53b10adeaa8606b8beba261
EBUILD pandoc-bin-3.6.1.ebuild 1482 BLAKE2B cb3fb2d97b37d03c0f5b8a0b4e7ba2e24d9c849cb6234ae793513a8203a2e9707663f4d196b476fcef00cb2eebbd8c35f76079405a1d2093304cb848418a0a13 SHA512 41bf87bed327f0763f19003947aa2924a978095d696a296f4ef010fb9cae85f6d96febb09d259136b859970f6c887dda93201a7d6777b244a5c173a0091485d1
-EBUILD pandoc-bin-3.6.2.ebuild 1484 BLAKE2B c8a8e67b62fa52a51fea4d29f08d522546422ba2321225cbe7c934354e36552e24b1b41088ad4cd5e3c0b8af3d1fa6ecfd9eb7ce06b2065eaaef459419015cd8 SHA512 8ec1c667d07e5011e8430eb4226db3bb51af2b99992ff0926693ae65feb607375f81ddf7115a3d7ee70c346db129a8a2c172def49bd2e8d7eefca842f434ebe5
+EBUILD pandoc-bin-3.6.2.ebuild 1482 BLAKE2B cb3fb2d97b37d03c0f5b8a0b4e7ba2e24d9c849cb6234ae793513a8203a2e9707663f4d196b476fcef00cb2eebbd8c35f76079405a1d2093304cb848418a0a13 SHA512 41bf87bed327f0763f19003947aa2924a978095d696a296f4ef010fb9cae85f6d96febb09d259136b859970f6c887dda93201a7d6777b244a5c173a0091485d1
EBUILD pandoc-bin-3.6.3.ebuild 1379 BLAKE2B 2624cc7f395deaef313e83d4a84753dceda9bda8f7826382cedb69a426167863d24e37742468a3c00a88726397b5de10ece1f9669ebb8e680d00a947438efe3c SHA512 38d6bad864c44bd96d604802a5be14b377b8cb8ccbcfffcea4f4c09419f758ab93051e257ceb88c593fc1b4662c8b0356b55f59c5643e7c0680be9fa1c1df66e
EBUILD pandoc-bin-3.6.ebuild 1482 BLAKE2B cb3fb2d97b37d03c0f5b8a0b4e7ba2e24d9c849cb6234ae793513a8203a2e9707663f4d196b476fcef00cb2eebbd8c35f76079405a1d2093304cb848418a0a13 SHA512 41bf87bed327f0763f19003947aa2924a978095d696a296f4ef010fb9cae85f6d96febb09d259136b859970f6c887dda93201a7d6777b244a5c173a0091485d1
MISC metadata.xml 986 BLAKE2B 10ab442c2f7892545054ba2747c0cde115d9d875673c077d2cefcd035e2ecd6d04f2aef05ef9ca58a2150a983079ad8fbdc6910ca93fc14977409041e5f20201 SHA512 c8e241d4d7bba0a6f36320517d18fbb99922e32970d7771d5bbc80a8ecf5086f8f7d1eadd0188d457412a66db898d044074b4d4f0301aab1e19cd1213e562375
diff --git a/app-text/pandoc-bin/pandoc-bin-3.6.2.ebuild b/app-text/pandoc-bin/pandoc-bin-3.6.2.ebuild
index 1b22b8e31a1e..add159d3d4db 100644
--- a/app-text/pandoc-bin/pandoc-bin-3.6.2.ebuild
+++ b/app-text/pandoc-bin/pandoc-bin-3.6.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* amd64 arm64"
IUSE="+pandoc-symlink"
RDEPEND="
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 55cfbdea773e..44f235c16c7d 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,13 +6,10 @@ AUX poppler-24.11.0-readd-StructTreeRoot.patch 698 BLAKE2B 08171ca524a1005a92362
AUX poppler-24.11.0-readd-ViewerPreferences.patch 719 BLAKE2B bd3e34a65493b7b76e0cfef98f6ef91ef62bf98aed0250a0d1ca16c0d7ff4babe112513746368c8506d9c844491d1f3d8f1b2986f5c4b8d71bcc7d2102a85f32 SHA512 9b68c2b826b73523f94d5c2264b636ea2962d9d3574185ea913b8387b1ad584a2c42792f648a9093f25a5599b3c53228b9215c37eaf966ed7ad800c551ad5e79
DIST poppler-24.11.0.tar.xz 1922804 BLAKE2B 2ee77ddfd49ab4b3f486fcd160be21fdf2d474e44b6cdfd40a7f927cbe253d407a6f75b66de83ab541288a54558445e409b283a81c7a8ff20f9a6d0d4f33adf7 SHA512 3823c024d9b1cab7c4ee8a99d5209722296cce8894e3f4ba8d5a84ab6bba430fa0c1078bfcddcdbc1c30bd98832e269df2aef1d5af20c1985b9f903cb70a24e7
DIST poppler-24.11.0.tar.xz.sig 833 BLAKE2B 7ef6e5bd5659c91dc5924367b7875a3946116a71b0cc02d98a1cccd51d4a46b8d8b219681e576ba7ea27f736c8a5220ae98acb0f454ac4785c03d1c66d104046 SHA512 7b935eaa99c4c3e8706bfcb010245babf5a4f08f6809a340239a0c40eed0a79472c34e4722d4b480e20fa6618106cc5e9583e209e025689f1fae06c5c499f95f
-DIST poppler-25.01.0.tar.xz 1942508 BLAKE2B e6d7711ac09abb981cca915999bfaeb16032989a8b1fed9eba06e4d5cb3bfd6bb76496243fb77fb05a9fe9b6a327571adffea4d943877b1f2693014bc2aeec52 SHA512 9791e32099a13a8e80c87f7be874da0fee21f84246c0d9e37ad0e902189e9bf027a35757e26a1b2bf161a098d0bed29abc1550301767d686928ed77c37977b93
-DIST poppler-25.01.0.tar.xz.sig 833 BLAKE2B 4b24055737c95e50d18a490809e4f24e14c730c474a623d507c6b6a1a38c0521becc42e7a3fb0e35a2697110a534a66611b77c98ab71ebfbfb6dfd674725723d SHA512 42600fc952416dc7b5f36c9696de5ee356d6eb50980fd06d3409923bfdd66d83e594b3a1eb6a499f6d51e516477a39d60f289d35789f53c2edb590c09d7c83b0
DIST poppler-25.02.0.tar.xz 1943728 BLAKE2B 4d58a6b4dbef0f45119ce9c18ebc9838cf65a18cb41fd08bbcbb9adb4d06adbb81c1fb50255cc6d96e5504a54e6756b6b6efb4bc7d34d19d47fb0089f8673d3f SHA512 5223dd2c6f4014b40da989d9a09cea7e8ae5441b4c511c89aab731abed6b72c817633addd591da34743f86cb81b0e147df05ac99ada2e3d2a13d287abef5c4a0
DIST poppler-25.02.0.tar.xz.sig 833 BLAKE2B 93a2443590ed97e09bced44a0b3aeff4dbcf74358923527bef8effcb09c14a0ac14e45aef7c76d929bb7b966b8aaf7417c551911f789ecf888f9bb04d9405c10 SHA512 6d723138c87a753d8d65e28f803fa6a75dbeb4f7e0510155f910e7d76c87e2b70554010214e7d125c1b619a672b251428de81bdde49ab682c5117eb1ff4847d2
DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
EBUILD poppler-24.11.0-r1.ebuild 4601 BLAKE2B 445cb55f547da3a3c4b0ddfadb7caebf54f82c5d50a5695e54b41443b4c1d362d424de98733a1c8fd9366dac6c254741a394e179dbcde927dbc1f437af283ee6 SHA512 0d05d9637903b61c9ed0095a3f9555cdb6609ef5ea15224f103976c08ad43996ca6261ff25976968f3007d619fdb44fabe145787fd4a30052fd0fc9be6230673
-EBUILD poppler-25.01.0.ebuild 4455 BLAKE2B 72d43f21e46cb6372e4c787fbf4842a6c1a0011e276168dc926ca0baf1cd7f27798136a630df841a6bc7174a9392389165657b91e9c93ffd9dca379d8ffe673b SHA512 30cdd21a6bd901bb2947d38395ef966c995b8248afe5d6d63d1a2ee281ab47c5842062998f847925b12bc3a745f4d6e68aa4f5f63cf78f9749f15f4370884563
EBUILD poppler-25.02.0.ebuild 4455 BLAKE2B b98668e6ae63ff035fb4525fc364266b6e6b25a3ff16a7dc3121fd465b92189bf6cd9a1ddf5bcb26171c43e0d192b3d3fd4660fa8632e9fd4232db725560adb2 SHA512 8efc7d62378982931c6d226f7cb6a71c0a4dc01a614d843c90ee9163ab375d8dabd8071b86ac4efc876f59de2aafed74478e65f82a2045bdc4977ed2ca63c051
EBUILD poppler-9999.ebuild 4455 BLAKE2B b98668e6ae63ff035fb4525fc364266b6e6b25a3ff16a7dc3121fd465b92189bf6cd9a1ddf5bcb26171c43e0d192b3d3fd4660fa8632e9fd4232db725560adb2 SHA512 8efc7d62378982931c6d226f7cb6a71c0a4dc01a614d843c90ee9163ab375d8dabd8071b86ac4efc876f59de2aafed74478e65f82a2045bdc4977ed2ca63c051
MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-25.01.0.ebuild b/app-text/poppler/poppler-25.01.0.ebuild
deleted file mode 100644
index 623628e1947e..000000000000
--- a/app-text/poppler/poppler-25.01.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 2005-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.freedesktop.org/poppler/poppler"
- SLOT="0/9999"
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
- inherit verify-sig
-
- TEST_COMMIT="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410"
- SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
- SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
- SLOT="0/145" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- >=media-libs/fontconfig-2.13
- >=media-libs/freetype-2.10
- sys-libs/zlib
- cairo? (
- >=dev-libs/glib-2.64:2
- >=x11-libs/cairo-1.16
- introspection? ( >=dev-libs/gobject-introspection-1.72:= )
- )
- curl? ( net-misc/curl )
- gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
- jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
- jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
- lcms? ( media-libs/lcms:2 )
- nss? ( >=dev-libs/nss-3.49 )
- png? ( media-libs/libpng:0= )
- qt5? (
- >=dev-qt/qtcore-5.15.2:5
- >=dev-qt/qtgui-5.15.2:5
- >=dev-qt/qtxml-5.15.2:5
- )
- qt6? ( dev-qt/qtbase:6[gui,xml] )
- tiff? ( media-libs/tiff:= )
-"
-RDEPEND="${COMMON_DEPEND}
- cjk? ( app-text/poppler-data )
-"
-DEPEND="${COMMON_DEPEND}
- boost? ( >=dev-libs/boost-1.74 )
- test? (
- qt5? (
- >=dev-qt/qttest-5.15.2:5
- >=dev-qt/qtwidgets-5.15.2:5
- )
- qt6? ( dev-qt/qtbase:6[widgets] )
- )
-"
-BDEPEND="
- >=dev-util/glib-utils-2.64
- virtual/pkgconfig
-"
-
-if [[ ${PV} != *9999* ]] ; then
- BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
-fi
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
- "${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
- "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_unpack() {
- if [[ ${PV} == *9999* ]] ; then
- git-r3_src_unpack
- elif use verify-sig ; then
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
- fi
-
- default
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # Clang doesn't grok this flag, the configure nicely tests that, but
- # cmake just uses it, so remove it if we use clang
- if tc-is-clang ; then
- sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
- fi
-
- if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
- sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
- -i CMakeLists.txt || die
- else
- einfo "policy(SET CMP0002 OLD) - workaround can be removed"
- fi
-}
-
-src_configure() {
- xdg_environment_reset
- append-lfs-flags # bug #898506
-
- local mycmakeargs=(
- -DBUILD_GTK_TESTS=OFF
- -DBUILD_QT5_TESTS=$(usex test $(usex qt5))
- -DBUILD_QT6_TESTS=$(usex test $(usex qt6))
- -DBUILD_CPP_TESTS=$(usex test)
- -DBUILD_MANUAL_TESTS=$(usex test)
- -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
- -DRUN_GPERF_IF_PRESENT=OFF
- -DENABLE_BOOST="$(usex boost)"
- -DENABLE_ZLIB_UNCOMPRESS=OFF
- -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
- -DUSE_FLOAT=OFF
- -DWITH_Cairo=$(usex cairo)
- -DENABLE_LIBCURL=$(usex curl)
- -DENABLE_CPP=$(usex cxx)
- -DENABLE_GPGME=$(usex gpgme)
- -DWITH_JPEG=$(usex jpeg)
- -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
- -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
- -DENABLE_LCMS=$(usex lcms)
- -DENABLE_NSS3=$(usex nss)
- -DWITH_PNG=$(usex png)
- -DENABLE_QT5=$(usex qt5)
- -DENABLE_QT6=$(usex qt6)
- -DENABLE_LIBTIFF=$(usex tiff)
- -DENABLE_UTILS=$(usex utils)
- )
- use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- # live version doesn't provide html documentation
- if use cairo && use doc && [[ ${PV} != *9999* ]]; then
- # For now install gtk-doc there
- insinto /usr/share/gtk-doc/html/poppler
- doins -r "${S}"/glib/reference/html/*
- fi
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-06 23:40:33 +0000