Commit e6e42127 authored by Rasmus Thomsen's avatar Rasmus Thomsen

community/poedit: upgrade to 2.4

parent 19c8f744
Upstream: Yes, https://github.com/vslavik/poedit/commit/29ff4b4e6e1d82e475589fa3eb199c4d43b57b03
From 29ff4b4e6e1d82e475589fa3eb199c4d43b57b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
Date: Wed, 29 Jul 2020 19:13:52 +0200
Subject: [PATCH] Compilation fix for !HAVE_HTTP_CLIENT
Fixes #653.
---
src/crowdin_gui.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/crowdin_gui.h b/src/crowdin_gui.h
index fce5030755..f8cef75261 100644
--- a/src/crowdin_gui.h
+++ b/src/crowdin_gui.h
@@ -121,6 +121,12 @@ void CrowdinOpenFile(wxWindow *parent, std::function<void(wxString)> onLoaded);
void CrowdinSyncFile(wxWindow *parent, std::shared_ptr<Catalog> catalog,
std::function<void(std::shared_ptr<Catalog>)> onDone);
-#endif // HAVE_HTTP_CLIENT
+#else // !HAVE_HTTP_CLIENT
+
+// convenience stubs to avoid additional checks all over other code:
+inline bool CanSyncWithCrowdin(CatalogPtr) { return false; }
+inline bool ShouldSyncToCrowdinAutomatically(CatalogPtr) { return false; }
+
+#endif // !HAVE_HTTP_CLIENT
#endif // Poedit_crowdin_gui_h
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=poedit
pkgver=2.3.1
pkgver=2.4
pkgrel=0
pkgdesc="A cross-platform translations editor"
url="https://www.poedit.net"
......@@ -9,9 +9,20 @@ arch="all"
license="MIT"
depends="gettext"
makedepends="boost-dev enchant2-dev gtk+3.0-dev gtkspell3-dev
lucene++-dev wxgtk3-dev"
lucene++-dev wxgtk3-dev autoconf automake libtool pugixml-dev
gettext-dev"
subpackages="$pkgname-lang $pkgname-doc"
source="https://github.com/vslavik/poedit/releases/download/v$pkgver-oss/poedit-$pkgver.tar.gz"
source="https://github.com/vslavik/poedit/archive/v$pkgver-oss.tar.gz
29ff4b4e6e1d82e475589fa3eb199c4d43b57b03.patch
b551f7d572ccaed8a870ba8ad7bc779275770b43.patch
"
builddir="$srcdir/$pkgname-$pkgver-oss"
prepare() {
default_prepare
./bootstrap
}
build() {
./configure \
......@@ -33,4 +44,6 @@ package() {
make DESTDIR="$pkgdir" install
}
sha512sums="73439ae96d3e04d8f6fc7e49f72cd259606e669f01490bd9a59f3fa7b33a6e11fb3af70a3a6e155b1edcee49ac9222b16e05e937088748a9c0f3ed9a6c97a208 poedit-2.3.1.tar.gz"
sha512sums="194ce963dbe1e630307cfa35cae9781633e915f8a0626bed20d90c2f8114a85c1c278c5420004ecc1ff447e17944dd7bd9f5bcd3fbae118615ecbc900aced9be v2.4-oss.tar.gz
dc74a83d50b9fce9388884682715ed0d1705b6c19b74fbde699649815808cfa3b7d28d63be148fad8513a029225daac896dec0f0d4ee640872703d17a0dc43e7 29ff4b4e6e1d82e475589fa3eb199c4d43b57b03.patch
97efda69e1896cccb559e67cec5f801c1522f32e17cb0a4ac5902296427d54408c35529a3a8d0cc649c5c68c14946b5c7ff6af32c05f4f6bbc3321157f71de24 b551f7d572ccaed8a870ba8ad7bc779275770b43.patch"
Upstream: Yes, https://github.com/vslavik/poedit/commit/b551f7d572ccaed8a870ba8ad7bc779275770b43
From b551f7d572ccaed8a870ba8ad7bc779275770b43 Mon Sep 17 00:00:00 2001
From: Omar Polo <op@omarpolo.com>
Date: Thu, 30 Jul 2020 19:34:19 +0200
Subject: [PATCH] Really fix !HAVE_HTTP_CLIENT compilation
29ff4b4e was insufficient and merely caused a different compilation
error.
Fixes #653.
---
src/crowdin_gui.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/crowdin_gui.h b/src/crowdin_gui.h
index f8cef75261..efc6b31e9c 100644
--- a/src/crowdin_gui.h
+++ b/src/crowdin_gui.h
@@ -26,9 +26,10 @@
#ifndef Poedit_crowdin_gui_h
#define Poedit_crowdin_gui_h
+#include "catalog.h"
+
#ifdef HAVE_HTTP_CLIENT
-#include "catalog.h"
#include "cloud_sync.h"
#include "customcontrols.h"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment