Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package gdal for openSUSE:Factory checked in 
at 2022-03-10 22:45:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gdal (Old)
 and      /work/SRC/openSUSE:Factory/.gdal.new.2349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gdal"

Thu Mar 10 22:45:26 2022 rev:71 rq:960732 version:3.4.1
Tue Mar  8 20:31:54 2022 rev:70 rq:960157 version:3.4.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/gdal/gdal.changes        2022-01-06 
15:51:15.880970643 +0100
+++ /work/SRC/openSUSE:Factory/.gdal.new.2349/gdal.changes      2022-03-11 
11:42:26.054686212 +0100
@@ -1,0 +2,14 @@
+Tue Mar  8 14:47:15 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Add gdal-fix-poppler-leap.patch: Fix build on Leap 15.4 and
+  poppler.
+- Add fdups macro, BuildRequires already in place, remove
+  duplicate files.
+
+-------------------------------------------------------------------
+Mon Mar  7 20:33:32 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Add gdal-fix-build-poppler.patch: Fix build with poppler 22.03.0
+  and newer.
+
+-------------------------------------------------------------------

New:
----
  gdal-fix-build-poppler.patch
  gdal-fix-poppler-leap.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gdal.spec ++++++
--- /var/tmp/diff_new_pack.gIx7HB/_old  2022-03-11 11:42:27.022687297 +0100
+++ /var/tmp/diff_new_pack.gIx7HB/_new  2022-03-11 11:42:27.030687306 +0100
@@ -38,6 +38,11 @@
 Source1:        
https://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{version}.tar.xz.md5
 Source2:        
https://download.osgeo.org/%{name}/%{version}/%{sourcename}autotest-%{version}.tar.gz
 Patch0:         gdal-perl.patch
+# PATCH-FIX-UPSTREAM gdal-fix-build-poppler.patch -- Fix build with poppler 
22.03.0 and newer
+Patch1:         gdal-fix-build-poppler.patch
+# PATCH-FIX-UPSTREAM gdal-fix-poppler-leap.patch -- Fix build on Leap 15.4 and 
poppler
+Patch2:         gdal-fix-poppler-leap.patch
+
 BuildRequires:  KEALib-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -342,6 +347,8 @@
 # License doesn't go there
 rm -f %{buildroot}%{_datadir}/gdal/LICENSE.TXT
 
+%fdupes %{buildroot}%{python3_sitearch}
+
 # avoid PACKAGE redefines
 sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' 
%{buildroot}%{_includedir}/gdal/cpl_config.h
 

++++++ gdal-fix-build-poppler.patch ++++++
>From 2d5f96f233e6bda613e98e056bb9a39d12409e32 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.roua...@spatialys.com>
Date: Fri, 18 Feb 2022 22:47:01 +0100
Subject: [PATCH] PDF: fix build against Poppler > 22.2

---
 gdal/frmts/pdf/pdfdataset.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

Index: gdal-3.4.1/frmts/pdf/pdfdataset.cpp
===================================================================
--- gdal-3.4.1.orig/frmts/pdf/pdfdataset.cpp
+++ gdal-3.4.1/frmts/pdf/pdfdataset.cpp
@@ -4241,8 +4241,6 @@ PDFDataset *PDFDataset::Open( GDALOpenIn
 #ifdef HAVE_POPPLER
   if(bUseLib.test(PDFLIB_POPPLER))
   {
-    GooString* poUserPwd = nullptr;
-
     static bool globalParamsCreatedByGDAL = false;
     {
         CPLMutexHolderD(&hGlobalParamsMutex);
@@ -4310,9 +4308,6 @@ PDFDataset *PDFDataset::Open( GDALOpenIn
     while( true )
     {
         VSIFSeekL(fp, 0, SEEK_SET);
-        if (pszUserPwd)
-            poUserPwd = new GooString(pszUserPwd);
-
         g_nPopplerErrors = 0;
         if( globalParamsCreatedByGDAL )
             registerErrorCallback();
@@ -4322,10 +4317,20 @@ PDFDataset *PDFDataset::Open( GDALOpenIn
         oObj.getObj()->initNull();
         auto poStream = new VSIPDFFileStream(fp, pszFilename, oObj.getObj());
 #endif
+#if POPPLER_MAJOR_VERSION > 22 || (POPPLER_MAJOR_VERSION == 22 && 
POPPLER_MINOR_VERSION > 2)
+        std::optional<GooString> osUserPwd;
+        if (pszUserPwd)
+            osUserPwd = std::optional<GooString>(pszUserPwd);
+        poDocPoppler = new PDFDoc(poStream, std::optional<GooString>(), 
osUserPwd);
+#else
+        GooString* poUserPwd = nullptr;
+        if (pszUserPwd)
+            poUserPwd = new GooString(pszUserPwd);
         poDocPoppler = new PDFDoc(poStream, nullptr, poUserPwd);
+        delete poUserPwd;
+#endif
         if( globalParamsCreatedByGDAL )
             registerErrorCallback();
-        delete poUserPwd;
         if( g_nPopplerErrors >= MAX_POPPLER_ERRORS )
         {
             PDFFreeDoc(poDocPoppler);

++++++ gdal-fix-poppler-leap.patch ++++++
#
# spec file
#
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via https://bugs.opensuse.org/
#


>From cbcfe2c8c5507ea00ef7371029ff94d0bf6f4a77 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.roua...@spatialys.com>
Date: Sat, 8 Jan 2022 14:25:09 +0100
Subject: [PATCH] frmts/pdf/GNUmakefile: force c++17 with Poppler > 21 (fixes
 #5071)

---
 gdal/frmts/pdf/GNUmakefile | 6 ++++++
 1 file changed, 6 insertions(+)

Index: gdal-3.4.1/frmts/pdf/GNUmakefile
===================================================================
--- gdal-3.4.1.orig/frmts/pdf/GNUmakefile
+++ gdal-3.4.1/frmts/pdf/GNUmakefile
@@ -11,6 +11,12 @@ LD_SHARED = $(LD) -bundle
 endif

 ifeq ($(HAVE_POPPLER),yes)
+# Poppler 2022.1 requires c++17
+ifeq ($(shell test $(POPPLER_MAJOR_VERSION) -gt 21; echo $$?),0)
+CXX := $(subst -std=c++11,,${CXX})
+CXX := $(subst -std=c++14,,${CXX})
+CXX := ${CXX} -std=c++17
+endif
 CPPFLAGS +=  -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=$(POPPLER_MAJOR_VERSION) 
-DPOPPLER_MINOR_VERSION=$(POPPLER_MINOR_VERSION)
 endif

%changelog

Reply via email to