From 63fa04d8c165f00609cd390d4954ab3de3d655df Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Fri, 5 Jun 2015 14:29:31 +0200
Subject: [PATCH] Update to 0.33.0

Resolves: #1190427
---
 .gitignore                                   |  1 +
 poppler-0.30.0-rotated-words-selection.patch | 16 ++++++++--------
 poppler.spec                                 | 10 +++++++---
 sources                                      |  2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index b045c17..593df8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /poppler-0.26.4.tar.xz
 /poppler-0.28.1.tar.xz
 /poppler-0.30.0.tar.xz
+/poppler-0.33.0.tar.xz
diff --git a/poppler-0.30.0-rotated-words-selection.patch b/poppler-0.30.0-rotated-words-selection.patch
index 87d553b..6b18058 100644
--- a/poppler-0.30.0-rotated-words-selection.patch
+++ b/poppler-0.30.0-rotated-words-selection.patch
@@ -16,9 +16,9 @@ diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
 index 7c2ca78..e93908c 100644
 --- a/poppler/TextOutputDev.cc
 +++ b/poppler/TextOutputDev.cc
-@@ -173,6 +173,12 @@
- // Max distance between edge of text and edge of link border
- #define hyperlinkSlack 2
+@@ -178,6 +178,12 @@
+ #define combMaxMidDelta 0.3
+ #define combMaxBaseDelta 0.4
  
 +// Returns whether x is between a and b or equal to a or b.
 +// a and b don't need to be sorted.
@@ -29,7 +29,7 @@ index 7c2ca78..e93908c 100644
  //------------------------------------------------------------------------
  // TextUnderline
  //------------------------------------------------------------------------
-@@ -4222,11 +4228,37 @@ void TextSelectionSizer::visitLine (TextLine *line,
+@@ -4411,11 +4417,37 @@ void TextSelectionSizer::visitLine (TextLine *line,
    PDFRectangle *rect;
    double x1, y1, x2, y2, margin;
  
@@ -72,7 +72,7 @@ index 7c2ca78..e93908c 100644
  
    rect = new PDFRectangle (floor (x1 * scale), 
  			   floor (y1 * scale),
-@@ -4310,19 +4341,56 @@ void TextSelectionPainter::visitLine (TextLine *line,
+@@ -4499,19 +4531,56 @@ void TextSelectionPainter::visitLine (TextLine *line,
  {
    double x1, y1, x2, y2, margin;
  
@@ -140,7 +140,7 @@ index 7c2ca78..e93908c 100644
  
    ictm.transform(x1, y1, &x1, &y1);
    ictm.transform(x2, y2, &x2, &y2);
-@@ -4400,17 +4467,27 @@ void TextWord::visitSelection(TextSelectionVisitor *visitor,
+@@ -4589,17 +4658,27 @@ void TextWord::visitSelection(TextSelectionVisitor *visitor,
  			      SelectionStyle style)
  {
    int i, begin, end;
@@ -174,7 +174,7 @@ index 7c2ca78..e93908c 100644
    }
  
    /* Skip empty selection. */
-@@ -4426,30 +4503,41 @@ void TextLine::visitSelection(TextSelectionVisitor *visitor,
+@@ -4615,30 +4694,41 @@ void TextLine::visitSelection(TextSelectionVisitor *visitor,
    TextWord *p, *begin, *end, *current;
    int i, edge_begin, edge_end;
    PDFRectangle child_selection;
@@ -228,7 +228,7 @@ index 7c2ca78..e93908c 100644
          end = p->next;
          current = p;
        }
-@@ -4461,23 +4549,42 @@ void TextLine::visitSelection(TextSelectionVisitor *visitor,
+@@ -4650,23 +4740,42 @@ void TextLine::visitSelection(TextSelectionVisitor *visitor,
    
    child_selection = *selection;
    if (style == selectionStyleWord) {
diff --git a/poppler.spec b/poppler.spec
index 36e5b4a..b44ca5b 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,7 +1,7 @@
 Summary: PDF rendering library
 Name:    poppler
-Version: 0.30.0
-Release: 5%{?dist}
+Version: 0.33.0
+Release: 1%{?dist}
 License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
 Group:   Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -213,7 +213,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_libdir}/libpoppler.so.49*
+%{_libdir}/libpoppler.so.52*
 
 %files devel
 %defattr(-,root,root,-)
@@ -282,6 +282,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 
 
 %changelog
+* Fri Jun  5 2015 Marek Kasik <mkasik@redhat.com> - 0.33.0-1
+- Update to 0.33.0
+- Resolves: #1190427
+
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.30.0-5
 - Rebuilt for GCC 5 C++11 ABI change
 
diff --git a/sources b/sources
index 17e62b8..6fca005 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb0a9d82b5433c823421a123eb8e9789  poppler-0.30.0.tar.xz
+69927d1614d6704021c0b0dd0ee6a852  poppler-0.33.0.tar.xz