[packages/qt4] - updated to 4.8.3 - updated webkit-no_Werror patch - remoed obsolete glib,git,gcc-4.7 patches - upd
qboosh
qboosh at pld-linux.org
Wed Sep 19 16:59:09 CEST 2012
commit 297dfe59cc6dd520af3729135af6a7710bac15d1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Sep 19 17:00:01 2012 +0200
- updated to 4.8.3
- updated webkit-no_Werror patch
- remoed obsolete glib,git,gcc-4.7 patches
- updated libicu dependencies to use icu 49.x
gcc-4.7.patch | 17 -----------------
qt4-git.patch | 27 ---------------------------
qt4-glib.patch | 11 -----------
qt4.spec | 28 ++++++++++++----------------
webkit-no_Werror.patch | 9 ++++-----
5 files changed, 16 insertions(+), 76 deletions(-)
---
diff --git a/qt4.spec b/qt4.spec
index 401fb01..8fb2b32 100644
--- a/qt4.spec
+++ b/qt4.spec
@@ -52,12 +52,12 @@ Summary(es.UTF-8): Biblioteca para ejecutar aplicaciones GUI Qt
Summary(pl.UTF-8): Biblioteka Qt do tworzenia GUI
Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt
Name: qt4
-Version: 4.8.2
-Release: 11
+Version: 4.8.3
+Release: 1
License: LGPL v2.1 or GPL v3.0
Group: X11/Libraries
Source0: http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-%{version}.tar.gz
-# Source0-md5: 3c1146ddf56247e16782f96910a8423b
+# Source0-md5: a663b6c875f8d7caa8ac9c30e4a4ec3b
Source2: %{name}-qtconfig.desktop
Source3: %{name}-designer.desktop
Source4: %{name}-assistant.desktop
@@ -75,13 +75,10 @@ Patch3: %{name}-locale.patch
Patch5: %{name}-support-cflags-with-commas.patch
Patch6: %{name}-build-lib-static.patch
Patch7: %{name}-x11_fonts.patch
-Patch8: %{name}-glib.patch
-Patch9: %{name}-ibase.patch
-Patch10: %{name}-git.patch
-Patch11: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
-Patch12: gcc-4.7.patch
-Patch13: webkit-no_Werror.patch
-Patch14: moc-boost148.patch
+Patch8: %{name}-ibase.patch
+Patch9: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
+Patch10: webkit-no_Werror.patch
+Patch11: moc-boost148.patch
URL: http://qt.nokia.com/
%{?with_ibase:BuildRequires: Firebird-devel}
BuildRequires: Mesa-libOpenVG-devel
@@ -97,7 +94,9 @@ BuildRequires: freetype-devel >= 1:2.0.0
BuildRequires: glib2-devel >= 2.0.0
BuildRequires: gstreamer-plugins-base-devel
%{?with_gtk:BuildRequires: gtk+2-devel >= 2:2.10}
-BuildRequires: libicu-devel >= 4.8
+# see dependency on libicu version below
+BuildRequires: libicu-devel >= 49
+BuildRequires: libicu-devel < 50
BuildRequires: libjpeg-devel
BuildRequires: libmng-devel >= 1.0.0
BuildRequires: libpng-devel >= 2:1.0.8
@@ -261,10 +260,10 @@ Group: X11/Libraries
%requires_eq libicu
# be sure to depend on proper arch.
%ifarch %{ix86}
-Requires: libicui18n.so.48
+Requires: libicui18n.so.49
%endif
%ifarch %{x8664}
-Requires: libicui18n.so.48()(64bit)
+Requires: libicui18n.so.49()(64bit)
%endif
Obsoletes: QtAssistant
@@ -1452,9 +1451,6 @@ Programas exemplo para o Qt versão.
%patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
%{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
mkspecs/common/linux.conf
diff --git a/gcc-4.7.patch b/gcc-4.7.patch
deleted file mode 100644
index 7ab2199..0000000
--- a/gcc-4.7.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- qt-everywhere-opensource-src-4.8.2/src/corelib/tools/qiterator.h~ 2012-04-26 21:46:08.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.2/src/corelib/tools/qiterator.h 2012-06-15 23:37:12.800330726 +0200
-@@ -43,13 +43,10 @@
- #define QITERATOR_H
-
- #include <QtCore/qglobal.h>
-+#include <iterator>
-
- QT_BEGIN_HEADER
-
--namespace std {
-- struct bidirectional_iterator_tag;
-- struct random_access_iterator_tag;
--}
-
- QT_BEGIN_NAMESPACE
-
diff --git a/qt4-git.patch b/qt4-git.patch
deleted file mode 100644
index 15aafe8..0000000
--- a/qt4-git.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit ca89c49fa2c5cbb3945897046f33eed9f7da846c
-Author: Jiang Jiang <jiang.jiang at nokia.com>
-Date: Tue Jul 3 10:17:49 2012 +0200
-
- Fix cursor truncate to include line position
-
- Since we could have moved the line position (QTextLine::setPosition),
- the truncating position should be adjusted with that.
-
- Change-Id: Ie1acd4a1b6a4adfbeeb9ce8ee2dfa19d992470e8
- Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at nokia.com>
-
-diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
-index 16f7150..52f2793 100644
---- a/src/gui/text/qtextlayout.cpp
-+++ b/src/gui/text/qtextlayout.cpp
-@@ -2616,8 +2616,8 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
- x += eng->offsetInLigature(si, pos, end, glyph_pos);
- }
-
-- if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.width)
-- x = line.width;
-+ if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.x + line.width)
-+ x = line.x + line.width;
-
- *cursorPos = pos + si->position;
- return x.toReal();
diff --git a/qt4-glib.patch b/qt4-glib.patch
deleted file mode 100644
index 3e15ca4..0000000
--- a/qt4-glib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.orig 2012-03-14 15:01:26.000000000 +0100
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2012-04-03 16:35:00.433473703 +0200
-@@ -52,7 +52,7 @@
- typedef struct _GHashTable GHashTable;
- typedef struct _GInputStream GInputStream;
- typedef struct _GList GList;
--typedef struct _GMutex GMutex;
-+typedef union _GMutex GMutex;
- typedef struct _GPatternSpec GPatternSpec;
- typedef struct _GPollableOutputStream GPollableOutputStream;
- typedef struct _GSocketClient GSocketClient;
diff --git a/webkit-no_Werror.patch b/webkit-no_Werror.patch
index ef5d55d..5208f7d 100644
--- a/webkit-no_Werror.patch
+++ b/webkit-no_Werror.patch
@@ -1,11 +1,10 @@
-diff -up qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri
---- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror 2012-03-14 15:01:29.000000000 +0100
-+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri 2012-03-28 17:12:33.391294004 +0200
-@@ -102,8 +102,6 @@ CONFIG -= warn_on
+--- qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri.orig 2012-09-16 10:19:19.460207413 +0200
++++ qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri 2012-09-16 10:20:36.650205806 +0200
+@@ -102,8 +102,6 @@
# Treat warnings as errors on x86/Linux/GCC
linux-g++* {
-- !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
+- !CONFIG(standalone_package):if(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)) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt4.git/commitdiff/297dfe59cc6dd520af3729135af6a7710bac15d1
More information about the pld-cvs-commit
mailing list