* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hyprland/files/
@ 2023-10-28 9:18 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2023-10-28 9:18 UTC (permalink / raw
To: gentoo-commits
commit: 4804245dd684b78edc624068a8850432e317233f
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 28 08:52:15 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 09:18:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4804245d
gui-wm/hyprland: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33557
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../hyprland-0.28.0-no-wlroots-automagic-r1.patch | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/gui-wm/hyprland/files/hyprland-0.28.0-no-wlroots-automagic-r1.patch b/gui-wm/hyprland/files/hyprland-0.28.0-no-wlroots-automagic-r1.patch
deleted file mode 100644
index ca37e4e7c16d..000000000000
--- a/gui-wm/hyprland/files/hyprland-0.28.0-no-wlroots-automagic-r1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# Disable automagic, otherwise wlroots will enable features if dependencies are present.
-# Enable x11-backend only if xwayland is enabled.
-diff --git a/meson.build b/meson.build
-index 6a94dee6..08993f8a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -39,7 +39,12 @@ add_project_arguments(
- ],
- language: 'cpp')
-
--wlroots = subproject('wlroots', default_options: ['examples=false'])
-+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'))
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hyprland/files/
@ 2023-11-24 4:38 Yixun Lan
0 siblings, 0 replies; 5+ messages in thread
From: Yixun Lan @ 2023-11-24 4:38 UTC (permalink / raw
To: gentoo-commits
commit: 9c3a7cc6757107e5c39e90d29c9e63a076ade395
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Nov 23 17:15:43 2023 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 04:37:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c3a7cc6
gui-wm/hyprland: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/33951
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
.../files/hyprland-0.30.0-3400-fix-build.patch | 49 ----------------------
.../hyprland-0.30.0-no-wlroots-automagic-r1.patch | 18 --------
2 files changed, 67 deletions(-)
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 <jbeich@FreeBSD.org>
-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 <wlr/util/box.h>
- #include <wlr/util/region.h>
-+}
-
- 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 <ranges>
- #include <algorithm>
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'))
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hyprland/files/
@ 2024-01-06 10:15 Yixun Lan
0 siblings, 0 replies; 5+ messages in thread
From: Yixun Lan @ 2024-01-06 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 7893c6d3a255d9d4538b30344e42a8b6acdb57a4
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jan 6 09:31:34 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 6 10:14:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7893c6d3
gui-wm/hyprland: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/34670
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
.../files/hyprland-0.31.0-fix-log-headers.patch | 33 ----------------------
1 file changed, 33 deletions(-)
diff --git a/gui-wm/hyprland/files/hyprland-0.31.0-fix-log-headers.patch b/gui-wm/hyprland/files/hyprland-0.31.0-fix-log-headers.patch
deleted file mode 100644
index 7abd8164c9b4..000000000000
--- a/gui-wm/hyprland/files/hyprland-0.31.0-fix-log-headers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5dd0637e90efa17e391b67934998936194701d08 Mon Sep 17 00:00:00 2001
-From: memchr <memchr@proton.me>
-Date: Mon, 16 Oct 2023 16:22:01 +0000
-Subject: [PATCH] fix(build): do not include wlr headers directly, use
- includes.hpp instead.
-
----
- src/debug/Log.hpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/debug/Log.hpp b/src/debug/Log.hpp
-index 125ed7f45d..085465c911 100644
---- a/src/debug/Log.hpp
-+++ b/src/debug/Log.hpp
-@@ -1,10 +1,10 @@
- #pragma once
- #include <string>
--#include <wlr/util/log.h>
- #include <format>
- #include <iostream>
- #include <fstream>
- #include <chrono>
-+#include "../includes.hpp"
- #include "../helpers/MiscFunctions.hpp"
-
- #define LOGMESSAGESIZE 1024
-@@ -79,4 +79,4 @@ namespace Debug {
- }
-
- void wlrLog(wlr_log_importance level, const char* fmt, va_list args);
--};
-\ No newline at end of file
-+};
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hyprland/files/
@ 2024-04-18 19:32 Conrad Kostecki
0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2024-04-18 19:32 UTC (permalink / raw
To: gentoo-commits
commit: 29b6a73a73351ecfda05d0b968dc672f2c9dc1e0
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 18 18:07:55 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:31:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29b6a73a
gui-wm/hyprland: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
gui-wm/hyprland/files/gcc14.patch | 32 --------------------------------
1 file changed, 32 deletions(-)
diff --git a/gui-wm/hyprland/files/gcc14.patch b/gui-wm/hyprland/files/gcc14.patch
deleted file mode 100644
index 1bebe9e9d4c4..000000000000
--- a/gui-wm/hyprland/files/gcc14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# From: https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/f3e1f7b2a70a500b740bfc406e893eba0852699a
-diff --git a/subprojects/wlroots/backend/libinput/tablet_pad.c b/subprojects/wlroots/backend/libinput/tablet_pad.c
-index 2e74022a..e5327528 100644
---- a/subprojects/wlroots/backend/libinput/tablet_pad.c
-+++ b/subprojects/wlroots/backend/libinput/tablet_pad.c
-@@ -33,7 +33,7 @@ static void add_pad_group_from_libinput(struct wlr_tablet_pad *pad,
- ++group->ring_count;
- }
- }
-- group->rings = calloc(sizeof(unsigned int), group->ring_count);
-+ group->rings = calloc(group->ring_count, sizeof(unsigned int));
- if (group->rings == NULL) {
- goto group_fail;
- }
-@@ -50,7 +50,7 @@ static void add_pad_group_from_libinput(struct wlr_tablet_pad *pad,
- ++group->strip_count;
- }
- }
-- group->strips = calloc(sizeof(unsigned int), group->strip_count);
-+ group->strips = calloc(group->strip_count, sizeof(unsigned int));
- if (group->strips == NULL) {
- goto group_fail;
- }
-@@ -66,7 +66,7 @@ static void add_pad_group_from_libinput(struct wlr_tablet_pad *pad,
- ++group->button_count;
- }
- }
-- group->buttons = calloc(sizeof(unsigned int), group->button_count);
-+ group->buttons = calloc(group->button_count, sizeof(unsigned int));
- if (group->buttons == NULL) {
- goto group_fail;
- }
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hyprland/files/
@ 2024-08-11 2:44 Yixun Lan
0 siblings, 0 replies; 5+ messages in thread
From: Yixun Lan @ 2024-08-11 2:44 UTC (permalink / raw
To: gentoo-commits
commit: fae9fb98ad3b44b2655af3751b58e222a2f5c237
Author: John M. Harris Jr. <johnmh <AT> johnmh <DOT> me>
AuthorDate: Sat Aug 10 20:06:18 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 02:41:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fae9fb98
gui-wm/hyprland/files: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/37930
Signed-off-by: John M. Harris Jr. <johnmh <AT> johnmh.me>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
.../files/bash-completion-fix-0.39.1.patch | 22 ---------------------
.../files/wlroots-hyprland-apply-0.40.0.patch | 23 ----------------------
2 files changed, 45 deletions(-)
diff --git a/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch b/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch
deleted file mode 100644
index fe48ce45dd3a..000000000000
--- a/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/hyprwm/Hyprland/pull/5653
-
---- a/hyprctl/meson.build
-+++ b/hyprctl/meson.build
-@@ -2,6 +2,6 @@ executable('hyprctl', 'main.cpp',
- install: true
- )
-
--install_data('hyprctl.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion'), install_tag: 'runtime', rename: 'hyprctl')
-+install_data('hyprctl.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion/completions'), install_tag: 'runtime', rename: 'hyprctl')
- install_data('hyprctl.fish', install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), install_tag: 'runtime')
- install_data('hyprctl.zsh', install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), install_tag: 'runtime', rename: '_hyprctl')
---- a/hyprpm/src/meson.build
-+++ b/hyprpm/src/meson.build
-@@ -9,6 +9,6 @@ executable('hyprpm', src,
- install : true
- )
-
--install_data('../hyprpm.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion'), install_tag: 'runtime', rename: 'hyprpm')
-+install_data('../hyprpm.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion/completions'), install_tag: 'runtime', rename: 'hyprpm')
- install_data('../hyprpm.fish', install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), install_tag: 'runtime')
- install_data('../hyprpm.zsh', install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), install_tag: 'runtime', rename: '_hyprpm')
diff --git a/gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch b/gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch
deleted file mode 100644
index 65148b64137f..000000000000
--- a/gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/patches/apply.sh b/patches/apply.sh
-index d5492b1b..87d84848 100755
---- a/subprojects/wlroots-hyprland/patches/apply.sh
-+++ b/subprojects/wlroots-hyprland/patches/apply.sh
-@@ -4,15 +4,15 @@
- PATCHES=$(find patches/ -type f -name '*.patch')
-
- apply () {
-- git apply $PATCH
-+ patch -p1 -r /dev/null -N -s < $PATCH >/dev/null 2>&1 && echo NEW: \'$PATCH\'
- }
-
- check_applied () {
-- git apply --check --reverse -q $PATCH
-+ patch -p1 -r /dev/null --dry-run -R -s < $PATCH >/dev/null 2>&1 && echo OK: \'$PATCH\'
- }
-
- fail () {
-- echo =======\> \'$PATCH\' was not applied && exit 1
-+ echo FAILED: \'$PATCH\' NOT APPLICABLE && exit 1
- }
-
- if [ -n "$PATCHES" ];
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-08-11 2:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-06 10:15 [gentoo-commits] repo/gentoo:master commit in: gui-wm/hyprland/files/ Yixun Lan
-- strict thread matches above, loose matches on Subject: below --
2024-08-11 2:44 Yixun Lan
2024-04-18 19:32 Conrad Kostecki
2023-11-24 4:38 Yixun Lan
2023-10-28 9:18 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox