Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pdfmixtool for openSUSE:Factory checked in at 2021-06-25 15:01:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pdfmixtool (Old) and /work/SRC/openSUSE:Factory/.pdfmixtool.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pdfmixtool" Fri Jun 25 15:01:29 2021 rev:3 rq:902221 version:1.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/pdfmixtool/pdfmixtool.changes 2021-06-18 10:14:03.130015334 +0200 +++ /work/SRC/openSUSE:Factory/.pdfmixtool.new.2625/pdfmixtool.changes 2021-06-25 15:02:13.676216714 +0200 @@ -1,0 +2,13 @@ +Thu Jun 24 21:00:15 UTC 2021 - Asterios Dramis <[email protected]> + +- Removed fix for rpmlint warning "files-duplicate" and fdupes + build requirement (not needed anymore). + +------------------------------------------------------------------- +Thu Jun 24 19:54:54 UTC 2021 - ecsos <[email protected]> + +- Update to 1.0.2 + - Improve compatibility with stable distros and multiarch distros +- Drop qpdf9.patch because now in upstream. + +------------------------------------------------------------------- Old: ---- pdfmixtool-v1.0.1.tar.bz2 qpdf9.patch New: ---- pdfmixtool-v1.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdfmixtool.spec ++++++ --- /var/tmp/diff_new_pack.EV8jVO/_old 2021-06-25 15:02:14.100217232 +0200 +++ /var/tmp/diff_new_pack.EV8jVO/_new 2021-06-25 15:02:14.100217232 +0200 @@ -17,17 +17,14 @@ Name: pdfmixtool -Version: 1.0.1 +Version: 1.0.2 Release: 0 Summary: Split, Merge, Rotate and Mix PDF Files License: GPL-3.0-only Group: Productivity/Publishing/PDF URL: https://gitlab.com/scarpetta/pdfmixtool/ Source0: https://gitlab.com/scarpetta/pdfmixtool/-/archive/v%{version}/%{name}-v%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM qpdf9.patch [email protected] -- Fix compilation with qpdf-9 in Leap <= 15.2 -Patch0: qpdf9.patch BuildRequires: cmake -BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig BuildRequires: update-desktop-files @@ -42,9 +39,6 @@ %prep %setup -q -n %{name}-v%{version} -%if 0%{?sle_version} <= 150200 && 0%{?is_opensuse} -%patch0 -p1 -%endif %build %cmake @@ -53,10 +47,6 @@ %install %cmake_install %suse_update_desktop_file -r -G "PDF Mix Tool" eu.scarpetta.PDFMixTool Qt Office Publishing Graphics Viewer -# Fix rpmlint warning "files-duplicate" -install -dpm 0755 %{buildroot}%{_defaultdocdir}/%{name} -install -pm 0644 AUTHORS.md CHANGELOG.md TRANSLATORS.md %{buildroot}%{_defaultdocdir}/%{name}/ -%fdupes -s %{buildroot} %files %license LICENSE @@ -65,6 +55,5 @@ %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/metainfo/*.xml -%{_datadir}/pdfmixtool/ %changelog ++++++ pdfmixtool-v1.0.1.tar.bz2 -> pdfmixtool-v1.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/CHANGELOG.md new/pdfmixtool-v1.0.2/CHANGELOG.md --- old/pdfmixtool-v1.0.1/CHANGELOG.md 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/CHANGELOG.md 2021-06-19 20:34:11.000000000 +0200 @@ -1,5 +1,13 @@ <h1>Changelog</h1> +<h2>Version 1.0.2</h2> + +<p><strong>Release date:</strong> 2021-06-19</p> + +<ul> + <li>Improve compatibility with stable distros and multiarch distros</li> +</ul> + <h2>Version 1.0.1</h2> <p><strong>Release date:</strong> 2021-06-13</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/CMakeLists.txt new/pdfmixtool-v1.0.2/CMakeLists.txt --- old/pdfmixtool-v1.0.1/CMakeLists.txt 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/CMakeLists.txt 2021-06-19 20:34:11.000000000 +0200 @@ -2,15 +2,29 @@ project (PDFMixTool) +include(GNUInstallDirs) +include(FindPkgConfig) + set(CMAKE_CXX_STANDARD 11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic") endif() +pkg_check_modules(QPDF libqpdf) +if (DEFINED QPDF_VERSION) + string(REPLACE "." ";" QPDF_VERSION_LIST ${QPDF_VERSION}) + list(GET QPDF_VERSION_LIST 0 QPDF_VERSION_MAJOR) +else() + set(QPDF_VERSION_MAJOR 10) +endif() +configure_file(src/qpdf_version.h.in qpdf_version.h @ONLY) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + file(GLOB TS_FILES LIST_DIRECTORIES false languages/pdfmixtool_*.ts @@ -26,6 +40,14 @@ qt6_add_translation(QM_FILES ${TS_FILES} resources/pdfmixtool_en.ts) endif() +set(TRANSLATIONS_QRC "${CMAKE_CURRENT_BINARY_DIR}/tr.qrc") +file(WRITE ${TRANSLATIONS_QRC} "<RCC><qresource prefix=\"/tr\">") +foreach(QM_FILE ${QM_FILES}) + get_filename_component(QM_FILE_NAME ${QM_FILE} NAME) + file(APPEND ${TRANSLATIONS_QRC} "<file>${QM_FILE_NAME}</file>") +endforeach() +file(APPEND ${TRANSLATIONS_QRC} "</qresource></RCC>") + set ( SRCS src/main.cpp @@ -86,8 +108,8 @@ add_executable ( pdfmixtool ${SRCS} - ${QM_FILES} - ${EN_QM_FILE} + resources/resources.qrc + ${TRANSLATIONS_QRC} ) target_link_libraries ( @@ -96,27 +118,11 @@ ${QT_LIBRARIES} ) -file(GLOB ICONS - LIST_DIRECTORIES false - resources/*.svg -) - -install(TARGETS pdfmixtool RUNTIME DESTINATION bin) -install(FILES resources/eu.scarpetta.PDFMixTool.desktop DESTINATION share/applications) -install(FILES resources/eu.scarpetta.PDFMixTool.appdata.xml DESTINATION share/metainfo) -install(FILES resources/icon.svg DESTINATION share/icons/hicolor/scalable/apps RENAME eu.scarpetta.PDFMixTool.svg) -install(FILES resources/icon_48.png DESTINATION share/icons/hicolor/48x48/apps RENAME eu.scarpetta.PDFMixTool.png) -install(FILES resources/icon_64.png DESTINATION share/icons/hicolor/64x64/apps RENAME eu.scarpetta.PDFMixTool.png) -install(FILES resources/icon_128.png DESTINATION share/icons/hicolor/128x128/apps RENAME eu.scarpetta.PDFMixTool.png) -install(FILES resources/icon_256.png DESTINATION share/icons/hicolor/256x256/apps RENAME eu.scarpetta.PDFMixTool.png) -install(FILES ${ICONS} DESTINATION share/pdfmixtool/icons) -install(FILES ${QM_FILES} DESTINATION share/pdfmixtool/translations) -install(FILES CHANGELOG.md DESTINATION share/pdfmixtool) -install(FILES AUTHORS.md DESTINATION share/pdfmixtool) -install(FILES TRANSLATORS.md DESTINATION share/pdfmixtool) - -add_custom_command( - TARGET pdfmixtool - POST_BUILD - COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -P cmake_install.cmake -) +INSTALL(TARGETS pdfmixtool RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +INSTALL(FILES resources/eu.scarpetta.PDFMixTool.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) +INSTALL(FILES resources/eu.scarpetta.PDFMixTool.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) +INSTALL(FILES resources/icon.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps RENAME eu.scarpetta.PDFMixTool.svg) +INSTALL(FILES resources/icon_48.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps RENAME eu.scarpetta.PDFMixTool.png) +INSTALL(FILES resources/icon_64.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps RENAME eu.scarpetta.PDFMixTool.png) +INSTALL(FILES resources/icon_128.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps RENAME eu.scarpetta.PDFMixTool.png) +INSTALL(FILES resources/icon_256.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/256x256/apps RENAME eu.scarpetta.PDFMixTool.png) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/README.md new/pdfmixtool-v1.0.2/README.md --- old/pdfmixtool-v1.0.1/README.md 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/README.md 2021-06-19 20:34:11.000000000 +0200 @@ -38,7 +38,7 @@ To build PDF Mix Tool you need the following libraries and tools: - **Qt** (base, svg and tools) >= **5.11** -- **qpdf** >= **10.0.0** +- **qpdf** (version >= **10.0.0** recommended) - **CMake** >= **3.6** Run the following commands inside the git repository directory: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/languages/pdfmixtool_de.ts new/pdfmixtool-v1.0.2/languages/pdfmixtool_de.ts --- old/pdfmixtool-v1.0.1/languages/pdfmixtool_de.ts 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/languages/pdfmixtool_de.ts 2021-06-19 20:34:11.000000000 +0200 @@ -180,7 +180,7 @@ <message> <location filename="../src/operations/alternate_mix.cpp" line="26"/> <source>Alternate mix</source> - <translation>Alternativer Mix</translation> + <translation>Alternierend mischen</translation> </message> </context> <context> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/resources/eu.scarpetta.PDFMixTool.appdata.xml new/pdfmixtool-v1.0.2/resources/eu.scarpetta.PDFMixTool.appdata.xml --- old/pdfmixtool-v1.0.1/resources/eu.scarpetta.PDFMixTool.appdata.xml 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/resources/eu.scarpetta.PDFMixTool.appdata.xml 2021-06-19 20:34:11.000000000 +0200 @@ -66,6 +66,13 @@ <content_rating type="oars-1.0" /> <releases> + <release version="1.0.2" date="2021-06-19"> + <description> + <ul> + <li>Improve compatibility with stable distros and multiarch distros</li> + </ul> + </description> + </release> <release version="1.0.1" date="2021-06-13"> <description> <ul> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/resources/eu.scarpetta.PDFMixTool.desktop new/pdfmixtool-v1.0.2/resources/eu.scarpetta.PDFMixTool.desktop --- old/pdfmixtool-v1.0.1/resources/eu.scarpetta.PDFMixTool.desktop 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/resources/eu.scarpetta.PDFMixTool.desktop 2021-06-19 20:34:11.000000000 +0200 @@ -11,5 +11,5 @@ Type=Application StartupNotify=true StartupWMClass=pdfmixtool -Categories=Office +Categories=Office; Keywords=pdf; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/resources/resources.qrc new/pdfmixtool-v1.0.2/resources/resources.qrc --- old/pdfmixtool-v1.0.1/resources/resources.qrc 1970-01-01 01:00:00.000000000 +0100 +++ new/pdfmixtool-v1.0.2/resources/resources.qrc 2021-06-19 20:34:11.000000000 +0200 @@ -0,0 +1,19 @@ +<RCC> + <qresource prefix="/icons"> + <file>add_empty_pages.svg</file> + <file>alternate_mix.svg</file> + <file>booklet.svg</file> + <file>delete.svg</file> + <file>edit_document_info.svg</file> + <file>extract.svg</file> + <file>icon.svg</file> + <file>merge.svg</file> + <file>pages_layout.svg</file> + <file>rotate.svg</file> + </qresource> + <qresource prefix="/docs"> + <file>../AUTHORS.md</file> + <file>../CHANGELOG.md</file> + <file>../TRANSLATORS.md</file> + </qresource> +</RCC> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/aboutdialog.cpp new/pdfmixtool-v1.0.2/src/aboutdialog.cpp --- old/pdfmixtool-v1.0.1/src/aboutdialog.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/aboutdialog.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -43,8 +43,7 @@ connect(close_button, SIGNAL(pressed()), this, SLOT(close())); QLabel *application_icon = new QLabel(this); - application_icon->setPixmap(QPixmap(QString(ICON_PATH).arg - (qApp->applicationDirPath()))); + application_icon->setPixmap(QPixmap(":/icons/icon.svg")); application_icon->setAlignment(Qt::AlignCenter); QLabel *application_name = new QLabel( @@ -78,13 +77,10 @@ QScrollArea *scroll_area = new QScrollArea(); scroll_area->setBackgroundRole(QPalette::Light); - QFile authors(QString("%1/../share/pdfmixtool/AUTHORS.md").arg( - qApp->applicationDirPath())); + QFile authors(":/docs/AUTHORS.md"); authors.open(QIODevice::ReadOnly | QIODevice::Text); - QFile translator_credits( - QString("%1/../share/pdfmixtool/TRANSLATORS.md").arg( - qApp->applicationDirPath())); + QFile translator_credits(":/docs/TRANSLATORS.md"); translator_credits.open(QIODevice::ReadOnly | QIODevice::Text); QLabel *credits = new QLabel(this); @@ -151,8 +147,7 @@ scroll_area = new QScrollArea(); scroll_area->setBackgroundRole(QPalette::Light); - QFile file(QString("%1/../share/pdfmixtool/CHANGELOG.md").arg( - qApp->applicationDirPath())); + QFile file(":/docs/CHANGELOG.md"); file.open(QIODevice::ReadOnly | QIODevice::Text); QLabel *changelog = new QLabel(this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/aboutdialog.h new/pdfmixtool-v1.0.2/src/aboutdialog.h --- old/pdfmixtool-v1.0.1/src/aboutdialog.h 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/aboutdialog.h 2021-06-19 20:34:11.000000000 +0200 @@ -21,9 +21,6 @@ #include <QDialog> -#define ICON_PATH "%1/../share/icons/hicolor/128x128/\ -apps/eu.scarpetta.PDFMixTool.png" - class AboutDialog : public QDialog { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/main.cpp new/pdfmixtool-v1.0.2/src/main.cpp --- old/pdfmixtool-v1.0.1/src/main.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/main.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -36,18 +36,14 @@ app.setApplicationDisplayName("PDF Mix Tool"); app.setOrganizationDomain("scarpetta.eu"); app.setOrganizationName("PDFMixTool"); - app.setApplicationVersion("1.0.1"); + app.setApplicationVersion("1.0.2"); app.setDesktopFileName("eu.scarpetta.PDFMixTool"); // Set up translations QTranslator translator; bool ok = translator.load( - QString("pdfmixtool_%1.qm").arg(QLocale::system().name()), - QString("%1/../share/pdfmixtool/translations").arg( - qApp->applicationDirPath() - ) - ); + QString(":/tr/pdfmixtool_%1.qm").arg(QLocale::system().name())); if (ok) app.installTranslator(&translator); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/mainwindow.cpp new/pdfmixtool-v1.0.2/src/mainwindow.cpp --- old/pdfmixtool-v1.0.1/src/mainwindow.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/mainwindow.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -45,8 +45,7 @@ m_operations_list(new QListWidget(this)) { // Main window properties - this->setWindowIcon(QIcon(QString(ICON_PATH).arg( - qApp->applicationDirPath()))); + this->setWindowIcon(QIcon(":/icons/icon.svg")); this->setWindowTitle(qApp->applicationDisplayName()); this->restoreGeometry( settings->value("main_window_geometry").toByteArray()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/operations/abstract_operation.cpp new/pdfmixtool-v1.0.2/src/operations/abstract_operation.cpp --- old/pdfmixtool-v1.0.1/src/operations/abstract_operation.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/operations/abstract_operation.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -32,13 +32,10 @@ AbstractOperation::AbstractOperation(QWidget *parent) : QWidget(parent), - m_icon_dir{QString("%1/../share/pdfmixtool/icons").arg( - qApp->applicationDirPath() - )}, m_is_single_file_operation{true}, m_active{false} { - m_icon = QIcon(m_icon_dir.filePath("icon.svg")); + m_icon = QIcon(":/icons/icon.svg"); m_save_button.setIcon(QIcon::fromTheme("document-save")); m_save_button.setText(tr("Save")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/operations/abstract_operation.h new/pdfmixtool-v1.0.2/src/operations/abstract_operation.h --- old/pdfmixtool-v1.0.1/src/operations/abstract_operation.h 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/operations/abstract_operation.h 2021-06-19 20:34:11.000000000 +0200 @@ -66,7 +66,6 @@ protected: QString m_name; - QDir m_icon_dir; QIcon m_icon; bool m_is_single_file_operation; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/operations/add_empty_pages.cpp new/pdfmixtool-v1.0.2/src/operations/add_empty_pages.cpp --- old/pdfmixtool-v1.0.1/src/operations/add_empty_pages.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/operations/add_empty_pages.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -30,7 +30,7 @@ AbstractOperation(parent) { m_name = tr("Add empty pages"); - m_icon = QIcon(m_icon_dir.filePath("add_empty_pages.svg")); + m_icon = QIcon(":/icons/add_empty_pages.svg"); QVBoxLayout *v_layout = new QVBoxLayout(); QGridLayout *grid_layout = new QGridLayout(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/operations/alternate_mix.cpp new/pdfmixtool-v1.0.2/src/operations/alternate_mix.cpp --- old/pdfmixtool-v1.0.1/src/operations/alternate_mix.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/operations/alternate_mix.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -24,7 +24,7 @@ Merge(parent) { m_name = tr("Alternate mix"); - m_icon = QIcon(m_icon_dir.filePath("alternate_mix.svg")); + m_icon = QIcon(":/icons/alternate_mix.svg"); m_delegate->set_alternate_mix(true); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/operations/booklet.cpp new/pdfmixtool-v1.0.2/src/operations/booklet.cpp --- old/pdfmixtool-v1.0.1/src/operations/booklet.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/operations/booklet.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -29,7 +29,7 @@ AbstractOperation(parent) { m_name = tr("Booklet"); - m_icon = QIcon(m_icon_dir.filePath("booklet.svg")); + m_icon = QIcon(":/icons/booklet.svg"); QVBoxLayout *v_layout = new QVBoxLayout(); QFormLayout *form_layout = new QFormLayout(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/operations/delete_pages.cpp new/pdfmixtool-v1.0.2/src/operations/delete_pages.cpp --- old/pdfmixtool-v1.0.1/src/operations/delete_pages.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/operations/delete_pages.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -30,7 +30,7 @@ AbstractOperation(parent) { m_name = tr("Delete pages"); - m_icon = QIcon(m_icon_dir.filePath("delete.svg")); + m_icon = QIcon(":/icons/delete.svg"); m_pages_selector = new PagesSelector(false, false, this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/operations/edit_document_info.cpp new/pdfmixtool-v1.0.2/src/operations/edit_document_info.cpp --- old/pdfmixtool-v1.0.1/src/operations/edit_document_info.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/operations/edit_document_info.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -12,7 +12,7 @@ AbstractOperation(parent) { m_name = tr("Document information"); - m_icon = QIcon(m_icon_dir.filePath("edit_document_info.svg")); + m_icon = QIcon(":/icons/edit_document_info.svg"); QVBoxLayout *v_layout = new QVBoxLayout(); this->setLayout(v_layout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/operations/edit_page_layout.cpp new/pdfmixtool-v1.0.2/src/operations/edit_page_layout.cpp --- old/pdfmixtool-v1.0.1/src/operations/edit_page_layout.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/operations/edit_page_layout.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -32,7 +32,7 @@ m_output_preview{new OutputPreview{this}} { m_name = tr("Pages layout"); - m_icon = QIcon(m_icon_dir.filePath("pages_layout.svg")); + m_icon = QIcon(":/icons/pages_layout.svg"); QVBoxLayout *v_layout = new QVBoxLayout(); this->setLayout(v_layout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/operations/extract_pages.cpp new/pdfmixtool-v1.0.2/src/operations/extract_pages.cpp --- old/pdfmixtool-v1.0.1/src/operations/extract_pages.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/operations/extract_pages.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -33,7 +33,7 @@ AbstractOperation(parent) { m_name = tr("Extract pages"); - m_icon = QIcon(m_icon_dir.filePath("extract.svg")); + m_icon = QIcon(":/icons/extract.svg"); QVBoxLayout *v_layout = new QVBoxLayout(); this->setLayout(v_layout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/operations/merge.cpp new/pdfmixtool-v1.0.2/src/operations/merge.cpp --- old/pdfmixtool-v1.0.1/src/operations/merge.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/operations/merge.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -40,7 +40,7 @@ m_edit_menu(new QMenu(this)) { m_name = tr("Merge PDF files"); - m_icon = QIcon(m_icon_dir.filePath("merge.svg")); + m_icon = QIcon(":/icons/merge.svg"); m_is_single_file_operation = false; // Create delegate for files list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/operations/rotate.cpp new/pdfmixtool-v1.0.2/src/operations/rotate.cpp --- old/pdfmixtool-v1.0.1/src/operations/rotate.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/operations/rotate.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -30,7 +30,7 @@ m_pages_selector{new PagesSelector{true, true, this}} { m_name = tr("Rotate"); - m_icon = QIcon(m_icon_dir.filePath("rotate.svg")); + m_icon = QIcon(":/icons/rotate.svg"); QVBoxLayout *v_layout = new QVBoxLayout{}; this->setLayout(v_layout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/pdf_edit_lib/pdf_editor.cpp new/pdfmixtool-v1.0.2/src/pdf_edit_lib/pdf_editor.cpp --- old/pdfmixtool-v1.0.1/src/pdf_edit_lib/pdf_editor.cpp 2021-06-13 17:09:12.000000000 +0200 +++ new/pdfmixtool-v1.0.2/src/pdf_edit_lib/pdf_editor.cpp 2021-06-19 20:34:11.000000000 +0200 @@ -26,6 +26,7 @@ #include <qpdf/QPDFPageLabelDocumentHelper.hh> #include <qpdf/QPDFAcroFormDocumentHelper.hh> #include <qpdf/QPDFOutlineDocumentHelper.hh> +#include "qpdf_version.h" QPDFOutlineDocumentHelper::~QPDFOutlineDocumentHelper() { @@ -670,6 +671,15 @@ int min_suffix = 0; std::string name = resources.getUniqueResourceName("/Fx", min_suffix); +#if QPDF_VERSION_MAJOR < 10 + std::string content = outer_page.placeFormXObject( + page_xobject, + name, + QPDFObjectHandle::Rectangle( + x, y, + x + page_width, y + page_height), + false); +#else std::string content = outer_page.placeFormXObject( page_xobject, name, @@ -679,6 +689,7 @@ false, true, true); +#endif if (!content.empty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pdfmixtool-v1.0.1/src/qpdf_version.h.in new/pdfmixtool-v1.0.2/src/qpdf_version.h.in --- old/pdfmixtool-v1.0.1/src/qpdf_version.h.in 1970-01-01 01:00:00.000000000 +0100 +++ new/pdfmixtool-v1.0.2/src/qpdf_version.h.in 2021-06-19 20:34:11.000000000 +0200 @@ -0,0 +1 @@ +#cmakedefine QPDF_VERSION_MAJOR @QPDF_VERSION_MAJOR@
