Hello community,

here is the log from the commit of package calligra for openSUSE:Factory 
checked in at 2019-08-24 18:45:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/calligra (Old)
 and      /work/SRC/openSUSE:Factory/.calligra.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "calligra"

Sat Aug 24 18:45:47 2019 rev:73 rq:725579 version:3.1.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/calligra/calligra.changes        2019-08-13 
13:23:12.925387580 +0200
+++ /work/SRC/openSUSE:Factory/.calligra.new.7948/calligra.changes      
2019-08-24 18:46:06.409759031 +0200
@@ -1,0 +2,6 @@
+Fri Aug 23 11:10:41 UTC 2019 - [email protected]
+
+- Add Guchar-to-unsigned-char.patch to fix build with poppler 0.73
+  and higher
+
+-------------------------------------------------------------------
@@ -4 +10 @@
-- Fix-build-with-Qt-5_13.patch
+- Add Fix-build-with-Qt-5_13.patch.

New:
----
  Guchar-to-unsigned-char.patch

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

Other differences:
------------------
++++++ calligra.spec ++++++
--- /var/tmp/diff_new_pack.zuignH/_old  2019-08-24 18:46:08.217758857 +0200
+++ /var/tmp/diff_new_pack.zuignH/_new  2019-08-24 18:46:08.221758857 +0200
@@ -36,6 +36,8 @@
 Patch7:         Fix-GooString-not-having-getCString-anymore.patch
 # PATCH-FIX-UPSTREAM
 Patch8:         Fix-build-with-Qt-5_13.patch
+# PATCH-FIX-UPSTREAM
+Patch9:         Guchar-to-unsigned-char.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  OpenColorIO-devel
 BuildRequires:  OpenEXR-devel

++++++ Guchar-to-unsigned-char.patch ++++++
>From a1ddd91e6c354e8f0dda40f8a522053c3fa19c39 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <[email protected]>
Date: Tue, 15 Jan 2019 22:24:08 +0100
Subject: Guchar -> unsigned char

It was just a typdef and it's now gone
---
 filters/karbon/pdf/SvgOutputDev.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/filters/karbon/pdf/SvgOutputDev.cpp 
b/filters/karbon/pdf/SvgOutputDev.cpp
index 80f01a5..1a5aa30b 100644
--- a/filters/karbon/pdf/SvgOutputDev.cpp
+++ b/filters/karbon/pdf/SvgOutputDev.cpp
@@ -496,7 +496,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, 
Stream *str,
     if (maskColors) {
         for (int y = 0; y < height; y++) {
             dest = (unsigned int *)(buffer + y * 4 * width);
-            Guchar * pix = imgStr->getLine();
+            unsigned char * pix = imgStr->getLine();
             colorMap->getRGBLine(pix, dest, width);
 
             for (int x = 0; x < width; x++) {
@@ -515,7 +515,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, 
Stream *str,
     } else {
         for (int y = 0; y < height; y++) {
             dest = (unsigned int *)(buffer + y * 4 * width);
-            Guchar * pix = imgStr->getLine();
+            unsigned char * pix = imgStr->getLine();
             colorMap->getRGBLine(pix, dest, width);
         }
 
-- 
cgit v1.1


Reply via email to