forked from coolsnowwolf/packages
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/packages: django: bump to version 4.0.4 Jinja2: change maintainer to Šimon Bořek Flask: change maintainer to Šimon Bořek php8: update to 8.1.5 passh: updated per OpenWrt's common practice sexpect: updated per OpenWrt's common practice tintin: add new package (coolsnowwolf#418) boost: Bump to version 1.79.0 (coolsnowwolf#419)
- Loading branch information
Showing
13 changed files
with
148 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| --- a/boost/json/impl/array.ipp | ||
| +++ b/boost/json/impl/array.ipp | ||
| @@ -491,8 +491,11 @@ erase( | ||
| auto const p = &(*t_)[0] + | ||
| (pos - &(*t_)[0]); | ||
| destroy(p, p + 1); | ||
| - relocate(p, p + 1, 1); | ||
| --t_->size; | ||
| + if(t_->size > 0) | ||
| + relocate(p, p + 1, | ||
| + t_->size - (p - | ||
| + &(*t_)[0])); | ||
| return p; | ||
| } | ||
|
|
||
| --- a/libs/json/test/array.cpp | ||
| +++ b/libs/json/test/array.cpp | ||
| @@ -1270,6 +1270,21 @@ public: | ||
| } | ||
|
|
||
| void | ||
| + testIssue692() | ||
| + { | ||
| + array a; | ||
| + object obj; | ||
| + obj["test1"] = "hello"; | ||
| + a.push_back(obj); | ||
| + a.push_back(obj); | ||
| + a.push_back(obj); | ||
| + a.push_back(obj); | ||
| + a.push_back(obj); | ||
| + while(a.size()) | ||
| + a.erase(a.begin()); | ||
| + } | ||
| + | ||
| + void | ||
| run() | ||
| { | ||
| testDestroy(); | ||
| @@ -1283,6 +1298,7 @@ public: | ||
| testExceptions(); | ||
| testEquality(); | ||
| testHash(); | ||
| + testIssue692(); | ||
| } | ||
| }; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| #!/bin/sh | ||
|
|
||
| out=`$1 --version` | ||
| if [ "$out" != "$1 $2" ]; then | ||
| exit 1 | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| #!/bin/sh | ||
|
|
||
| out=`$1 --version` | ||
| if [ "$out" != "$1 $2" ]; then | ||
| exit 1 | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| include $(TOPDIR)/rules.mk | ||
|
|
||
| PKG_NAME:=tintin | ||
| PKG_VERSION:=2.02.20 | ||
| PKG_RELEASE:=$(AUTORELEASE) | ||
|
|
||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | ||
| PKG_SOURCE_URL:=https://github.com/scandum/tintin/releases/download/$(PKG_VERSION)/ | ||
| PKG_HASH:=331673e6ee3c945cf27e1c0d71cec1225c9d992588ed73b2a707c4c49523e8d2 | ||
|
|
||
| PKG_MAINTAINER:=scandum <ivdhoven@gmail.com> | ||
| PKG_LICENSE:=GPL-3.0-or-later | ||
| PKG_LICENSE_FILES:=COPYING | ||
| PKG_CPE_ID:=cpe:/a:gnu:tt++ | ||
|
|
||
| PKG_INSTALL:=1 | ||
| PKG_BUILD_PARALLEL:=1 | ||
|
|
||
| include $(INCLUDE_DIR)/package.mk | ||
|
|
||
| define Package/tintin | ||
| SECTION:=utils | ||
| CATEGORY:=Utilities | ||
| SUBMENU:=Terminal | ||
| TITLE:=tintin a MUD client | ||
| DEPENDS:=+zlib +libpcre +libgnutls | ||
| URL:=https://downloads.sf.net/tintin/ | ||
| endef | ||
|
|
||
| define Package/tintin/description | ||
| TinTin++ is a command line MUD client which features support for TELNET, | ||
| PCRE, UTF-8, SSL, VT100, IPv6, the dynamic TINTIN scripting language, | ||
| a comprensive trigger system, and several other features geared towards | ||
| mudding, scripting, shell-scripting, text processing, automation, | ||
| interprocess communication, redirection, xterm terminal emulation, and | ||
| multiplexing / demultiplexing. | ||
| endef | ||
|
|
||
| define Build/Prepare | ||
| $(Build/Prepare/Default) | ||
| ($(CP) $(PKG_BUILD_DIR)/../tt/src/. $(PKG_BUILD_DIR)/ && \ | ||
| $(SED) 's/^.*ptmx.*/#&/' $(PKG_BUILD_DIR)/configure.in && \ | ||
| $(SED) 's/^.*cannot check for file existence when cross compiling.*/#&/' $(PKG_BUILD_DIR)/configure) | ||
| endef | ||
| define Package/tintin/install | ||
| $(INSTALL_DIR) $(1)/usr/bin | ||
| $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tt++ $(1)/usr/bin/ | ||
| endef | ||
|
|
||
| $(eval $(call BuildPackage,tintin)) |