diff options
Diffstat (limited to 'editors')
-rw-r--r-- | editors/chexedit/Makefile | 6 | ||||
-rw-r--r-- | editors/encryptpad/Makefile | 2 | ||||
-rw-r--r-- | editors/libreoffice/files/patch-avmedia_source_qt6_QtPlayer.cxx | 17 | ||||
-rw-r--r-- | editors/novelwriter/Makefile | 8 | ||||
-rw-r--r-- | editors/novelwriter/distinfo | 6 | ||||
-rw-r--r-- | editors/novelwriter/files/patch-pyproject.toml | 14 | ||||
-rw-r--r-- | editors/rehex/Makefile | 2 | ||||
-rw-r--r-- | editors/vscode/Makefile | 4 | ||||
-rw-r--r-- | editors/vscode/distinfo | 14 | ||||
-rw-r--r-- | editors/vscode/files/patch-node__modules_kerberos_binding.gyp | 18 | ||||
-rw-r--r-- | editors/vscode/files/patch-node__modules_kerberos_src_unix_kerberos__gss.cc | 20 | ||||
-rw-r--r-- | editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp | 18 | ||||
-rw-r--r-- | editors/vscode/files/patch-remote_node__modules_kerberos_src_unix_kerberos__gss.cc | 20 |
13 files changed, 105 insertions, 44 deletions
diff --git a/editors/chexedit/Makefile b/editors/chexedit/Makefile index 98b8b8757bdb..f699c876d288 100644 --- a/editors/chexedit/Makefile +++ b/editors/chexedit/Makefile @@ -2,13 +2,13 @@ PORTNAME= chexedit PORTVERSION= 0.9.7 PORTREVISION= 2 CATEGORIES= editors -MASTER_SITES= http://www.rogoyski.com/adam/programs/hexedit/ \ - http://mirror.amdmi3.ru/distfiles/ +MASTER_SITES= https://www.rogoyski.com/adam/programs/hexedit/ \ + https://mirror.amdmi3.ru/distfiles/ DISTNAME= hexedit-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Full screen text mode Hex editor using the [n]curses library -WWW= http://www.rogoyski.com/adam/programs/hexedit/ +WWW= https://www.rogoyski.com/adam/programs/hexedit/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/editors/encryptpad/Makefile b/editors/encryptpad/Makefile index 0dc81c6e5d95..76e8770adba9 100644 --- a/editors/encryptpad/Makefile +++ b/editors/encryptpad/Makefile @@ -1,7 +1,7 @@ PORTNAME= encryptpad DISTVERSIONPREFIX= v DISTVERSION= 0.5.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors security MAINTAINER= eduardo@FreeBSD.org diff --git a/editors/libreoffice/files/patch-avmedia_source_qt6_QtPlayer.cxx b/editors/libreoffice/files/patch-avmedia_source_qt6_QtPlayer.cxx deleted file mode 100644 index eaa1a925ec1d..000000000000 --- a/editors/libreoffice/files/patch-avmedia_source_qt6_QtPlayer.cxx +++ /dev/null @@ -1,17 +0,0 @@ ---- avmedia/source/qt6/QtPlayer.cxx.orig 2025-05-20 08:25:45 UTC -+++ avmedia/source/qt6/QtPlayer.cxx -@@ -41,6 +41,14 @@ using namespace ::com::sun::star; - - using namespace ::com::sun::star; - -+namespace -+{ -+inline OUString toOUString(const QString& s) -+{ -+ return OUString(reinterpret_cast<const sal_Unicode*>(s.data()), s.length()); -+} -+} -+ - namespace avmedia::qt - { - QtPlayer::QtPlayer() diff --git a/editors/novelwriter/Makefile b/editors/novelwriter/Makefile index 29b996c7fa83..0993e2bad552 100644 --- a/editors/novelwriter/Makefile +++ b/editors/novelwriter/Makefile @@ -1,6 +1,6 @@ PORTNAME= novelwriter DISTVERSIONPREFIX= v -DISTVERSION= 2.6.3 +DISTVERSION= 2.7.2 CATEGORIES= editors python MASTER_SITES= PYPI @@ -18,9 +18,9 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PY_DEPENDS} -USES= python pyqt:5 -USE_PYQT= pyqt5 -USE_PYTHON= pep517 concurrent autoplist +USES= python pyqt:6 +USE_PYQT= pyqt6 +USE_PYTHON= pep517 autoplist USE_GITHUB= yes GH_ACCOUNT= vkbo diff --git a/editors/novelwriter/distinfo b/editors/novelwriter/distinfo index 82c36656f0a7..aafec72f169e 100644 --- a/editors/novelwriter/distinfo +++ b/editors/novelwriter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1739770802 -SHA256 (vkbo-novelWriter-v2.6.3_GH0.tar.gz) = 8d18acf0069852c2598e73c3b76b4a8cf1d1c96d485d5165ff8cf3337ec7f920 -SIZE (vkbo-novelWriter-v2.6.3_GH0.tar.gz) = 7884399 +TIMESTAMP = 1750830387 +SHA256 (vkbo-novelWriter-v2.7.2_GH0.tar.gz) = 33a7648e316c563f9809998b88e94ff9e446576f6af16224e946f9c3e2d41915 +SIZE (vkbo-novelWriter-v2.7.2_GH0.tar.gz) = 5092204 diff --git a/editors/novelwriter/files/patch-pyproject.toml b/editors/novelwriter/files/patch-pyproject.toml index 10d0dac42b93..7a94437c17c0 100644 --- a/editors/novelwriter/files/patch-pyproject.toml +++ b/editors/novelwriter/files/patch-pyproject.toml @@ -1,6 +1,9 @@ ---- pyproject.toml.orig 2024-04-21 04:21:03 UTC +--- pyproject.toml.orig 2025-06-24 14:43:34 UTC +++ pyproject.toml -@@ -3,7 +3,7 @@ build-backend = "setuptools.build_meta" +@@ -1,15 +1,15 @@ + [build-system] +-requires = ["setuptools >= 77.0.3"] ++requires = ["setuptools"] build-backend = "setuptools.build_meta" [project] @@ -9,3 +12,10 @@ authors = [ {name = "Veronica Berglyd Olsen", email = "code@vkbo.net"}, ] + description = "A plain text editor for planning and writing novels" + readme = {file = "setup/description_pypi.md", content-type = "text/markdown"} +-license = "GPL-3.0" ++#license = "GPL-3.0" + classifiers = [ + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.10", diff --git a/editors/rehex/Makefile b/editors/rehex/Makefile index ebb38ee78530..3fa55e2fc94c 100644 --- a/editors/rehex/Makefile +++ b/editors/rehex/Makefile @@ -1,6 +1,6 @@ PORTNAME= rehex DISTVERSION= 0.63.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MAINTAINER= fuz@FreeBSD.org diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile index bc4b226d64bf..bc6c46e5efd6 100644 --- a/editors/vscode/Makefile +++ b/editors/vscode/Makefile @@ -1,5 +1,5 @@ PORTNAME= vscode -DISTVERSION= 1.101.1 +DISTVERSION= 1.101.2 PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= https://github.com/tagattie/FreeBSD-VSCode/releases/download/${DISTVERSION}/:node_modules @@ -69,7 +69,7 @@ USES= desktop-file-utils gl gmake gnome gssapi:mit iconv:wchar_t \ USE_GITHUB= yes GH_ACCOUNT= microsoft -SOURCE_COMMIT_HASH= 18e3a1ec544e6907be1e944a94c496e302073435 +SOURCE_COMMIT_HASH= 2901c5ac6db8a986a5666c3af51ff804d05af0d4 BINARY_ALIAS= python=${PYTHON_CMD} diff --git a/editors/vscode/distinfo b/editors/vscode/distinfo index 6abb2ca8eea5..c39714bbf8fa 100644 --- a/editors/vscode/distinfo +++ b/editors/vscode/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1750365794 -SHA256 (vscode/vscode-node-modules-1.101.1.tar.gz) = 7fdee8be7622f42be9d0658076c0d8c077d79a86250eda38d97dcda98111d1a7 -SIZE (vscode/vscode-node-modules-1.101.1.tar.gz) = 395119485 -SHA256 (vscode/vscode-marketplace-exts-1.101.1.tar.gz) = 13c6bd8b7ca7535e6ae1fa5178f56a703b1de7a484ff01d60931a692ec1924c5 -SIZE (vscode/vscode-marketplace-exts-1.101.1.tar.gz) = 1708576 -SHA256 (vscode/microsoft-vscode-1.101.1_GH0.tar.gz) = fc015daead5b5a14422944af9b04eb241c78d5b7273888c46bb184d6651a7a2b -SIZE (vscode/microsoft-vscode-1.101.1_GH0.tar.gz) = 22852405 +TIMESTAMP = 1750968241 +SHA256 (vscode/vscode-node-modules-1.101.2.tar.gz) = 84aab8d4b3f220ea94c9533c33be10fb66c518cdb2e0b643f563319cc4d39533 +SIZE (vscode/vscode-node-modules-1.101.2.tar.gz) = 395151117 +SHA256 (vscode/vscode-marketplace-exts-1.101.2.tar.gz) = 49e723dbfff85988adbb55815b0bcf5632449d3bb16a4a578b7caf9f4d468c26 +SIZE (vscode/vscode-marketplace-exts-1.101.2.tar.gz) = 1714638 +SHA256 (vscode/microsoft-vscode-1.101.2_GH0.tar.gz) = d65d04e68ae04a372b1c6b13d0e8a72e2c919e491d4c3b2dcf997b22fc25a509 +SIZE (vscode/microsoft-vscode-1.101.2_GH0.tar.gz) = 22853707 diff --git a/editors/vscode/files/patch-node__modules_kerberos_binding.gyp b/editors/vscode/files/patch-node__modules_kerberos_binding.gyp index 8d5f1b08f7db..98d1ff149173 100644 --- a/editors/vscode/files/patch-node__modules_kerberos_binding.gyp +++ b/editors/vscode/files/patch-node__modules_kerberos_binding.gyp @@ -1,4 +1,4 @@ ---- node_modules/kerberos/binding.gyp.orig 2025-06-12 22:34:24 UTC +--- node_modules/kerberos/binding.gyp.orig 2025-06-26 19:59:03 UTC +++ node_modules/kerberos/binding.gyp @@ -54,14 +54,14 @@ ] @@ -17,7 +17,7 @@ 'link_settings': { 'libraries': [ '-lkrb5', -@@ -78,7 +78,7 @@ +@@ -78,11 +78,21 @@ }] ] }], @@ -26,3 +26,17 @@ 'defines': ['KERBEROS_USE_RTLD=1'], 'link_settings': { 'libraries': [ + '-ldl', ++ ] ++ }, ++ }], ++ ['OS=="freebsd"', { ++ 'include_dirs+': [ ++ '<!(pkg-config krb5 --cflags-only-I | sed -E "s/(-I *|-isystem *)//g")', ++ ], ++ 'link_settings': { ++ 'library_dirs': [ ++ '<!(pkg-config krb5 --libs-only-L | sed -e "s/-L//g")', + ] + }, + }], diff --git a/editors/vscode/files/patch-node__modules_kerberos_src_unix_kerberos__gss.cc b/editors/vscode/files/patch-node__modules_kerberos_src_unix_kerberos__gss.cc new file mode 100644 index 000000000000..4ee74c9e7851 --- /dev/null +++ b/editors/vscode/files/patch-node__modules_kerberos_src_unix_kerberos__gss.cc @@ -0,0 +1,20 @@ +--- node_modules/kerberos/src/unix/kerberos_gss.cc.orig 2025-06-26 20:14:32 UTC ++++ node_modules/kerberos/src/unix/kerberos_gss.cc +@@ -65,10 +65,17 @@ struct DLOpenHandle { + DLOpenHandle& operator=(DLOpenHandle&) = delete; + }; + ++#ifndef __FreeBSD__ + #define DYLIBS(V) \ + V(gssapi, "libgssapi_krb5.so.2") \ + V(krb5, "libkrb5.so.3") \ + V(comerr, "libcom_err.so.2") ++#else ++#define DYLIBS(V) \ ++ V(gssapi, "libgssapi_krb5.so.2") \ ++ V(krb5, "libkrb5.so.3") \ ++ V(comerr, "libcom_err.so.3") ++#endif + + #define LIBRARY_HANDLE_GETTER(name, lib) \ + static const DLOpenHandle& name ## _handle() { \ diff --git a/editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp b/editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp index 6f7857f33b31..c45e3b1a359c 100644 --- a/editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp +++ b/editors/vscode/files/patch-remote_node__modules_kerberos_binding.gyp @@ -1,4 +1,4 @@ ---- remote/node_modules/kerberos/binding.gyp.orig 2025-06-12 22:38:39 UTC +--- remote/node_modules/kerberos/binding.gyp.orig 2025-06-26 20:01:28 UTC +++ remote/node_modules/kerberos/binding.gyp @@ -54,14 +54,14 @@ ] @@ -17,7 +17,7 @@ 'link_settings': { 'libraries': [ '-lkrb5', -@@ -78,7 +78,7 @@ +@@ -78,11 +78,21 @@ }] ] }], @@ -26,3 +26,17 @@ 'defines': ['KERBEROS_USE_RTLD=1'], 'link_settings': { 'libraries': [ + '-ldl', ++ ] ++ }, ++ }], ++ ['OS=="freebsd"', { ++ 'include_dirs+': [ ++ '<!(pkg-config krb5 --cflags-only-I | sed -E "s/(-I *|-isystem *)//g")', ++ ], ++ 'link_settings': { ++ 'library_dirs': [ ++ '<!(pkg-config krb5 --libs-only-L | sed -e "s/-L//g")', + ] + }, + }], diff --git a/editors/vscode/files/patch-remote_node__modules_kerberos_src_unix_kerberos__gss.cc b/editors/vscode/files/patch-remote_node__modules_kerberos_src_unix_kerberos__gss.cc new file mode 100644 index 000000000000..be4c95e3d422 --- /dev/null +++ b/editors/vscode/files/patch-remote_node__modules_kerberos_src_unix_kerberos__gss.cc @@ -0,0 +1,20 @@ +--- remote/node_modules/kerberos/src/unix/kerberos_gss.cc.orig 2025-06-26 20:17:25 UTC ++++ remote/node_modules/kerberos/src/unix/kerberos_gss.cc +@@ -65,10 +65,17 @@ struct DLOpenHandle { + DLOpenHandle& operator=(DLOpenHandle&) = delete; + }; + ++#ifndef __FreeBSD__ + #define DYLIBS(V) \ + V(gssapi, "libgssapi_krb5.so.2") \ + V(krb5, "libkrb5.so.3") \ + V(comerr, "libcom_err.so.2") ++#else ++#define DYLIBS(V) \ ++ V(gssapi, "libgssapi_krb5.so.2") \ ++ V(krb5, "libkrb5.so.3") \ ++ V(comerr, "libcom_err.so.3") ++#endif + + #define LIBRARY_HANDLE_GETTER(name, lib) \ + static const DLOpenHandle& name ## _handle() { \ |