Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev (455db19daa066c9a2e4fc70f4e48ff407fe1b61e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev (455db19daa066c9a2e4fc70f4e48ff407fe1b61e)
  • Date: Thu, 14 Jun 2012 08:10:22 -0500

GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

utils/pciutils/DETAILS | 2
utils/pciutils/HISTORY | 4 +
utils/psmisc/DETAILS | 4 -
utils/psmisc/HISTORY | 3
x11-toolkits/qt4/CONFIGURE | 6 +
x11-toolkits/qt4/DEPENDS | 12
+--
x11-toolkits/qt4/DETAILS | 7 --
x11-toolkits/qt4/HISTORY | 17
+++++
x11-toolkits/qt4/PRE_BUILD | 12
+++
x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch | 33
----------
10 files changed, 52 insertions(+), 48 deletions(-)

New commits:
commit 455db19daa066c9a2e4fc70f4e48ff407fe1b61e
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

qt4: add config_query to build webkit with or without HTML5 video support

DEPENDS: change optional_depends gst-plugins-base to depends if phonon or
HTML5 video selected
add depends icu if webkit selected

PRE_BUILD: add ENABLE_VIDEO=0 to WebCore.pro if HTML5 video is not
selected, so gstreamer, qtmultimedia, or Phonon are not needed
(cherry picked from commit 0a49c76567adc3776235cce2fdde588343704ccf)

commit 7d41b18da405b6694802f5e0e6b7f45ea33dbba8
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

qt4: added a fix for icu, so webkit support can be enabled again.
(cherry picked from commit a624dedda3fcad26517f1d740264b1aa69ac9322)

commit 220c0d8cc251833437c84a3dfa469d7e639c59c1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

qt4 4.8.2
(cherry picked from commit 0ef3da6812caf38bcfda2df637e310b9b746c73d)

commit 1b137452b2fe16084dc5417c904023fa59a61d18
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pciutils: renewed hash sum, diff returns nothing between contents of old
and new tarballs
(cherry picked from commit eefc748eb466b66b124a97fb7e5173854537fea2)

commit 19458d118402f4b60652081a1e843fe85a525656
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

psmisc 22.17
(cherry picked from commit a49ff00ceeff2d1533e30e928f8629b438b5e990)

diff --git a/utils/pciutils/DETAILS b/utils/pciutils/DETAILS
index 985a652..49969be 100755
--- a/utils/pciutils/DETAILS
+++ b/utils/pciutils/DETAILS
@@ -1,6 +1,6 @@
SPELL=pciutils
VERSION=3.1.9
-
SOURCE_HASH=sha512:9e15ae5743bfbdaeb73d02c237d2632ee31f36be3efa5c26688473d2720157ca728384d98a06738eacab0d9a160641a22d53422d0a5d507d9779e0517e18bffb
+
SOURCE_HASH=sha512:4b254f063cab0c5ee65a93a3faca46ff793874ca60db3b3c480b952213f9918833a025b5d2a75f46386c421a9dc3d46aaafeee5283f40a5ec72433758ffbad45
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/$SOURCE
diff --git a/utils/pciutils/HISTORY b/utils/pciutils/HISTORY
index c0f6a19..b50e7e3 100644
--- a/utils/pciutils/HISTORY
+++ b/utils/pciutils/HISTORY
@@ -1,3 +1,7 @@
+2012-06-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated hash sum, reuploaded by upstream; contents is
+ completely identical though
+
2012-01-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.1.9

diff --git a/utils/psmisc/DETAILS b/utils/psmisc/DETAILS
index a57b0c5..687180c 100755
--- a/utils/psmisc/DETAILS
+++ b/utils/psmisc/DETAILS
@@ -1,6 +1,6 @@
SPELL=psmisc
- VERSION=22.16
-
SOURCE_HASH=sha512:265c9cc757c0d3f2a1b5ccf2171d1639d7af027ff13dd0d8fe1222ec3abc943cd1b60de49b3e651d21639590180ceb34a192121ecae5cd220814918c397c2426
+ VERSION=22.17
+
SOURCE_HASH=sha512:3e4aee636fb7d41d09f2903c029da1b297c8b5de7b8add2fc259cfa3742d381449a7bf2656a7ec66f096e45cc473167a2218cb85a26afb145689d0440cd79fc7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/utils/psmisc/HISTORY b/utils/psmisc/HISTORY
index d76fabd..d8342e2 100644
--- a/utils/psmisc/HISTORY
+++ b/utils/psmisc/HISTORY
@@ -1,3 +1,6 @@
+2012-06-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 22.17
+
2012-03-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 22.16

diff --git a/x11-toolkits/qt4/CONFIGURE b/x11-toolkits/qt4/CONFIGURE
index dc02c5d..83c4783 100755
--- a/x11-toolkits/qt4/CONFIGURE
+++ b/x11-toolkits/qt4/CONFIGURE
@@ -56,6 +56,12 @@ config_query_option QT_WEBKIT 'Build the WebKit module?'
y \
'-webkit' \
'-no-webkit' &&

+if [[ $QT_WEBKIT == '-webkit' ]]; then
+ message "${MESSAGE_COLOR}Note that HTML5 Video requires either"
+ message "Multimedia support or Phonon to be built.${DEFAULT_COLOR}"
+ config_query QT_WEBKIT_VIDEO 'Build Webkit with HTML5 video
support?' y
+fi &&
+
config_query_option QT_MEDIA 'Build Multimedia support?' y \
'-multimedia' \
'-no-multimedia' &&
diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index d71d81e..d6fa036 100755
--- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
@@ -78,12 +78,12 @@ optional_depends glib2 \
'-no-glib' \
'glib support' &&

-# qt4 only compiles with gstreamer if there phonon build too
-if [[ $QT_PHONON == "-phonon -phonon-backend" ]]; then
-optional_depends gst-plugins-base \
- '-gstreamer' \
- '-no-gstreamer' \
- 'video streaming'
+if [[ $QT_PHONON == "-phonon -phonon-backend" || $QT_WEBKIT_VIDEO == "y" ]];
then
+ depends gst-plugins-base
+fi &&
+
+if [[ $QT_WEBKIT == "-webkit" ]]; then
+ depends icu
fi &&

optional_depends nas \
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 1d03fed..cca3b81 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,13 +2,12 @@ persistent_remove QT_VER
SPELL=qt4
TMPFS=off
SPELLX=qt-everywhere-opensource-src
- VERSION=4.8.1
-
SOURCE_HASH=sha512:a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90
+ VERSION=4.8.2
+
SOURCE_HASH=sha512:42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62
SOURCE=$SPELLX-$VERSION.tar.gz
- URI=qt/source/$SOURCE
SECURITY_PATCH=4
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- SOURCE_URL[0]=http://download.qt.nokia.com/$URI
+ SOURCE_URL[0]=http://releases.qt-project.org/qt4/source/$SOURCE
WEB_SITE=http://www.qtsoftware.com/products
ENTERED=20020410
LICENSE[0]=LGPL
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 0ef0938..713ad6b 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,20 @@
+2012-06-02 Sukneet Basuta <sukneet AT sourcemage.org>
+ * CONFIGURE: add config_query to build webkit with or without
+ HTML5 video support
+ * DEPENDS: change optional_depends gst-plugins-base to depends
+ if phonon or HTML5 video selected
+ add depends icu if webkit selected
+ * PRE_BUILD: add ENABLE_VIDEO=0 to WebCore.pro if HTML5 video
+ is not selected, so gstreamer, qtmultimedia, or phonon are
+ not needed
+
+2012-05-29 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: added a fix for icu
+
+2012-05-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.8.2, URI removed, SOURCE_URL[0] updated
+ * qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch: removed
+
2012-04-09 Ladislav Hagara <hgr AT vabo.cz>
* PRE_BUILD, qt-4.8-glib-2.32.patch: patch removed
* PRE_BUILD: sed added
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 93950b5..b62fd90 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -2,7 +2,6 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&

sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &&
-patch -p1 <
${SCRIPT_DIRECTORY}/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch &&
patch -p1 <
${SCRIPT_DIRECTORY}/qt-everywhere-opensource-src-4.8.1-glib_fix-1.patch &&

# fix bad .pro file for 4.6.0-beta1
@@ -34,4 +33,13 @@ fi &&
# fix use of firebird
sed -i "s/-lgds/-lfbclient/" config.tests/unix/ibase/ibase.pro \
src/sql/drivers/drivers.pri \
- src/plugins/sqldrivers/ibase/ibase.pro
+ src/plugins/sqldrivers/ibase/ibase.pro &&
+
+# fix icu support
+echo "fixing icu support" &&
+sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
+ src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri &&
+
+if [[ $QT_WEBKIT_VIDEO == n ]]; then
+ sed -i '1iDEFINES += ENABLE_VIDEO=0'
src/3rdparty/webkit/Source/WebCore/WebCore.pro
+fi
diff --git
a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch
b/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch
deleted file mode 100644
index 6f4985c..0000000
--- a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Submitted By: Ragnar Thomsen
<rthomsen_at_linuxfromscratch_dot_org>
-Date: 2012-04-04
-Initial Package Version: 4.8.1
-Origin: OpenSUSE
-Description: Fixes building with GCC 4.7
-
-diff -rupN
a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
2012-03-14 15:01:30.000000000 +0100
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
2012-04-04 21:40:41.287652897 +0200
-@@ -57,9 +57,7 @@ namespace JSC {
-
- class JSGlobalObject : public JSVariableObject {
- protected:
-- using JSVariableObject::JSVariableObjectData;
--
-- struct JSGlobalObjectData : public JSVariableObjectData {
-+ struct JSGlobalObjectData : public
JSVariableObject::JSVariableObjectData {
- // We use an explicit destructor function pointer instead of a
- // virtual destructor because we want to avoid adding a vtable
- // pointer to this struct. Adding a vtable pointer would force
the
-diff -rupN
a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
----
a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
2012-03-14 15:01:30.000000000 +0100
-+++
b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
2012-04-04 21:40:41.287652897 +0200
-@@ -32,8 +32,7 @@ namespace JSC{
-
- class JSStaticScopeObject : public JSVariableObject {
- protected:
-- using JSVariableObject::JSVariableObjectData;
-- struct JSStaticScopeObjectData : public JSVariableObjectData {
-+ struct JSStaticScopeObjectData : public
JSVariableObject::JSVariableObjectData {
- JSStaticScopeObjectData()
- : JSVariableObjectData(&symbolTable, &registerStore + 1)
- {



  • [SM-Commit] GIT changes to stable-rc-0.61 grimoire by Vlad Glagolev (455db19daa066c9a2e4fc70f4e48ff407fe1b61e), Vlad Glagolev, 06/14/2012

Archive powered by MHonArc 2.6.24.

Top of Page