diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-17 19:32:06 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-17 19:32:06 +0000 |
commit | 1eb5f398c9f506720dfea10eab3dc057a74785fc (patch) | |
tree | c4743be589e881dcedbfba8149dcc3c05de140e1 /kde-base | |
parent | arm/ia64/s390/sh/sparc stable wrt #259046 (diff) | |
download | historical-1eb5f398c9f506720dfea10eab3dc057a74785fc.tar.gz historical-1eb5f398c9f506720dfea10eab3dc057a74785fc.tar.bz2 historical-1eb5f398c9f506720dfea10eab3dc057a74785fc.zip |
Add patch for default font setting, so user will have allways readable font by default.
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/systemsettings/ChangeLog | 10 | ||||
-rw-r--r-- | kde-base/systemsettings/Manifest | 14 | ||||
-rw-r--r-- | kde-base/systemsettings/files/20_use_dejavu_as_default_font.patch | 23 | ||||
-rw-r--r-- | kde-base/systemsettings/systemsettings-4.2.0-r1.ebuild | 61 |
4 files changed, 96 insertions, 12 deletions
diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog index a3572a3c5274..61841082fe10 100644 --- a/kde-base/systemsettings/ChangeLog +++ b/kde-base/systemsettings/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/systemsettings # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.20 2009/02/17 14:37:08 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.21 2009/02/17 19:32:06 scarabeus Exp $ + +*systemsettings-4.2.0-r1 (17 Feb 2009) + + 17 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org> + +files/20_use_dejavu_as_default_font.patch, + +systemsettings-4.2.0-r1.ebuild: + Add patch for default font setting, so user will have allways readable + font by default. 17 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org> -systemsettings-4.1.4.ebuild: diff --git a/kde-base/systemsettings/Manifest b/kde-base/systemsettings/Manifest index 930b6a747e94..a2507222ab68 100644 --- a/kde-base/systemsettings/Manifest +++ b/kde-base/systemsettings/Manifest @@ -1,16 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX 20_use_dejavu_as_default_font.patch 680 RMD160 d3e9b72f35d712ff4b860084e41abdb14efacd2f SHA1 e0779bcc90200bb728b3382c161e473559de3f9b SHA256 dc1aaa0d6f76e3425079b9bc6e9254137b063ee24c06588abc9ed3542c5d9c3a AUX systemsettings-4.0.2-opengl.patch 353 RMD160 47836819fdd5947106c16c00ed7e31456102df07 SHA1 1e193087e4d01aeb13f79df837d2141811dcc281 SHA256 d5330a09354d15712a80af9231f0af645286cdc8a6b396d8d2f9a7384ebcf371 AUX systemsettings-enable-admin-mode.patch 2282 RMD160 d213394d82d4cbbfe7da8cc8596f526e5e20a407 SHA1 64066963c069e82de3ab782dfd85b8f046d5574c SHA256 a02c0ff5dcf1d6d47268493a4e38500b12dd0c5299617536e7aee458f09f3705 DIST kdebase-workspace-4.2.0.tar.bz2 50724381 RMD160 752e727aaf0010e362f3c77190584fa8c6bd4761 SHA1 351eae9401ac6fb990950d1a5120505475abef05 SHA256 e5c550af7d655d62e37c51667f264b53eb9785166f3567960d91acd37b6f902b +EBUILD systemsettings-4.2.0-r1.ebuild 1622 RMD160 24788beeed6f69c281013fffbbad1bf2ed9c853f SHA1 73e68174a930971fa65dc07c3b9051bf39f93aaa SHA256 443ec2c41158e45cfa9e66c1bf84e6f9dfc499fc5442afd8d9768637f16adc2c EBUILD systemsettings-4.2.0.ebuild 1560 RMD160 39bced98d3038a75378075b14de25e28db868b24 SHA1 70a9554f7dd6e52d54411623f7f8f8f82fa35c07 SHA256 73995141bfae1919a5ca8dee97f4156d7815f2e8c2648c1cfa5f2bcb8f0102ab -MISC ChangeLog 3661 RMD160 998b733138a61dd38034bc482976a825d1171565 SHA1 a1ebec83d81dcaf1958a5b9ac64ce2b344c16811 SHA256 17827ef861a5fac0cfef3c5e258f439f03f1ef43599b9b74a95b49393d6943fb +MISC ChangeLog 3930 RMD160 90c49593e78501b75e3f53bdce21ca4e2a690d23 SHA1 def46ee2c7c59f2a37a8c242772eb6fce548c2e8 SHA256 df0c249216b3c5a56483a584b3dcc8aec7b3ea364e84e2c1f5b81aee8ea08de2 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.10 (GNU/Linux) - -iEYEARECAAYFAkmay5oACgkQ5BmOA85PVLg5nQCgj2c+Qr6LLY4MyetYcpvqVTh4 -mIsAn29ywZwEeSctkWhzr4RU8HA8udoj -=rQwx ------END PGP SIGNATURE----- diff --git a/kde-base/systemsettings/files/20_use_dejavu_as_default_font.patch b/kde-base/systemsettings/files/20_use_dejavu_as_default_font.patch new file mode 100644 index 000000000000..f0d43a2253a2 --- /dev/null +++ b/kde-base/systemsettings/files/20_use_dejavu_as_default_font.patch @@ -0,0 +1,23 @@ + +--- a/kcontrol/fonts/fonts.cpp ++++ b/kcontrol/fonts/fonts.cpp +@@ -513,12 +513,12 @@ + + // NOTE: keep in sync with kdelibs/kdeui/kernel/kglobalsettings.cpp + +- QFont f0("Sans Serif", 10); +- QFont f1("Monospace", 10); +- QFont f2("Sans Serif", 8); +- QFont f3("Sans Serif", 9, QFont::Bold); +- QFont f4("Sans Serif", 10); +- QFont f5("Sans Serif", 8); // smallestReadableFont ++ QFont f0("DejaVu Sans", 9); ++ QFont f1("DejaVu Sans Mono", 9); ++ QFont f2("DejaVu Sans", 8); ++ QFont f3("DejaVu Sans", 9, QFont::Bold); ++ QFont f4("DejaVu Sans", 9); ++ QFont f5("DejaVu Sans", 8); // smallestReadableFont + + defaultFontList << f0 << f1 << f5 << f2 << f0 << f3 << f4 << f0; + + diff --git a/kde-base/systemsettings/systemsettings-4.2.0-r1.ebuild b/kde-base/systemsettings/systemsettings-4.2.0-r1.ebuild new file mode 100644 index 000000000000..3b6e4a91f009 --- /dev/null +++ b/kde-base/systemsettings/systemsettings-4.2.0-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.2.0-r1.ebuild,v 1.1 2009/02/17 19:32:06 scarabeus Exp $ + +EAPI="2" + +KMNAME="kdebase-workspace" +OPENGL_REQUIRED="optional" +inherit kde4-meta + +DESCRIPTION="System settings utility" +IUSE="debug htmlhandbook +usb xinerama" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +COMMONDEPEND=" + >=dev-libs/glib-2 + media-libs/fontconfig + >=media-libs/freetype-2 + >=x11-libs/libxklavier-3.2 + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXrandr + x11-libs/libXtst + opengl? ( virtual/opengl ) + usb? ( dev-libs/libusb ) + xinerama? ( x11-libs/libXinerama )" +DEPEND="${COMMONDEPEND} + x11-proto/xextproto + x11-proto/kbproto + xinerama? ( x11-proto/xineramaproto )" +RDEPEND="${COMMONDEPEND} + >=kde-base/kcontrol-${PV}:${SLOT} + || ( x11-misc/xkeyboard-config + x11-misc/xkbdata ) + x11-apps/setxkbmap" + +KMEXTRA="kcontrol/" + +KMEXTRACTONLY="krunner/dbus/org.kde.krunner.App.xml + krunner/dbus/org.kde.screensaver.xml + kwin/ + libs/ + plasma/" + +PATCHES=( "$FILESDIR/20_use_dejavu_as_default_font.patch" ) + +# FIXME: is have_openglxvisual found without screensaver +src_configure() { + # Old keyboard-detection code is unmaintained, + # so we force the new stuff, using libxklavier. + mycmakeargs="${mycmakeargs} + -DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON + -DWITH_GLIB2=ON -DWITH_GObject=ON + $(cmake-utils_use_with opengl OpenGL) + $(cmake-utils_use_with usb USB) + $(cmake-utils_use_with xinerama X11_Xinerama)" + + kde4-meta_src_configure +} |