From 6cc523e46b3e59af1c3035277b10cfaefde870bf Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sun, 17 Jul 2016 16:57:28 +0200
Subject: update qtxlsxwriter

Switched to de facto maintainer's fork.
---
 src/qtxlsxwriter-1.patch | 47 -----------------------------------------------
 src/qtxlsxwriter.mk      |  8 ++++----
 2 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 src/qtxlsxwriter-1.patch

diff --git a/src/qtxlsxwriter-1.patch b/src/qtxlsxwriter-1.patch
deleted file mode 100644
index 5a47018..0000000
--- a/src/qtxlsxwriter-1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a50811ed7fcf98e53aab7f10b1e1348716a34ecc Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Sat, 13 Jun 2015 22:05:54 +0200
-Subject: [PATCH 1/2] avoid shadowing member
-
-The parameter row shadows the member method row(), which generates
-warning or error.
-
-diff --git a/src/xlsx/xlsxcellreference.h b/src/xlsx/xlsxcellreference.h
-index 6a917c2..db20806 100644
---- a/src/xlsx/xlsxcellreference.h
-+++ b/src/xlsx/xlsxcellreference.h
-@@ -41,7 +41,7 @@ public:
-     QString toString(bool row_abs=false, bool col_abs=false) const;
-     static CellReference fromString(const QString &cell);
-     bool isValid() const;
--    inline void setRow(int row) { _row = row; }
-+    inline void setRow(int arow) { _row = arow; }
-     inline void setColumn(int col) { _column = col; }
-     inline int row() const { return _row; }
-     inline int column() const { return _column; }
--- 
-2.5.0
-
-
-From 789f259bd86ef817be1e8b9343621a1865479654 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Wed, 16 Mar 2016 15:38:08 +0100
-Subject: [PATCH 2/2] fix QList to QVector conversion failure
-
-
-diff --git a/src/xlsx/xlsxzipreader.cpp b/src/xlsx/xlsxzipreader.cpp
-index 7b63a98..38772c3 100644
---- a/src/xlsx/xlsxzipreader.cpp
-+++ b/src/xlsx/xlsxzipreader.cpp
-@@ -48,7 +48,7 @@ ZipReader::~ZipReader()
- 
- void ZipReader::init()
- {
--    QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
-+    const QVector<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
-     foreach (const QZipReader::FileInfo &fi, allFiles) {
-         if (fi.isFile)
-             m_filePaths.append(fi.filePath);
--- 
-2.5.0
-
diff --git a/src/qtxlsxwriter.mk b/src/qtxlsxwriter.mk
index cc1fed4..700192b 100644
--- a/src/qtxlsxwriter.mk
+++ b/src/qtxlsxwriter.mk
@@ -2,14 +2,14 @@
 # See index.html for further information.
 PKG             := qtxlsxwriter
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := ad90b6a2c21b300138ceb9fe9030a5917230f92d
-$(PKG)_CHECKSUM := bebf32dab284d4774bedc6dc897ede5c74531495f28f2be66191fbdc3e1ce01f
+$(PKG)_VERSION  := 3c474f376d1eb098793c45c2f512b216e696052b
+$(PKG)_CHECKSUM := 9b9dc38ec4817dcc8e720276ea590a5b39f27908b67e8bfdb98b946b2f35ef67
 $(PKG)_SUBDIR   := QtXlsxWriter-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/dbzhang800/QtXlsxWriter/archive/$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://github.com/VSRonin/QtXlsxWriter/archive/$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := gcc qtbase
 
-$(PKG)_UPDATE    = $(call MXE_GET_GITHUB_SHA, dbzhang800/QtXlsxWriter, master)
+$(PKG)_UPDATE    = $(call MXE_GET_GITHUB_SHA, VSRonin/QtXlsxWriter, master)
 
 define $(PKG)_BUILD
     cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-- 
cgit v0.12