Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a7821e4670aa24525e790a22cc26df819dbe62be
commit a7821e4670aa24525e790a22cc26df819dbe62be
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sat Sep 3 21:33:19 2016 +0200
libreoffice-5.2.1.2-1-x86_64
- 5.2.0 -> 5.2.1
diff --git
a/source/xoffice/libreoffice/0005-curl-7.50.0-has-CURL-as-typedef-struct-Curl_easy.patch
b/source/xoffice/libreoffice/0005-curl-7.50.0-has-CURL-as-typedef-struct-Curl_easy.patch
deleted file mode 100644
index 43c9afa..0000000
---
a/source/xoffice/libreoffice/0005-curl-7.50.0-has-CURL-as-typedef-struct-Curl_easy.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 90cdadc9497e12d2e0376a368c5bcf50e275bc57 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caol...@redhat.com>
-Date: Mon, 25 Jul 2016 12:08:35 +0100
-Subject: [PATCH] curl 7.50.0 has CURL as typedef struct Curl_easy
-
-Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4
-(cherry picked from commit 0b8e589875ffd84150470832de18ebd79989efc0)
----
- ucb/source/ucp/ftp/ftploaderthread.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx
b/ucb/source/ucp/ftp/ftploaderthread.cxx
-index 25bc26d..5d1cfb5 100644
---- a/ucb/source/ucp/ftp/ftploaderthread.cxx
-+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
-@@ -77,7 +77,7 @@ FTPLoaderThread::~FTPLoaderThread() {
-
-
- CURL* FTPLoaderThread::handle() {
-- CURL* ret = osl_getThreadKeyData(m_threadKey);
-+ CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey));
- if(!ret) {
- ret = curl_easy_init();
- if (ret != nullptr) {
---
-2.7.4
-
diff --git a/source/xoffice/libreoffice/FrugalBuild
b/source/xoffice/libreoffice/FrugalBuild
index 3fa05bc..a944e09 100644
--- a/source/xoffice/libreoffice/FrugalBuild
+++ b/source/xoffice/libreoffice/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Laszlo Dvornik <dvor...@gnome.hu>
pkgname=libreoffice
-pkgver=5.2.0.4
+pkgver=5.2.1.2
minor=${pkgver:0:5} # x.y.z
major=${pkgver:0:3} # x.y
pkgrel=1
@@ -91,10 +91,8 @@ _F_archive_grepv="beta"
up2date="Flasttar $mirror"
modules=('' 'help-' 'translations-')
source=(
- 0005-curl-7.50.0-has-CURL-as-typedef-struct-Curl_easy.patch
)
signatures=(
- ''
)
for i in "${modules[@]}"
do
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
