[SM-Commit] GIT changes to master grimoire by Bor Kraljič (70bd889f21651120caab1208bf9e3bc369e19bf0)

Bor Kraljič scm at sourcemage.org
Tue Mar 1 11:17:07 EST 2011


GIT changes to master grimoire by Bor Kraljič <pyrobor at ver.si>:

 x11-toolkits/qt4/DETAILS |    2 --
 x11-toolkits/qt4/HISTORY |    4 ++++
 x11-toolkits/qt4/PREPARE |   14 +++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 70bd889f21651120caab1208bf9e3bc369e19bf0
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    qt4: TMPFS=off for all users
    
    ATM size of tmpfs is hardcoded in sorcery and set to 1GB. Due to that fact
    cast fails with reason "not enough space" despite user has lots of RAM
    (for example 8GB or more).

diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 986f850..e61f576 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -1,8 +1,6 @@
 persistent_remove QT_VER
            SPELL=qt4
-if  [[ $QT_TMPFS == n ]];  then
            TMPFS=off
-fi
          SPELLX=qt-everywhere-opensource-src
          VERSION=4.7.2
      SOURCE_HASH=sha512:5515d6666ee5aa875c32c8d8a0518b3e0ec26988f2bf31bbd584df7c43caba08d11ace092d5c5e178339b64ac390121f85f2f9b81aabe076ed254de0c583d32a
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index ddfd7c7..288e6ea 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2011-03-01 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: TMPFS=off for all
+	* PREPARE: commented unneeded code
+
 2011-03-01 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 4.7.2
 	* PRE_BUILD, ca2e8b6dc176576f7217f4b7209994eddad1a358.patch: removed
diff --git a/x11-toolkits/qt4/PREPARE b/x11-toolkits/qt4/PREPARE
index 533990c..ea0b68e 100755
--- a/x11-toolkits/qt4/PREPARE
+++ b/x11-toolkits/qt4/PREPARE
@@ -1,8 +1,8 @@
-MEMSIZ=$(free | awk '/^Mem/ {print $2}')
+#MEMSIZ=$(free | awk '/^Mem/ {print $2}')
 
-if [[ $MEMSIZ < 1020000 ]]; then
-  QT_TMPFS=n  &&
-  persistent_add  QT_TMPFS
-elif [[ $TMPFS == on || $TMPFS == 1 ]]; then
-  config_query  QT_TMPFS  'Enable tmpfs? (consuming over 1GB RAM)'  n
-fi
+#if [[ $MEMSIZ < 1020000 ]]; then
+#  QT_TMPFS=n  &&
+#  persistent_add  QT_TMPFS
+#elif [[ $TMPFS == on || $TMPFS == 1 ]]; then
+#  config_query  QT_TMPFS  'Enable tmpfs? (consuming over 1GB RAM)'  n
+#fi



More information about the SM-Commit mailing list