From 13cc8acd02b0309c70ea9dca6edebcb60c9f15078eb4ad861aa66f7a192ead29 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Thu, 9 Jan 2025 17:53:36 +0000 Subject: [PATCH] revert to last rev OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=94 --- fix_build_with_poppler_25.01.0.patch | 26 -------------------------- scribus.changes | 6 ------ scribus.spec | 2 -- 3 files changed, 34 deletions(-) delete mode 100644 fix_build_with_poppler_25.01.0.patch diff --git a/fix_build_with_poppler_25.01.0.patch b/fix_build_with_poppler_25.01.0.patch deleted file mode 100644 index ffca0c0..0000000 --- a/fix_build_with_poppler_25.01.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -Subject: fix build with poppler 25.01.0 -## patch from arch linux -## https://gitlab.archlinux.org/archlinux/packaging/packages/scribus/-/blob/main/fix_build_with_poppler_25.01.0.patch?ref_type=heads - -diff --unified --recursive --text --new-file scribus-1.6.2.orig/scribus/plugins/import/pdf/slaoutput.cpp scribus-1.6.2/scribus/plugins/import/pdf/slaoutput.cpp ---- scribus-1.6.2.orig/scribus/plugins/import/pdf/slaoutput.cpp 2025-01-05 14:55:32.980845515 +0100 -+++ scribus-1.6.2/scribus/plugins/import/pdf/slaoutput.cpp 2025-01-05 14:56:43.914591368 +0100 -@@ -123,7 +123,7 @@ - - Object obj3 = getFileSpecNameForPlatform(&obj1); - if (!obj3.isNull()) -- fileName = obj3.getString()->copy(); -+ fileName = obj3.getString()->copy().release(); - } - - LinkImportData::~LinkImportData() -@@ -176,7 +176,7 @@ - if (state->getFont()) - fontName = state->getFont()->getName()->copy(); - #endif -- itemText = s->copy(); -+ itemText = s->copy().release(); - } - - QString AnoOutputDev::getColor(GfxColorSpace *color_space, const GfxColor *color, int *shade) - diff --git a/scribus.changes b/scribus.changes index c4b95b3..5b019cc 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Jan 8 15:14:02 UTC 2025 - Bjørn Lie - -- Add poppler 25.01 compatibility patch: - * fix_build_with_poppler_25.01.0.patch - ------------------------------------------------------------------- Fri Dec 20 17:14:05 UTC 2024 - Bjørn Lie diff --git a/scribus.spec b/scribus.spec index 86999a0..2f54fd6 100644 --- a/scribus.spec +++ b/scribus.spec @@ -35,8 +35,6 @@ Source2: scribus.keyring Patch0: 0001-Make-sure-information-displayed-on-the-about-window-.patch # PATCH-FIX-UPSTREAM poppler... Patch1: fix_build_with_poppler_24.12.0.patch -# PATCH-FIX-UPSTREAM poppler x2 -Patch2: fix_build_with_poppler_25.01.0.patch BuildRequires: cmake >= 3.14.0 BuildRequires: cups-devel BuildRequires: dos2unix