* [gentoo-commits] repo/proj/guru:dev commit in: gui-wm/miracle-wm/, gui-wm/miracle-wm/files/
@ 2024-05-28 9:54 Takuya Wakazono
0 siblings, 0 replies; 3+ messages in thread
From: Takuya Wakazono @ 2024-05-28 9:54 UTC (permalink / raw
To: gentoo-commits
commit: 874070746cc1dbc8c37136abba0fc4aa5fb169b6
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Mon May 27 13:11:25 2024 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Tue May 28 09:53:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87407074
gui-wm/miracle-wm: fix hardcoded g++
Closes: https://bugs.gentoo.org/932784
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
.../files/miracle-wm-0.2.1-unset-compiler.patch | 22 ++++++++++++++++++++++
gui-wm/miracle-wm/miracle-wm-0.2.1.ebuild | 5 +++++
2 files changed, 27 insertions(+)
diff --git a/gui-wm/miracle-wm/files/miracle-wm-0.2.1-unset-compiler.patch b/gui-wm/miracle-wm/files/miracle-wm-0.2.1-unset-compiler.patch
new file mode 100644
index 000000000..5748ad93b
--- /dev/null
+++ b/gui-wm/miracle-wm/files/miracle-wm-0.2.1-unset-compiler.patch
@@ -0,0 +1,22 @@
+https://github.com/mattkae/miracle-wm/pull/138
+https://bugs.gentoo.org/932784
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,6 @@
+ set(CMAKE_CXX_STANDARD 20)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+-set(CMAKE_CXX_COMPILER g++)
+
+ set(ENV{PKG_CONFIG_PATH} "/usr/local/lib/pkgconfig/")
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -3,7 +3,6 @@
+ set(CMAKE_CXX_STANDARD 20)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+-set(CMAKE_CXX_COMPILER g++)
+
+ include_directories(
+ ${PROJECT_SOURCE_DIR}/src
diff --git a/gui-wm/miracle-wm/miracle-wm-0.2.1.ebuild b/gui-wm/miracle-wm/miracle-wm-0.2.1.ebuild
index e42a6b101..153f400d7 100644
--- a/gui-wm/miracle-wm/miracle-wm-0.2.1.ebuild
+++ b/gui-wm/miracle-wm/miracle-wm-0.2.1.ebuild
@@ -29,6 +29,11 @@ BDEPEND="
test? ( dev-cpp/gtest )
"
+PATCHES=(
+ # bug #932784
+ "${FILESDIR}/${P}-unset-compiler.patch"
+)
+
src_prepare() {
cmake_src_prepare
use test || cmake_comment_add_subdirectory tests/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: gui-wm/miracle-wm/, gui-wm/miracle-wm/files/
@ 2025-07-13 18:40 Takuya Wakazono
0 siblings, 0 replies; 3+ messages in thread
From: Takuya Wakazono @ 2025-07-13 18:40 UTC (permalink / raw
To: gentoo-commits
commit: e972c54e8cd226403fca83c67ed94af9aec7298c
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sun Jul 13 18:34:15 2025 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sun Jul 13 18:35:15 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e972c54e
gui-wm/miracle-wm: add 0.6.1
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
gui-wm/miracle-wm/Manifest | 1 +
.../files/miracle-wm-0.6.1-conditional-tests.patch | 26 ++++++++
gui-wm/miracle-wm/miracle-wm-0.6.1.ebuild | 77 ++++++++++++++++++++++
3 files changed, 104 insertions(+)
diff --git a/gui-wm/miracle-wm/Manifest b/gui-wm/miracle-wm/Manifest
index a2932774fb..226c74fd23 100644
--- a/gui-wm/miracle-wm/Manifest
+++ b/gui-wm/miracle-wm/Manifest
@@ -1,2 +1,3 @@
DIST miracle-wm-0.4.1.tar.gz 478349 BLAKE2B 6a8f942280ed33d5e285fc41eab8c0b2fca34aeafd828e6afc346eb18c89e7aebb2056f55ee7c1d7a624581096f63d7091e0e1be44135d7df54482cfe878f851 SHA512 50b49bd711b0aa4d2285423340a4328e961b4feee77c8c2c931a747ceec1eaabb51e6a4bb3fa8d6cab420555baa2f919369a3d1d195b1bcbc1be033b2087f86e
DIST miracle-wm-0.5.2.tar.gz 1089314 BLAKE2B b68e8f58b6359bdba2cb367d46ceb939a192ffb8b70566803b9aea3e2eb167a942aa6edf087ffa2a1910a51b5d6450f633936a60f89521deabafe51436a8fdd6 SHA512 959e79d7139decbd1ebc2d0bb03fd23a40bfc7debdeb500c5a62b1dfa568ef76b0e32e12064412122c4820f6525ec25206f0434b3d1614399e5b750e950dc53b
+DIST miracle-wm-0.6.1.tar.gz 1146630 BLAKE2B e5982359e7abbecd97b099c03b80a4374db01528981f4e1ee1fd8ef2112718af8d3c2c9a3f920c48dcb954cd03c93aa68433d3328a2c2ec27f230916fcfb4ade SHA512 823ac88b23b0d9337bf8e28520ca20fc17e0fe52955657c69703e8d37c394f192feb463ba307f7b6bc6c4b136770f3f03551991de649034b5abb1dc53c35c6e8
diff --git a/gui-wm/miracle-wm/files/miracle-wm-0.6.1-conditional-tests.patch b/gui-wm/miracle-wm/files/miracle-wm-0.6.1-conditional-tests.patch
new file mode 100644
index 0000000000..29c868d073
--- /dev/null
+++ b/gui-wm/miracle-wm/files/miracle-wm-0.6.1-conditional-tests.patch
@@ -0,0 +1,26 @@
+--- a/miracle-wm-config/CMakeLists.txt
++++ b/miracle-wm-config/CMakeLists.txt
+@@ -3,7 +3,9 @@ pkg_check_modules(MIRCORE mircore REQUIRED)
+ pkg_check_modules(YAML REQUIRED IMPORTED_TARGET yaml-cpp)
+ pkg_check_modules(LIBEVDEV REQUIRED IMPORTED_TARGET libevdev)
+ pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
+-find_package(GTest REQUIRED)
++if(WITH_TESTS)
++ find_package(GTest REQUIRED)
++endif()
+
+ add_library(miracle-wm-config
+ SHARED
+@@ -55,6 +57,7 @@ install(
+ )
+
+ # Tests
++if(WITH_TESTS)
+ add_executable(test_miracle_wm_config_c_api
+ tests/test_miracle_wm_config_c_api.cpp
+ )
+@@ -74,3 +77,4 @@ target_link_libraries(test_miracle_wm_config_c_api
+ )
+
+ add_test(NAME test_miracle_wm_config_c_api COMMAND test_miracle_wm_config_c_api)
++endif()
diff --git a/gui-wm/miracle-wm/miracle-wm-0.6.1.ebuild b/gui-wm/miracle-wm/miracle-wm-0.6.1.ebuild
new file mode 100644
index 0000000000..450b551727
--- /dev/null
+++ b/gui-wm/miracle-wm/miracle-wm-0.6.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_13 )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Tiling Wayland compositor based on Mir"
+HOMEPAGE="https://github.com/miracle-wm-org/miracle-wm"
+SRC_URI="https://github.com/miracle-wm-org/miracle-wm/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd test"
+REQUIRED_USE="systemd? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-cpp/yaml-cpp:=
+ dev-cpp/nlohmann_json
+ dev-libs/glib:2
+ dev-libs/json-c:=
+ dev-libs/libevdev
+ dev-libs/libpcre2:=
+ dev-libs/wayland
+ >=gui-libs/mir-2.18:=
+ media-libs/libglvnd
+ x11-base/xwayland
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ systemd? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/dbus-next[${PYTHON_USEDEP}]
+ dev-python/tenacity[${PYTHON_USEDEP}]
+ ')
+ )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ media-libs/glm
+"
+BDEPEND="
+ virtual/pkgconfig
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-conditional-tests.patch"
+)
+
+pkg_setup() {
+ use systemd && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+ use test || cmake_comment_add_subdirectory tests/
+ use systemd && python_fix_shebang session/usr/bin/libexec/miracle-wm-wait-sni-ready
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSYSTEMD_INTEGRATION=$(usex systemd)
+ -DWITH_TESTS=$(usex test)
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ "${BUILD_DIR}/tests/miracle-wm-tests" || die
+ "${BUILD_DIR}/miracle-wm-config/test_miracle_wm_config_c_api" || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: gui-wm/miracle-wm/, gui-wm/miracle-wm/files/
@ 2025-09-06 15:27 Takuya Wakazono
0 siblings, 0 replies; 3+ messages in thread
From: Takuya Wakazono @ 2025-09-06 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 642b0b75edbe64a9e211af871c78597b2f56ad21
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat Sep 6 15:26:25 2025 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sat Sep 6 15:26:25 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=642b0b75
gui-wm/miracle-wm: add 0.7.0
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
gui-wm/miracle-wm/Manifest | 1 +
.../files/miracle-wm-0.7.0-disable-mirtest.patch | 15 ++++
.../files/miracle-wm-0.7.0-no-automagic.patch | 25 +++++++
gui-wm/miracle-wm/miracle-wm-0.7.0.ebuild | 80 ++++++++++++++++++++++
4 files changed, 121 insertions(+)
diff --git a/gui-wm/miracle-wm/Manifest b/gui-wm/miracle-wm/Manifest
index 42e1c48ac2..40d87e5aba 100644
--- a/gui-wm/miracle-wm/Manifest
+++ b/gui-wm/miracle-wm/Manifest
@@ -1,2 +1,3 @@
DIST miracle-wm-0.6.1.tar.gz 1146630 BLAKE2B e5982359e7abbecd97b099c03b80a4374db01528981f4e1ee1fd8ef2112718af8d3c2c9a3f920c48dcb954cd03c93aa68433d3328a2c2ec27f230916fcfb4ade SHA512 823ac88b23b0d9337bf8e28520ca20fc17e0fe52955657c69703e8d37c394f192feb463ba307f7b6bc6c4b136770f3f03551991de649034b5abb1dc53c35c6e8
DIST miracle-wm-0.6.2.tar.gz 1146767 BLAKE2B 1c623224d6d68acb1336f4bc953cd993fa26a3166f3117802c3797b62d6db4bfec543e020cf5777d00f9271c00f800e42504d06b05e61b9dac3ec9fc56194c1c SHA512 d992b0a77ef290174cad2a810ecc0f311a24b08e2feb6384c7a51a5fd47ddac0e931dd634ba969f59b0a9bd116d26a6c7f53ebdb7f7cb8e321017bd18936a04b
+DIST miracle-wm-0.7.0.tar.gz 1163831 BLAKE2B 5a289c7083df4fdbeb632b81e5753554caf73b5fce27d8b803ab5fcc13cb89ca8c8b6cc2e9bd784dc6fd483fe49ab015105ed1ffded7c16cf0cb6855f7bdf04d SHA512 c66da8c19f35c4f4d7dbe21c2e87bee033232e6d9b0c271325ee3a81c53efbcfe3dcdeb856d2990a7ca5551fc7e4bcf9cd8497d5b5c1bc71dccc65fa5625d088
diff --git a/gui-wm/miracle-wm/files/miracle-wm-0.7.0-disable-mirtest.patch b/gui-wm/miracle-wm/files/miracle-wm-0.7.0-disable-mirtest.patch
new file mode 100644
index 0000000000..6b2f2f934a
--- /dev/null
+++ b/gui-wm/miracle-wm/files/miracle-wm-0.7.0-disable-mirtest.patch
@@ -0,0 +1,15 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -9,12 +9,10 @@ include_directories(
+ find_package(PkgConfig)
+ pkg_check_modules(MIRAL miral REQUIRED)
+ pkg_check_modules(MIRSERVER mirserver REQUIRED)
+-pkg_check_modules(MIRTEST mirtest REQUIRED)
+ pkg_check_modules(YAML REQUIRED IMPORTED_TARGET yaml-cpp)
+ find_package(GTest REQUIRED)
+ find_package(nlohmann_json 3.2.0 REQUIRED)
+
+-option(END_TO_END_TESTS "Include end-to-end tests?" OFF)
+
+ set(SOURCES
+ mock_animation.h
diff --git a/gui-wm/miracle-wm/files/miracle-wm-0.7.0-no-automagic.patch b/gui-wm/miracle-wm/files/miracle-wm-0.7.0-no-automagic.patch
new file mode 100644
index 0000000000..a51f872a2b
--- /dev/null
+++ b/gui-wm/miracle-wm/files/miracle-wm-0.7.0-no-automagic.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,6 @@ if(CMAKE_GENERATOR STREQUAL "")
+ endif()
+
+ # Enable ccache if available
+-find_program(CCACHE_PROGRAM ccache)
+ if(CCACHE_PROGRAM)
+ message(STATUS "Using ccache: ${CCACHE_PROGRAM}")
+ set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM})
+@@ -22,14 +21,12 @@ if(CCACHE_PROGRAM)
+ endif()
+
+ # Enable mold if available
+-find_program(MOLD_LINKER mold)
+ if(MOLD_LINKER)
+ message(STATUS "Using mold linker: ${MOLD_LINKER}")
+ add_link_options(-fuse-ld=mold)
+ endif()
+
+ # Optional LTO
+-option(ENABLE_LTO "Enable link-time optimization (slower builds, faster binaries)" OFF)
+ if(ENABLE_LTO)
+ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
+ endif()
diff --git a/gui-wm/miracle-wm/miracle-wm-0.7.0.ebuild b/gui-wm/miracle-wm/miracle-wm-0.7.0.ebuild
new file mode 100644
index 0000000000..e42ab28bc7
--- /dev/null
+++ b/gui-wm/miracle-wm/miracle-wm-0.7.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_13 )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Tiling Wayland compositor based on Mir"
+HOMEPAGE="https://github.com/miracle-wm-org/miracle-wm"
+SRC_URI="https://github.com/miracle-wm-org/miracle-wm/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd test"
+REQUIRED_USE="systemd? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ dev-cpp/yaml-cpp:=
+ dev-cpp/nlohmann_json
+ dev-libs/glib:2
+ dev-libs/json-c:=
+ dev-libs/libevdev
+ dev-libs/libpcre2:=
+ dev-libs/wayland
+ >=gui-libs/mir-2.18:=
+ media-libs/libglvnd
+ x11-base/xwayland
+ x11-libs/libxkbcommon
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ systemd? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/dbus-next[${PYTHON_USEDEP}]
+ dev-python/tenacity[${PYTHON_USEDEP}]
+ ')
+ )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ media-libs/glm
+"
+BDEPEND="
+ virtual/pkgconfig
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.6.1-conditional-tests.patch"
+ "${FILESDIR}/${P}-disable-mirtest.patch"
+ "${FILESDIR}/${P}-no-automagic.patch"
+)
+
+pkg_setup() {
+ use systemd && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+ use test || cmake_comment_add_subdirectory tests/
+ use systemd && python_fix_shebang session/usr/bin/libexec/miracle-wm-wait-sni-ready
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSYSTEMD_INTEGRATION=$(usex systemd)
+ -DWITH_TESTS=$(usex test)
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ "${BUILD_DIR}/tests/miracle-wm-tests" || die
+ "${BUILD_DIR}/miracle-wm-config/test_miracle_wm_config_c_api" || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-09-06 15:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-13 18:40 [gentoo-commits] repo/proj/guru:dev commit in: gui-wm/miracle-wm/, gui-wm/miracle-wm/files/ Takuya Wakazono
-- strict thread matches above, loose matches on Subject: below --
2025-09-06 15:27 Takuya Wakazono
2024-05-28 9:54 Takuya Wakazono
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox