summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2009-02-12 06:50:19 +0000
committerBen de Groot <yngwin@gentoo.org>2009-02-12 06:50:19 +0000
commitb93add64036256527db8a2d5cdf839ecf4d11d2d (patch)
tree6f4dd32d5ae1d7f333b2921751916691f9dcd19d /x11-libs
parentMask greater than glibc 2.6.x on hardened profiles for now (diff)
downloadhistorical-b93add64036256527db8a2d5cdf839ecf4d11d2d.tar.gz
historical-b93add64036256527db8a2d5cdf839ecf4d11d2d.tar.bz2
historical-b93add64036256527db8a2d5cdf839ecf4d11d2d.zip
Add patch. Fixes bug 258670.
Package-Manager: portage-2.2_rc23/cvs/Linux i686
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt-gui/ChangeLog6
-rw-r--r--x11-libs/qt-gui/Manifest3
-rw-r--r--x11-libs/qt-gui/files/hardcoded_fonts.patch13
3 files changed, 20 insertions, 2 deletions
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index f2f75d5b6dcd..4e98d956c0da 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qt-gui
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.27 2009/02/11 23:16:48 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.28 2009/02/12 06:50:19 yngwin Exp $
+
+ 12 Feb 2009; Ben de Groot <yngwin@gentoo.org>
+ +files/hardcoded_fonts.patch:
+ Add patch. Fixes bug 258670.
*qt-gui-4.5.0_rc1 (11 Feb 2009)
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 47b88696fa9f..a96c7f5b801b 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -6,6 +6,7 @@ AUX 0263-fix-fontconfig-handling.diff 925 RMD160 7c90f57d43fe8287d6a1b2e75f70422
AUX 0265-fix-formlayoutcrash.diff 942 RMD160 5fb1f77bec05db7b6e567923c3f7e69abd737a60 SHA1 da689978030dfc6abe823aa7cf1de4ef3c534722 SHA256 d890a97fb97625dd8e0211c3cb458a45318184d7266636deda909a980f6d02c2
AUX Designer.desktop 374 RMD160 bdd36d944e2549649cd0a51382296d86d5c2ac37 SHA1 2ca9fc952d204635a2b62480cf4531faf2938110 SHA256 96a2d2a6c0723c1ce7cbb9fd295eadcc300450ce2b585d1168a380142be0e741
AUX Linguist.desktop 362 RMD160 ce7f588d57300eb859634cabdccd5331da572c76 SHA1 ba914198e37fbf94a8bcbcbfb33bf0f5b45aec8b SHA256 3c527616f52bf533256150dab7f5f6e94bc4f73e2193fae20314cf3d70c4b1f7
+AUX hardcoded_fonts.patch 520 RMD160 cdc8f5b4db20b4eede5eabad61ea7893e7b2fc8f SHA1 e23e2731074170585165d89822b83215ba0e3bea SHA256 0d428c620f995d1e96e649b3e49e9ce591b2882a38e600b485c6c8b509504c51
AUX qt-gui-4.4.0-scrollbars.patch 508 RMD160 fc8f3b529f6abf395643f839af91d87654f6de00 SHA1 ef9b3996d7ad046725c7cc4ea5210e83ed0bcbe6 SHA256 55eaa28bfed52326ad116aa95f77bccce8b1702def464c6f9d225764141d6945
AUX qt-gui-designer-4.4.1.patch 531 RMD160 ab7e5f965541ff4e16d3530f55b8fc40cfc6d5a5 SHA1 dba254383e0504e8f4257217e15e201cc5216f9c SHA256 fbc46d38a87ab3ffaec5ac5b58f4a534e1ef3af050f9f68eb6001ddb33920b12
AUX xinerama.patch 693 RMD160 c5bdfb4184c4b94059b8c095545355a0b5c48643 SHA1 6848994884a62a0d599e0cb499e546688bfba062 SHA256 ca1afcdd29fe2a1c02af3dbe4640fd4ec2aafa4f0bae4c01e0b6a40e23303a0b
@@ -15,5 +16,5 @@ DIST qt-x11-opensource-src-4.5.0-rc1.tar.bz2 110889586 RMD160 60b410f1776d5f5586
EBUILD qt-gui-4.4.2-r1.ebuild 4588 RMD160 6f70f8e47e83ccd1bf471e3841cee3616f787923 SHA1 0fe3970456b74e54a2cfb86f5f9659df9cae6648 SHA256 d6a11115170543d651835b15494fa3287827e1eb61628782ae9b25d93086d539
EBUILD qt-gui-4.4.2-r2.ebuild 4870 RMD160 7bb9cbf0f2990fe4098d2d691e4275745cfe37e3 SHA1 586c4fefd44948a4ae370f64e9ea410241633cfc SHA256 5226ed0dcf8e5d33393ecdd76d6e273c4871ba6c573091b5d1b07d3228a56c35
EBUILD qt-gui-4.5.0_rc1.ebuild 4303 RMD160 c9655c04010323153347dc39480a3d4b051fad79 SHA1 c6872570206936a0d20a542dc67d8401bd9c37c4 SHA256 d4e7f37daeb183660bd9b906c7421012c0117f249aec1ed61d792e0dcdb00c08
-MISC ChangeLog 3949 RMD160 f4b2367df389e71fd1fbc06285067e2c49134149 SHA1 1d822f5fe754320753bbb0572d4460c2e78db4b0 SHA256 f796797064c499571794086eca7776b7273f51554db68407e6f5ee9dd5d1912b
+MISC ChangeLog 4061 RMD160 9a58c3cac23fa926535d1d068f8af238f488f1a5 SHA1 96c44c29355c4424bddbd3866864e5267732dbe5 SHA256 c652afb2d70deb728a3fe0df542236af458bc3090a1a9617a49072d6a18203d5
MISC metadata.xml 636 RMD160 d7e251319271eb08ec8a81f159b788399b72209b SHA1 ee1479223764214d8d9811dc5bc8bf7a1d95cfd7 SHA256 00175a33be6633a0cee53ef22c8db1f3d3e3c3bfddfcbef6cb95ff89065064b3
diff --git a/x11-libs/qt-gui/files/hardcoded_fonts.patch b/x11-libs/qt-gui/files/hardcoded_fonts.patch
new file mode 100644
index 000000000000..65706e0d3169
--- /dev/null
+++ b/x11-libs/qt-gui/files/hardcoded_fonts.patch
@@ -0,0 +1,13 @@
+Index: qt-x11-opensource-src-4.5.0-beta1/src/gui/text/qfont.cpp
+===================================================================
+--- qt-x11-opensource-src-4.5.0-beta1.orig/src/gui/text/qfont.cpp
++++ qt-x11-opensource-src-4.5.0-beta1/src/gui/text/qfont.cpp
+@@ -1767,7 +1767,7 @@ static void initFontSubst()
+ // default substitutions
+ static const char *initTbl[] = {
+
+-#if defined(Q_WS_X11)
++#if 0
+ "arial", "helvetica",
+ "times new roman", "times",
+ "courier new", "courier",