From 0e7b1da874d923b9f006e0000023f5fa528140a8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 24 Nov 2023 10:33:12 +0000 Subject: gentoo auto-resync : 24:11:2023 - 10:33:11 --- gui-wm/hyprland/Manifest | 2 - .../files/hyprland-0.30.0-3400-fix-build.patch | 49 ---------------------- .../hyprland-0.30.0-no-wlroots-automagic-r1.patch | 18 -------- 3 files changed, 69 deletions(-) delete mode 100644 gui-wm/hyprland/files/hyprland-0.30.0-3400-fix-build.patch delete mode 100644 gui-wm/hyprland/files/hyprland-0.30.0-no-wlroots-automagic-r1.patch (limited to 'gui-wm/hyprland') diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest index c6244b5a69f5..1c7ccda2f289 100644 --- a/gui-wm/hyprland/Manifest +++ b/gui-wm/hyprland/Manifest @@ -1,5 +1,3 @@ -AUX hyprland-0.30.0-3400-fix-build.patch 1923 BLAKE2B 57bd8c8ad0dbb308c4cc49ecebb584fb6516997d7af8e064dd5a153d5dd321d2739d9bb39cd104ef551faad307d4bd29b4446f186170fc9c6bab8039f9553f2a SHA512 8d1dd21104103ef95c6585b246eb9abd239eea20be7bea64bb9fc5b81547d910b7490df0083de9e92735b02b7995e880f1c9be0aeaf18972f515e04e6966dd97 -AUX hyprland-0.30.0-no-wlroots-automagic-r1.patch 760 BLAKE2B 386b70de5c525fb1f1258565cb6dccc7edb1561190c261885ee6603640e81f866887adbd22caf765c3c9dd5a94d03b104136f48c93be3cbcad8da0206e73dc35 SHA512 e6915957153fba06b00dcd3401e3febacca0b9976ff9ac73611732b632d55348b153132554026ebecefea63834d006c9bd57e4ecb55ecddde8add5f376364900 AUX hyprland-0.31.0-fix-log-headers.patch 865 BLAKE2B c8173cdac049a5914c3f00261300ef5d9dbfd89b0e8ff643b97b86bc590fb23b5824005cd42a9f790bf1766843bf92765cbd0b65b0a2ef8390505e47dcc6771b SHA512 f6546c729596a18d91471e1853c5a377c05637e572814006635d039f027a4943fea13206794ed537862e83b708e1a49b81db874362073ec267b5f0f378b98696 DIST hyprland-0.31.0.gh.tar.gz 14068621 BLAKE2B 272ba0c92ee6f8db623bb7b79a64ec1a3f2d2e0e1a8825ab7cc43e30dc64d77396ae014469a308c10deea0f9607680ff3a9328b747c82acccd5156e9d9c07cde SHA512 27798eba3bc430fe3689ecfb6ae38a59f48c39183c8cbd4fea8dca0a92a25941e6ee8b51d70f18498a3b0ef6c2575658299ee36ed6a6a93c7b54548ab64f07ca DIST hyprland-0.32.3.gh.tar.gz 14119304 BLAKE2B 304878a3bb167da9ceae8afbde21bf2c64b81ffd61c13ccfd772f240d234bb9cbd448f7ae2d0fcc6d8e7c7e29e1eca66ad68d98cfef9b22caccae9ee9f3ae39d SHA512 521cfa6b3621142cb4cc1e6c11978e49f28b29836a1a8e00cc2c697f44dcf620da63e9d39deeabb41130a56c65464b6117416c8a3c1bd690bb056955b7ccea40 diff --git a/gui-wm/hyprland/files/hyprland-0.30.0-3400-fix-build.patch b/gui-wm/hyprland/files/hyprland-0.30.0-3400-fix-build.patch deleted file mode 100644 index 3ee5ca710015..000000000000 --- a/gui-wm/hyprland/files/hyprland-0.30.0-3400-fix-build.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8637bfb1b79d7778447d93349f14b86dea41d2a4 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Sat, 23 Sep 2023 12:31:37 +0000 -Subject: [PATCH] build: Unbreak build without precompiled headers (#3400) - -* helpers: add missing header after 2e34548aea5b - -src/helpers/VarList.cpp: In constructor 'CVarList::CVarList(const std::string&, size_t, char, bool)': -src/helpers/VarList.cpp:19:34: error: 'removeBeginEndSpacesTabs' was not declared in this scope - 19 | m_vArgs.emplace_back(removeBeginEndSpacesTabs(in.substr(pos))); - | ^~~~~~~~~~~~~~~~~~~~~~~~ -src/helpers/VarList.cpp:23:30: error: 'removeBeginEndSpacesTabs' was not declared in this scope - 23 | m_vArgs.emplace_back(removeBeginEndSpacesTabs(std::string_view{s}.data())); - | ^~~~~~~~~~~~~~~~~~~~~~~~ - -* helpers: add missing C linkage after 0dbd99700319 - -ld.lld: error: undefined symbol: wlr_region_scale(pixman_region32*, pixman_region32 const*, float) ->>> referenced by Region.cpp ->>> src/Hyprland.p/helpers_Region.cpp.o:(CRegion::scale(float)) ->>> did you mean: extern "C" wlr_region_scale ->>> defined in: /usr/lib/libwlroots.so.12032 ---- - src/helpers/Region.cpp | 2 ++ - src/helpers/VarList.cpp | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/src/helpers/Region.cpp b/src/helpers/Region.cpp -index e2db466438..5515e71e7e 100644 ---- a/src/helpers/Region.cpp -+++ b/src/helpers/Region.cpp -@@ -1,6 +1,8 @@ - #include "Region.hpp" -+extern "C" { - #include - #include -+} - - CRegion::CRegion() { - pixman_region32_init(&m_rRegion); -diff --git a/src/helpers/VarList.cpp b/src/helpers/VarList.cpp -index c29a1e9641..780ea9a045 100644 ---- a/src/helpers/VarList.cpp -+++ b/src/helpers/VarList.cpp -@@ -1,3 +1,4 @@ -+#include "MiscFunctions.hpp" - #include "VarList.hpp" - #include - #include diff --git a/gui-wm/hyprland/files/hyprland-0.30.0-no-wlroots-automagic-r1.patch b/gui-wm/hyprland/files/hyprland-0.30.0-no-wlroots-automagic-r1.patch deleted file mode 100644 index 452c1cc80f5e..000000000000 --- a/gui-wm/hyprland/files/hyprland-0.30.0-no-wlroots-automagic-r1.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/meson.build b/meson.build -index d515621e..08993f8a 100644 ---- a/meson.build -+++ b/meson.build -@@ -39,7 +39,12 @@ add_project_arguments( - ], - language: 'cpp') - --wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2']) -+if get_option('xwayland').enabled() -+ wlroots = subproject('wlroots', default_options: ['backends=drm,libinput,x11','examples=false','renderers=gles2','xcb-errors=disabled','xwayland=enabled']) -+else -+ wlroots = subproject('wlroots', default_options: ['backends=drm,libinput','examples=false','renderers=gles2','xcb-errors=disabled','xwayland=disabled']) -+endif -+ - have_xwlr = wlroots.get_variable('features').get('xwayland') - xcb_dep = dependency('xcb', required: get_option('xwayland')) - -- cgit v1.2.3