packages (DEVEL): qt4/qt4-kde-git.patch, qt4/qt4.spec - up to 4.6.0
cactus
cactus at pld-linux.org
Wed Dec 2 14:40:08 CET 2009
Author: cactus Date: Wed Dec 2 13:40:08 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
- up to 4.6.0
---- Files affected:
packages/qt4:
qt4-kde-git.patch (1.1.2.2 -> 1.1.2.3) , qt4.spec (1.226.2.12 -> 1.226.2.13)
---- Diffs:
================================================================
Index: packages/qt4/qt4-kde-git.patch
diff -u packages/qt4/qt4-kde-git.patch:1.1.2.2 packages/qt4/qt4-kde-git.patch:1.1.2.3
--- packages/qt4/qt4-kde-git.patch:1.1.2.2 Wed Nov 25 20:50:18 2009
+++ packages/qt4/qt4-kde-git.patch Wed Dec 2 14:40:01 2009
@@ -225,10 +225,10 @@
for(my $i = 0; $i < $count; $i++) {
$dots .= "../";
diff --git a/configure b/configure
-index b6ce9e6..6c69378 100755
+index 146ba82..7be8f7c 100755
--- a/configure
+++ b/configure
-@@ -1022,6 +1022,11 @@ while [ "$#" -gt 0 ]; do
+@@ -1012,6 +1012,11 @@ while [ "$#" -gt 0 ]; do
VAL=`echo $1 | sed 's,-D,,'`
fi
;;
@@ -240,7 +240,7 @@
-I?*|-I)
VAR="add_ipath"
if [ "$1" = "-I" ]; then
-@@ -2030,6 +2035,9 @@ while [ "$#" -gt 0 ]; do
+@@ -2020,6 +2025,9 @@ while [ "$#" -gt 0 ]; do
add_ipath)
I_FLAGS="$I_FLAGS -I\"${VAL}\""
;;
@@ -265,7 +265,7 @@
false:macx { #mac install location
diff --git a/qmake/property.cpp b/qmake/property.cpp
-index 1ee6530..b779756 100644
+index ea4842a..ac54854 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -81,29 +81,32 @@ QMakeProperty::keyBase(bool version) const
@@ -323,10 +323,10 @@
QString version = qmake_version();
if(slash != -1) {
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
-index 1260d47..5984770 100644
+index 9614e7a..58493a5 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
-@@ -1124,8 +1124,16 @@ void QObject::setObjectName(const QString &name)
+@@ -1136,8 +1136,16 @@ void QObject::setObjectName(const QString &name)
{
Q_D(QObject);
d->objectName = name;
@@ -344,7 +344,7 @@
#ifdef QT3_SUPPORT
/*! \internal
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
-index f087407..559b7ff 100644
+index e75f24e..1294fa4 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -83,7 +83,9 @@ void Q_CORE_EXPORT qt_register_signal_spy_callbacks(const QSignalSpyCallbackSet
@@ -369,7 +369,7 @@
static Sender *setCurrentSender(QObject *receiver,
Sender *sender);
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
-index 1a76083..69a05a8 100644
+index 528d512..edbe75b 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -1139,10 +1139,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
@@ -424,10 +424,10 @@
} else if (key) {
int i=0;
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
-index df28bac..f9ba561 100644
+index 7832393..18c331a 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
-@@ -655,6 +655,7 @@ public:
+@@ -661,6 +661,7 @@ public:
static QWidget *keyboardGrabber;
void setWindowRole();
@@ -436,10 +436,10 @@
void setNetWmWindowTypes();
void x11UpdateIsOpaque();
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
-index 7461637..59bf2ac 100644
+index 3135ece..5c997a4 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -758,6 +758,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+@@ -763,6 +763,11 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
Q_ASSERT(id);
XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
&wsa);
@@ -451,7 +451,7 @@
} else if (topLevel && !desktop) { // top-level widget
if (!X11->wm_client_leader)
create_wm_client_leader();
-@@ -811,32 +816,40 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
+@@ -816,32 +821,40 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
// set EWMH window types
setNetWmWindowTypes();
@@ -504,7 +504,7 @@
}
if (initializeWindow && q->internalWinId()) {
-@@ -2914,6 +2927,17 @@ void QWidgetPrivate::setWindowRole()
+@@ -2919,6 +2932,17 @@ void QWidgetPrivate::setWindowRole()
(unsigned char *)windowRole.constData(), windowRole.length());
}
@@ -523,7 +523,7 @@
QPaintEngine *QWidget::paintEngine() const
{
diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
-index 3935c55..d97cf74 100644
+index 30f6144..36dfe6d 100644
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh()
@@ -537,7 +537,7 @@
/*!
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
-index 2f972e3..ddcf6a6 100644
+index 8e033b7..b5b2edd 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -94,7 +94,13 @@ static QByteArray combinePath(const char *infile, const char *outfile)
================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.226.2.12 packages/qt4/qt4.spec:1.226.2.13
--- packages/qt4/qt4.spec:1.226.2.12 Wed Nov 25 20:50:18 2009
+++ packages/qt4/qt4.spec Wed Dec 2 14:40:01 2009
@@ -64,8 +64,6 @@
%bcond_with sse # use SSE instructions in gui/painting module
%bcond_with sse2 # use SSE2 instructions
#
-%define state rc1
-#
%ifnarch %{ix86} %{x8664} sparc sparcv9 alpha ppc
%undefine with_ibase
%endif
@@ -85,11 +83,11 @@
Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt
Name: qt4
Version: 4.6.0
-Release: 0.%{state}.1
+Release: 0.1
License: LGPL v2.1 or GPL v3.0
Group: X11/Libraries
-Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}-%{state}.tar.gz
-# Source0-md5: 56772a3f9128f00504d2b21dbe4186b3
+Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
+# Source0-md5: 2a7b5126f2450d8525af355fc4c12ad6
Source2: %{name}-qtconfig.desktop
Source3: %{name}-designer.desktop
Source4: %{name}-assistant.desktop
@@ -1353,7 +1351,7 @@
Programas exemplo para o Qt versão.
%prep
-%setup -q -n qt-everywhere-opensource-src-%{version}-%{state}
+%setup -q -n qt-everywhere-opensource-src-%{version}
%patch100 -p1
@@ -2257,6 +2255,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.226.2.13 2009/12/02 13:40:01 cactus
+- up to 4.6.0
+
Revision 1.226.2.12 2009/11/25 19:50:18 cactus
- updated kde-qt patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4-kde-git.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.226.2.12&r2=1.226.2.13&f=u
More information about the pld-cvs-commit
mailing list