[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.0-beta2-3-13-g24aec18
Fathi Boudra
fabo at alioth.debian.org
Sun Sep 5 06:03:43 UTC 2010
The following commit has been merged in the experimental-snapshots branch:
commit 24aec18a6d43b544c77bc9748f999ce687825768
Author: Fathi Boudra <fabo at debian.org>
Date: Sun Sep 5 09:03:21 2010 +0300
Add 3 patches from upstream
---
debian/changelog | 8 ++
.../0002_fix_qstatictext_with_opengl1_engine.patch | 32 ++++++
.../0003_add_three_new_style-hints_to_qfont.patch | 106 ++++++++++++++++++++
.../0004_fix_qstatictext_copy_constructor.patch | 28 +++++
debian/patches/05_append_qt4_target.diff | 6 +-
debian/patches/08_configure_quilt_compat.diff | 2 +-
debian/patches/series | 3 +
7 files changed, 181 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 823b606..bd925a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,14 @@ qt4-x11 (4:4.7.0~rc1-1) experimental; urgency=low
* New upstream release.
* Remove 0001_add_webkit_qt_config.patch in favor of
0001_webkit_self_injection_into_qt_configuration.patch.
+ * Add patches:
+ - 0002_fix_qstatictext_with_opengl1_engine.patch
+ OpenGL1 paint engine transforms text coordinates itself and
+ does not require QStaticText to use device coordinates.
+ - 0003_add_three_new_style-hints_to_qfont.patch
+ Add three new style-hints to QFont to match CSS generic font families.
+ - 0004_fix_qstatictext_copy_constructor.patch
+ Fix QStaticText copy constructor to also copy text option property.
* Update debian/control:
- bump Standards-Version to 3.9.1 (no changes needed).
- add libqt4-assistant and libqt4-webkit-dbg dummy transitional packages.
diff --git a/debian/patches/0002_fix_qstatictext_with_opengl1_engine.patch b/debian/patches/0002_fix_qstatictext_with_opengl1_engine.patch
new file mode 100644
index 0000000..08f8297
--- /dev/null
+++ b/debian/patches/0002_fix_qstatictext_with_opengl1_engine.patch
@@ -0,0 +1,32 @@
+commit d0f1f569e27f7f34f3bfc03bd759f28f7b567997
+Author: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at nokia.com>
+Date: Mon Aug 30 17:16:49 2010 +0200
+
+ Fix QStaticText with OpenGL1 engine
+
+ Like OpenGL2 and OpenVG, the OpenGL1 paint engine also transforms text
+ coordinates itself and does not require QStaticText to use device
+ coordinates.
+
+ Task-number: QTBUG-13228
+ Reviewed-by: Samuel
+
+--- a/src/gui/painting/qpainter.cpp
++++ b/src/gui/painting/qpainter.cpp
+@@ -5853,10 +5853,14 @@ void QPainter::drawStaticText(const QPoi
+ return;
+ }
+
+- if (d->extended->type() == QPaintEngine::OpenGL2 && !staticText_d->untransformedCoordinates) {
++ bool paintEngineSupportsTransformations = d->extended->type() == QPaintEngine::OpenGL2
++ || d->extended->type() == QPaintEngine::OpenVG
++ || d->extended->type() == QPaintEngine::OpenGL;
++
++ if (paintEngineSupportsTransformations && !staticText_d->untransformedCoordinates) {
+ staticText_d->untransformedCoordinates = true;
+ staticText_d->needsRelayout = true;
+- } else if (d->extended->type() != QPaintEngine::OpenGL2 && staticText_d->untransformedCoordinates) {
++ } else if (!paintEngineSupportsTransformations && staticText_d->untransformedCoordinates) {
+ staticText_d->untransformedCoordinates = false;
+ staticText_d->needsRelayout = true;
+ }
diff --git a/debian/patches/0003_add_three_new_style-hints_to_qfont.patch b/debian/patches/0003_add_three_new_style-hints_to_qfont.patch
new file mode 100644
index 0000000..9219f3c
--- /dev/null
+++ b/debian/patches/0003_add_three_new_style-hints_to_qfont.patch
@@ -0,0 +1,106 @@
+commit 6d5655089fa4e2231a1a8edc98ecbb6b29e344e1
+Author: Tor Arne Vestbø <tor.arne.vestbo at nokia.com>
+Date: Mon Jul 5 17:38:51 2010 +0200
+
+ Add three new style-hints to QFont to match CSS' generic font families
+
+ The defaults were chosen to match major web browsers. See:
+
+ http://xhva.net/log/?p=160
+
+ Reviewed-by: Simon Hausmann
+
+--- a/src/gui/text/qfont.cpp
++++ b/src/gui/text/qfont.cpp
+@@ -1266,6 +1266,15 @@ QFont::StyleHint QFont::styleHint() cons
+ \value OldEnglish the font matcher prefers decorative fonts.
+ \value Decorative is a synonym for \c OldEnglish.
+
++ \value Monospace the font matcher prefers fonts that map to the
++ CSS generic font-family 'monospace'.
++
++ \value Fantasy the font matcher prefers fonts that map to the
++ CSS generic font-family 'fantasy'.
++
++ \value Cursive the font matcher prefers fonts that map to the
++ CSS generic font-family 'cursive'.
++
+ \value System the font matcher prefers system fonts.
+ */
+
+--- a/src/gui/text/qfont.h
++++ b/src/gui/text/qfont.h
+@@ -72,7 +72,10 @@ public:
+ Courier, TypeWriter = Courier,
+ OldEnglish, Decorative = OldEnglish,
+ System,
+- AnyStyle
++ AnyStyle,
++ Cursive,
++ Monospace,
++ Fantasy
+ };
+
+ enum StyleStrategy {
+--- a/src/gui/text/qfont_mac.cpp
++++ b/src/gui/text/qfont_mac.cpp
+@@ -136,8 +136,14 @@ QString QFont::defaultFamily() const
+ return QString::fromLatin1("Times New Roman");
+ case QFont::Courier:
+ return QString::fromLatin1("Courier New");
++ case QFont::Monospace:
++ return QString::fromLatin1("Courier");
+ case QFont::Decorative:
+ return QString::fromLatin1("Bookman Old Style");
++ case QFont::Cursive:
++ return QString::fromLatin1("Apple Chancery");
++ case QFont::Fantasy:
++ return QString::fromLatin1("Papyrus");
+ case QFont::Helvetica:
+ case QFont::System:
+ default:
+--- a/src/gui/text/qfont_qws.cpp
++++ b/src/gui/text/qfont_qws.cpp
+@@ -108,6 +108,7 @@ QString QFont::defaultFamily() const
+ case QFont::Times:
+ return QString::fromLatin1("times");
+ case QFont::Courier:
++ case QFont::Monospace:
+ return QString::fromLatin1("courier");
+ case QFont::Decorative:
+ return QString::fromLatin1("old english");
+--- a/src/gui/text/qfont_win.cpp
++++ b/src/gui/text/qfont_win.cpp
+@@ -148,9 +148,14 @@ QString QFont::defaultFamily() const
+ case QFont::Times:
+ return QString::fromLatin1("Times New Roman");
+ case QFont::Courier:
++ case QFont::Monospace:
+ return QString::fromLatin1("Courier New");
+ case QFont::Decorative:
+ return QString::fromLatin1("Bookman Old Style");
++ case QFont::Cursive:
++ return QString::fromLatin1("Comic Sans MS");
++ case QFont::Fantasy:
++ return QString::fromLatin1("Impact");
+ case QFont::Helvetica:
+ return QString::fromLatin1("Arial");
+ case QFont::System:
+--- a/src/gui/text/qfont_x11.cpp
++++ b/src/gui/text/qfont_x11.cpp
+@@ -281,6 +281,15 @@ QString QFont::defaultFamily() const
+ case QFont::Courier:
+ return QString::fromLatin1("Courier");
+
++ case QFont::Monospace:
++ return QString::fromLatin1("Courier New");
++
++ case QFont::Cursive:
++ return QString::fromLatin1("Comic Sans MS");
++
++ case QFont::Fantasy:
++ return QString::fromLatin1("Impact");
++
+ case QFont::Decorative:
+ return QString::fromLatin1("Old English");
+
diff --git a/debian/patches/0004_fix_qstatictext_copy_constructor.patch b/debian/patches/0004_fix_qstatictext_copy_constructor.patch
new file mode 100644
index 0000000..215b387
--- /dev/null
+++ b/debian/patches/0004_fix_qstatictext_copy_constructor.patch
@@ -0,0 +1,28 @@
+commit 200d1743dcdacf1036384f746046e55d91ccd918
+Author: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at nokia.com>
+Date: Fri Sep 3 12:48:01 2010 +0200
+
+ Fix QStaticText copy constructor to also copy text option property
+
+ The text option property of QStaticText was not copied in the copy
+ constructor, so when the text was detached, the property would be
+ reset to the default.
+
+ Task-number: QTBUG-13368
+ Reviewed-by: Gunnar
+
+--- a/src/gui/text/qstatictext.cpp
++++ b/src/gui/text/qstatictext.cpp
+@@ -392,9 +392,9 @@ QStaticTextPrivate::QStaticTextPrivate()
+
+ QStaticTextPrivate::QStaticTextPrivate(const QStaticTextPrivate &other)
+ : text(other.text), font(other.font), textWidth(other.textWidth), matrix(other.matrix),
+- items(0), itemCount(0), glyphPool(0), positionPool(0), charPool(0), needsRelayout(true),
+- useBackendOptimizations(other.useBackendOptimizations), textFormat(other.textFormat),
+- untransformedCoordinates(other.untransformedCoordinates)
++ items(0), itemCount(0), glyphPool(0), positionPool(0), charPool(0), textOption(other.textOption),
++ needsRelayout(true), useBackendOptimizations(other.useBackendOptimizations),
++ textFormat(other.textFormat), untransformedCoordinates(other.untransformedCoordinates)
+ {
+ }
+
diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/05_append_qt4_target.diff
index 626ad4d..4e8953c 100644
--- a/debian/patches/05_append_qt4_target.diff
+++ b/debian/patches/05_append_qt4_target.diff
@@ -66,7 +66,7 @@ author: Fathi Boudra <fabo at debian.org>
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -7761,8 +7761,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -7759,8 +7759,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -77,7 +77,7 @@ author: Fathi Boudra <fabo at debian.org>
QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -8152,11 +8152,11 @@ EXEC=""
+@@ -8150,11 +8150,11 @@ EXEC=""
#-------------------------------------------------------------------------------
echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@ author: Fathi Boudra <fabo at debian.org>
fi
# .projects -> projects to process
-@@ -8333,7 +8333,7 @@ for file in .projects .projects.3; do
+@@ -8331,7 +8331,7 @@ for file in .projects .projects.3; do
QMAKE_SPEC_ARGS="-spec $SPEC"
echo $ECHO_N " for $a$ECHO_C"
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index 59d4475..27aea69 100644
--- a/debian/patches/08_configure_quilt_compat.diff
+++ b/debian/patches/08_configure_quilt_compat.diff
@@ -3,7 +3,7 @@ It breaks qmake projects search.
--- a/configure
+++ b/configure
-@@ -8208,7 +8208,7 @@ fi
+@@ -8206,7 +8206,7 @@ fi
# .projects.3 -> the rest
rm -f .projects .projects.1 .projects.2 .projects.3
diff --git a/debian/patches/series b/debian/patches/series
index fa7e4b0..32d032b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,8 @@
# upstream patches
0001_webkit_self_injection_into_qt_configuration.patch
+0002_fix_qstatictext_with_opengl1_engine.patch
+0003_add_three_new_style-hints_to_qfont.patch
+0004_fix_qstatictext_copy_constructor.patch
# qt-copy patches
0180-window-role.diff
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list