root
12 years ago
parent
93dd777003
commit
f36d2c6150
@ -1,2 +1 @@
|
||||
DIST pylibmc-1.2.1.tar.gz 45382 RMD160 175af400e7abfd62ef19cc5598bfb4e0ad0171da SHA1 8384df95401f3026667941f0980f6d77aff761c4 SHA256 f5c4830c6cc791141d2988c80f59b19f6f31ec53594b75a3e34c0c7d54d6a535
|
||||
DIST pylibmc-1.2.2.tar.gz 47032 RMD160 a11a88ef849fe72fbf50a45ba2d5b847b9f289b2 SHA1 082805650649866b81ee2e1eb0be6f42665dd5e2 SHA256 040e9536d1722760bdb61b8a0a2780491176b73196603ec0b1de01381271aa54
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibmc/pylibmc-1.2.1.ebuild,v 1.1 2011/10/24 09:03:00 djc Exp $
|
||||
|
||||
EAPI="3"
|
||||
PYTHON_DEPEND="2:2.5"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
RESTRICT_PYTHON_ABIS="2.4 3.*"
|
||||
|
||||
inherit distutils
|
||||
|
||||
DESCRIPTION="Libmemcached wrapper written as a Python extension"
|
||||
HOMEPAGE="http://sendapatch.se/projects/pylibmc/ http://pypi.python.org/pypi/pylibmc"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-libs/libmemcached-0.32"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_test() {
|
||||
testing() {
|
||||
PYTHONPATH="$(dir -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" runtests.py || die "Tests failed"
|
||||
}
|
||||
python_execute_function testing
|
||||
}
|
||||
@ -1,5 +1,2 @@
|
||||
DIST catalyst-2.0.6.916.tar.bz2 807678 RMD160 2603b46b38258a2812888416da71c99cd0d7d3a4 SHA1 49ce32a3fcbd5c171a29d0f921b54479c691c18d SHA256 434e59d1233d9215a6deda5f12a64af1241ba3fcaae4ee63145cd9b488b5a968
|
||||
DIST catalyst-2.0.6.918.tar.bz2 824436 RMD160 95a1417972bcf32f51d574aa1c1178dc26d648e8 SHA1 09999720c779da7bb5f7ecbd76e079a22a908643 SHA256 620183ccc27c406225abbf9bc5420e65ecbb95ab9f73fa357fda6b373eab951c
|
||||
DIST catalyst-2.0.6.tar.bz2 797947 RMD160 c85ea4008fb94fbb5dc896883968a503aec11b28 SHA1 2df2301ae8faee31e96448d7fa5682ae19abf64d SHA256 aa3e03ec2d3f0f6b62b8d8c8a39b197dd91fa3ea60cd96999c3b1c03f9877af3
|
||||
DIST catalyst-2.0.7.1.tar.bz2 901524 RMD160 b862f149b2faf60367d2458546aed706cbf8119a SHA1 89724af0818266e3790f9ed262f4316148902cc0 SHA256 77998b27cd8136c03380c1fdb271c69eae72891fe8177f0bf95b64c9f5fe82d6
|
||||
DIST catalyst-2.0.8.tar.bz2 901440 RMD160 5dbfd990b8c64a10f060fd3716c65c19da578310 SHA1 64ee740aeea9fdf23a7aeae01c8270c0f7e64ba5 SHA256 8e9a7e6854a89734952daefdd0cad34d198e2c2dc3fd4571674dbce2f21732f7
|
||||
|
||||
@ -1,95 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.916.ebuild,v 1.5 2011/07/17 00:29:56 mattst88 Exp $
|
||||
|
||||
# catalyst-9999 -> latest Git
|
||||
# catalyst-2.9999 -> catalyst_2 branch from Git
|
||||
# catalyst-VER -> normal catalyst release
|
||||
|
||||
EAPI=2
|
||||
|
||||
if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
|
||||
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
|
||||
inherit git-2
|
||||
SRC_URI=""
|
||||
S="${WORKDIR}/${PN}"
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="mirror://gentoo/${P}.tar.bz2"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
fi
|
||||
inherit eutils multilib
|
||||
|
||||
DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
|
||||
HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
RESTRICT=""
|
||||
IUSE="ccache"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="dev-lang/python
|
||||
app-crypt/shash
|
||||
virtual/cdrtools
|
||||
ccache? ( dev-util/ccache )
|
||||
ia64? ( sys-fs/dosfstools )
|
||||
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
|
||||
|
||||
pkg_setup() {
|
||||
if use ccache ; then
|
||||
einfo "Enabling ccache support for catalyst."
|
||||
else
|
||||
ewarn "By default, ccache support for catalyst is disabled."
|
||||
ewarn "If this is not what you intended,"
|
||||
ewarn "then you should add ccache to your USE."
|
||||
fi
|
||||
echo
|
||||
einfo "The template spec files are now installed by default. You can find"
|
||||
einfo "them under /usr/share/doc/${PF}/examples"
|
||||
einfo "and they are considered to be the authorative source of information"
|
||||
einfo "on catalyst."
|
||||
echo
|
||||
if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
|
||||
ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains"
|
||||
ewarn "work-in-progress code. Be aware that it's likely that it will not"
|
||||
ewarn "be in a working state at any given point. Please do not file bugs"
|
||||
ewarn "until you have posted on the gentoo-catalyst mailing list and we"
|
||||
ewarn "have asked you to do so."
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/$(get_libdir)/${PN}
|
||||
exeinto /usr/$(get_libdir)/${PN}
|
||||
doexe catalyst || die "copying catalyst"
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
doins -r modules files || die "copying files"
|
||||
else
|
||||
doins -r arch modules livecd || die "copying files"
|
||||
fi
|
||||
for x in targets/*; do
|
||||
exeinto /usr/$(get_libdir)/${PN}/$x
|
||||
doexe $x/* || die "copying ${x}"
|
||||
done
|
||||
make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
|
||||
insinto /etc/catalyst
|
||||
doins files/catalyst.conf files/catalystrc || die "copying configuration"
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins examples/* || die
|
||||
dodoc README ChangeLog AUTHORS
|
||||
doman files/catalyst.1
|
||||
# Here is where we actually enable ccache
|
||||
use ccache && \
|
||||
dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
|
||||
/etc/catalyst/catalyst.conf
|
||||
dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
|
||||
/etc/catalyst/catalyst.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "You can find more information about catalyst by checking out the"
|
||||
einfo "catalyst project page at:"
|
||||
einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
|
||||
echo
|
||||
}
|
||||
@ -1,96 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.918.ebuild,v 1.2 2011/07/17 00:29:56 mattst88 Exp $
|
||||
|
||||
# catalyst-9999 -> latest Git
|
||||
# catalyst-2.9999 -> catalyst_2 branch from Git
|
||||
# catalyst-VER -> normal catalyst release
|
||||
|
||||
EAPI=2
|
||||
|
||||
if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
|
||||
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
|
||||
inherit git-2
|
||||
SRC_URI=""
|
||||
S="${WORKDIR}/${PN}"
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="mirror://gentoo/${P}.tar.bz2
|
||||
http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
fi
|
||||
inherit eutils multilib
|
||||
|
||||
DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
|
||||
HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
RESTRICT=""
|
||||
IUSE="ccache"
|
||||
|
||||
DEPEND="app-text/asciidoc"
|
||||
RDEPEND="dev-lang/python
|
||||
app-crypt/shash
|
||||
virtual/cdrtools
|
||||
ccache? ( dev-util/ccache )
|
||||
ia64? ( sys-fs/dosfstools )
|
||||
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
|
||||
|
||||
pkg_setup() {
|
||||
if use ccache ; then
|
||||
einfo "Enabling ccache support for catalyst."
|
||||
else
|
||||
ewarn "By default, ccache support for catalyst is disabled."
|
||||
ewarn "If this is not what you intended,"
|
||||
ewarn "then you should add ccache to your USE."
|
||||
fi
|
||||
echo
|
||||
einfo "The template spec files are now installed by default. You can find"
|
||||
einfo "them under /usr/share/doc/${PF}/examples"
|
||||
einfo "and they are considered to be the authorative source of information"
|
||||
einfo "on catalyst."
|
||||
echo
|
||||
if [[ ${PV} == 9999* || ${PV} == 2.9999* ]]; then
|
||||
ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains"
|
||||
ewarn "work-in-progress code. Be aware that it's likely that it will not"
|
||||
ewarn "be in a working state at any given point. Please do not file bugs"
|
||||
ewarn "until you have posted on the gentoo-catalyst mailing list and we"
|
||||
ewarn "have asked you to do so."
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/$(get_libdir)/${PN}
|
||||
exeinto /usr/$(get_libdir)/${PN}
|
||||
doexe catalyst || die "copying catalyst"
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
doins -r modules files || die "copying files"
|
||||
else
|
||||
doins -r arch modules livecd || die "copying files"
|
||||
fi
|
||||
for x in targets/*; do
|
||||
exeinto /usr/$(get_libdir)/${PN}/$x
|
||||
doexe $x/* || die "copying ${x}"
|
||||
done
|
||||
make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
|
||||
insinto /etc/catalyst
|
||||
doins files/catalyst.conf files/catalystrc || die "copying configuration"
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins examples/* || die
|
||||
dodoc README ChangeLog AUTHORS
|
||||
doman files/catalyst.1
|
||||
# Here is where we actually enable ccache
|
||||
use ccache && \
|
||||
dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
|
||||
/etc/catalyst/catalyst.conf
|
||||
dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
|
||||
/etc/catalyst/catalyst.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "You can find more information about catalyst by checking out the"
|
||||
einfo "catalyst project page at:"
|
||||
einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
|
||||
echo
|
||||
}
|
||||
@ -1,81 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.6.ebuild,v 1.7 2011/07/17 00:29:56 mattst88 Exp $
|
||||
|
||||
# catalyst-9999 -> latest Git
|
||||
# catalyst-2.9999 -> catalyst_2 branch from Git
|
||||
# catalyst-VER -> normal catalyst release
|
||||
|
||||
inherit eutils multilib
|
||||
SRC_URI="mirror://gentoo/${P}.tar.bz2
|
||||
http://wolf31o2.org/sources/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="release metatool used for creating releases based on Gentoo Linux"
|
||||
HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
#KEYWORDS=""
|
||||
RESTRICT=""
|
||||
IUSE="ccache"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="dev-lang/python
|
||||
app-crypt/shash
|
||||
virtual/cdrtools
|
||||
ccache? ( dev-util/ccache )
|
||||
ia64? ( sys-fs/dosfstools )
|
||||
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )"
|
||||
|
||||
pkg_setup() {
|
||||
if use ccache ; then
|
||||
einfo "Enabling ccache support for catalyst."
|
||||
else
|
||||
ewarn "By default, ccache support for catalyst is disabled."
|
||||
ewarn "If this is not what you intended,"
|
||||
ewarn "then you should add ccache to your USE."
|
||||
fi
|
||||
echo
|
||||
einfo "The template spec files are now installed by default. You can find"
|
||||
einfo "them under /usr/share/doc/${PF}/examples"
|
||||
einfo "and they are considered to be the authorative source of information"
|
||||
einfo "on catalyst."
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/$(get_libdir)/${PN}
|
||||
exeinto /usr/$(get_libdir)/${PN}
|
||||
doexe catalyst || die "copying catalyst"
|
||||
doins -r arch modules livecd || die "copying files"
|
||||
for x in targets/*; do
|
||||
exeinto /usr/$(get_libdir)/${PN}/$x
|
||||
doexe $x/* || die "copying ${x}"
|
||||
done
|
||||
make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
|
||||
insinto /etc/catalyst
|
||||
doins files/catalyst.conf files/catalystrc || die "copying configuration"
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins examples/* || die
|
||||
dodoc README ChangeLog AUTHORS
|
||||
doman files/catalyst.1
|
||||
# Here is where we actually enable ccache
|
||||
use ccache && \
|
||||
dosed 's:options="autoresume kern:options="autoresume ccache kern:' \
|
||||
/etc/catalyst/catalyst.conf
|
||||
dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
|
||||
/etc/catalyst/catalyst.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "You can find more information about catalyst by checking out the"
|
||||
einfo "catalyst project page at:"
|
||||
einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
|
||||
echo
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST devhelp-2.32.0.tar.bz2 503689 RMD160 934697815ec13a5629db775bb3b8585c80c8c6f0 SHA1 8a7c15a17ccfb0b39b1f1f8b57f77e544fb3b2b8 SHA256 61b342cbaf27379be9baa5df1f34c9464916601ec4378fa7e1c76fcc686553e4
|
||||
DIST devhelp-3.2.0.tar.xz 486576 RMD160 314ec9db1f3e7c05a32ee485888b0f416e52fee2 SHA1 b76492d5130ec078e32f0fa359b1be88a988ee34 SHA256 974b4418036fa9a63a8f275257ed9ec1b7cae61a97e8e001e56e460c8a8e310e
|
||||
DIST devhelp-3.4.1.tar.xz 492976 RMD160 670c175966d8c7d6e6b1422b9aec72311aae9bb1 SHA1 2ed4fda8918abfff8bbf808c860d45310de8f2ba SHA256 3d1148d45d6fac5bb9a4fdf223f19ffa5774aa56df6bbf5b6e86363d8f55552c
|
||||
|
||||
@ -0,0 +1,69 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.4.1.ebuild,v 1.1 2012/05/03 05:05:47 tetromino Exp $
|
||||
|
||||
EAPI="4"
|
||||
GCONF_DEBUG="no"
|
||||
GNOME2_LA_PUNT="yes"
|
||||
PYTHON_DEPEND="2"
|
||||
|
||||
inherit eutils gnome2 python toolchain-funcs
|
||||
|
||||
DESCRIPTION="An API documentation browser for GNOME 2"
|
||||
HOMEPAGE="http://live.gnome.org/devhelp"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
COMMON_DEPEND=">=gnome-base/gconf-2.6:2
|
||||
>=dev-libs/glib-2.25.11:2
|
||||
>=x11-libs/gtk+-3.0.2:3
|
||||
>=net-libs/webkit-gtk-1.6:3"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
gnome-base/gsettings-desktop-schemas"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=sys-devel/gettext-0.17
|
||||
>=dev-util/intltool-0.40
|
||||
>=dev-util/pkgconfig-0.9"
|
||||
|
||||
pkg_setup() {
|
||||
DOCS="AUTHORS NEWS README"
|
||||
# ICC is crazy, silence warnings (bug #154010)
|
||||
if [[ $(tc-getCC) == "icc" ]] ; then
|
||||
G2CONF="${G2CONF} --with-compile-warnings=no"
|
||||
fi
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Use gsettings-desktop-schemas instead of obsolete libgnome's
|
||||
# /desktop/gnome/interface/* gconf keys for fonts; bug #396637,
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=646402
|
||||
epatch "${FILESDIR}/devhelp-3.4.1-gsettings-fonts.patch"
|
||||
|
||||
gnome2_src_prepare
|
||||
|
||||
python_clean_py-compile_files
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_pkg_preinst
|
||||
preserve_old_lib /usr/$(get_libdir)/libdevhelp-2.so.1
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_pkg_postinst
|
||||
python_need_rebuild
|
||||
python_mod_optimize /usr/$(get_libdir)/gedit/plugins
|
||||
# Keep all the notify calls around so that users get reminded to delete them
|
||||
preserve_old_lib_notify /usr/$(get_libdir)/libdevhelp-1.so.1
|
||||
preserve_old_lib_notify /usr/$(get_libdir)/libdevhelp-2.so.1
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_pkg_postrm
|
||||
python_mod_cleanup /usr/$(get_libdir)/gedit/plugins
|
||||
}
|
||||
@ -0,0 +1,114 @@
|
||||
From d761ce906fab110d38d9e71d4c25a334d79b9869 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mu=C5=BCy=C5=82o?= <galtgendo@o2.pl>
|
||||
Date: Thu, 3 May 2012 00:15:50 -0400
|
||||
Subject: [PATCH] stop using obsoleted default keys
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=646402
|
||||
---
|
||||
src/dh-preferences.c | 36 ++++++++----------------------------
|
||||
src/dh-util.c | 14 ++++++++------
|
||||
2 files changed, 16 insertions(+), 34 deletions(-)
|
||||
|
||||
diff --git a/src/dh-preferences.c b/src/dh-preferences.c
|
||||
index 7d75ebf..0f33810 100644
|
||||
--- a/src/dh-preferences.c
|
||||
+++ b/src/dh-preferences.c
|
||||
@@ -287,41 +287,21 @@ preferences_connect_conf_listeners (void)
|
||||
}
|
||||
#endif
|
||||
|
||||
-/* FIXME: Use the functions in dh-util.c for this. */
|
||||
static void
|
||||
preferences_fonts_get_font_names (gboolean use_system_fonts,
|
||||
gchar **variable,
|
||||
gchar **fixed)
|
||||
{
|
||||
- gchar *var_font_name;
|
||||
- gchar *fixed_font_name;
|
||||
- IgeConf *conf;
|
||||
-
|
||||
- conf = ige_conf_get ();
|
||||
+ gchar *name;
|
||||
+ gdouble size;
|
||||
|
||||
- if (use_system_fonts) {
|
||||
-#ifdef GDK_WINDOWING_QUARTZ
|
||||
- var_font_name = g_strdup ("Lucida Grande 14");
|
||||
- fixed_font_name = g_strdup ("Monaco 14");
|
||||
-#else
|
||||
- ige_conf_get_string (conf,
|
||||
- DH_CONF_SYSTEM_VARIABLE_FONT,
|
||||
- &var_font_name);
|
||||
- ige_conf_get_string (conf,
|
||||
- DH_CONF_SYSTEM_FIXED_FONT,
|
||||
- &fixed_font_name);
|
||||
-#endif
|
||||
- } else {
|
||||
- ige_conf_get_string (conf,
|
||||
- DH_CONF_VARIABLE_FONT,
|
||||
- &var_font_name);
|
||||
- ige_conf_get_string (conf,
|
||||
- DH_CONF_FIXED_FONT,
|
||||
- &fixed_font_name);
|
||||
- }
|
||||
+ dh_util_font_get_variable (&name, &size, use_system_fonts);
|
||||
+ *variable = g_strdup_printf ("%s %u", name, (guint)size);
|
||||
+ g_free (name);
|
||||
|
||||
- *variable = var_font_name;
|
||||
- *fixed = fixed_font_name;
|
||||
+ dh_util_font_get_fixed (&name, &size, use_system_fonts);
|
||||
+ *fixed = g_strdup_printf ("%s %u", name, (guint)size);
|
||||
+ g_free (name);
|
||||
}
|
||||
|
||||
static void
|
||||
diff --git a/src/dh-util.c b/src/dh-util.c
|
||||
index 74312d2..08151a3 100644
|
||||
--- a/src/dh-util.c
|
||||
+++ b/src/dh-util.c
|
||||
@@ -603,6 +603,7 @@ dh_util_font_get_variable (gchar **name,
|
||||
{
|
||||
IgeConf *conf;
|
||||
gchar *name_and_size;
|
||||
+ GSettings *settings;
|
||||
|
||||
conf = ige_conf_get ();
|
||||
|
||||
@@ -610,9 +611,9 @@ dh_util_font_get_variable (gchar **name,
|
||||
#ifdef GDK_WINDOWING_QUARTZ
|
||||
name_and_size = g_strdup ("Lucida Grande 14");
|
||||
#else
|
||||
- ige_conf_get_string (conf,
|
||||
- DH_CONF_SYSTEM_VARIABLE_FONT,
|
||||
- &name_and_size);
|
||||
+ settings = g_settings_new ("org.gnome.desktop.interface");
|
||||
+ name_and_size = g_settings_get_string (settings, "font-name");
|
||||
+ g_object_unref (settings);
|
||||
#endif
|
||||
} else {
|
||||
ige_conf_get_string (conf,
|
||||
@@ -635,6 +636,7 @@ dh_util_font_get_fixed (gchar **name,
|
||||
{
|
||||
IgeConf *conf;
|
||||
gchar *name_and_size;
|
||||
+ GSettings *settings;
|
||||
|
||||
conf = ige_conf_get ();
|
||||
|
||||
@@ -642,9 +644,9 @@ dh_util_font_get_fixed (gchar **name,
|
||||
#ifdef GDK_WINDOWING_QUARTZ
|
||||
name_and_size = g_strdup ("Monaco 14");
|
||||
#else
|
||||
- ige_conf_get_string (conf,
|
||||
- DH_CONF_SYSTEM_FIXED_FONT,
|
||||
- &name_and_size);
|
||||
+ settings = g_settings_new ("org.gnome.desktop.interface");
|
||||
+ name_and_size = g_settings_get_string (settings, "monospace-font-name");
|
||||
+ g_object_unref (settings);
|
||||
#endif
|
||||
} else {
|
||||
ige_conf_get_string (conf,
|
||||
--
|
||||
1.7.8.6
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue