Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b82844ecad9ecde1a8f6ec29ece2ed8e1fda7f3d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b82844ecad9ecde1a8f6ec29ece2ed8e1fda7f3d)
  • Date: Sat, 5 May 2012 05:27:01 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

video/minitube/0001-fix-build-with-gcc-4.7.patch | 25
+++++++++++++++++++++++
video/minitube/BUILD | 3 --
video/minitube/DETAILS | 13 +++++++++++
video/minitube/HISTORY | 6 +++++
video/minitube/PREPARE | 2 +
video/minitube/PRE_BUILD | 3 ++
6 files changed, 50 insertions(+), 2 deletions(-)

New commits:
commit b82844ecad9ecde1a8f6ec29ece2ed8e1fda7f3d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/minitube: fix build with gcc 4.7

commit 6402b01d13f77d9e09cb0f678bde51df3b30f3c2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/minitube: add option for selecting the scm version

commit c01d7df28f790a3468726c7091cc19e3ca1c9497
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/minitube: use qt4_build

diff --git a/video/minitube/0001-fix-build-with-gcc-4.7.patch
b/video/minitube/0001-fix-build-with-gcc-4.7.patch
new file mode 100644
index 0000000..4fdf0f4
--- /dev/null
+++ b/video/minitube/0001-fix-build-with-gcc-4.7.patch
@@ -0,0 +1,25 @@
+From a186f8dfc22d24b03d103df1f303cb22fb38d149 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sat, 5 May 2012 11:44:24 +0200
+Subject: [PATCH] fix build with gcc 4.7
+
+---
+ src/qtsingleapplication/qtlocalpeer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qtsingleapplication/qtlocalpeer.cpp
b/src/qtsingleapplication/qtlocalpeer.cpp
+index 4c4382d..b666197 100644
+--- a/src/qtsingleapplication/qtlocalpeer.cpp
++++ b/src/qtsingleapplication/qtlocalpeer.cpp
+@@ -101,7 +101,7 @@ QtLocalPeer::QtLocalPeer(QObject* parent, const QString
&appId)
+ socketName += QLatin1Char('-') + QString::number(sessionId, 16);
+ }
+ #else
+- socketName += QLatin1Char('-') + QString::number(::getuid(), 16);
++ socketName += QLatin1Char('-') +
QString::number(QtLP_Private::getuid(), 16);
+ #endif
+
+ server = new QLocalServer(this);
+--
+1.7.10.1
+
diff --git a/video/minitube/BUILD b/video/minitube/BUILD
index 3ba0b3a..eec3de4 100755
--- a/video/minitube/BUILD
+++ b/video/minitube/BUILD
@@ -1,2 +1 @@
-/usr/bin/qt4/qmake &&
-make
+qt4_build
diff --git a/video/minitube/DETAILS b/video/minitube/DETAILS
index 7569a5e..c55e92e 100755
--- a/video/minitube/DETAILS
+++ b/video/minitube/DETAILS
@@ -1,9 +1,22 @@
SPELL=minitube
+if [[ "${MINITUBE_BRANCH}" == "scm" ]] ; then
+ if [[ "${MINITUBE_AUTOUPDATE}" == "y" ]] ; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=git
+ fi
+ SOURCE=${SPELL}-git.tar.bz2
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-git
+ SOURCE_URL[0]=git://gitorious.org/minitube/minitube.git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+else
VERSION=1.7.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://flavio.tordini.org/files/${SPELL}/${SOURCE}

SOURCE_HASH=sha512:e1987506c4691021e712486d6b918e2c4383d24ab32e39431cc4c302b7f1196369f83fa42d630b19af51843877474308adb39a9f290dc00f2e7a53d117791e00
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+fi
WEB_SITE="http://flavio.tordini.org/minitube";
LICENSE[0]=GPL
ENTERED=20090617
diff --git a/video/minitube/HISTORY b/video/minitube/HISTORY
index b2a2eac..2d3643c 100644
--- a/video/minitube/HISTORY
+++ b/video/minitube/HISTORY
@@ -1,3 +1,9 @@
+2012-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: use qt4_build
+ * PREPARE, DETAILS: add option for selecting the scm version
+ * 0001-fix-build-with-gcc-4.7.patch, PRE_BUILD: fix build with
+ gcc 4.7
+
2012-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.7.1

diff --git a/video/minitube/PREPARE b/video/minitube/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/video/minitube/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/video/minitube/PRE_BUILD b/video/minitube/PRE_BUILD
new file mode 100755
index 0000000..8d6e6d3
--- /dev/null
+++ b/video/minitube/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/0001-fix-build-with-gcc-4.7.patch



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b82844ecad9ecde1a8f6ec29ece2ed8e1fda7f3d), Florian Franzmann, 05/05/2012

Archive powered by MHonArc 2.6.24.

Top of Page