[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.0-rc1-1-1-g37abd77
Fathi Boudra
fabo at alioth.debian.org
Wed Sep 8 11:13:53 UTC 2010
The following commit has been merged in the experimental-snapshots branch:
commit 37abd7787c8233357274ec70acb1076a8f0584e7
Author: Fathi Boudra <fabo at debian.org>
Date: Wed Sep 8 14:13:36 2010 +0300
Prepare Qt 4.7.0 release
Remove patches stolen upstream
---
debian/changelog | 10 ++
.../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/series | 3 -
5 files changed, 10 insertions(+), 169 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bd925a3..d6c830f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+qt4-x11 (4:4.7.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Remove patches:
+ - 0002_fix_qstatictext_with_opengl1_engine.patch - stolen upstream
+ - 0003_add_three_new_style-hints_to_qfont.patch - stolen upstream
+ - 0004_fix_qstatictext_copy_constructor.patch - stolen upstream
+
+ -- Fathi Boudra <fabo at debian.org> Wed, 08 Sep 2010 14:10:23 +0300
+
qt4-x11 (4:4.7.0~rc1-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/patches/0002_fix_qstatictext_with_opengl1_engine.patch b/debian/patches/0002_fix_qstatictext_with_opengl1_engine.patch
deleted file mode 100644
index 08f8297..0000000
--- a/debian/patches/0002_fix_qstatictext_with_opengl1_engine.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index 9219f3c..0000000
--- a/debian/patches/0003_add_three_new_style-hints_to_qfont.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-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
deleted file mode 100644
index 215b387..0000000
--- a/debian/patches/0004_fix_qstatictext_copy_constructor.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/series b/debian/patches/series
index 32d032b..fa7e4b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
# 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