Rebuild for poppler-0.73.0

This commit is contained in:
Marek Kasik 2019-01-25 19:49:13 +01:00
parent 96f5a71088
commit f7e941062e
2 changed files with 74 additions and 1 deletions

View File

@ -0,0 +1,69 @@
--- pdf2djvu-0.9.11/pdf2djvu.cc
+++ pdf2djvu-0.9.11/pdf2djvu.cc
@@ -456,7 +456,7 @@ public:
switch (link_action->getKind())
{
case actionURI:
- uri += dynamic_cast<pdf::link::URI*>(link_action)->getURI()->getCString();
+ uri += dynamic_cast<pdf::link::URI*>(link_action)->getURI()->c_str();
break;
case actionGoTo:
{
@@ -1396,7 +1396,7 @@ static int xmain(int argc, char * const
#pragma omp critical
{
debug(0)--;
- debug(1) << doc->getFileName()->getCString() << ":" << std::endl;
+ debug(1) << doc->getFileName()->c_str() << ":" << std::endl;
debug(0)++;
}
out1.reset(new MainRenderer(paper_color, config.monochrome));
--- pdf2djvu-0.9.11/pdf-backend.cc
+++ pdf2djvu-0.9.11/pdf-backend.cc
@@ -32,7 +32,6 @@
#include <GlobalParams.h>
#include <PDFDoc.h>
#include <goo/GooString.h>
-#include <goo/gtypes.h>
#include <splash/SplashClip.h>
#include <splash/SplashTypes.h>
@@ -225,7 +225,7 @@ const std::string pdf::Document::get_xmp
mstring.reset(this->readMetadata());
if (mstring.get() == nullptr)
return "";
- const char *cstring = mstring->getCString();
+ const char *cstring = mstring->c_str();
if (strncmp(cstring, "<?xpacket begin=", 16) != 0)
return "";
cstring += 16;
@@ -392,7 +392,7 @@ pdf::Metadata::Metadata(pdf::Document &d
char tzs = 0; int tzh = 0, tzm = 0;
if (!pdf::dict_lookup(info_dict, field.first, &object)->isString())
continue;
- const char *input = object.getString()->getCString();
+ const char *input = object.getString()->c_str();
if (input[0] == 'D' && input[1] == ':')
input += 2;
int year = scan_date_digits(input, 4);
--- pdf2djvu-0.9.11/pdf-backend.hh
+++ pdf2djvu-0.9.11/pdf-backend.hh
@@ -40,7 +40,6 @@
#include <SplashOutputDev.h>
#include <Stream.h>
#include <goo/GooString.h>
-#include <goo/gtypes.h>
#include <splash/Splash.h>
#include <splash/SplashBitmap.h>
#include <splash/SplashClip.h>
--- pdf2djvu-0.9.11/pdf-unicode.cc
+++ pdf2djvu-0.9.11/pdf-unicode.cc
@@ -53,7 +53,7 @@ std::string pdf::string_as_utf8(const pd
* for description of both UTF-16 and UTF-8.
*/
const static uint32_t replacement_character = 0xFFFD;
- const char *cstring = string->getCString();
+ const char *cstring = string->c_str();
#if POPPLER_VERSION < 3500
size_t clength = const_cast<pdf::String *>(string)->getLength();
#else

View File

@ -2,12 +2,13 @@
Name: pdf2djvu
Version: 0.9.11
Release: 1%{?dist}
Release: 2%{?dist}
Summary: PDF to DjVu converter
Group: Applications/Publishing
License: GPLv2+
URL: http://jwilk.net/software/pdf2djvu
Source0: https://github.com/jwilk/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
Patch0: pdf2djvu-0.9.11-poppler-0.73.0.patch
BuildRequires: gcc-c++
BuildRequires: djvulibre-devel djvulibre
BuildRequires: libjpeg-devel
@ -49,6 +50,9 @@ install -p -m 644 -D {doc,%{buildroot}%{_mandir}/man1}/%{name}.1
%{_mandir}/ru/man1/%{name}.1*
%changelog
* Fri Jan 25 2019 Marek Kasik <mkasik@redhat.com> - 0.9.11-2
- Rebuild for poppler-0.73.0
* Sat Oct 27 2018 Filipe Rosset <rosset.filipe@gmail.com> - 0.9.11-1
- Rebuilt for new upstream release 0.9.11
- Upstream changelog https://github.com/jwilk/pdf2djvu/blob/master/doc/changelog