Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (7e485150186908b059703d90e77a5f43b8c7b2e4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (7e485150186908b059703d90e77a5f43b8c7b2e4)
  • Date: Thu, 4 Jul 2013 06:56:50 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

x11-toolkits/qt4/DETAILS | 12
++++----
x11-toolkits/qt4/HISTORY | 6
++++
x11-toolkits/qt4/PRE_BUILD | 5
---
x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch | 15
----------
4 files changed, 13 insertions(+), 25 deletions(-)

New commits:
commit 7e485150186908b059703d90e77a5f43b8c7b2e4
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

qt4 4.8.5, SECURITY_PATCH=5

diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index ad4ad08..d5ca68e 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,14 +2,14 @@ persistent_remove QT_VER
SPELL=qt4
TMPFS=off
SPELLX=qt-everywhere-opensource-src
- VERSION=4.8.4
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496
+ VERSION=4.8.5
+ PATCHLEVEL=0
+
SOURCE_HASH=sha512:47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb
SOURCE=$SPELLX-$VERSION.tar.gz
- SECURITY_PATCH=4
+ SECURITY_PATCH=5
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- SOURCE_URL[0]=http://releases.qt-project.org/qt4/source/$SOURCE
- WEB_SITE=http://www.qtsoftware.com/products
+
SOURCE_URL[0]=http://download.qt-project.org/official_releases/qt/4.8/$VERSION/$SOURCE
+ WEB_SITE=http://qt-project.org/
ENTERED=20020410
LICENSE[0]=LGPL
DOCS="FAQ README README-QT.TXT"
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 3f980f0..e78e8f1 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,9 @@
+2013-07-04 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.8.5, SECURITY_PATCH=5
+ WEB_SITE and SOURCE_URL[0] updated
+ * PRE_BUILD, qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch:
+ patch removed
+
2013-02-27 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD, qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch:
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 15a1cd6..4efb000 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -41,7 +41,4 @@ sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/
s:^#\s*::' \

if [[ $QT_WEBKIT_VIDEO == n ]]; then
sed -i '1iDEFINES += ENABLE_VIDEO=0'
src/3rdparty/webkit/Source/WebCore/WebCore.pro
-fi &&
-
-# fix moc for spells that depend on BOOST 1.53
-patch -p1 <
$SPELL_DIRECTORY/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch
+fi
diff --git
a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch
b/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch
deleted file mode 100644
index fa82334..0000000
--- a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up
qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148
qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp
---- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148
2012-11-23 04:09:53.000000000 -0600
-+++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11
07:07:18.942748176 -0600
-@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv)
- Moc moc;
- pp.macros["Q_MOC_RUN"];
- pp.macros["__cplusplus"];
-+
-+ // Workaround a bugs while parsing some boost headers. See QTBUG-22829
-+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
-+ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
-+
- QByteArray filename;
- QByteArray output;
- FILE *in = 0;



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (7e485150186908b059703d90e77a5f43b8c7b2e4), Ladislav Hagara, 07/04/2013

Archive powered by MHonArc 2.6.24.

Top of Page