feat: upgrade libs and remove libpeas

README.md

@@ -15,7 +15,6 @@ You'll need the following dependencies:
 * libgtkspell3-3-dev
 * libgranite-7-dev >= 6.0.0
 * libadwaita-1-dev >= 1.0.0
-* libpeas-2-dev
 * libsoup2.4-dev
 * libvala-0.56-dev (or higher)
 * libvte-2.91-dev

io.elementary.code.yml

@@ -1,54 +1,43 @@
 app-id: io.elementary.code
 runtime: io.elementary.Sdk # The outline plugin requires libvala which is only in the SDK, not the runtime
-runtime-version: '7.1'
+runtime-version: "7.1"
 sdk: io.elementary.Sdk
 command: io.elementary.code
 finish-args:
-  - '--filesystem=xdg-run/gvfsd'
-  - '--filesystem=host'
+  - "--filesystem=xdg-run/gvfsd"
+  - "--filesystem=host"
 
-  - '--share=ipc'
-  - '--socket=fallback-x11'
-  - '--socket=wayland'
+  - "--share=ipc"
+  - "--socket=fallback-x11"
+  - "--socket=wayland"
 
-  - '--talk-name=org.gtk.vfs.*'
-  - '--talk-name=org.gnome.SettingsDaemon'
-  - '--talk-name=org.elementary.Contractor'
+  - "--talk-name=org.gtk.vfs.*"
+  - "--talk-name=org.gnome.SettingsDaemon"
+  - "--talk-name=org.elementary.Contractor"
 
-  - '--metadata=X-DConf=migrate-path=/io/elementary/code/'
+  - "--metadata=X-DConf=migrate-path=/io/elementary/code/"
 cleanup:
-  - '/include'
-  - '/lib/pkgconfig'
-  - '/lib/cmake'
-  - '/lib/girepository-1.0'
-  - '/share/gir-1.0'
-  - '/share/vala'
-  - '*.a'
-  - '*.la'
+  - "/include"
+  - "/lib/pkgconfig"
+  - "/lib/cmake"
+  - "/lib/girepository-1.0"
+  - "/share/gir-1.0"
+  - "/share/vala"
+  - "*.a"
+  - "*.la"
 modules:
   - name: gtksourceview
     buildsystem: meson
     sources:
       - type: git
         url: https://gitlab.gnome.org/GNOME/gtksourceview.git
-        tag: '4.8.4'
-
-  - name: peas
-    buildsystem: meson
-    config-opts:
-      - '-Dgtk_doc=false'
-      - '-Ddemos=false'
-      - '-Dvapi=true'
-    sources:
-      - type: git
-        url: https://gitlab.gnome.org/GNOME/libpeas.git
-        tag: libpeas-1.34.0
+        tag: "4.8.4"
 
   - name: git2-glib
     buildsystem: meson
     builddir: true
     config-opts:
-      - '-Dpython=false'
+      - "-Dpython=false"
     sources:
       - type: git
         url: https://gitlab.gnome.org/GNOME/libgit2-glib.git
@@ -57,51 +46,51 @@ modules:
       - name: ssh2
         buildsystem: cmake-ninja
         config-opts:
-          - '-DCMAKE_BUILD_TYPE=RelWithDebInfo'
-          - '-DBUILD_SHARED_LIBS:BOOL=ON'
-          - '-DBUILD_EXAMPLES:BOOL=OFF'
-          - '-DBUILD_TESTING:BOOL=OFF'
-          - '-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib'
+          - "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+          - "-DBUILD_SHARED_LIBS:BOOL=ON"
+          - "-DBUILD_EXAMPLES:BOOL=OFF"
+          - "-DBUILD_TESTING:BOOL=OFF"
+          - "-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib"
         cleanup:
-          - '/share/man'
-          - '/share/doc'
+          - "/share/man"
+          - "/share/doc"
         sources:
           - type: git
             url: https://github.com/libssh2/libssh2.git
             tag: libssh2-1.10.0
       - name: libgit2
         buildsystem: cmake-ninja
         config-opts:
