calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'develop' of git.calculate-linux.org:calculate/calculate-overlay into develop

Browse Source
mhiretskiy
Alexander Tratsevskiy 3 years ago
parent 12298df603 75e9086229
commit fc79e1c805
6 changed files with 79 additions and 3 deletions
Show Stats Download Patch File Download Diff File

10
eclass/calculate-kernel-8.eclass
Unescape View File

@ -101,12 +101,15 @@ vmlinuz_src_install() {
INSTALL_MOD_PATH=${D} emake modules_install
/sbin/depmod -b ${D} ${KV_FULL}
cp /etc/dracut.conf dracut.conf
echo >>dracut.conf
if use themes
then
PLYMOUTH="-a plymouth"
echo add_dracutmodules+=\" plymouth\" >>dracut.conf
else
PLYMOUTH="-o plymouth"
echo omit_dracutmodules+=\" plymouth\" >>dracut.conf
fi
echo add_dracutmodules+=\" calculate video\" >>dracut.conf
if grep -q CONFIG_RD_ZSTD=y .config &>/dev/null
then
@ -120,10 +123,11 @@ vmlinuz_src_install() {
else
RDARCH=""
fi
/usr/bin/dracut $RDARCH -a calculate $PLYMOUTH -a video -k ${D}/lib/modules/${KV_FULL} \
/usr/bin/dracut $RDARCH -c dracut.conf -k ${D}/lib/modules/${KV_FULL} \
--kver ${KV_FULL} \
${D}/usr/share/${PN}/${PV}/boot/initramfs-${KV_FULL}
# move firmware to share, because /lib/firmware installation does collisions
rm dracut.conf
mv ${D}/lib/firmware ${D}/usr/share/${PN}/${PV}
insinto /usr/share/${PN}/${PV}/boot/
newins .config config-${KV_FULL}

8
profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0/gtk.css
Unescape View File

@ -1,5 +1,13 @@
@import url("resource:///org/gtk/libgtk/theme/Adwaita/gtk-contained.css");
#login_box infobar box {
background-color: white;
}
#login_box box {
border: none;
}
.panel {
#?pkg(xfce-base/xfce4-panel)>=4.14#
background-color: #343938;

6
profiles/templates/3.6/2_ac_install_merge/xfce-base/xfce4-session/xflock4
Unescape View File

@ -25,6 +25,12 @@
PATH=/bin:/usr/bin
export PATH
#
# Lock by xfce4-screensaver, if a respective daemon is running
if type xfce4-screensaver-command
then
xfce4-screensaver-command --lock &>/dev/null && exit
fi
# spawn xflock4 before suspend contains DISPLAY without dot symbol
# wait several seconds before the dm-tool running if it's the suspend

31
profiles/templates/3.6/6_ac_install_patch/xfce-extra/xfce4-power-manager/wait_lid_dpms_on.patch
Unescape View File

@ -0,0 +1,31 @@
# Calculate format=diff
diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
index e9acaa0..05e9964 100644
--- a/src/xfpm-manager.c
+++ b/src/xfpm-manager.c
@@ -441,12 +441,11 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
{
XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID close event");
- if ( action == LID_TRIGGER_NOTHING )
- {
- if ( !xfpm_is_multihead_connected () )
- xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOff);
- }
- else if ( action == LID_TRIGGER_LOCK_SCREEN )
+ if ( action != LID_TRIGGER_NOTHING ) {
+ if ( !xfpm_is_multihead_connected () )
+ xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOff);
+ }
+ if ( action == LID_TRIGGER_LOCK_SCREEN )
{
if ( !xfpm_is_multihead_connected () )
{
@@ -466,6 +463,7 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
* user for confirmation in case of an application is inhibiting
* the power manager.
*/
+ g_usleep (1000000);
xfpm_manager_sleep_request (manager, action, TRUE);
}
}

2
sys-apps/calculate-utils/Manifest
Unescape View File

