revert to last rev
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=94
This commit is contained in:
parent
a70158db01
commit
13cc8acd02
@ -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)
|
||||
|
@ -1,9 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 8 15:14:02 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- 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 <bjorn.lie@gmail.com>
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user