-          - '-DCMAKE_BUILD_TYPE=RelWithDebInfo'
+          - "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
         sources:
           - type: git
             url: https://github.com/libgit2/libgit2.git
-            tag: 'v1.5.1'
+            tag: "v1.5.1"
 
   - name: editorconfig
     buildsystem: cmake-ninja
     config-opts:
-      - '-DCMAKE_BUILD_TYPE=RelWithDebInfo'
-      - '-DBUILD_DOCUMENTATION:BOOL=OFF'
+      - "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+      - "-DBUILD_DOCUMENTATION:BOOL=OFF"
     sources:
       - type: git
         url: https://github.com/editorconfig/editorconfig-core-c.git
-        tag: 'v0.12.6'
+        tag: "v0.12.6"
         disable-submodules: true
 
   - name: gtkspell
     config-opts:
-      - '--disable-gtk-doc-html'
+      - "--disable-gtk-doc-html"
     cleanup:
-      - '/share/gtk-doc' # for some reason, it still install the html folder.
+      - "/share/gtk-doc" # for some reason, it still install the html folder.
     sources:
       - type: archive
         url: https://downloads.sourceforge.net/gtkspell/gtkspell3-3.0.10.tar.xz
         sha256: b040f63836b347eb344f5542443dc254621805072f7141d49c067ecb5a375732
     modules:
       - name: intltool
         cleanup:
-          - '*'
+          - "*"
         sources:
           - type: archive
             url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
@@ -110,11 +99,11 @@ modules:
   - name: vte
     buildsystem: meson
     config-opts:
-      - '-Dbuildtype=debugoptimized'
+      - "-Dbuildtype=debugoptimized"
     sources:
       - type: git
         url: https://gitlab.gnome.org/GNOME/vte.git
-        branch: '0.70.2'
+        branch: "0.70.2"
 
   - name: universal-ctags
     sources:
@@ -125,7 +114,7 @@ modules:
   - name: code
     buildsystem: meson
     config-opts:
-     - '-Dhave_pkexec=false'
+      - "-Dhave_pkexec=false"
     sources:
       - type: dir
         path: .

meson.build

@@ -12,7 +12,7 @@ add_project_arguments([
 )
 
 add_project_arguments(
-    ['--vapidir', meson.project_source_root() / 'vapi'],
+    ['--vapidir', meson.global_source_root() / 'vapi'],
     language: 'vala'
 )
 
@@ -33,8 +33,6 @@ gtk_dep = dependency('gtk4', version: '>=4.14.2')
 granite_dep = dependency('granite-7', version: '>=7.0.0')
 handy_dep = dependency('libadwaita-1', version: '>=1.0.0')
 gtksourceview_dep = dependency('gtksourceview-5')
-peas_dep = dependency('libpeas-2')
-peasgtk_dep = dependency('libpeas-gtk-1.0')
 git_dep = dependency('libgit2-glib-1.0')
 fontconfig_dep = dependency('fontconfig')
 pangofc_dep = dependency('pangoft2')
@@ -58,8 +56,6 @@ dependencies = [
     granite_dep,
     handy_dep,
     gtksourceview_dep,
-    peas_dep,
-    peasgtk_dep,
     git_dep,
     fontconfig_dep,
     pangofc_dep,

plugins/fuzzy-search/meson.build

@@ -29,7 +29,7 @@ custom_target(module_name + '.plugin_merge',
                '--desktop',
                '--keyword=Description',
                '--keyword=Name',
-               '-d' + join_paths(meson.source_root (), 'po', 'plugins'),
+               '-d' + join_paths(meson.global_source_root (), 'po', 'plugins'),
                '--template=@INPUT@',
                '-o@OUTPUT@',
                ],

src/codecore.deps

@@ -5,4 +5,3 @@ gobject-2.0
 gio-2.0
 gtk4
 granite-7
-libpeas-2