Fix vinject lib name in meson script

ensemblesaw · Dec 6, 2023 · b6a28bf · b6a28bf
1 parent 0cc291f
commit b6a28bf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/com.github.ensemblesaw.ensembles.yml b/com.github.ensemblesaw.ensembles.yml
@@ -22,8 +22,6 @@ modules:
   # Adds dependency injection
   - name: vinject
     buildsystem: meson
-    cleanup:
-      - /include
     sources:
       - type: git
         url: https://gitlab.com/geeky_endeavours/vinject.git
@@ -147,6 +145,12 @@ modules:
   # The app itself
   - name: ensembles
     buildsystem: meson
+    build-options:
+      config-opts:
+        - -Dprofile=default
+        - -Dbuildtype=release
+        - --wrap-mode=nofallback
+        - --force-fallback-for=ens-enstl-0,ens-shell-cli-0,ens-shell-gtk-0,ens-aw-core-0
     sources:
       - type: dir
         path: .

diff --git a/meson.build b/meson.build
@@ -51,7 +51,7 @@ gettext_package = application_id
 dependencies = [
     dependency ('glib-2.0'),
     dependency ('gee-0.8'),
-    dependency ('libvinject-0.0.0', fallback: ['libvinject', 'vinject_dep']),
+    dependency ('Vinject-0.0.0', fallback: ['libvinject', 'vinject_dep']),
     dependency ('ens-enstl-0', fallback: ['enstl', 'enstl_dep']),
     dependency ('ens-shell-cli-0', fallback: ['ens-shell-cli', 'ens_shell_cli_dep']),
     dependency ('ens-shell-gtk-0', fallback: ['ens-shell-gtk', 'ens_shell_gtk_dep'],

diff --git a/subprojects/ens-aw-core b/subprojects/ens-aw-core
diff --git a/subprojects/ens-shell-gtk b/subprojects/ens-shell-gtk
+1 −1		meson.build
+27 −22		src/Classes/Layouts/DesktopLayout.vala
+1 −0		src/Classes/MainWindow.vala
+1 −1		subprojects/ens-aw-core