Skip to Content.
Sympa Menu

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

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 (b6684908c1e156835f513cf60cd2eadf174e34ac)
  • Date: Mon, 2 Apr 2012 10:18:03 -0500

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

x11-toolkits/qt4/DETAILS | 4 ++--
x11-toolkits/qt4/HISTORY | 6 ++++++
x11-toolkits/qt4/PRE_BUILD | 2 +-
x11-toolkits/qt4/WebKit.pri.patch | 11 -----------
x11-toolkits/qt4/qt-4.8-glib-2.32.patch | 28 ++++++++++++++++++++++++++++
5 files changed, 37 insertions(+), 14 deletions(-)

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

qt4 4.8.1

diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 446dfcd..1d03fed 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,8 +2,8 @@ persistent_remove QT_VER
SPELL=qt4
TMPFS=off
SPELLX=qt-everywhere-opensource-src
- VERSION=4.8.0
-
SOURCE_HASH=sha512:b37f2d5fe3cebdcc7ebd5b6bc68ea03f4cabeadc492c77d7c18d00ede5c254adb57fcbe5cec6326072304db49e69e59c14af7e90875138c3b2f255237a99a78f
+ VERSION=4.8.1
+
SOURCE_HASH=sha512:a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=4
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 3d3b701..254c40b 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,9 @@
+2012-04-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.8.1
+ * PRE_BUILD, WebKit.pri.patch: patch removed
+ * PRE_BUILD, qt-4.8-glib-2.32.patch: patch added,
+ https://bugs.gentoo.org/show_bug.cgi?id=401855
+
2012-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, WebKit.pri.patch: removed -Werror CXXFLAG for webkit
to avoid compile error
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 3435443..66a54c2 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-patch -p1 < ${SCRIPT_DIRECTORY}/WebKit.pri.patch &&
+patch -p1 < ${SCRIPT_DIRECTORY}/qt-4.8-glib-2.32.patch &&

# fix bad .pro file for 4.6.0-beta1
for file in
tools/assistant/tools/{qhelpgenerator,qcollectiongenerator,qhelpconverter,assistant}/*.pro;
do
diff --git a/x11-toolkits/qt4/WebKit.pri.patch
b/x11-toolkits/qt4/WebKit.pri.patch
deleted file mode 100644
index 268874b..0000000
--- a/x11-toolkits/qt4/WebKit.pri.patch
+++ /dev/null
@@ -1,11 +0,0 @@
----
qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/WebKit.pri.orig
2012-01-02 13:44:33.130841538 +0100
-+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/WebKit.pri
2012-01-02 13:44:54.300511604 +0100
-@@ -102,8 +102,6 @@
-
- # Treat warnings as errors on x86/Linux/GCC
- linux-g++* {
-- isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
--
- greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION,
5) {
- if (!contains(QMAKE_CXXFLAGS, -std=c++0x) &&
!contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
- # We need to deactivate those warnings because some names
conflicts with upcoming c++0x types (e.g.nullptr).
diff --git a/x11-toolkits/qt4/qt-4.8-glib-2.32.patch
b/x11-toolkits/qt4/qt-4.8-glib-2.32.patch
new file mode 100644
index 0000000..0f5ddc6
--- /dev/null
+++ b/x11-toolkits/qt4/qt-4.8-glib-2.32.patch
@@ -0,0 +1,28 @@
+---
qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
2012-04-01 19:32:46.621395314 +0200
++++
qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
2012-04-01 19:34:23.693181749 +0200
+@@ -24,6 +24,7 @@
+
+ #if ENABLE(GLIB_SUPPORT)
+
++#include <glib.h>
+ #include <algorithm>
+ #include <wtf/Assertions.h>
+ #include <wtf/Noncopyable.h>
+---
qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
2012-04-01 19:32:46.624395278 +0200
++++
qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
2012-04-01 19:34:09.420360184 +0200
+@@ -39,7 +39,6 @@
+ typedef struct _GAsyncResult GAsyncResult;
+ typedef struct _GCancellable GCancellable;
+ typedef struct _GCharsetConverter GCharsetConverter;
+-typedef struct _GCond GCond;
+ typedef struct _GDir GDir;
+ typedef struct _GdkAtom* GdkAtom;
+ typedef struct _GdkCursor GdkCursor;
+@@ -52,7 +51,6 @@
+ typedef struct _GHashTable GHashTable;
+ typedef struct _GInputStream GInputStream;
+ typedef struct _GList GList;
+-typedef struct _GMutex GMutex;
+ typedef struct _GPatternSpec GPatternSpec;
+ typedef struct _GPollableOutputStream GPollableOutputStream;
+ typedef struct _GSocketClient GSocketClient;



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (b6684908c1e156835f513cf60cd2eadf174e34ac), Ladislav Hagara, 04/02/2012

Archive powered by MHonArc 2.6.24.

Top of Page