Author: arekm Date: Thu Dec 15 19:51:54 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 4.8.0
---- Files affected:
packages/qt4:
qt4-buildsystem.patch (1.8 -> 1.9) , qt4-locale.patch (1.15 -> 1.16) ,
qt4.spec (1.294 -> 1.295) , qt4-qvfb.patch (NONE -> 1.1) (NEW),
qt-everywhere-opensource-src-4.7.1-qtextcursor-crash.patch (1.1 -> NONE)
(REMOVED), qt4-antialias.patch (1.7 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/qt4/qt4-buildsystem.patch
diff -u packages/qt4/qt4-buildsystem.patch:1.8
packages/qt4/qt4-buildsystem.patch:1.9
--- packages/qt4/qt4-buildsystem.patch:1.8 Wed Dec 2 15:53:33 2009
+++ packages/qt4/qt4-buildsystem.patch Thu Dec 15 20:51:48 2011
@@ -1,14 +1,14 @@
---- qt-copy/configure.orig 2005-05-13 16:45:03.000000000 +0200
-+++ qt-copy/configure 2005-05-13 20:19:54.084025408 +0200
-@@ -2694,6 +2694,11 @@
- EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)"
- EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"
+--- qt-everywhere-opensource-src-4.8.0/configure~ 2011-12-15
15:34:08.000000000 +0100
++++ qt-everywhere-opensource-src-4.8.0/configure 2011-12-15
15:35:49.522563474 +0100
+@@ -4916,6 +4916,11 @@
+ EXTRA_LFLAGS="\$(QMAKE_LFLAGS_RPATH)\"$rpath\" $EXTRA_LFLAGS"
+ done
fi
+
+ if [ -n "$OPTFLAGS" ]; then
-+ EXTRA_CFLAGS="$EXTRA_CFLAGS $OPTFLAGS"
++ EXTRA_CFLAGS="$EXTRA_CFLAGS $OPTFLAGS"
+ fi
+
- if [ "$PLATFORM_MAC" = "yes" ]; then
- echo "export MACOSX_DEPLOYMENT_TARGET = 10.2" >>$mkfile
- echo "CARBON_LFLAGS +=-framework CoreServices -framework
CoreFoundation" >>$mkfile
+ if [ "$BUILD_ON_MAC" = "yes" ]; then
+ echo "export MACOSX_DEPLOYMENT_TARGET = 10.5" >> "$mkfile"
+ echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
================================================================
Index: packages/qt4/qt4-locale.patch
diff -u packages/qt4/qt4-locale.patch:1.15 packages/qt4/qt4-locale.patch:1.16
--- packages/qt4/qt4-locale.patch:1.15 Tue Sep 21 21:44:52 2010
+++ packages/qt4/qt4-locale.patch Thu Dec 15 20:51:48 2011
@@ -33,19 +33,99 @@
--- qt-everywhere-opensource-src-4.7.0/src/corelib/kernel/qtranslator.cpp.orig
2010-09-10 11:05:25.000000000 +0200
+++ qt-everywhere-opensource-src-4.7.0/src/corelib/kernel/qtranslator.cpp
2010-09-21 21:36:42.645202096 +0200
@@ -55,6 +55,7 @@
- #include "qalgorithms.h"
#include "qhash.h"
#include "qtranslator_p.h"
+ #include "qlocale.h"
+#include <qlibraryinfo.h>
#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
#define QT_USE_MMAP
-@@ -407,31 +408,71 @@
+@@ -445,49 +445,71 @@
QString delims;
delims = search_delimiters.isNull() ? QString::fromLatin1("_.") :
search_delimiters;
- for (;;) {
- QFileInfo fi;
++ if (directory == QLibraryInfo::location(QLibraryInfo::TranslationsPath)) {
++ QString locale;
++ int idelim = 0, leftmost;
++
++ for (;;) {
++ leftmost = filename.size();
++ for (int i = 0; i < (int)delims.length(); i++) {
++ int k = filename.indexOf(delims[i], idelim);
++ if ((k > 0)&&(k < leftmost))
++ leftmost = k;
++ }
++
++ if (leftmost == filename.size())
++ return false;
++
++ idelim = leftmost + 1;
++ fname = filename.left(leftmost);
++ locale = filename.mid(leftmost+1);
++
++ while (!locale.isEmpty()) {
++ QFileInfo fi;
++ realname = prefix + locale +
QString::fromLatin1("/LC_MESSAGES/") + fname + QString::fromLatin1(".qm");
++
++ fi.setFile(realname);
++ if (fi.isReadable())
++ break;
++
++ int rightmost = 0;
++ for (int i = 0; i < (int)delims.length(); i++) {
++ int k = locale.lastIndexOf(delims[i]);
++ if (k > rightmost)
++ rightmost = k;
++ }
++ locale.truncate(rightmost);
++ }
++ if (!locale.isEmpty())
++ break;
++ }
++ } else {
++ for (;;) {
++ QFileInfo fi;
++
++ realname = prefix + fname + (suffix.isNull() ?
QString::fromLatin1(".qm") : suffix);
++ fi.setFile(realname);
++ if (fi.isReadable())
++ break;
++
++ realname = prefix + fname;
++ fi.setFile(realname);
++ if (fi.isReadable())
++ break;
++
++ int rightmost = 0;
++ for (int i = 0; i < (int)delims.length(); i++) {
++ int k = fname.lastIndexOf(delims[i]);
++ if (k > rightmost)
++ rightmost = k;
++ }
++
++ // no truncations? fail
++ if (rightmost == 0)
++ return false;
+
+-#ifdef Q_OS_SYMBIAN
+- //search for translations on other drives, e.g. Qt may be in Z, while
app is in C
+- //note this uses symbian search rules, i.e. y:->a:, followed by z:
+- TFindFile finder(qt_s60GetRFs());
+- QString fname2 = fname + (suffix.isNull() ?
QString::fromLatin1(".qm") : suffix);
+- TInt err = finder.FindByDir(
+- qt_QString2TPtrC(fname2),
+- qt_QString2TPtrC(nativePrefix));
+- if (err != KErrNone)
+- err = finder.FindByDir(qt_QString2TPtrC(fname),
qt_QString2TPtrC(nativePrefix));
+- if (err == KErrNone) {
+- fi.setFile(qt_TDesC2QString(finder.File()));
+- realname = fi.canonicalFilePath();
+- if (fi.isReadable() && fi.isFile())
+- break;
+- }
+-#endif
-
- realname = prefix + fname + (suffix.isNull() ?
QString::fromLatin1(".qm") : suffix);
- fi.setFile(realname);
@@ -69,71 +149,9 @@
- return false;
-
- fname.truncate(rightmost);
-+ if (directory == QLibraryInfo::location(QLibraryInfo::TranslationsPath))
{
-+ QString locale;
-+ int idelim = 0, leftmost;
-+
-+ for (;;) {
-+ leftmost = filename.size();
-+ for (int i = 0; i < (int)delims.length(); i++) {
-+ int k = filename.indexOf(delims[i], idelim);
-+ if ((k > 0)&&(k < leftmost))
-+ leftmost = k;
-+ }
-+
-+ if (leftmost == filename.size())
-+ return false;
-+
-+ idelim = leftmost + 1;
-+ fname = filename.left(leftmost);
-+ locale = filename.mid(leftmost+1);
-+
-+ while (!locale.isEmpty()) {
-+ QFileInfo fi;
-+ realname = prefix + locale +
QString::fromLatin1("/LC_MESSAGES/") + fname + QString::fromLatin1(".qm");
-+
-+ fi.setFile(realname);
-+ if (fi.isReadable())
-+ break;
-+
-+ int rightmost = 0;
-+ for (int i = 0; i < (int)delims.length(); i++) {
-+ int k = locale.lastIndexOf(delims[i]);
-+ if (k > rightmost)
-+ rightmost = k;
-+ }
-+ locale.truncate(rightmost);
-+ }
-+ if (!locale.isEmpty())
-+ break;
-+ }
-+ } else {
-+ for (;;) {
-+ QFileInfo fi;
-+
-+ realname = prefix + fname + (suffix.isNull() ?
QString::fromLatin1(".qm") : suffix);
-+ fi.setFile(realname);
-+ if (fi.isReadable())
-+ break;
-+
-+ realname = prefix + fname;
-+ fi.setFile(realname);
-+ if (fi.isReadable())
-+ break;
-+
-+ int rightmost = 0;
-+ for (int i = 0; i < (int)delims.length(); i++) {
-+ int k = fname.lastIndexOf(delims[i]);
-+ if (k > rightmost)
-+ rightmost = k;
-+ }
-+
-+ // no truncations? fail
-+ if (rightmost == 0)
-+ return false;
-+
-+ fname.truncate(rightmost);
-+ }
++ fname.truncate(rightmost);
++ }
}
// realname is now the fully qualified name of a readable file.
+
================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.294 packages/qt4/qt4.spec:1.295
--- packages/qt4/qt4.spec:1.294 Sun Sep 18 23:08:52 2011
+++ packages/qt4/qt4.spec Thu Dec 15 20:51:49 2011
@@ -56,12 +56,12 @@
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.7.4
-Release: 3
+Version: 4.8.0
+Release: 1
License: LGPL v2.1 or GPL v3.0
Group: X11/Libraries
Source0:
http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
-# Source0-md5: ddf7d83f912cf1283aa066368464fa22
+# Source0-md5: e8a5fdbeba2927c948d9f477a6abe904
Source2: %{name}-qtconfig.desktop
Source3: %{name}-designer.desktop
Source4: %{name}-assistant.desktop
@@ -76,7 +76,7 @@
Patch1: %{name}-qt_copy.patch
Patch2: %{name}-buildsystem.patch
Patch3: %{name}-locale.patch
-Patch4: %{name}-antialias.patch
+Patch4: %{name}-qvfb.patch
Patch5: %{name}-support-cflags-with-commas.patch
Patch6: %{name}-build-lib-static.patch
Patch7: %{name}-x11_fonts.patch
@@ -1430,6 +1430,9 @@
s|^QMAKE_STRIP.*=.*|QMAKE_STRIP =|;
' mkspecs/common/linux.conf
+# disable webkit tests, broken build
+rm -r src/3rdparty/webkit/Source/WebKit/qt/tests
+
%build
# pass OPTFLAGS to build qmake itself with optimization
export OPTFLAGS="%{rpmcflags}"
@@ -1440,7 +1443,6 @@
##################################
COMMONOPT=" \
- -DQT_CLEAN_NAMESPACE \
-buildkey pld \
-verbose \
-prefix %{_qtdir} \
@@ -1455,6 +1457,8 @@
-sysconfdir %{_sysconfdir}/qt4 \
-examplesdir %{_examplesdir}/qt4 \
-demosdir %{_examplesdir}/qt4-demos \
+ -opensource \
+ -optimized-qmake \
-fast \
-glib \
%{!?with_gtk:-no-gtkstyle} \
@@ -1470,13 +1474,16 @@
%{!?with_sse42:-no-sse4.2} \
%{!?with_avx:-no-avx} \
-qdbus \
- -qt-gif \
+ -dbus-linked \
-reduce-relocations \
-system-libjpeg \
-system-libmng \
-system-libpng \
+ -system-libtiff \
-system-zlib \
+ -openssl-linked \
-exceptions \
+ -graphicssystem raster \
-largefile \
-I/usr/include/postgresql/server \
-I/usr/include/mysql \
@@ -1486,13 +1493,17 @@
%{!?debug:-release} \
-qt3support \
-fontconfig \
+ -largefile \
-iconv \
+ -icu \
-no-separate-debug-info \
-xfixes \
-nis \
-sm \
-xcursor \
-xinput \
+ -xinerama \
+ -xrandr \
-xkb \
-xrender \
-xshape \
@@ -1592,6 +1603,7 @@
ln -sf ../%{_lib}/qt4/bin/qhelpconverter .
ln -sf ../%{_lib}/qt4/bin/qhelpgenerator .
ln -sf ../%{_lib}/qt4/bin/qmlviewer .
+ln -sf ../%{_lib}/qt4/bin/qmlplugindump .
ln -sf ../%{_lib}/qt4/bin/qttracereplay .
ln -sf ../%{_lib}/qt4/bin/qvfb .
ln -sf ../%{_lib}/qt4/bin/xmlpatternsvalidator .
@@ -1908,7 +1920,9 @@
%files -n QtDeclarative
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/qmlviewer
+%attr(755,root,root) %{_bindir}/qmlplugindump
%attr(755,root,root) %{_qtdir}/bin/qmlviewer
+%attr(755,root,root) %{_qtdir}/bin/qmlplugindump
%attr(755,root,root) %{_libdir}/libQtDeclarative.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libQtDeclarative.so.4
%dir %{_qtdir}/imports
@@ -1925,6 +1939,7 @@
%{_qtdir}/imports/QtWebKit/qmldir
%dir %{_qtdir}/plugins/qmltooling
%attr(755,root,root) %{_qtdir}/plugins/qmltooling/libqmldbg_tcp.so
+%attr(755,root,root) %{_qtdir}/plugins/qmltooling/libqmldbg_inspector.so
%files -n QtDesigner
%defattr(644,root,root,755)
@@ -1949,6 +1964,7 @@
%attr(755,root,root) %{_qtdir}/plugins/imageformats/libqico.so
%attr(755,root,root) %{_qtdir}/plugins/imageformats/libqjpeg.so
%attr(755,root,root) %{_qtdir}/plugins/imageformats/libqmng.so
+%attr(755,root,root) %{_qtdir}/plugins/imageformats/libqtga.so
%attr(755,root,root) %{_qtdir}/plugins/imageformats/libqtiff.so
%dir %{_qtdir}/plugins/inputmethods
%attr(755,root,root) %{_qtdir}/plugins/inputmethods/*.so
@@ -2379,6 +2395,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.295 2011/12/15 19:51:49 arekm
+- up to 4.8.0
+
Revision 1.294 2011/09/18 21:08:52 glen
- qtconfig: update-desktop-database (.desktop specifies MimeType)
================================================================
Index: packages/qt4/qt4-qvfb.patch
diff -u /dev/null packages/qt4/qt4-qvfb.patch:1.1
--- /dev/null Thu Dec 15 20:51:54 2011
+++ packages/qt4/qt4-qvfb.patch Thu Dec 15 20:51:49 2011
@@ -0,0 +1,11 @@
+--- qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro~ 2011-12-08
06:06:02.000000000 +0100
++++ qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro 2011-12-15
20:13:00.159241557 +0100
+@@ -38,8 +38,6 @@
+
+ !embedded {
+ DEFINES += QT_NO_QWS_SIGNALHANDLER
+- HEADERS += ../../src/gui/embedded/qlock_p.h
+- SOURCES += ../../src/gui/embedded/qlock.cpp
+ }
+
+ include(../shared/deviceskin/deviceskin.pri)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4-buildsystem.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4-locale.patch?r1=1.15&r2=1.16&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.294&r2=1.295&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
