Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (46ef131c078667550a9e1dc95a0faedbc911ca6f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (46ef131c078667550a9e1dc95a0faedbc911ca6f)
  • Date: Tue, 14 Jan 2014 10:00:59 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 +++
FUNCTIONS | 27 ---------------------------
disk/udisks2/DETAILS | 4 ++--
disk/udisks2/HISTORY | 3 +++
ftp/valknut/BUILD | 7 ++-----
ftp/valknut/DEPENDS | 6 +-----
ftp/valknut/HISTORY | 3 +++
7 files changed, 14 insertions(+), 39 deletions(-)

New commits:
commit 46ef131c078667550a9e1dc95a0faedbc911ca6f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

udisks2: => 2.1.2

commit 01f55f012a1d617bbad0ad4a8c799935b8f8564a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

FUNCTIONS - remove some obsolete functions

commit 9011fd0f4a417153c084f67f82a5a2f2b3599257
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

valknut - is qt4 only

diff --git a/ChangeLog b/ChangeLog
index c2e2017..9d8021e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-01-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: remove obsolete functions regarding qt3/kde3
+
2014-01-11 Vlad Glagolev <stealth AT sourcemage.org>
* utils/mdp: new spell, simplified password manager

diff --git a/FUNCTIONS b/FUNCTIONS
index 2ca1669..7da8ec0 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -556,33 +556,6 @@ qt4_build() {
make
}

-# check whether the QT provider is qt4
-function check_if_qt4_provider()
-{
- if [[ "$(get_spell_provider ${1:-$SPELL} QT)" == "qt4" ]]
- then
- return 0
- fi
- return 1
-}
-
-
-# build using qt3 or qt4
-# some spells an adapt the build process to either qt3 or qt4
-function build_qt3_or_4()
-{
- if check_if_qt4_provider
- then
- QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
- PATH="$QTDIR/bin/qt4:$PATH"
- else
- [[ -z $QTDIR ]] && source /etc/profile.d/qt.sh
- QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
- fi &&
- qmake &&
- make
-}
-
# cmake flags use : which is an internal sorcery delimiter.
# In order to facilitate the passing of depends flags, use % instead and call
# this function at the start of BUILD. Don't use it anywhere else.
diff --git a/disk/udisks2/DETAILS b/disk/udisks2/DETAILS
index 61d1dce..faa7cc9 100755
--- a/disk/udisks2/DETAILS
+++ b/disk/udisks2/DETAILS
@@ -1,6 +1,6 @@
SPELL=udisks2
- VERSION=2.1.1
-
SOURCE_HASH=sha512:d232bcf60365c8f5687af2c9f95752c6ed4be1aee218f0e3e509c4da5853714642a622298755516e1b9802a2a7acf04100300dee8d94953360d00f53897a4491
+ VERSION=2.1.2
+
SOURCE_HASH=sha512:24c321627bcc8b5a3e4d048669b35d25ca92cb7f606819c8375fac3994106ce56766fd2a32eb55b6b6f4838e90dc841139faaea52f3cc2229a134963af27c934
# SECURITY_PATCH=2
SOURCE="${SPELL//2}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://udisks.freedesktop.org/releases/$SOURCE
diff --git a/disk/udisks2/HISTORY b/disk/udisks2/HISTORY
index 06b48fe..a80e782 100644
--- a/disk/udisks2/HISTORY
+++ b/disk/udisks2/HISTORY
@@ -1,3 +1,6 @@
+2014-01-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.1.2
+
2013-10-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional gettext
fix unknown --enable-man-pages
diff --git a/ftp/valknut/BUILD b/ftp/valknut/BUILD
index 30370ac..ff9a08c 100755
--- a/ftp/valknut/BUILD
+++ b/ftp/valknut/BUILD
@@ -1,6 +1,3 @@
-if check_if_qt4_provider
-then
- QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
- PATH="$QTDIR/bin/qt4:$PATH"
-fi &&
+QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
+PATH="$QTDIR/bin/qt4:$PATH"
default_build
diff --git a/ftp/valknut/DEPENDS b/ftp/valknut/DEPENDS
index 1d03b16..fa41374 100755
--- a/ftp/valknut/DEPENDS
+++ b/ftp/valknut/DEPENDS
@@ -1,7 +1,3 @@
depends libxml2 &&
-depends QT &&
-if [[ "$(get_spell_provider ${SPELL} QT)" == "qt4" ]]
-then
- depends -sub QT3 qt4
-fi &&
+depends -sub QT3 qt4
depends dclib
diff --git a/ftp/valknut/HISTORY b/ftp/valknut/HISTORY
index f007665..72e2ce9 100644
--- a/ftp/valknut/HISTORY
+++ b/ftp/valknut/HISTORY
@@ -1,3 +1,6 @@
+2014-01-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS, BUILD: can only depend on qt4
+
2010-09-19 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 0.4.9, fixed SOURCE_URL and WEB_SITE
removed UPDATED and BUILD_API=2



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (46ef131c078667550a9e1dc95a0faedbc911ca6f), Treeve Jelbert, 01/14/2014

Archive powered by MHonArc 2.6.24.

Top of Page