From ec6dee89065dc6a51f1cd28536672b9aa989f4ab Mon Sep 17 00:00:00 2001 From: Kaley Fischer <46651680+DRAGONTOS@users.noreply.github.com> Date: Sat, 25 Nov 2023 03:47:36 +0100 Subject: [PATCH] Delete subprojects directory --- subprojects/hyprland-protocols | 1 - .../packagefiles/wlroots-meson-build.patch | 45 ------------------- subprojects/tracy | 1 - subprojects/udis86 | 1 - subprojects/wlroots | 1 - subprojects/wlroots.wrap | 7 --- 6 files changed, 56 deletions(-) delete mode 160000 subprojects/hyprland-protocols delete mode 100644 subprojects/packagefiles/wlroots-meson-build.patch delete mode 160000 subprojects/tracy delete mode 160000 subprojects/udis86 delete mode 160000 subprojects/wlroots delete mode 100644 subprojects/wlroots.wrap diff --git a/subprojects/hyprland-protocols b/subprojects/hyprland-protocols deleted file mode 160000 index 0c2ce706..00000000 --- a/subprojects/hyprland-protocols +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0c2ce70625cb30aef199cb388f99e19a61a6ce03 diff --git a/subprojects/packagefiles/wlroots-meson-build.patch b/subprojects/packagefiles/wlroots-meson-build.patch deleted file mode 100644 index 6741fdc7..00000000 --- a/subprojects/packagefiles/wlroots-meson-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/include/meson.build b/include/meson.build -index e669800..687786b 100644 ---- a/include/meson.build -+++ b/include/meson.build -@@ -1,4 +1,5 @@ --subdir('wlr') -+run_command('ln', '-sf', join_paths(meson.project_source_root(), 'include', 'wlr'), join_paths(meson.project_source_root(), 'include', 'wlroots'), check: true) -+subdir('wlroots') - - exclude_files = ['meson.build', 'config.h.in', 'version.h.in'] - if not features.get('drm-backend') -@@ -24,8 +25,8 @@ if not features.get('session') - exclude_files += 'backend/session.h' - endif - --install_subdir('wlr', -- install_dir: get_option('includedir'), -+install_subdir('wlroots', -+ install_dir: join_paths(get_option('includedir'), 'hyprland'), - exclude_files: exclude_files, - ) - -diff --git a/include/wlr/meson.build b/include/wlr/meson.build -index f7ca413..0a86d54 100644 ---- a/include/wlr/meson.build -+++ b/include/wlr/meson.build -@@ -22,4 +22,4 @@ ver_h = configure_file( - configuration: version_data, - ) - --install_headers(conf_h, ver_h, subdir: 'wlr') -+install_headers(conf_h, ver_h, subdir: join_paths('hyprland', 'wlroots')) -diff --git a/meson.build b/meson.build -index 29b103a..0b6e5a4 100644 ---- a/meson.build -+++ b/meson.build -@@ -15,7 +15,7 @@ project( - # necessary for bugfix releases. Increasing soversion is required because - # wlroots never guarantees ABI stability -- only API stability is guaranteed - # between minor releases. --soversion = 12 -+soversion = 12032 - - little_endian = target_machine.endian() == 'little' - big_endian = target_machine.endian() == 'big' diff --git a/subprojects/tracy b/subprojects/tracy deleted file mode 160000 index 37aff70d..00000000 --- a/subprojects/tracy +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 37aff70dfa50cf6307b3fee6074d627dc2929143 diff --git a/subprojects/udis86 b/subprojects/udis86 deleted file mode 160000 index 5336633a..00000000 --- a/subprojects/udis86 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5336633af70f3917760a6d441ff02d93477b0c86 diff --git a/subprojects/wlroots b/subprojects/wlroots deleted file mode 160000 index 5de9e1a9..00000000 --- a/subprojects/wlroots +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5de9e1a99d6642c2d09d589aa37ff0a8945dcee1 diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap deleted file mode 100644 index 94757838..00000000 --- a/subprojects/wlroots.wrap +++ /dev/null @@ -1,7 +0,0 @@ -[wrap-git] -directory = wlroots -url = https://gitlab.freedesktop.org/wlroots/wlroots.git -revision = f1762f428b0ef2989c81f57ea9e810403d34d946 -depth = 1 - -diff_files = wlroots-meson-build.patch