diff options
| author | dbaio <dbaio@FreeBSD.org> | 2017-09-17 21:51:04 +0800 |
|---|---|---|
| committer | dbaio <dbaio@FreeBSD.org> | 2017-09-17 21:51:04 +0800 |
| commit | 7714fcc07080d6c158dd34753ba9c89fa2ae6718 (patch) | |
| tree | 4fa07f1eb6a291eb0bc9083adc82660edf6ffa70 | |
| parent | 7f36839e1e6f6d8654154b2581fc5b7b28d957a4 (diff) | |
| download | freebsd-ports-gnome-7714fcc07080d6c158dd34753ba9c89fa2ae6718.tar.gz freebsd-ports-gnome-7714fcc07080d6c158dd34753ba9c89fa2ae6718.tar.zst freebsd-ports-gnome-7714fcc07080d6c158dd34753ba9c89fa2ae6718.zip | |
textproc/sdcv: Update to 0.5.2
Patch removed was incorporated upstream.
Changes: https://raw.githubusercontent.com/Dushistov/sdcv/master/NEWS
PR: 222267
Submitted by: Anton Yuzhaninov (maintainer)
| -rw-r--r-- | textproc/sdcv/Makefile | 3 | ||||
| -rw-r--r-- | textproc/sdcv/distinfo | 6 | ||||
| -rw-r--r-- | textproc/sdcv/files/patch-bug19 | 60 |
3 files changed, 4 insertions, 65 deletions
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile index d9786c00717a..145e23e1f443 100644 --- a/textproc/sdcv/Makefile +++ b/textproc/sdcv/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= sdcv -PORTVERSION= 0.5.1 +PORTVERSION= 0.5.2 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= citrin@citrin.ru diff --git a/textproc/sdcv/distinfo b/textproc/sdcv/distinfo index 7b9f9d45af7b..fcc03d0c02e5 100644 --- a/textproc/sdcv/distinfo +++ b/textproc/sdcv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499366673 -SHA256 (Dushistov-sdcv-v0.5.1_GH0.tar.gz) = d0c64429547adb127d5ff9f0f0db8c4bc663bc413dfb5b5d32c924a67171c247 -SIZE (Dushistov-sdcv-v0.5.1_GH0.tar.gz) = 58941 +TIMESTAMP = 1505656097 +SHA256 (Dushistov-sdcv-v0.5.2_GH0.tar.gz) = ec08dc084a0748d5a89df01a20bbf294f09b0366295cd418000f15d2e043c4f7 +SIZE (Dushistov-sdcv-v0.5.2_GH0.tar.gz) = 61541 diff --git a/textproc/sdcv/files/patch-bug19 b/textproc/sdcv/files/patch-bug19 deleted file mode 100644 index f3d3dd8e3b83..000000000000 --- a/textproc/sdcv/files/patch-bug19 +++ /dev/null @@ -1,60 +0,0 @@ ---- src/sdcv.cpp.orig -+++ src/sdcv.cpp -@@ -157,7 +157,7 @@ int main(int argc, char *argv[]) try { - }); - - std::list<std::string> order_list; -- if (use_dict_list) { -+ if (use_dict_list != nullptr) { - for (auto &&x : bookname_to_ifo) { - gchar **p = get_impl(use_dict_list); - for (; *p != nullptr; ++p) ---- src/stardict_lib.cpp.orig -+++ src/stardict_lib.cpp -@@ -89,7 +89,6 @@ bool DictInfo::load_from_ifo_file(const std::string& ifofilename, - if (!g_str_has_prefix( - g_str_has_prefix(get_impl(buffer), (const gchar *)(utf8_bom)) ? get_impl(buffer) + 3 : get_impl(buffer), - magic_data)) { -- g_free(buffer); - return false; - } - ---- src/utils.hpp.orig -+++ src/utils.hpp -@@ -27,6 +27,14 @@ class ResourceWrapper { - } - } - -+ friend inline bool operator==(const ResourceWrapper& lhs, std::nullptr_t) noexcept { -+ return !lhs.p_; -+ } -+ -+ friend inline bool operator!=(const ResourceWrapper& lhs, std::nullptr_t) noexcept { -+ return !!lhs.p_; -+ } -+ - friend inline T *get_impl(const ResourceWrapper& rw) { - return rw.p_; - } -@@ -39,21 +47,6 @@ class ResourceWrapper { - T *p_; - - void free_resource() { if (p_) unref_res(p_); } -- --// Helper for enabling 'if (sp)' -- struct Tester { -- Tester() {} -- private: -- void operator delete(void*); -- }; --public: -- // enable 'if (sp)' -- operator Tester*() const { -- if (!*this) -- return 0; -- static Tester t; -- return &t; -- } - }; - - namespace glib { |