File opensuse-hyprpm-use-hyprland-devel-subpkg.patch of Package hyprland

Overview Repositories Revisions Requests Users Attributes Meta

File opensuse-hyprpm-use-hyprland-devel-subpkg.patch of Package hyprland (Revision f2711bc2a9ebd27affbf15037d759692)

Currently displaying revision f2711bc2a9ebd27affbf15037d759692 , Show latest

From 59baf7887afbb81fc56fc211571f50c6f6806be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20sp1rit=E2=80=8B?= <sp1rit@disroot.org>
Date: Fri, 14 Jun 2024 23:43:46 +0200
Subject: [PATCH] openSUSE: Use hyprland-devel instead of downloading from
 upstream
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The plugin manager needs headers in order to build plugins for hyprland.
This patch removes the ability of hyprpm to download another copy of
hyprland upstream and instead forces hyprpm to use the headers already
installed from the hyprland-devel subpackage.

It also adds a new check to ensure that the subpackage is instealled.

Signed-off-by: Florian "sp1rit" <sp1rit@disroot.org>
---
 hyprpm/src/core/DataState.cpp     |   2 +-
 hyprpm/src/core/PluginManager.cpp | 138 ++++--------------------------
 2 files changed, 20 insertions(+), 120 deletions(-)

diff --git a/hyprpm/src/core/DataState.cpp b/hyprpm/src/core/DataState.cpp
index fb8679d..a1c7026 100644
--- a/hyprpm/src/core/DataState.cpp
+++ b/hyprpm/src/core/DataState.cpp
@@ -21,7 +21,7 @@ std::string DataState::getDataStatePath() {
 }
 
 std::string DataState::getHeadersPath() {
-    return getDataStatePath() + "/headersRoot";
+    return "REPLACE_ME_WITH_PREFIX/";
 }
 
 void DataState::ensureStateStoreExists() {
diff --git a/hyprpm/src/core/PluginManager.cpp b/hyprpm/src/core/PluginManager.cpp
index 57c6764..7f2ca09 100644
--- a/hyprpm/src/core/PluginManager.cpp
+++ b/hyprpm/src/core/PluginManager.cpp
@@ -17,6 +17,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 #include <pwd.h>
 #include <unistd.h>
 
@@ -412,141 +413,27 @@ bool CPluginManager::updateHeaders(bool force) {
     const auto HLVER = getHyprlandVersion();
 
     if (!hasDeps()) {
-        std::println("\n{}", failureString("Could not update. Dependencies not satisfied. Hyprpm requires: cmake, meson, cpio"));
+        std::println("\n{}", failureString("Could not update. Dependencies not satisfied. Hyprpm requires: hyprland-devel, cmake, meson, cpio"));
         return false;
     }
 
-    if (!std::filesystem::exists("/tmp/hyprpm")) {
-        std::filesystem::create_directory("/tmp/hyprpm");
-        std::filesystem::permissions("/tmp/hyprpm", std::filesystem::perms::all, std::filesystem::perm_options::replace);
-    }
-
-    if (!force && headersValid() == HEADERS_OK) {
-        std::println("\n{}", successString("Headers up to date."));
-        return true;
-    }
-
     CProgressBar progress;
-    progress.m_iMaxSteps        = 5;
+    progress.m_iMaxSteps        = 1;
     progress.m_iSteps           = 0;
-    progress.m_szCurrentMessage = "Cloning the hyprland repository";
-    progress.print();
-
-    const std::string USERNAME   = getpwuid(getuid())->pw_name;
-    const auto        WORKINGDIR = "/tmp/hyprpm/hyprland-" + USERNAME;
-
-    if (!createSafeDirectory(WORKINGDIR)) {
-        std::println("\n{}", failureString("Could not prepare working dir for hl"));
-        return false;
-    }
-
-    progress.printMessageAbove(statusString("!", Colors::YELLOW, "Cloning https://github.com/hyprwm/Hyprland, this might take a moment."));
-
-    const bool bShallow = (HLVER.branch == "main") && !m_bNoShallow;
-
-    // let us give a bit of leg-room for shallowing
-    // due to timezones, etc.
-    const std::string SHALLOW_DATE = trim(HLVER.date).empty() ? "" : execAndGet("LC_TIME=\"en_US.UTF-8\" date --date='" + HLVER.date + " - 1 weeks' '+%a %b %d %H:%M:%S %Y'");
-
-    if (m_bVerbose && bShallow)
-        progress.printMessageAbove(verboseString("will shallow since: {}", SHALLOW_DATE));
-
-    std::string ret =
-        execAndGet("cd /tmp/hyprpm && git clone --recursive https://github.com/hyprwm/Hyprland hyprland-" + USERNAME + (bShallow ? " --shallow-since='" + SHALLOW_DATE + "'" : ""));
-
-    if (!std::filesystem::exists(WORKINGDIR)) {
-        progress.printMessageAbove(failureString("Clone failed. Retrying without shallow."));
-        ret = execAndGet("cd /tmp/hyprpm && git clone --recursive https://github.com/hyprwm/hyprland hyprland-" + USERNAME);
-    }
-
-    if (!std::filesystem::exists(WORKINGDIR + "/.git")) {
-        std::println(stderr, "\n{}", failureString("Could not clone the Hyprland repository. shell returned:\n{}", ret));
-        return false;
-    }
-
-    progress.printMessageAbove(successString("Hyprland cloned"));
-    progress.m_iSteps           = 2;
-    progress.m_szCurrentMessage = "Checking out sources";
-    progress.print();
-
-    if (m_bVerbose)
-        progress.printMessageAbove(verboseString("will run: cd {} && git checkout {} 2>&1", WORKINGDIR, HLVER.hash));
-
-    ret = execAndGet("cd " + WORKINGDIR + " && git checkout " + HLVER.hash + " 2>&1");
-
-    if (ret.contains("fatal: unable to read tree")) {
-        std::println(stderr, "\n{}",
-                     failureString("Could not checkout the running Hyprland commit. If you are on -git, try updating.\n"
-                                   "You can also try re-running hyprpm update with --no-shallow."));
-        return false;
-    }
-
-    if (m_bVerbose)
-        progress.printMessageAbove(verboseString("git returned (co): {}", ret));
-
-    ret = execAndGet("cd " + WORKINGDIR + " ; git rm subprojects/tracy ; git submodule update --init 2>&1 ; git reset --hard --recurse-submodules " + HLVER.hash);
-
-    if (m_bVerbose)
-        progress.printMessageAbove(verboseString("git returned (rs): {}", ret));
-
-    progress.printMessageAbove(successString("checked out to running ver"));
-    progress.m_iSteps           = 3;
-    progress.m_szCurrentMessage = "Building Hyprland";
+    progress.m_szCurrentMessage = "Checking headers";
     progress.print();
 
-    progress.printMessageAbove(statusString("!", Colors::YELLOW, "configuring Hyprland"));
-
-    if (m_bVerbose)
-        progress.printMessageAbove(verboseString("setting PREFIX for cmake to {}", DataState::getHeadersPath()));
-
-    ret = execAndGet(std::format("cd {} && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:STRING=\"{}\" -S . -B ./build -G Ninja", WORKINGDIR,
-                                 DataState::getHeadersPath()));
-    if (m_bVerbose)
-        progress.printMessageAbove(verboseString("cmake returned: {}", ret));
-
-    if (ret.contains("CMake Error at")) {
-        // missing deps, let the user know.
-        std::string missing = ret.substr(ret.find("CMake Error at"));
-        missing             = ret.substr(ret.find_first_of('\n') + 1);
-        missing             = missing.substr(0, missing.find("-- Configuring incomplete"));
-        missing             = missing.substr(0, missing.find_last_of('\n'));
-
-        std::println(stderr, "\n{}",
-                     failureString("Could not configure the hyprland source, cmake complained:\n{}\n\n"
-                                   "This likely means that you are missing the above dependencies or they are out of date.",
-                                   missing));
-        return false;
-    }
-
-    progress.printMessageAbove(successString("configured Hyprland"));
-    progress.m_iSteps           = 4;
-    progress.m_szCurrentMessage = "Installing sources";
-    progress.print();
-
-    const std::string& cmd =
-        std::format("sed -i -e \"s#PREFIX = /usr/local#PREFIX = {}#\" {}/Makefile && cd {} && make installheaders", DataState::getHeadersPath(), WORKINGDIR, WORKINGDIR);
-    if (m_bVerbose)
-        progress.printMessageAbove(verboseString("installation will run: {}", cmd));
-
-    ret = execAndGet(cmd);
-
-    if (m_bVerbose)
-        std::println("{}", verboseString("installer returned: {}", ret));
-
-    // remove build files
-    std::filesystem::remove_all(WORKINGDIR);
-
     auto HEADERSVALID = headersValid();
     if (HEADERSVALID == HEADERS_OK) {
         progress.printMessageAbove(successString("installed headers"));
-        progress.m_iSteps           = 5;
+        progress.m_iSteps           = 1;
         progress.m_szCurrentMessage = "Done!";
         progress.print();
 
         std::print("\n");
     } else {
         progress.printMessageAbove(failureString("failed to install headers with error code {} ({})", (int)HEADERSVALID, headerErrorShort(HEADERSVALID)));
-        progress.m_iSteps           = 5;
+        progress.m_iSteps           = 1;
         progress.m_szCurrentMessage = "Failed";
         progress.print();
 
@@ -910,6 +797,19 @@ std::string CPluginManager::headerErrorShort(const eHeadersErrors err) {
 }
 
 bool CPluginManager::hasDeps() {
+    pid_t pid = fork();
+    if (pid == 0) {
+        close(STDOUT_FILENO);
+        execlp("rpm", "rpm", "-q", "hyprland-devel", NULL);
+        exit(1);
+    }
+    int status;
+    pid = waitpid(pid, &status, 0);
+    if (pid < 0)
+        return false;
+    if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+        return false;
+
     std::vector<std::string> deps = {"meson", "cpio", "cmake", "pkg-config"};
     for (auto const& d : deps) {
         if (!execAndGet("command -v " + d).contains("/"))
-- 
2.47.0

Places

File opensuse-hyprpm-use-hyprland-devel-subpkg.patch of Package hyprland (Revision f2711bc2a9ebd27affbf15037d759692)

Places