Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package poppler for openSUSE:Factory checked
in at 2022-12-05 18:00:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/poppler (Old)
and /work/SRC/openSUSE:Factory/.poppler.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poppler"
Mon Dec 5 18:00:37 2022 rev:187 rq:1040166 version:22.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/poppler/poppler.changes 2022-11-19
18:08:51.722282885 +0100
+++ /work/SRC/openSUSE:Factory/.poppler.new.1835/poppler.changes
2022-12-05 18:00:38.724400000 +0100
@@ -1,0 +2,15 @@
+Mon Dec 5 08:28:08 UTC 2022 - Stefan Weiberg <sweib...@suse.com>
+
+- The development compiler in SLE 15 has been updated to gcc12 via
+ maintenance update. Therefore adjusting the compiler version for
+ SLE 15 in the spec file, to not build with gcc11 anymore. This
+ resolves bsc#1206019
+
+-------------------------------------------------------------------
+Sat Dec 3 20:23:48 UTC 2022 - Dirk Müller <dmuel...@suse.com>
+
+- update to 22.12.0:
+ core:
+ * Form::addFontToDefaultResources: Be stubborn in finding a font we can use.
Issue #1272
+
+-------------------------------------------------------------------
Old:
----
poppler-22.11.0.tar.xz
poppler-22.11.0.tar.xz.sig
New:
----
poppler-22.12.0.tar.xz
poppler-22.12.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ poppler.spec ++++++
--- /var/tmp/diff_new_pack.Z5tH53/_old 2022-12-05 18:00:39.436403877 +0100
+++ /var/tmp/diff_new_pack.Z5tH53/_new 2022-12-05 18:00:39.440403899 +0100
@@ -24,7 +24,7 @@
%endif
# Actual version of poppler-data:
%define poppler_data_version 0.4.11
-%define poppler_sover 125
+%define poppler_sover 126
%define poppler_cpp_sover 0
%define poppler_glib_sover 8
%define poppler_qt5_sover 1
@@ -32,7 +32,7 @@
%define poppler_api 0.18
%define poppler_apipkg 0_18
Name: poppler%{?psuffix}
-Version: 22.11.0
+Version: 22.12.0
Release: 0
Summary: PDF Rendering Library
License: GPL-2.0-only OR GPL-3.0-only
@@ -44,7 +44,7 @@
Source99: baselibs.conf
BuildRequires: cmake >= 3.10
%if 0%{?suse_version} < 1550
-BuildRequires: gcc11-c++
+BuildRequires: gcc12-c++
%else
BuildRequires: gcc-c++
%endif
++++++ poppler-22.11.0.tar.xz -> poppler-22.12.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.11.0/CMakeLists.txt
new/poppler-22.12.0/CMakeLists.txt
--- old/poppler-22.11.0/CMakeLists.txt 2022-11-01 09:40:01.000000000 +0100
+++ new/poppler-22.12.0/CMakeLists.txt 2022-12-01 21:19:03.000000000 +0100
@@ -39,7 +39,7 @@
endif()
set(POPPLER_MAJOR_VERSION "22")
-set(POPPLER_MINOR_VERSION_STRING "11")
+set(POPPLER_MINOR_VERSION_STRING "12")
# We want the string version to have 08 but the integer version can't have a
leading 0 since otherwise it's considered octal
# So strip a leading 0 if found in POPPLER_MINOR_VERSION_STRING and store the
result in POPPLER_MINOR_VERSION
string(REGEX REPLACE "^0?(.+)$" "\\1" POPPLER_MINOR_VERSION
"${POPPLER_MINOR_VERSION_STRING}")
@@ -579,7 +579,7 @@
endif()
add_library(poppler ${poppler_SRCS})
generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME
"${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h")
-set_target_properties(poppler PROPERTIES VERSION 125.0.0 SOVERSION 125)
+set_target_properties(poppler PROPERTIES VERSION 126.0.0 SOVERSION 126)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_SOVERSION poppler SOVERSION)
set_target_properties(poppler PROPERTIES SUFFIX
"-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.11.0/ChangeLog
new/poppler-22.12.0/ChangeLog
--- old/poppler-22.11.0/ChangeLog 2022-11-01 09:42:44.000000000 +0100
+++ new/poppler-22.12.0/ChangeLog 2022-12-01 21:21:31.000000000 +0100
@@ -1,3 +1,54 @@
+commit df568263c51950ceed6f1fb42f80e99a2614c275
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Thu Dec 1 21:19:03 2022 +0100
+
+ poppler 22.12.0
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 4 ++++
+ cpp/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt6/src/Doxyfile | 2 +-
+ 5 files changed, 9 insertions(+), 5 deletions(-)
+
+commit 198dc1d0674c0a462668e6868c35b1ee0e731005
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Wed Sep 7 01:12:35 2022 +0200
+
+ Form::addFontToDefaultResources: Be stubborn in finding a font we
+ can use
+
+ Fixes #1272
+
+ poppler/Form.cc | 14 ++++++++++---
+ poppler/GlobalParams.cc | 52
+ ++++++++++++++++++++++++++--------------------
+ poppler/GlobalParams.h | 6 +++---
+ poppler/GlobalParamsWin.cc | 4 ++--
+ 4 files changed, 46 insertions(+), 30 deletions(-)
+
+commit a5952ab70716a2d4f792a943c2dcf3068f1d6885
+Author: Jeremy Bicha <jeremy.bi...@canonical.com>
+Date: Wed Nov 2 15:03:24 2022 +0100
+
+ Revert "CI: Fix Debian brokenness"
+
+ This reverts commit 8fcaa7c622d24761a9ecb3922f95d072077d6f34.
+
+ Debian's systemd 252-2 fixed the bug in 252-1
+
+ .gitlab-ci.yml | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 8fcaa7c622d24761a9ecb3922f95d072077d6f34
+Author: Albert Astals Cid <aa...@kde.org>
+Date: Tue Nov 1 10:11:41 2022 +0100
+
+ CI: Fix Debian brokenness
+
+ .gitlab-ci.yml | 1 +
+ 1 file changed, 1 insertion(+)
+
commit cc665f757af6b87dd245d36e079dd44d8d2d2182
Author: Albert Astals Cid <aa...@kde.org>
Date: Tue Nov 1 09:40:01 2022 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.11.0/NEWS new/poppler-22.12.0/NEWS
--- old/poppler-22.11.0/NEWS 2022-11-01 09:40:01.000000000 +0100
+++ new/poppler-22.12.0/NEWS 2022-12-01 21:19:03.000000000 +0100
@@ -1,3 +1,7 @@
+Release 22.12.0:
+ core:
+ * Form::addFontToDefaultResources: Be stubborn in finding a font we
can use. Issue #1272
+
Release 22.11.0:
core:
* CairoOutputDev: Update font after restore
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.11.0/cpp/Doxyfile
new/poppler-22.12.0/cpp/Doxyfile
--- old/poppler-22.11.0/cpp/Doxyfile 2022-11-01 09:40:01.000000000 +0100
+++ new/poppler-22.12.0/cpp/Doxyfile 2022-12-01 21:19:03.000000000 +0100
@@ -31,7 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 22.11.0
+PROJECT_NUMBER = 22.12.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.11.0/glib/reference/html/index.html
new/poppler-22.12.0/glib/reference/html/index.html
--- old/poppler-22.11.0/glib/reference/html/index.html 2022-11-01
09:41:54.000000000 +0100
+++ new/poppler-22.12.0/glib/reference/html/index.html 2022-12-01
21:20:32.000000000 +0100
@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2"
cellspacing="0"><tr><th valign="middle"><p class="title">Poppler Reference
Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- for Poppler 22.11.0
+ for Poppler 22.12.0
</p></div>
</div>
<hr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/poppler-22.11.0/glib/reference/html/poppler-Poppler-Features.html
new/poppler-22.12.0/glib/reference/html/poppler-Poppler-Features.html
--- old/poppler-22.11.0/glib/reference/html/poppler-Poppler-Features.html
2022-11-01 09:41:54.000000000 +0100
+++ new/poppler-22.12.0/glib/reference/html/poppler-Poppler-Features.html
2022-12-01 21:20:32.000000000 +0100
@@ -205,7 +205,7 @@
<hr>
<div class="refsect2">
<a name="POPPLER-MINOR-VERSION:CAPS"></a><h3>POPPLER_MINOR_VERSION</h3>
-<pre class="programlisting">#define POPPLER_MINOR_VERSION (11)
+<pre class="programlisting">#define POPPLER_MINOR_VERSION (12)
</pre>
<p>The major version number of the poppler header files (e.g. in poppler
version
0.1.2 this is 1.)</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.11.0/poppler/Form.cc
new/poppler-22.12.0/poppler/Form.cc
--- old/poppler-22.11.0/poppler/Form.cc 2022-11-01 09:40:01.000000000 +0100
+++ new/poppler-22.12.0/poppler/Form.cc 2022-12-01 21:19:03.000000000 +0100
@@ -2727,9 +2727,17 @@
Form::AddFontResult Form::addFontToDefaultResources(const std::string
&fontFamily, const std::string &fontStyle)
{
- const FamilyStyleFontSearchResult res =
globalParams->findSystemFontFileForFamilyAndStyle(fontFamily, fontStyle);
-
- return addFontToDefaultResources(res.filepath, res.faceIndex, fontFamily,
fontStyle);
+ FamilyStyleFontSearchResult findFontRes =
globalParams->findSystemFontFileForFamilyAndStyle(fontFamily, fontStyle);
+ std::vector<std::string> filesToIgnore;
+ while (!findFontRes.filepath.empty()) {
+ Form::AddFontResult addFontRes =
addFontToDefaultResources(findFontRes.filepath, findFontRes.faceIndex,
fontFamily, fontStyle);
+ if (!addFontRes.fontName.empty()) {
+ return addFontRes;
+ }
+ filesToIgnore.emplace_back(findFontRes.filepath);
+ findFontRes =
globalParams->findSystemFontFileForFamilyAndStyle(fontFamily, fontStyle,
filesToIgnore);
+ }
+ return {};
}
Form::AddFontResult Form::addFontToDefaultResources(const std::string
&filepath, int faceIndex, const std::string &fontFamily, const std::string
&fontStyle)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.11.0/poppler/GlobalParams.cc
new/poppler-22.12.0/poppler/GlobalParams.cc
--- old/poppler-22.11.0/poppler/GlobalParams.cc 2022-11-01 09:40:01.000000000
+0100
+++ new/poppler-22.12.0/poppler/GlobalParams.cc 2022-12-01 21:19:03.000000000
+0100
@@ -254,7 +254,7 @@
~SysFontList();
SysFontList(const SysFontList &) = delete;
SysFontList &operator=(const SysFontList &) = delete;
- const SysFontInfo *find(const std::string &name, bool isFixedWidth, bool
exact);
+ const SysFontInfo *find(const std::string &name, bool isFixedWidth, bool
exact, const std::vector<std::string> &filesToIgnore = {});
const std::vector<SysFontInfo *> &getFonts() const { return fonts; }
@@ -284,7 +284,7 @@
}
}
-const SysFontInfo *SysFontList::find(const std::string &name, bool fixedWidth,
bool exact)
+const SysFontInfo *SysFontList::find(const std::string &name, bool fixedWidth,
bool exact, const std::vector<std::string> &filesToIgnore)
{
GooString *name2;
bool bold, italic, oblique;
@@ -368,7 +368,9 @@
for (const SysFontInfo *f : fonts) {
fi = f;
if (fi->match(name2, bold, italic, oblique, fixedWidth)) {
- break;
+ if (std::find(filesToIgnore.begin(), filesToIgnore.end(),
fi->path->toStr()) == filesToIgnore.end()) {
+ break;
+ }
}
fi = nullptr;
}
@@ -377,7 +379,9 @@
for (const SysFontInfo *f : fonts) {
fi = f;
if (fi->match(name2, false, italic)) {
- break;
+ if (std::find(filesToIgnore.begin(), filesToIgnore.end(),
fi->path->toStr()) == filesToIgnore.end()) {
+ break;
+ }
}
fi = nullptr;
}
@@ -387,7 +391,9 @@
for (const SysFontInfo *f : fonts) {
fi = f;
if (fi->match(name2, false, false)) {
- break;
+ if (std::find(filesToIgnore.begin(), filesToIgnore.end(),
fi->path->toStr()) == filesToIgnore.end()) {
+ break;
+ }
}
fi = nullptr;
}
@@ -1104,32 +1110,34 @@
return path;
}
-FamilyStyleFontSearchResult
GlobalParams::findSystemFontFileForFamilyAndStyle(const std::string
&fontFamily, const std::string &fontStyle)
+FamilyStyleFontSearchResult
GlobalParams::findSystemFontFileForFamilyAndStyle(const std::string
&fontFamily, const std::string &fontStyle, const std::vector<std::string>
&filesToIgnore)
{
- FcChar8 *fcFilePath = nullptr;
- int faceIndex = 0;
FcPattern *p = FcPatternBuild(nullptr, FC_FAMILY, FcTypeString,
fontFamily.c_str(), FC_STYLE, FcTypeString, fontStyle.c_str(), nullptr);
FcConfigSubstitute(nullptr, p, FcMatchPattern);
FcDefaultSubstitute(p);
if (p) {
FcResult res;
- FcFontSet *set = FcFontSort(nullptr, p, FcFalse, nullptr, &res);
- if (set) {
- if (res == FcResultMatch && set->nfont > 0) {
- FcPatternGetString(set->fonts[0], FC_FILE, 0, &fcFilePath);
- FcPatternGetInteger(set->fonts[0], FC_INDEX, 0, &faceIndex);
+ FcFontSet *fontSet = FcFontSort(nullptr, p, FcFalse, nullptr, &res);
+ if (fontSet) {
+ const std::unique_ptr<FcFontSet, void (*)(FcFontSet *)>
fontSetDeleter(fontSet, [](FcFontSet *fSet) { FcFontSetDestroy(fSet); });
+ if (res == FcResultMatch) {
+ for (int i = 0; i < fontSet->nfont; i++) {
+ FcChar8 *fcFilePath = nullptr;
+ int faceIndex = 0;
+ FcPatternGetString(fontSet->fonts[i], FC_FILE, 0,
&fcFilePath);
+ FcPatternGetInteger(fontSet->fonts[i], FC_INDEX, 0,
&faceIndex);
+
+ const std::string sFilePath = reinterpret_cast<char
*>(fcFilePath);
+ if (std::find(filesToIgnore.begin(), filesToIgnore.end(),
sFilePath) == filesToIgnore.end()) {
+ return FamilyStyleFontSearchResult(sFilePath,
faceIndex);
+ }
+ }
}
- FcFontSetDestroy(set);
}
- FcPatternDestroy(p);
}
- if (!fcFilePath) {
- error(errIO, -1, "Couldn't find font file for {0:s} {1:s}",
fontFamily.c_str(), fontStyle.c_str());
- return {};
- }
-
- return FamilyStyleFontSearchResult(reinterpret_cast<char *>(fcFilePath),
faceIndex);
+ error(errIO, -1, "Couldn't find font file for {0:s} {1:s}",
fontFamily.c_str(), fontStyle.c_str());
+ return {};
}
UCharFontSearchResult GlobalParams::findSystemFontFileForUChar(Unicode uChar,
const GfxFont &fontToEmulate)
@@ -1179,7 +1187,7 @@
#else
-FamilyStyleFontSearchResult
GlobalParams::findSystemFontFileForFamilyAndStyle(const std::string
&fontFamily, const std::string &fontStyle)
+FamilyStyleFontSearchResult
GlobalParams::findSystemFontFileForFamilyAndStyle(const std::string
&fontFamily, const std::string &fontStyle, const std::vector<std::string>
&filesToIgnore)
{
error(errUnimplemented, -1,
"GlobalParams::findSystemFontFileForFamilyAndStyle not implemented for this
platform");
return {};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.11.0/poppler/GlobalParams.h
new/poppler-22.12.0/poppler/GlobalParams.h
--- old/poppler-22.11.0/poppler/GlobalParams.h 2022-11-01 09:40:01.000000000
+0100
+++ new/poppler-22.12.0/poppler/GlobalParams.h 2022-12-01 21:19:03.000000000
+0100
@@ -85,8 +85,8 @@
FamilyStyleFontSearchResult(const std::string &filepathA, int faceIndexA)
: filepath(filepathA), faceIndex(faceIndexA) { }
- const std::string filepath;
- const int faceIndex = 0;
+ std::string filepath;
+ int faceIndex = 0;
};
//------------------------------------------------------------------------
@@ -137,7 +137,7 @@
GooString *findFontFile(const std::string &fontName);
GooString *findBase14FontFile(const GooString *base14Name, const GfxFont
*font);
GooString *findSystemFontFile(const GfxFont *font, SysFontType *type, int
*fontNum, GooString *substituteFontName = nullptr, const GooString *base14Name
= nullptr);
- FamilyStyleFontSearchResult findSystemFontFileForFamilyAndStyle(const
std::string &fontFamily, const std::string &fontStyle);
+ FamilyStyleFontSearchResult findSystemFontFileForFamilyAndStyle(const
std::string &fontFamily, const std::string &fontStyle, const
std::vector<std::string> &filesToIgnore = {});
UCharFontSearchResult findSystemFontFileForUChar(Unicode uChar, const
GfxFont &fontToEmulate);
std::string getTextEncodingName() const;
bool getPrintCommands();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.11.0/poppler/GlobalParamsWin.cc
new/poppler-22.12.0/poppler/GlobalParamsWin.cc
--- old/poppler-22.11.0/poppler/GlobalParamsWin.cc 2022-11-01
09:40:01.000000000 +0100
+++ new/poppler-22.12.0/poppler/GlobalParamsWin.cc 2022-12-01
21:19:03.000000000 +0100
@@ -503,14 +503,14 @@
return path;
}
-FamilyStyleFontSearchResult
GlobalParams::findSystemFontFileForFamilyAndStyle(const std::string
&fontFamily, const std::string &fontStyle)
+FamilyStyleFontSearchResult
GlobalParams::findSystemFontFileForFamilyAndStyle(const std::string
&fontFamily, const std::string &fontStyle, const std::vector<std::string>
&filesToIgnore)
{
const std::scoped_lock locker(mutex);
setupBaseFonts(POPPLER_FONTSDIR);
const std::string familyAndStyle = fontFamily + " " + fontStyle;
- const SysFontInfo *fi = sysFonts->find(familyAndStyle, false, false);
+ const SysFontInfo *fi = sysFonts->find(familyAndStyle, false, false,
filesToIgnore);
if (fi) {
return FamilyStyleFontSearchResult(fi->path->toStr(), fi->fontNum);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.11.0/qt5/src/Doxyfile
new/poppler-22.12.0/qt5/src/Doxyfile
--- old/poppler-22.11.0/qt5/src/Doxyfile 2022-11-01 09:40:01.000000000
+0100
+++ new/poppler-22.12.0/qt5/src/Doxyfile 2022-12-01 21:19:03.000000000
+0100
@@ -31,7 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 22.11.0
+PROJECT_NUMBER = 22.12.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/poppler-22.11.0/qt6/src/Doxyfile
new/poppler-22.12.0/qt6/src/Doxyfile
--- old/poppler-22.11.0/qt6/src/Doxyfile 2022-11-01 09:40:01.000000000
+0100
+++ new/poppler-22.12.0/qt6/src/Doxyfile 2022-12-01 21:19:03.000000000
+0100
@@ -31,7 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 22.11.0
+PROJECT_NUMBER = 22.12.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
