git: 08116c1bf630 - main - =?utf-8?Q?net-im/dissent: Update 0.0.30 =E2=86=92 0.0.32, take maintainership, impr=Q?net-im/dissent: Update 0.0.30 =E2=86=92 0.0.32, take maintainership, impr=
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 27 Jan 2025 16:30:16 UTC
ove port?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08116c1bf630f65171e59217dca72295841877f7 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=08116c1bf630f65171e59217dca72295841877f7 commit 08116c1bf630f65171e59217dca72295841877f7 Author: Yusuf Yaman <nxjoseph@protonmail.com> AuthorDate: 2025-01-27 16:28:25 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-01-27 16:28:25 +0000 net-im/dissent: Update 0.0.30 → 0.0.32, take maintainership, improve port Port changes: * Switch to GO_MODULE instead of GitHub because fetch of a file from GH is failed. * Pet port{clippy,fmt,lint}. * Submitter becomes maintainer. ChangeLogs: https://github.com/diamondburned/dissent/releases/tag/v0.0.31 https://github.com/diamondburned/dissent/releases/tag/v0.0.32 PR: 284323 --- net-im/dissent/Makefile | 57 +-- net-im/dissent/distinfo | 88 +--- net-im/dissent/files/patch-gotk4-spelling | 681 ++++++++++++++++++++++++++++++ net-im/dissent/pkg-descr | 1 - 4 files changed, 695 insertions(+), 132 deletions(-) diff --git a/net-im/dissent/Makefile b/net-im/dissent/Makefile index 0787c43e6179..408994ec7a21 100644 --- a/net-im/dissent/Makefile +++ b/net-im/dissent/Makefile @@ -1,10 +1,9 @@ PORTNAME= dissent DISTVERSIONPREFIX= v -DISTVERSION= 0.0.30 -PORTREVISION= 2 +DISTVERSION= 0.0.32 CATEGORIES= net-im -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nxjoseph@protonmail.com COMMENT= Tiny native Discord app WWW= https://github.com/diamondburned/dissent @@ -14,50 +13,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libgraphene-1.0.so:graphics/graphene \ libspelling-1.so:x11-toolkits/libspelling -USES= gnome go:1.22,modules pkgconfig -USE_GITHUB= yes +USES= gnome go:1.22,modules gstreamer pkgconfig USE_GNOME= cairo gdkpixbuf2 gtk40 gtksourceview5 libadwaita -GH_ACCOUNT= diamondburned -GH_TUPLE= KarpelesLab:weak:v0.1.1:karpeleslab_weak/vendor/github.com/KarpelesLab/weak \ - alecthomas:chroma:v0.10.0:alecthomas_chroma/vendor/github.com/alecthomas/chroma \ - alessio:shellescape:v1.4.2:alessio_shellescape/vendor/github.com/alessio/shellescape \ - danieljoos:wincred:v1.2.1:danieljoos_wincred/vendor/github.com/danieljoos/wincred \ - diamondburned:adaptive:fa139be203a8:diamondburned_adaptive/vendor/github.com/diamondburned/adaptive \ - diamondburned:arikawa:v3.4.0:diamondburned_arikawa_v3/vendor/github.com/diamondburned/arikawa/v3 \ - diamondburned:chatkit:5788b19145bc:diamondburned_chatkit/vendor/github.com/diamondburned/chatkit \ - diamondburned:ctxt:2db38a5d3c12:diamondburned_ctxt/vendor/libdb.so/ctxt \ - diamondburned:go-emoji:39776eee41ac:diamondburned_go_emoji/vendor/libdb.so/go-emoji \ - diamondburned:gotk4-adwaita:824c3ce8a5f4:diamondburned_gotk4_adwaita_pkg/vendor/github.com/diamondburned/gotk4-adwaita \ - diamondburned:gotk4-sourceview:98263515a466:diamondburned_gotk4_sourceview/vendor/libdb.so/gotk4-sourceview \ - diamondburned:gotk4-spelling:ee26db878626:diamondburned_gotk4_spelling/vendor/libdb.so/gotk4-spelling \ - diamondburned:gotk4:v0.3.1:diamondburned_gotk4_pkg/vendor/github.com/diamondburned/gotk4 \ - diamondburned:gotkit:aa2fb5bc486d:diamondburned_gotkit/vendor/github.com/diamondburned/gotkit \ - diamondburned:ningen:f1a24c0da3d8:diamondburned_ningen_v3/vendor/github.com/diamondburned/ningen/v3 \ - dlclark:regexp2:v1.11.0:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \ - dustin:go-humanize:v1.0.1:dustin_go_humanize/vendor/github.com/dustin/go-humanize \ - enescakir:emoji:v1.0.0:enescakir_emoji/vendor/github.com/enescakir/emoji \ - go4org:go4:214862532bf5:go4org_go4/vendor/go4.org \ - go4org:unsafe-assume-no-moving-gc:b99613f794b6:go4org_unsafe_assume_no_moving_gc/vendor/go4.org/unsafe/assume-no-moving-gc \ - godbus:dbus:v5.1.0:godbus_dbus_v5/vendor/github.com/godbus/dbus/v5 \ - gofrs:flock:v0.12.1:gofrs_flock/vendor/github.com/gofrs/flock \ - golang:crypto:v0.25.0:golang_crypto/vendor/golang.org/x/crypto \ - golang:sync:v0.7.0:golang_sync/vendor/golang.org/x/sync \ - golang:sys:v0.22.0:golang_sys/vendor/golang.org/x/sys \ - golang:text:v0.16.0:golang_text/vendor/golang.org/x/text \ - golang:time:v0.6.0:golang_time/vendor/golang.org/x/time \ - gorilla:schema:v1.4.1:gorilla_schema/vendor/github.com/gorilla/schema \ - gorilla:websocket:v1.5.3:gorilla_websocket/vendor/github.com/gorilla/websocket \ - ianlancetaylor:cgosymbolizer:581a3f7c677f:ianlancetaylor_cgosymbolizer/vendor/github.com/ianlancetaylor/cgosymbolizer \ - leonelquinteros:gotext:v1.6.0:leonelquinteros_gotext/vendor/github.com/leonelquinteros/gotext \ - lmittmann:tint:v1.0.4:lmittmann_tint/vendor/github.com/lmittmann/tint \ - mattn:go-isatty:v0.0.20:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ - pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \ - puzpuzpuz:xsync:v3.1.0:puzpuzpuz_xsync_v3/vendor/github.com/puzpuzpuz/xsync/v3 \ - sahilm:fuzzy:v0.1.1:sahilm_fuzzy/vendor/github.com/sahilm/fuzzy \ - twmb:murmur3:v1.1.8:twmb_murmur3/vendor/github.com/twmb/murmur3 \ - yalue:merged_fs:v1.3.0:yalue_merged_fs/vendor/github.com/yalue/merged_fs \ - yuin:goldmark:v1.7.1:yuin_goldmark/vendor/github.com/yuin/goldmark \ - zalando:go-keyring:v0.2.4:zalando_go_keyring/vendor/github.com/zalando/go-keyring +USE_GSTREAMER= bad good ugly +GO_MODULE= libdb.so/dissent CGO_LDFLAGS+= -Wl,--as-needed # gtk4 deps PLIST_FILES= bin/${PORTNAME} \ share/applications/so.libdb.dissent.desktop \ @@ -66,12 +25,14 @@ PLIST_FILES= bin/${PORTNAME} \ share/metainfo/so.libdb.dissent.metainfo.xml post-patch: - @${REINPLACE_CMD} 's,/usr/bin,${PREFIX}/bin,' ${WRKSRC}/nix/*.service + @${REINPLACE_CMD} 's,/usr/bin,${PREFIX}/bin,' \ + ${WRKSRC}/nix/*.service + @${RM} ${WRKSRC}/vendor/libdb.so/gotk4-spelling/pkg/spelling/spelling-dictionary.go post-install: # Install extras similar to Nix flake .for f in nix/*.desktop nix/*.service *.metainfo.xml \ - internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg + internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg ${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.${f:E}:H} ${INSTALL_DATA} ${WRKSRC}/${f} \ ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.${f:E}} diff --git a/net-im/dissent/distinfo b/net-im/dissent/distinfo index ef784b07293a..d5e9e889207c 100644 --- a/net-im/dissent/distinfo +++ b/net-im/dissent/distinfo @@ -1,83 +1,5 @@ -TIMESTAMP = 1724751353 -SHA256 (diamondburned-dissent-v0.0.30_GH0.tar.gz) = 63994e46b01e135c36902b67a8495eef71d4a4b09204c712629edadfc8398dc6 -SIZE (diamondburned-dissent-v0.0.30_GH0.tar.gz) = 4041825 -SHA256 (KarpelesLab-weak-v0.1.1_GH0.tar.gz) = a8b6b241e8b72c95132497864c59a559fb35f6ae4b296c299e563a12a3a16fbe -SIZE (KarpelesLab-weak-v0.1.1_GH0.tar.gz) = 3484 -SHA256 (alecthomas-chroma-v0.10.0_GH0.tar.gz) = 98a517ae99f48e3b54d5c8cd7473d5c544f51bee7a4be17f5175736fce37da56 -SIZE (alecthomas-chroma-v0.10.0_GH0.tar.gz) = 798272 -SHA256 (alessio-shellescape-v1.4.2_GH0.tar.gz) = cb97c613c10328f08969b77cf97c7d996f4415cf22aea71cebc985c558afb89b -SIZE (alessio-shellescape-v1.4.2_GH0.tar.gz) = 9331 -SHA256 (danieljoos-wincred-v1.2.1_GH0.tar.gz) = 572e2318744c658b520c7c676c7638a97851a111315ab179d25e4896a6adb823 -SIZE (danieljoos-wincred-v1.2.1_GH0.tar.gz) = 10253 -SHA256 (diamondburned-adaptive-fa139be203a8_GH0.tar.gz) = 72fb26ba28d2ee4528f626a9e496f676dce7f452204f81f04768eece441bba3f -SIZE (diamondburned-adaptive-fa139be203a8_GH0.tar.gz) = 18557 -SHA256 (diamondburned-arikawa-v3.4.0_GH0.tar.gz) = 455b18a0d0586bad90f7bf32f870d4ca583227a3843606d35f079e28aa0aa24c -SIZE (diamondburned-arikawa-v3.4.0_GH0.tar.gz) = 266125 -SHA256 (diamondburned-chatkit-5788b19145bc_GH0.tar.gz) = 92f6c0bbb61537cd72014f30e4f1751604d617405ddbce4040ccd45cf75ebf20 -SIZE (diamondburned-chatkit-5788b19145bc_GH0.tar.gz) = 61420 -SHA256 (diamondburned-ctxt-2db38a5d3c12_GH0.tar.gz) = e326eae196ce8f25bf12e45d57c08011c3c3673a2e5da805235ee423f105e2b1 -SIZE (diamondburned-ctxt-2db38a5d3c12_GH0.tar.gz) = 3561 -SHA256 (diamondburned-go-emoji-39776eee41ac_GH0.tar.gz) = 3159ca9f8a77340f1f4605ac3b8f54201ff2217bc9681dbe6c733de859b5a295 -SIZE (diamondburned-go-emoji-39776eee41ac_GH0.tar.gz) = 374906 -SHA256 (diamondburned-gotk4-adwaita-824c3ce8a5f4_GH0.tar.gz) = 118e06eb3e8be8838caebd9525e0d3c2b6297912e5fb34b6335e2ca56714ced8 -SIZE (diamondburned-gotk4-adwaita-824c3ce8a5f4_GH0.tar.gz) = 177839 -SHA256 (diamondburned-gotk4-sourceview-98263515a466_GH0.tar.gz) = 7e8c5500784fde5e6f3322b4326352ff1e4f900976b8a0af86807acbee30451b -SIZE (diamondburned-gotk4-sourceview-98263515a466_GH0.tar.gz) = 246143 -SHA256 (diamondburned-gotk4-spelling-ee26db878626_GH0.tar.gz) = 2d36302292cbd494c68e4bd53626ab2a3b4b2393a28eeb1b8c9dc9a99aef43de -SIZE (diamondburned-gotk4-spelling-ee26db878626_GH0.tar.gz) = 25338 -SHA256 (diamondburned-gotk4-v0.3.1_GH0.tar.gz) = 1aea32fc2026aa0d3b2ad429eff2900d826a7a1dddceb2649d4d4114fe86feca -SIZE (diamondburned-gotk4-v0.3.1_GH0.tar.gz) = 3311686 -SHA256 (diamondburned-gotkit-aa2fb5bc486d_GH0.tar.gz) = 9a01653ae12e1d2c4b5978f90ee64296572dc6a270d611c59c5ce29932bbfae4 -SIZE (diamondburned-gotkit-aa2fb5bc486d_GH0.tar.gz) = 75705 -SHA256 (diamondburned-ningen-f1a24c0da3d8_GH0.tar.gz) = 88814c8bef1f44d397205bc001c3a118fe3fca6e1acc18c77218074a85c3ba07 -SIZE (diamondburned-ningen-f1a24c0da3d8_GH0.tar.gz) = 46994 -SHA256 (dlclark-regexp2-v1.11.0_GH0.tar.gz) = c380209bd67b67859014f9bfd155aec4bfc4beb65f4a6aec37683b80186b18f7 -SIZE (dlclark-regexp2-v1.11.0_GH0.tar.gz) = 212532 -SHA256 (dustin-go-humanize-v1.0.1_GH0.tar.gz) = ac3a0d8d0eef07c75d12eddce775a8e8306dfb9783a45312597c34ff643793d8 -SIZE (dustin-go-humanize-v1.0.1_GH0.tar.gz) = 17692 -SHA256 (enescakir-emoji-v1.0.0_GH0.tar.gz) = d62dc29e5a3f08b8de6fdb8919089cfa9a82c003466b0b1cb5feb33563612839 -SIZE (enescakir-emoji-v1.0.0_GH0.tar.gz) = 68908 -SHA256 (go4org-go4-214862532bf5_GH0.tar.gz) = 20b143aa387a37cab6f69eaf3a234fe33d801114193d27d90b11e940e5e5c257 -SIZE (go4org-go4-214862532bf5_GH0.tar.gz) = 151259 -SHA256 (go4org-unsafe-assume-no-moving-gc-b99613f794b6_GH0.tar.gz) = 92c41675053bbd8fb47ba69e2688c8e51910891a5dbb96b4fc9a8cc3576fba80 -SIZE (go4org-unsafe-assume-no-moving-gc-b99613f794b6_GH0.tar.gz) = 2616 -SHA256 (godbus-dbus-v5.1.0_GH0.tar.gz) = 2f4939ab13a20178584ef534293abc5b6744bb5b6232432050c5a3ab2ab85fd7 -SIZE (godbus-dbus-v5.1.0_GH0.tar.gz) = 74080 -SHA256 (gofrs-flock-v0.12.1_GH0.tar.gz) = 4782769ed6566f75e03da9157087337f03868ab3533c193bd5ccd276f0517146 -SIZE (gofrs-flock-v0.12.1_GH0.tar.gz) = 14942 -SHA256 (golang-crypto-v0.25.0_GH0.tar.gz) = 44619ce0bc1901464e14925487f5152b850b50e214cc12021dbe177f22444749 -SIZE (golang-crypto-v0.25.0_GH0.tar.gz) = 1796762 -SHA256 (golang-sync-v0.7.0_GH0.tar.gz) = 39bf56d2dc04d16baabbf5eb5d847a2ad68762b5efde7ca3a8fdb24bdcdd9461 -SIZE (golang-sync-v0.7.0_GH0.tar.gz) = 18181 -SHA256 (golang-sys-v0.22.0_GH0.tar.gz) = b5a84a20ff327803ed47aefd837a3264d511b3f644017cb8e050ff1f5bd22471 -SIZE (golang-sys-v0.22.0_GH0.tar.gz) = 1498230 -SHA256 (golang-text-v0.16.0_GH0.tar.gz) = 6df270cb3d696f882857c8ce02233e7f08d5ff900986e1ac669b47e088b18779 -SIZE (golang-text-v0.16.0_GH0.tar.gz) = 8972326 -SHA256 (golang-time-v0.6.0_GH0.tar.gz) = ae14197c16c163312cda54facc15cbf36f2bd8cf09daefe1489b234335f162e3 -SIZE (golang-time-v0.6.0_GH0.tar.gz) = 12219 -SHA256 (gorilla-schema-v1.4.1_GH0.tar.gz) = 5ba1ae2586add03cbbe9ca0f4669c37fd257b196f6e3d2f41dc98cc99efb802b -SIZE (gorilla-schema-v1.4.1_GH0.tar.gz) = 28615 -SHA256 (gorilla-websocket-v1.5.3_GH0.tar.gz) = 707f217e9a46c516c289b71c45a4e51b11b5e0fcec54c1fbfecde47b8a001799 -SIZE (gorilla-websocket-v1.5.3_GH0.tar.gz) = 54884 -SHA256 (ianlancetaylor-cgosymbolizer-581a3f7c677f_GH0.tar.gz) = ba359abe38f7cf2459aa9e37175e78927f8ab141c87b853d26baa580ec74aae5 -SIZE (ianlancetaylor-cgosymbolizer-581a3f7c677f_GH0.tar.gz) = 104214 -SHA256 (leonelquinteros-gotext-v1.6.0_GH0.tar.gz) = 6f612c6307f089526362a6b683eafa81385cc278f80024018217e3c90849dfee -SIZE (leonelquinteros-gotext-v1.6.0_GH0.tar.gz) = 47645 -SHA256 (lmittmann-tint-v1.0.4_GH0.tar.gz) = 803ec253a835a7becf88a77083a847b88a62833ab1af289c248491f574c570dc -SIZE (lmittmann-tint-v1.0.4_GH0.tar.gz) = 8467 -SHA256 (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 18fc42a278e60fb7a1dffa72f20539ae88d0e292db55b513ef514b7d369883a6 -SIZE (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 4713 -SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608 -SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415 -SHA256 (puzpuzpuz-xsync-v3.1.0_GH0.tar.gz) = 92f87513b2d240e5c562a00e222e1aae42cc685cd5292a8b70e1b77c993da059 -SIZE (puzpuzpuz-xsync-v3.1.0_GH0.tar.gz) = 37965 -SHA256 (sahilm-fuzzy-v0.1.1_GH0.tar.gz) = 3242679be224552ef8934524cb08bb5d355644084a3476509bedd4dba57af408 -SIZE (sahilm-fuzzy-v0.1.1_GH0.tar.gz) = 3353368 -SHA256 (twmb-murmur3-v1.1.8_GH0.tar.gz) = afa51249308db62b5a2d4610b7c30cd41dc4906777211d8d8b09250875a668aa -SIZE (twmb-murmur3-v1.1.8_GH0.tar.gz) = 12570 -SHA256 (yalue-merged_fs-v1.3.0_GH0.tar.gz) = 27639efb6111bb5e924fc9f4d68bf2233608c89e8411e304fbb8d18d2cff0f56 -SIZE (yalue-merged_fs-v1.3.0_GH0.tar.gz) = 91888 -SHA256 (yuin-goldmark-v1.7.1_GH0.tar.gz) = e1159c456d6d5c8fdfeb61534aa23ef6f4108bbf74a21016199debfdde82590a -SIZE (yuin-goldmark-v1.7.1_GH0.tar.gz) = 252103 -SHA256 (zalando-go-keyring-v0.2.4_GH0.tar.gz) = 82e1fa8b5f79203c58f0374a1c68104e89e53ec9497b9e9894d9b5cd2c00308e -SIZE (zalando-go-keyring-v0.2.4_GH0.tar.gz) = 11218 +TIMESTAMP = 1737743530 +SHA256 (go/net-im_dissent/dissent-v0.0.32/v0.0.32.mod) = 66ae8707c26c1a6bb9f1426c7f72415877af7fe8e4943f5646d0ed52e9d5a7d0 +SIZE (go/net-im_dissent/dissent-v0.0.32/v0.0.32.mod) = 2123 +SHA256 (go/net-im_dissent/dissent-v0.0.32/v0.0.32.zip) = 8d5fb8045f955ac587a381205387ab01c449abb501e745235c585f1db6d70a10 +SIZE (go/net-im_dissent/dissent-v0.0.32/v0.0.32.zip) = 4219755 diff --git a/net-im/dissent/files/patch-gotk4-spelling b/net-im/dissent/files/patch-gotk4-spelling new file mode 100644 index 000000000000..b4cb8cc3da63 --- /dev/null +++ b/net-im/dissent/files/patch-gotk4-spelling @@ -0,0 +1,681 @@ +Remove features that causing build error that our libspelling version doesn't have. + +Reverted this commit: +https://github.com/diamondburned/gotk4-spelling/commit/a9edc40bddb0d3ae25dab085d0ae4d96097477ff + +https://github.com/diamondburned/gotk4-spelling/issues/://github.com/diamondburned/gotk4-spelling/issues/1 + +--- vendor/libdb.so/gotk4-spelling/pkg/spelling/spelling-checker.go.orig 2025-01-24 19:56:09 UTC ++++ vendor/libdb.so/gotk4-spelling/pkg/spelling/spelling-checker.go +@@ -34,8 +34,6 @@ func defaultCheckerOverrides(v *Checker) CheckerOverri + return CheckerOverrides{} + } + +-// Checker: SpellingChecker is the core class of libspelling. It provides +-// high-level APIs for spellchecking. + type Checker struct { + _ [0]func() // equal guard + *coreglib.Object +@@ -71,7 +69,7 @@ func marshalChecker(p uintptr) (interface{}, error) { + return wrapChecker(coreglib.ValueFromNative(unsafe.Pointer(p)).Object()), nil + } + +-// NewChecker: create a new SpellingChecker. ++// NewChecker: create a new Checker. + // + // The function takes the following parameters: + // +@@ -80,7 +78,7 @@ func marshalChecker(p uintptr) (interface{}, error) { + // + // The function returns the following values: + // +-// - checker: newly created SpellingChecker. ++// - checker: newly created Checker. + func NewChecker(provider Providerer, language string) *Checker { + var _arg1 *C.SpellingProvider // out + var _arg2 *C.char // out +@@ -101,11 +99,6 @@ func NewChecker(provider Providerer, language string) + return _checker + } + +-// AddWord adds word to the active dictionary. +-// +-// The function takes the following parameters: +-// +-// - word to be added. + func (self *Checker) AddWord(word string) { + var _arg0 *C.SpellingChecker // out + var _arg1 *C.char // out +@@ -119,15 +112,6 @@ func (self *Checker) AddWord(word string) { + runtime.KeepAlive(word) + } + +-// CheckWord checks if the active dictionary contains word. +-// +-// The function takes the following parameters: +-// +-// - word to be checked. +-// +-// The function returns the following values: +-// +-// - ok: TRUE if the dictionary contains the word. + func (self *Checker) CheckWord(word string) bool { + var _arg0 *C.SpellingChecker // out + var _arg1 *C.char // out +@@ -153,11 +137,6 @@ func (self *Checker) CheckWord(word string) bool { + return _ok + } + +-// ExtraWordChars gets the extra word characters of the active dictionary. +-// +-// The function returns the following values: +-// +-// - utf8: extra word characters. + func (self *Checker) ExtraWordChars() string { + var _arg0 *C.SpellingChecker // out + var _cret *C.char // in +@@ -203,7 +182,7 @@ func (self *Checker) Language() string { + // + // The function returns the following values: + // +-// - provider: SpellingProvider. ++// - provider: Provider. + func (self *Checker) Provider() Providerer { + var _arg0 *C.SpellingChecker // out + var _cret *C.SpellingProvider // in +@@ -236,11 +215,6 @@ func (self *Checker) Provider() Providerer { + return _provider + } + +-// IgnoreWord requests the active dictionary to ignore word. +-// +-// The function takes the following parameters: +-// +-// - word to be ignored. + func (self *Checker) IgnoreWord(word string) { + var _arg0 *C.SpellingChecker // out + var _arg1 *C.char // out +@@ -318,12 +292,12 @@ func (self *Checker) SetLanguage(language string) { + runtime.KeepAlive(language) + } + +-// CheckerGetDefault gets a default SpellingChecker using the default provider +-// and language. ++// CheckerGetDefault gets a default Checker using the default provider and ++// language. + // + // The function returns the following values: + // +-// - checker: SpellingChecker. ++// - checker: Checker. + func CheckerGetDefault() *Checker { + var _cret *C.SpellingChecker // in + +--- vendor/libdb.so/gotk4-spelling/pkg/spelling/spelling-init.go.orig 2025-01-24 19:56:09 UTC ++++ vendor/libdb.so/gotk4-spelling/pkg/spelling/spelling-init.go +@@ -6,8 +6,6 @@ import "C" + // #include <libspelling.h> + import "C" + +-// Init: call this function before using any other libspelling functions in your +-// applications. It will initialize everything needed to operate the library. + func Init() { + C.spelling_init() + } +--- vendor/libdb.so/gotk4-spelling/pkg/spelling/spelling-language.go.orig 2025-01-24 20:13:11 UTC ++++ vendor/libdb.so/gotk4-spelling/pkg/spelling/spelling-language.go +@@ -6,7 +6,6 @@ import ( + "runtime" + "unsafe" + +- "github.com/diamondburned/gotk4/pkg/core/gextras" + coreglib "github.com/diamondburned/gotk4/pkg/core/glib" + ) + +@@ -26,15 +25,6 @@ func init() { + }) + } + +-// LanguageOverrides contains methods that are overridable. +-type LanguageOverrides struct { +-} +- +-func defaultLanguageOverrides(v *Language) LanguageOverrides { +- return LanguageOverrides{} +-} +- +-// Language represents a spellchecking language. + type Language struct { + _ [0]func() // equal guard + *coreglib.Object +@@ -44,21 +34,16 @@ var ( + _ coreglib.Objector = (*Language)(nil) + ) + +-func init() { +- coreglib.RegisterClassInfo[*Language, *LanguageClass, LanguageOverrides]( +- GTypeLanguage, +- initLanguageClass, +- wrapLanguage, +- defaultLanguageOverrides, +- ) ++// Languager describes types inherited from class Language. ++// ++// To get the original type, the caller must assert this to an interface or ++// another type. ++type Languager interface { ++ coreglib.Objector ++ baseLanguage() *Language + } + +-func initLanguageClass(gclass unsafe.Pointer, overrides LanguageOverrides, classInitFunc func(*LanguageClass)) { +- if classInitFunc != nil { +- class := (*LanguageClass)(gextras.NewStructNative(gclass)) +- classInitFunc(class) +- } +-} ++var _ Languager = (*Language)(nil) + + func wrapLanguage(obj *coreglib.Object) *Language { + return &Language{ +@@ -70,11 +55,53 @@ func marshalLanguage(p uintptr) (interface{}, error) { + return wrapLanguage(coreglib.ValueFromNative(unsafe.Pointer(p)).Object()), nil + } + +-// Code gets the code of the language, or NULL if undefined. +-// +-// The function returns the following values: +-// +-// - utf8 (optional): code of the language. ++func (self *Language) baseLanguage() *Language { ++ return self ++} ++ ++// BaseLanguage returns the underlying base object. ++func BaseLanguage(obj Languager) *Language { ++ return obj.baseLanguage() ++} ++ ++func (self *Language) AddWord(word string) { ++ var _arg0 *C.SpellingLanguage // out ++ var _arg1 *C.char // out ++ ++ _arg0 = (*C.SpellingLanguage)(unsafe.Pointer(coreglib.InternObject(self).Native())) ++ _arg1 = (*C.char)(unsafe.Pointer(C.CString(word))) ++ defer C.free(unsafe.Pointer(_arg1)) ++ ++ C.spelling_language_add_word(_arg0, _arg1) ++ runtime.KeepAlive(self) ++ runtime.KeepAlive(word) ++} ++ ++func (self *Language) ContainsWord(word string) bool { ++ var _arg0 *C.SpellingLanguage // out ++ var _arg1 *C.char // out ++ var _arg2 C.gssize ++ var _cret C.gboolean // in ++ ++ _arg0 = (*C.SpellingLanguage)(unsafe.Pointer(coreglib.InternObject(self).Native())) ++ _arg2 = (C.gssize)(len(word)) ++ _arg1 = (*C.char)(C.calloc(C.size_t((len(word) + 1)), C.size_t(C.sizeof_char))) ++ copy(unsafe.Slice((*byte)(unsafe.Pointer(_arg1)), len(word)), word) ++ defer C.free(unsafe.Pointer(_arg1)) ++ ++ _cret = C.spelling_language_contains_word(_arg0, _arg1, _arg2) ++ runtime.KeepAlive(self) ++ runtime.KeepAlive(word) ++ ++ var _ok bool // out ++ ++ if _cret != 0 { ++ _ok = true ++ } ++ ++ return _ok ++} ++ + func (self *Language) Code() string { + var _arg0 *C.SpellingLanguage // out + var _cret *C.char // in +@@ -86,65 +113,84 @@ func (self *Language) Code() string { + + var _utf8 string // out + +- if _cret != nil { +- _utf8 = C.GoString((*C.gchar)(unsafe.Pointer(_cret))) +- } ++ _utf8 = C.GoString((*C.gchar)(unsafe.Pointer(_cret))) + + return _utf8 + } + +-// Group gets the group of the language, or NULL if undefined. +-// +-// The function returns the following values: +-// +-// - utf8 (optional): group of the language. +-func (self *Language) Group() string { ++func (self *Language) ExtraWordChars() string { + var _arg0 *C.SpellingLanguage // out + var _cret *C.char // in + + _arg0 = (*C.SpellingLanguage)(unsafe.Pointer(coreglib.InternObject(self).Native())) + +- _cret = C.spelling_language_get_group(_arg0) ++ _cret = C.spelling_language_get_extra_word_chars(_arg0) + runtime.KeepAlive(self) + + var _utf8 string // out + +- if _cret != nil { +- _utf8 = C.GoString((*C.gchar)(unsafe.Pointer(_cret))) +- } ++ _utf8 = C.GoString((*C.gchar)(unsafe.Pointer(_cret))) + + return _utf8 + } + +-// Name gets the name of the language, or NULL if undefined. ++func (self *Language) IgnoreWord(word string) { ++ var _arg0 *C.SpellingLanguage // out ++ var _arg1 *C.char // out ++ ++ _arg0 = (*C.SpellingLanguage)(unsafe.Pointer(coreglib.InternObject(self).Native())) ++ _arg1 = (*C.char)(unsafe.Pointer(C.CString(word))) ++ defer C.free(unsafe.Pointer(_arg1)) ++ ++ C.spelling_language_ignore_word(_arg0, _arg1) ++ runtime.KeepAlive(self) ++ runtime.KeepAlive(word) ++} ++ ++// ListCorrections retrieves a list of possible corrections for word. + // ++// The function takes the following parameters: ++// ++// - word to be checked. ++// + // The function returns the following values: + // +-// - utf8 (optional): name of the language. +-func (self *Language) Name() string { ++// - utf8s (optional): A list of possible corrections, or NULL. ++func (self *Language) ListCorrections(word string) []string { + var _arg0 *C.SpellingLanguage // out +- var _cret *C.char // in ++ var _arg1 *C.char // out ++ var _arg2 C.gssize ++ var _cret **C.char // in + + _arg0 = (*C.SpellingLanguage)(unsafe.Pointer(coreglib.InternObject(self).Native())) ++ _arg2 = (C.gssize)(len(word)) ++ _arg1 = (*C.char)(C.calloc(C.size_t((len(word) + 1)), C.size_t(C.sizeof_char))) ++ copy(unsafe.Slice((*byte)(unsafe.Pointer(_arg1)), len(word)), word) ++ defer C.free(unsafe.Pointer(_arg1)) + +- _cret = C.spelling_language_get_name(_arg0) ++ _cret = C.spelling_language_list_corrections(_arg0, _arg1, _arg2) + runtime.KeepAlive(self) ++ runtime.KeepAlive(word) + +- var _utf8 string // out ++ var _utf8s []string // out + + if _cret != nil { +- _utf8 = C.GoString((*C.gchar)(unsafe.Pointer(_cret))) ++ defer C.free(unsafe.Pointer(_cret)) ++ { ++ var i int ++ var z *C.char ++ for p := _cret; *p != z; p = &unsafe.Slice(p, 2)[1] { ++ i++ ++ } ++ ++ src := unsafe.Slice(_cret, i) ++ _utf8s = make([]string, i) ++ for i := range src { ++ _utf8s[i] = C.GoString((*C.gchar)(unsafe.Pointer(src[i]))) ++ defer C.free(unsafe.Pointer(src[i])) ++ } ++ } + } + +- return _utf8 +-} +- +-// LanguageClass: instance of this type is always passed by reference. +-type LanguageClass struct { +- *languageClass +-} +- +-// languageClass is the struct that's finalized. +-type languageClass struct { +- native *C.SpellingLanguageClass ++ return _utf8s + } +--- vendor/libdb.so/gotk4-spelling/pkg/spelling/spelling-provider.go.orig 2025-01-24 20:13:11 UTC ++++ vendor/libdb.so/gotk4-spelling/pkg/spelling/spelling-provider.go +@@ -7,7 +7,6 @@ import ( + "unsafe" + + coreglib "github.com/diamondburned/gotk4/pkg/core/glib" +- "github.com/diamondburned/gotk4/pkg/gio/v2" + ) + + // #include <stdlib.h> +@@ -26,7 +25,6 @@ func init() { + }) + } + +-// Provider: abstract base class for spellchecking providers. + type Provider struct { + _ [0]func() // equal guard + *coreglib.Object +@@ -66,12 +64,6 @@ func BaseProvider(obj Providerer) *Provider { + return obj.baseProvider() + } + +-// DefaultCode gets the default language code for the detected system locales, +-// or NULL if the provider doesn't support any of them. +-// +-// The function returns the following values: +-// +-// - utf8 (optional): default language code. + func (self *Provider) DefaultCode() string { + var _arg0 *C.SpellingProvider // out + var _cret *C.char // in +@@ -83,18 +75,11 @@ func (self *Provider) DefaultCode() string { + + var _utf8 string // out + +- if _cret != nil { +- _utf8 = C.GoString((*C.gchar)(unsafe.Pointer(_cret))) +- } ++ _utf8 = C.GoString((*C.gchar)(unsafe.Pointer(_cret))) + + return _utf8 + } + +-// DisplayName gets the display name of the provider, or NULL if undefined. +-// +-// The function returns the following values: +-// +-// - utf8 (optional): display name of the provider. + func (self *Provider) DisplayName() string { + var _arg0 *C.SpellingProvider // out + var _cret *C.char // in +@@ -106,63 +91,35 @@ func (self *Provider) DisplayName() string { + + var _utf8 string // out + +- if _cret != nil { +- _utf8 = C.GoString((*C.gchar)(unsafe.Pointer(_cret))) +- } ++ _utf8 = C.GoString((*C.gchar)(unsafe.Pointer(_cret))) + + return _utf8 + } + +-// ListLanguages gets a GListModel of languages supported by the provider. ++// Language gets an Language for the requested language, or NULL if the language ++// is not supported. + // +-// The function returns the following values: +-// +-// - listModel: GListModel of SpellingLanguage. +-func (self *Provider) ListLanguages() *gio.ListModel { +- var _arg0 *C.SpellingProvider // out +- var _cret *C.GListModel // in +- +- _arg0 = (*C.SpellingProvider)(unsafe.Pointer(coreglib.InternObject(self).Native())) +- +- _cret = C.spelling_provider_list_languages(_arg0) +- runtime.KeepAlive(self) +- +- var _listModel *gio.ListModel // out +- +- { +- obj := coreglib.AssumeOwnership(unsafe.Pointer(_cret)) +- _listModel = &gio.ListModel{ +- Object: obj, +- } +- } +- +- return _listModel +-} +- +-// LoadDictionary gets a SpellingDictionary for the requested language, or NULL +-// if the language is not supported. +-// + // The function takes the following parameters: + // + // - language to load such as en_US. + // + // The function returns the following values: + // +-// - dictionary (optional): SpellingDictionary or NULL. +-func (self *Provider) LoadDictionary(language string) Dictionarier { +- var _arg0 *C.SpellingProvider // out +- var _arg1 *C.char // out +- var _cret *C.SpellingDictionary // in ++// - ret (optional) or NULL. ++func (self *Provider) Language(language string) Languager { ++ var _arg0 *C.SpellingProvider // out ++ var _arg1 *C.char // out ++ var _cret *C.SpellingLanguage // in + + _arg0 = (*C.SpellingProvider)(unsafe.Pointer(coreglib.InternObject(self).Native())) + _arg1 = (*C.char)(unsafe.Pointer(C.CString(language))) + defer C.free(unsafe.Pointer(_arg1)) + +- _cret = C.spelling_provider_load_dictionary(_arg0, _arg1) ++ _cret = C.spelling_provider_get_language(_arg0, _arg1) + runtime.KeepAlive(self) + runtime.KeepAlive(language) + +- var _dictionary Dictionarier // out ++ var _ret Languager // out + + if _cret != nil { + { +@@ -170,18 +127,18 @@ func (self *Provider) LoadDictionary(language string) + + object := coreglib.AssumeOwnership(objptr) + casted := object.WalkCast(func(obj coreglib.Objector) bool { +- _, ok := obj.(Dictionarier) ++ _, ok := obj.(Languager) + return ok + }) +- rv, ok := casted.(Dictionarier) ++ rv, ok := casted.(Languager) + if !ok { +- panic("no marshaler for " + object.TypeFromInstance().String() + " matching spelling.Dictionarier") ++ panic("no marshaler for " + object.TypeFromInstance().String() + " matching spelling.Languager") + } +- _dictionary = rv ++ _ret = rv + } + } + +- return _dictionary ++ return _ret + } + + // SupportsLanguage checks of language is supported by the provider. +@@ -219,7 +176,7 @@ func (self *Provider) SupportsLanguage(language string + // + // The function returns the following values: + // +-// - provider: SpellingProvider. ++// - provider: Provider. + func ProviderGetDefault() Providerer { + var _cret *C.SpellingProvider // in + +--- vendor/libdb.so/gotk4-spelling/pkg/spelling/spelling-text-buffer-adapter.go.orig 2025-01-24 20:13:11 UTC ++++ vendor/libdb.so/gotk4-spelling/pkg/spelling/spelling-text-buffer-adapter.go +@@ -37,8 +37,6 @@ func defaultTextBufferAdapterOverrides(v *TextBufferAd + return TextBufferAdapterOverrides{} + } + +-// TextBufferAdapter: SpellingTextBufferAdapter implements helpers to easily add +-// spellchecking capabilities to a GtkSourceBuffer. + type TextBufferAdapter struct { + _ [0]func() // equal guard + *coreglib.Object +@@ -79,16 +77,10 @@ func marshalTextBufferAdapter(p uintptr) (interface{}, + return wrapTextBufferAdapter(coreglib.ValueFromNative(unsafe.Pointer(p)).Object()), nil + } + +-// NewTextBufferAdapter: create a new SpellingTextBufferAdapter. +-// + // The function takes the following parameters: + // +-// - buffer: GtkSourceBuffer. +-// - checker: SpellingChecker. +-// +-// The function returns the following values: +-// +-// - textBufferAdapter: newly created SpellingTextBufferAdapter. ++// - buffer ++// - checker + func NewTextBufferAdapter(buffer *gtksource.Buffer, checker *Checker) *TextBufferAdapter { + var _arg1 *C.GtkSourceBuffer // out + var _arg2 *C.SpellingChecker // out +@@ -112,7 +104,7 @@ func NewTextBufferAdapter(buffer *gtksource.Buffer, ch + // + // The function returns the following values: + // +-// - buffer (optional): GtkSourceBuffer. ++// - buffer (optional): SourceBuffer. + func (self *TextBufferAdapter) Buffer() *gtksource.Buffer { + var _arg0 *C.SpellingTextBufferAdapter // out + var _cret *C.GtkSourceBuffer // in +@@ -142,7 +134,7 @@ func (self *TextBufferAdapter) Buffer() *gtksource.Buf + // + // The function returns the following values: + // +-// - checker (optional): SpellingChecker or NULL. ++// - checker (optional) or NULL. + func (self *TextBufferAdapter) Checker() *Checker { + var _arg0 *C.SpellingTextBufferAdapter // out + var _cret *C.SpellingChecker // in +@@ -161,11 +153,6 @@ func (self *TextBufferAdapter) Checker() *Checker { + return _checker + } + +-// Enabled gets if the spellcheck is enabled. +-// +-// The function returns the following values: +-// +-// - ok: TRUE if enabled. + func (self *TextBufferAdapter) Enabled() bool { + var _arg0 *C.SpellingTextBufferAdapter // out + var _cret C.gboolean // in +@@ -184,11 +171,6 @@ func (self *TextBufferAdapter) Enabled() bool { + return _ok + } + +-// Language gets the checker language. +-// +-// The function returns the following values: +-// +-// - utf8 (optional): language code. + func (self *TextBufferAdapter) Language() string { + var _arg0 *C.SpellingTextBufferAdapter // out + var _cret *C.char // in +@@ -200,9 +182,7 @@ func (self *TextBufferAdapter) Language() string { + + var _utf8 string // out + +- if _cret != nil { +- _utf8 = C.GoString((*C.gchar)(unsafe.Pointer(_cret))) +- } ++ _utf8 = C.GoString((*C.gchar)(unsafe.Pointer(_cret))) + + return _utf8 + } +@@ -211,7 +191,7 @@ func (self *TextBufferAdapter) Language() string { + // + // The function returns the following values: + // +-// - menuModel: GMenuModel. ++// - menuModel: Model. + func (self *TextBufferAdapter) MenuModel() gio.MenuModeller { + var _arg0 *C.SpellingTextBufferAdapter // out + var _cret *C.GMenuModel // in +@@ -248,7 +228,7 @@ func (self *TextBufferAdapter) MenuModel() gio.MenuMod + // + // The function returns the following values: + // +-// - textTag (optional): GtkTextTag or NULL. ++// - textTag (optional) or NULL. + func (self *TextBufferAdapter) Tag() *gtk.TextTag { + var _arg0 *C.SpellingTextBufferAdapter // out + var _cret *C.GtkTextTag // in +@@ -272,9 +252,6 @@ func (self *TextBufferAdapter) Tag() *gtk.TextTag { + return _textTag + } + +-// InvalidateAll: invalidate the spelling engine, to force parsing again. +-// +-// Invalidation is automatically done on gtksource.Buffer:loading change. + func (self *TextBufferAdapter) InvalidateAll() { + var _arg0 *C.SpellingTextBufferAdapter // out + +@@ -284,11 +261,6 @@ func (self *TextBufferAdapter) InvalidateAll() { + runtime.KeepAlive(self) + } + +-// SetChecker: set the spelling.Checker used for spellchecking. +-// +-// The function takes the following parameters: +-// +-// - checker: SpellingChecker. + func (self *TextBufferAdapter) SetChecker(checker *Checker) { + var _arg0 *C.SpellingTextBufferAdapter // out + var _arg1 *C.SpellingChecker // out +@@ -301,11 +273,6 @@ func (self *TextBufferAdapter) SetChecker(checker *Che + runtime.KeepAlive(checker) + } + +-// SetEnabled: if TRUE spellcheck is enabled. +-// +-// The function takes the following parameters: +-// +-// - enabled: whether the spellcheck is enabled. + func (self *TextBufferAdapter) SetEnabled(enabled bool) { + var _arg0 *C.SpellingTextBufferAdapter // out + var _arg1 C.gboolean // out +@@ -320,11 +287,6 @@ func (self *TextBufferAdapter) SetEnabled(enabled bool + runtime.KeepAlive(enabled) + } + +-// SetLanguage sets the language code to use by the checker, such as en_US. +-// +-// The function takes the following parameters: +-// +-// - language to use. + func (self *TextBufferAdapter) SetLanguage(language string) { + var _arg0 *C.SpellingTextBufferAdapter // out + var _arg1 *C.char // out +@@ -336,20 +298,6 @@ func (self *TextBufferAdapter) SetLanguage(language st + C.spelling_text_buffer_adapter_set_language(_arg0, _arg1) + runtime.KeepAlive(self) + runtime.KeepAlive(language) +-} +- +-// UpdateCorrections looks at the current cursor position and updates the list +-// of corrections based on the current word. +-// +-// Use this to force an update immediately rather than after the automatic +-// timeout caused by cursor movements. +-func (self *TextBufferAdapter) UpdateCorrections() { +- var _arg0 *C.SpellingTextBufferAdapter // out +- +- _arg0 = (*C.SpellingTextBufferAdapter)(unsafe.Pointer(coreglib.InternObject(self).Native())) +- +- C.spelling_text_buffer_adapter_update_corrections(_arg0) +- runtime.KeepAlive(self) + } + + // TextBufferAdapterClass: instance of this type is always passed by reference. diff --git a/net-im/dissent/pkg-descr b/net-im/dissent/pkg-descr index 5da8309ce1e7..01127edf6f01 100644 --- a/net-im/dissent/pkg-descr +++ b/net-im/dissent/pkg-descr @@ -3,4 +3,3 @@ smooth, native experience on Linux desktops. Built with the GTK4 and libadwaita for a modern look and feel, it delivers your favorite Discord app in a lightweight and visually appealing package. -