@ -1,4 +1,5 @@
DIST calculate-builder-3.6.8.tar.bz2 42331 BLAKE2B 9d701b522d969f4f34ea6be5590b22875d76c27596c2d42dcc1f2ba2dd72a79c48ab3d758879562526783c9c7155fcf0f0cfed03448c4be122f6ec7645d5cfd6 SHA512 668c8bd99cdad2467115516a5fdf8be49e6b77c88f8bce363bd95e82666fb11f12fa09e4fe10252094c3670de097f07f4f2da31aebacc69f149de7d15eb3a081
DIST calculate-builder-3.6.9.1.tar.bz2 42464 BLAKE2B 5390010279755b37cec002a9032ce421bd381c63488a50f6783e502ab22c1c1ff5498173413b951b20a0e89618705d59856de1973124aa2a3c88e69eae5ecefa SHA512 d2861f986c7010c4f5fddc969f1649c13df4427a1dff3ff0ed220d27d2e69b24fb1b01f2118f7a34cae4022104f6c9246ffbcc9a2c5a1cc888b646c72a2b16ce
DIST calculate-builder-3.6.9.tar.bz2 42512 BLAKE2B ed94c820a9b736c7016add9af32784cf962eeb82b7094451a8e548e7aa12fa345c21d32eb8036ee1100aa4d9c3b647f8a33f36dbdc287a07868429af82c42bc4 SHA512 0aa342c5dbb00c4b81d2c9a85bf6b8f91dd6cf7bd4e9bb1124cb59ef0038068d1b11eaa77677c81027571762be37a69b3b46790a59f3add819765a1f83fa88f8
DIST calculate-client-3.6.8.2.tar.bz2 31700 BLAKE2B 2188029d5c92dd70d3e925fc04c0fd8769d5278aa495172bcc78ae8b92379cdbeae178c0777a03b6da943a1161376389011940c19e80ee675e9fdab8eef16643 SHA512 f0bd6bbdb3bd18322cd9f700a31ea11858a589d4868df0b8f043e768ebc2642f245f34d0d52563aef164589a1e224341a9968c3c46c54c2a1341ce28b6f3662f
DIST calculate-client-3.6.9.1.tar.bz2 33706 BLAKE2B 54560219524331920f225902d5f376cd53c960da8410280f1b7cc20da781ed9ec7c3f459f8c5adcaaebe6c562c99afa5962a0da5b58bbaa26651a9eefb76b389 SHA512 7785c45709f0712099156bcc934418f9eebde0e12ff238b5fb87be5c65f6e61e416145440c6a300f8e1ccf051c515153af1e34a0756ea8781f920b668e8e81d5
@ -34,6 +35,7 @@ DIST calculate-install-3.6.8.9.tar.bz2 85088 BLAKE2B 5b38f0137ddaf5e83219ba01643
DIST calculate-install-3.6.9.1.tar.bz2 85085 BLAKE2B 80304a0beb07bcda5f38029f8d08a2821060914b363cfe52ee03132f4c835f83b929f6e641f81fcd8241b285c7fe64d6a50c7afc203ec0d3456f5a1557190f78 SHA512 cd83353f844a57e0c335d152ed0e9e9692528f617f2f8eebcc7a8fc8b527da74ac83d5a8812104bffc847977887a2bc5edc83718af39bf223ce176bebf212adf
DIST calculate-install-3.6.9.10.tar.bz2 85101 BLAKE2B e74b855d8761ee472548aad4bf1d9dc340f8fa84babd616bf450e72f978c54ecbb5d5fcaa7053fe88ac4e912cc615035f4624c2b6a0ebc743a57cbed441e95eb SHA512 a86c8a1ec2113778443a599fe5c8539a00a2f53d743ba86987a81b352d1c8f068e52960b252ee54fd43229370ab6ff06af81a6bdc49b7aa21d2858cb8aeac526
DIST calculate-install-3.6.9.11.tar.bz2 85202 BLAKE2B c343b0757f7775102008274aa26454b8a23dd757e16a08556962f88852172024dce47a63c826ad12d60aaadaa0c2bb1ed646a758e5e3537e493c02416df8ab60 SHA512 3c5896ee63966fdf3af6b2d91cacb2e41bdc8d83d82007bf4afb8b4e1991b5e4b146d1d5393ace23a60750aae3d965357f175881f47a013c9b13d2edfea117e3
DIST calculate-install-3.6.9.12.tar.bz2 84847 BLAKE2B c69b5b33a06333de57f4c28b4ff42cbbde7070dd59a0beba097531f65863baaaddf3d41460de3efcfb9352fae4ba07d618b23a45b79a5caf8f87997fd0fd2fc9 SHA512 f806247f72ce57fba71fc5c17827dfb469eda58f0d08fb8ad11e9fb7fa67b12cff0ec57a59f049d8fd6c2afb544e9a378ed3a1f2d6a0e475f719a051873156d7
DIST calculate-install-3.6.9.2.tar.bz2 85016 BLAKE2B 75e9928c15da1a849defea8147fb9a093fa47439d0e68de52f46b6b4037bf3ee38d5b0c97712f963a0bcdd4b35af27422c051dfd2b243719e9e2f779ad985aa3 SHA512 91c29e71cb6744d67640f47601e3c1138716dffa0536258a3a99c692fe4a598f798e5b402170fae378a8e81b587196321f134a6444df564e108ccdb1aa89901f
DIST calculate-install-3.6.9.3.tar.bz2 84784 BLAKE2B 4f1a416b8152f38d9bcd4951b4c6e897d056ed0c9292e9fdedf7359343c250e8f1d702146e67836f2d63bb7e7b90668c2452b70b3fb0a80e490a7cb021937d4e SHA512 a5a14495b39e6f11fdcb47fa746138bd8fa3ca8d249f6f766f82f837e53af90256c2b23361ecae37489b52949ae906d77af0ef769af5afd37b8c276909836ad4
DIST calculate-install-3.6.9.7.tar.bz2 85145 BLAKE2B 4304274f8d2f833eb3a8cec1185dd235da9fcee927adf991d7ddce5abab9d8e3ffac177124e34f7d65cb4aff8aceb41c8715220e450e5a95552fa6be5d5340cc SHA512 d8b82604492adbe07eefa7dbd7ca96289386f4152cbe86b6dc8d4997370bca1d087cd06fe02e1a1a93fe5f0a08bd200439b3f723e2aa5c7b85ce0c92c4b8fdeb

25
sys-apps/calculate-utils/calculate-utils-3.6.9.16.ebuild
Unescape View File

@ -0,0 +1,25 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="7"
PYTHON_COMPAT=(python2_7)
declare -A CALCULATE_MODULES=(
["lib"]="3.6.9.6"
["install"]="3.6.9.12"
["client"]="3.6.9.9"
["desktop"]="3.6.9.2"
["update"]="3.6.9.1"
["builder"]="3.6.9.1"
)
inherit calculate-utils-r12
DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64"
Write Preview
Loading…
Cancel
Save