From owner-svn-ports-all@freebsd.org Sun Apr 2 22:27:26 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E123D2B56D; Sun, 2 Apr 2017 22:27:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 194613F0; Sun, 2 Apr 2017 22:27:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v32MRPoJ025857; Sun, 2 Apr 2017 22:27:25 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v32MROrR025853; Sun, 2 Apr 2017 22:27:24 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201704022227.v32MROrR025853@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 2 Apr 2017 22:27:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437584 - in head/textproc/stardict3: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Apr 2017 22:27:26 -0000 Author: bapt Date: Sun Apr 2 22:27:24 2017 New Revision: 437584 URL: https://svnweb.freebsd.org/changeset/ports/437584 Log: Fix bulid with -std=c++11 Added: head/textproc/stardict3/files/patch-dict_src_dictmanage.cpp (contents, props changed) head/textproc/stardict3/files/patch-dict_src_lib_pluginmanager.cpp (contents, props changed) head/textproc/stardict3/files/patch-dict_src_lib_storage.cpp (contents, props changed) Modified: head/textproc/stardict3/Makefile Modified: head/textproc/stardict3/Makefile ============================================================================== --- head/textproc/stardict3/Makefile Sun Apr 2 22:16:37 2017 (r437583) +++ head/textproc/stardict3/Makefile Sun Apr 2 22:27:24 2017 (r437584) @@ -10,8 +10,6 @@ DIST_SUBDIR= stardict MAINTAINER= makc@FreeBSD.org COMMENT= Dictionary lookup program written in Gtk2 -BROKEN= Depends on c++11 libs while not being c++11 compatible - LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \ libenchant.so:textproc/enchant RUN_DEPENDS= xdg-open:devel/xdg-utils Added: head/textproc/stardict3/files/patch-dict_src_dictmanage.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/stardict3/files/patch-dict_src_dictmanage.cpp Sun Apr 2 22:27:24 2017 (r437584) @@ -0,0 +1,11 @@ +--- dict/src/dictmanage.cpp.orig 2017-04-02 22:24:23 UTC ++++ dict/src/dictmanage.cpp +@@ -77,7 +77,7 @@ static void get_all_plugin_list(std::list + std::list plugin_disable_list; + std::list plugins_dirs; + plugins_dirs.push_back(conf_dirs->get_plugin_dir()); +- for_each_file(plugins_dirs, "."G_MODULE_SUFFIX, plugin_order_list, ++ for_each_file(plugins_dirs, "." G_MODULE_SUFFIX, plugin_order_list, + plugin_disable_list, GetAllPluginList(plugin_all_list)); + } + Added: head/textproc/stardict3/files/patch-dict_src_lib_pluginmanager.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/stardict3/files/patch-dict_src_lib_pluginmanager.cpp Sun Apr 2 22:27:24 2017 (r437584) @@ -0,0 +1,20 @@ +--- dict/src/lib/pluginmanager.cpp.orig 2017-04-02 22:22:40 UTC ++++ dict/src/lib/pluginmanager.cpp +@@ -96,7 +96,7 @@ void StarDictPlugins::load(const std::string& dirpath, + { + std::list plugins_dirs; + plugins_dirs.push_back(dirpath); +- for_each_file(plugins_dirs, "."G_MODULE_SUFFIX, order_list, disable_list, PluginLoader(*this)); ++ for_each_file(plugins_dirs, "." G_MODULE_SUFFIX, order_list, disable_list, PluginLoader(*this)); + } + + void StarDictPlugins::reorder(const std::list& order_list) +@@ -184,7 +184,7 @@ void StarDictPlugins::get_plugin_list(const std::list< + std::list plugins_dirs; + plugins_dirs.push_back(plugindirpath); + std::list disable_list; +- for_each_file(plugins_dirs, "."G_MODULE_SUFFIX, order_list, disable_list, PluginInfoLoader(*this, virtualdict_pluginlist, netdict_pluginlist, specialdict_pluginlist, tts_pluginlist, parsedata_pluginlist, misc_pluginlist)); ++ for_each_file(plugins_dirs, "." G_MODULE_SUFFIX, order_list, disable_list, PluginInfoLoader(*this, virtualdict_pluginlist, netdict_pluginlist, specialdict_pluginlist, tts_pluginlist, parsedata_pluginlist, misc_pluginlist)); + + if (!virtualdict_pluginlist.empty()) { + plugin_list.push_back(std::pair >(StarDictPlugInType_VIRTUALDICT, virtualdict_pluginlist)); Added: head/textproc/stardict3/files/patch-dict_src_lib_storage.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/stardict3/files/patch-dict_src_lib_storage.cpp Sun Apr 2 22:27:24 2017 (r437584) @@ -0,0 +1,11 @@ +--- dict/src/lib/storage.cpp.orig 2017-04-02 22:21:15 UTC ++++ dict/src/lib/storage.cpp +@@ -793,7 +793,7 @@ FileHolder Database_ResourceStorage::get_file_path(con + std::string name_pattern; // in file name encoding + if(!utf8_to_file_name(key, name_pattern)) + return FileHolder(); +- std::string::size_type pos = name_pattern.find_last_of("."DB_DIR_SEPARATOR_S); ++ std::string::size_type pos = name_pattern.find_last_of("." DB_DIR_SEPARATOR_S); + if(pos != std::string::npos) { + if(name_pattern[pos] == '.') + name_pattern = name_pattern.substr(pos);