diff options
Diffstat (limited to 'editors')
-rw-r--r-- | editors/emacs-devel/Makefile | 4 | ||||
-rw-r--r-- | editors/emacs-devel/distinfo | 6 | ||||
-rw-r--r-- | editors/vscode/Makefile | 4 | ||||
-rw-r--r-- | editors/vscode/distinfo | 14 | ||||
-rw-r--r-- | editors/xmlcopyeditor/files/patch-src_wraplibxml.cpp | 39 |
5 files changed, 48 insertions, 19 deletions
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 1d924855771f..26e9efca785b 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= emacs -DISTVERSION= 31.0.50.20250503 +DISTVERSION= 31.0.50.20250515 PORTEPOCH= 3 CATEGORIES= editors PKGNAMESUFFIX= -devel @@ -24,7 +24,7 @@ USES= autoreconf:build cpe gmake localbase:ldflags makeinfo ncurses \ CPE_VENDOR= gnu USE_GITHUB= yes GH_ACCOUNT= emacs-mirror -GH_TAGNAME= f180e4c9cb6 +GH_TAGNAME= db198e0e59b GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-build-details \ diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo index cb3f18b18dbd..737429f8904c 100644 --- a/editors/emacs-devel/distinfo +++ b/editors/emacs-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746247240 -SHA256 (emacs-mirror-emacs-31.0.50.20250503-f180e4c9cb6_GH0.tar.gz) = ebc6cef6615b50de315cfa62e04cbf9fc1ea45705891e87ad8e9f33fae6c42df -SIZE (emacs-mirror-emacs-31.0.50.20250503-f180e4c9cb6_GH0.tar.gz) = 52092643 +TIMESTAMP = 1747328902 +SHA256 (emacs-mirror-emacs-31.0.50.20250515-db198e0e59b_GH0.tar.gz) = 70d09e0a7a0564dc7ad6e619361d7bf3fc683666271fe5979ddd7fc3b5f8ed2e +SIZE (emacs-mirror-emacs-31.0.50.20250515-db198e0e59b_GH0.tar.gz) = 52116050 diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index f373ba08b4a1..cafb8b6b53d2 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,5 +1,5 @@ PORTNAME= vscode -DISTVERSION= 1.100.1 +DISTVERSION= 1.100.2 CATEGORIES= editors MASTER_SITES= https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:node_modules DISTFILES= vscode-node-modules-${DISTVERSION}${EXTRACT_SUFX}:node_modules \ @@ -69,7 +69,7 @@ USES= desktop-file-utils gl gmake gnome iconv:wchar_t jpeg \ USE_GITHUB= yes GH_ACCOUNT= microsoft -SOURCE_COMMIT_HASH= 91fa95bccb027ece6a968589bb1d662fa9c8e170 +SOURCE_COMMIT_HASH= 848b80aeb52026648a8ff9f7c45a9b0a80641e2e BINARY_ALIAS= python=${PYTHON_CMD} diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo index 5e2d036a8af8..48911ac3d902 100644 --- a/editors/vscode/distinfo +++ b/editors/vscode/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1747224879 -SHA256 (vscode/vscode-node-modules-1.100.1.tar.gz) = 3d178a4ed5e90b55644c92c2483b2266c28d725478062c0a9343b9c851bd909f -SIZE (vscode/vscode-node-modules-1.100.1.tar.gz) = 400219899 -SHA256 (vscode/vscode-marketplace-exts-1.100.1.tar.gz) = 289eb2b6105b5c1925c65c17e410412c46c9731f297a798c90ba25d269c3d03b -SIZE (vscode/vscode-marketplace-exts-1.100.1.tar.gz) = 1710748 -SHA256 (vscode/microsoft-vscode-1.100.1_GH0.tar.gz) = 628afc21dacd066eccaae5ce1ee71b6b552f035703d825e26aa78528925c4f15 -SIZE (vscode/microsoft-vscode-1.100.1_GH0.tar.gz) = 22647774 +TIMESTAMP = 1747369448 +SHA256 (vscode/vscode-node-modules-1.100.2.tar.gz) = b9246cba227bc2bd827a9be7e45a13f65b6b68d4df5039517b314765c44ecf51 +SIZE (vscode/vscode-node-modules-1.100.2.tar.gz) = 400199168 +SHA256 (vscode/vscode-marketplace-exts-1.100.2.tar.gz) = 88553d52d84916e8f91fa57ccd00d78f5f91fb533cb7b403746b32f08ebb8fbf +SIZE (vscode/vscode-marketplace-exts-1.100.2.tar.gz) = 1709308 +SHA256 (vscode/microsoft-vscode-1.100.2_GH0.tar.gz) = de57439ffcdfe70020d6c2397b0d62089cc01fe7fe612a65649cbaa5360a6a81 +SIZE (vscode/microsoft-vscode-1.100.2_GH0.tar.gz) = 22647395 diff --git a/editors/xmlcopyeditor/files/patch-src_wraplibxml.cpp b/editors/xmlcopyeditor/files/patch-src_wraplibxml.cpp index dd59b228708c..e5071186ce18 100644 --- a/editors/xmlcopyeditor/files/patch-src_wraplibxml.cpp +++ b/editors/xmlcopyeditor/files/patch-src_wraplibxml.cpp @@ -1,9 +1,38 @@ -Fix with >libxml2-2.12 -https://sourceforge.net/p/xml-copy-editor/bugs/239/ +Fix with libxml2-2.14 +https://sourceforge.net/p/xml-copy-editor/bugs/242/ ---- src/wraplibxml.cpp.orig 2025-01-23 10:31:01 UTC +--- src/wraplibxml.cpp.orig 2025-05-15 17:09:04 UTC +++ src/wraplibxml.cpp -@@ -706,7 +706,7 @@ wxString WrapLibxml::getLastError() +@@ -54,7 +54,11 @@ class Initializer (public) + xmlLoadCatalog ( CONV ( catalogPath ) ); + ::catalog = xmlLoadACatalog ( CONV ( catalogPath ) ); + ++#if LIBXML_VERSION < 21400 + initGenericErrorDefaultFunc ( NULL ); ++#else ++ xmlSetGenericErrorFunc ( NULL, NULL ); ++#endif + } + + ~Initializer () +@@ -472,7 +476,7 @@ std::string WrapLibxml::dumpXPathObject ( xmlXPathObje + case XPATH_STRING: + sstream << obj->stringval; + break; +- ++#if LIBXML_VERSION < 21400 + case XPATH_POINT: + xmlBufferPtr bufferPtr; + bufferPtr = xmlBufferCreate(); +@@ -486,6 +490,7 @@ std::string WrapLibxml::dumpXPathObject ( xmlXPathObje + + case XPATH_RANGE: + case XPATH_LOCATIONSET: ++#endif + case XPATH_XSLT_TREE: + default: + FILE *fp = tmpfile(); +@@ -706,7 +711,7 @@ wxString WrapLibxml::getLastError() wxString WrapLibxml::getLastError() { @@ -12,7 +41,7 @@ https://sourceforge.net/p/xml-copy-editor/bugs/239/ if ( !err ) return nonParserError; -@@ -722,7 +722,7 @@ std::pair<int, int> WrapLibxml::getErrorPosition() +@@ -722,7 +727,7 @@ std::pair<int, int> WrapLibxml::getErrorPosition() std::pair<int, int> WrapLibxml::getErrorPosition() { |