Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (d98698bdab558f5467bfb3321b597d5fff382636)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (d98698bdab558f5467bfb3321b597d5fff382636)
  • Date: Tue, 26 Mar 2024 02:22:42 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

wm-addons/hyprpaper/BUILD | 6 +++++-
wm-addons/hyprpaper/CONFIGURE | 3 +++
wm-addons/hyprpaper/DEPENDS | 4 +++-
wm-addons/hyprpaper/DETAILS | 1 +
wm-addons/hyprpaper/HISTORY | 4 ++++
wm-addons/hyprpaper/INSTALL | 6 +++++-
6 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit d98698bdab558f5467bfb3321b597d5fff382636
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

wm-addons/hyprpaper: scm branch now uses default
cmake build/install,
enabled parallel/distributed
build for stable

diff --git a/wm-addons/hyprpaper/BUILD b/wm-addons/hyprpaper/BUILD
index bee6666..c174489 100755
--- a/wm-addons/hyprpaper/BUILD
+++ b/wm-addons/hyprpaper/BUILD
@@ -1 +1,5 @@
-make all
+if [[ "${HYPRPAPER_BRANCH}" == "scm" ]]; then
+ default_build
+else
+ ${MAKE:-make} -j $((${#DISTCC_HOSTS[*]} * JOBS_PER_HOST + MAKE_NJOBS)) all
+fi
diff --git a/wm-addons/hyprpaper/CONFIGURE b/wm-addons/hyprpaper/CONFIGURE
new file mode 100755
index 0000000..c55095d
--- /dev/null
+++ b/wm-addons/hyprpaper/CONFIGURE
@@ -0,0 +1,3 @@
+if [[ "${HYPRPAPER_BRANCH}" == "scm" ]]; then
+ . "${GRIMOIRE}/CMAKE_CONFIGURE"
+fi
diff --git a/wm-addons/hyprpaper/DEPENDS b/wm-addons/hyprpaper/DEPENDS
index 2d2e724..c0e1ea0 100755
--- a/wm-addons/hyprpaper/DEPENDS
+++ b/wm-addons/hyprpaper/DEPENDS
@@ -1,6 +1,8 @@
-depends cmake &&
if [[ "${HYPRPAPER_BRANCH}" == "scm" ]]; then
+ . "${GRIMOIRE}/CMAKE_DEPENDS" &&
depends git
+else
+ depends cmake
fi &&
depends cairo &&
depends hyprlang &&
diff --git a/wm-addons/hyprpaper/DETAILS b/wm-addons/hyprpaper/DETAILS
index 14d16f0..a12beb2 100755
--- a/wm-addons/hyprpaper/DETAILS
+++ b/wm-addons/hyprpaper/DETAILS
@@ -1,6 +1,7 @@
. "${GRIMOIRE}/FUNCTIONS"
SPELL="hyprpaper"
if [[ "${HYPRPAPER_BRANCH}" == "scm" ]]; then
+. "${GRIMOIRE}/CMAKE_FUNCTIONS"
VERSION="$(get_scm_version)"
SOURCE="${SPELL}-scm.tar.xz"
FORCE_DOWNLOAD="on"
diff --git a/wm-addons/hyprpaper/HISTORY b/wm-addons/hyprpaper/HISTORY
index aea107e..54498cf 100644
--- a/wm-addons/hyprpaper/HISTORY
+++ b/wm-addons/hyprpaper/HISTORY
@@ -1,3 +1,7 @@
+2024-03-25 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS, INSTALL: scm branch now uses default
cmake
+ build/install, enabled parallel/distributed build for stable
+
2024-01-12 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.6.0
* DEPENDS: needs hyprlang
diff --git a/wm-addons/hyprpaper/INSTALL b/wm-addons/hyprpaper/INSTALL
index b2a1026..441c464 100755
--- a/wm-addons/hyprpaper/INSTALL
+++ b/wm-addons/hyprpaper/INSTALL
@@ -1 +1,5 @@
-install -D "build/${SPELL}" -t "${INSTALL_ROOT}/usr/bin"
+if [[ "${HYPRPAPER_BRANCH}" == "scm" ]]; then
+ default_install
+else
+ install -D "build/${SPELL}" -t "${INSTALL_ROOT}/usr/bin"
+fi


  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (d98698bdab558f5467bfb3321b597d5fff382636), Pavel Vinogradov, 03/25/2024

Archive powered by MHonArc 2.6.24.

Top of Page