svn commit: r445277 - in head/textproc/sdcv: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Jul  7 16:33:57 2017
New Revision: 445277
URL: https://svnweb.freebsd.org/changeset/ports/445277

Log:
  Add missing patch for Clang 3.4.1 on FreeBSD 10
  
  - Bump PORTREVISION for package change
  
  PR:		220451

Added:
  head/textproc/sdcv/files/patch-bug19   (contents, props changed)
Modified:
  head/textproc/sdcv/Makefile

Modified: head/textproc/sdcv/Makefile
==============================================================================
--- head/textproc/sdcv/Makefile	Fri Jul  7 16:33:52 2017	(r445276)
+++ head/textproc/sdcv/Makefile	Fri Jul  7 16:33:57 2017	(r445277)
@@ -4,6 +4,7 @@
 PORTNAME=	sdcv
 PORTVERSION=	0.5.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	citrin at citrin.ru

Added: head/textproc/sdcv/files/patch-bug19
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/sdcv/files/patch-bug19	Fri Jul  7 16:33:57 2017	(r445277)
@@ -0,0 +1,60 @@
+--- 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 {