From: Matthieu Herrb <matthieu@openbsd.org>
Subject: [llvm22] update/fix x11/elementary/granite 3/5 code 8.3.0
To: ports@openbsd.org
Date: Sat, 23 May 2026 21:04:57 +0200

Index: Makefile
===================================================================
RCS file: /local/cvs/ports/x11/elementary/code/Makefile,v
diff -u -p -u -r1.11 Makefile
--- Makefile	13 Mar 2026 07:27:44 -0000	1.11
+++ Makefile	23 May 2026 19:04:21 -0000
@@ -1,19 +1,20 @@
+BROKEN =	does't build with granite 7.x yet
+
 COMMENT =	code editor from elementary OS
 PKGNAME =	${DISTNAME:S/^/elementary-/}
-REVISION =	8
 
 SHARED_LIBS +=	codecore                  0.0 # 0.0
 
 GH_PROJECT =	code
-GH_TAGNAME =	3.4.1
+GH_TAGNAME =	8.3.0
 
 # GPLv3+
 PERMIT_PACKAGE =	Yes
 
 WANTLIB += c editorconfig fontconfig gdk-3 gee-0.8 gio-2.0 git2-glib-1.0
-WANTLIB += glib-2.0 gobject-2.0 granite gtk-3 gtksourceview-3.0
+WANTLIB += glib-2.0 gobject-2.0 granite-7 gtk-3 gtksourceview-4
 WANTLIB += gtkspell3-3 intl pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += peas-1.0 peas-gtk-1.0 soup-2.4 vala-0.56 vte-2.91
+WANTLIB += peas-2 soup-2.4 vala-0.56 vte-2.91
 
 MODULES =	devel/dconf
 
@@ -22,14 +23,14 @@ BUILD_DEPENDS =	devel/gettext,-tools \
 
 LIB_DEPENDS =	devel/libgee \
 		devel/libgit2/libgit2-glib \
-		devel/libpeas \
+		devel/libpeas2 \
 		devel/libsoup \
 		devel/vte3 \
 		editors/editorconfig-core-c \
 		lang/vala \
 		textproc/gtkspell3 \
 		x11/elementary/granite \
-		x11/gtksourceview3
+		x11/gtksourceview4
 
 RUN_DEPENDS =	devel/desktop-file-utils \
 		x11/gtk+4,-guic
Index: distinfo
===================================================================
RCS file: /local/cvs/ports/x11/elementary/code/distinfo,v
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo	25 Jun 2020 23:09:05 -0000	1.1.1.1
+++ distinfo	23 May 2026 19:04:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (code-3.4.1.tar.gz) = 2Es4GTtyzZOZWq5gQ1jIPFtpdthHLOmFAnuUfP7ZkL8=
-SIZE (code-3.4.1.tar.gz) = 1468212
+SHA256 (code-8.3.0.tar.gz) = 1lSQ/j/MuIs6kxhbHjeOLGjjXoI87rD9XxyPmp6IL8A=
+SIZE (code-8.3.0.tar.gz) = 2213224
Index: patches/patch-meson_build
===================================================================
RCS file: patches/patch-meson_build
diff -N patches/patch-meson_build
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-meson_build	23 May 2026 19:04:21 -0000
@@ -0,0 +1,12 @@
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -30,7 +30,7 @@ glib_dep = dependency('glib-2.0', version: '>=2.74.0')
+ gio_unix_dep = dependency('gio-unix-2.0', version: '>=2.20')
+ gee_dep = dependency('gee-0.8', version: '>=0.8.5')
+ gtk_dep = dependency('gtk+-3.0', version: '>=3.6.0')
+-granite_dep = dependency('granite', version: '>=6.0.0')
++granite_dep = dependency('granite-7', version: '>=6.0.0')
+ handy_dep = dependency('libhandy-1', version: '>=0.90.0')
+ gtksourceview_dep = dependency('gtksourceview-4')
+ peas_dep = dependency('libpeas-2')
Index: patches/patch-plugins_meson_build
===================================================================
RCS file: patches/patch-plugins_meson_build
diff -N patches/patch-plugins_meson_build
--- patches/patch-plugins_meson_build	13 Mar 2026 07:27:44 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Don't ship browser-preview as is depends on an old version of webkitgtk4.
-
-Index: plugins/meson.build
---- plugins/meson.build.orig
-+++ plugins/meson.build
-@@ -1,7 +1,6 @@
- msgfmt = find_program('msgfmt')
- 
- subdir('brackets-completion')
--subdir('browser-preview')
- subdir('detect-indent')
- subdir('editorconfig')
- subdir('highlight-word-selection')

-- 
Matthieu Herrb