head 1.4; access; symbols pkgsrc-2023Q3:1.3.0.106 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.104 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.102 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.100 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.98 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.96 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.94 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.92 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.90 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.88 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.86 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.84 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.82 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.78 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.58 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.80 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.76 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.74 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.72 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.70 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.68 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.66 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.64 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.62 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.60 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.56 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.54 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.52 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.50 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.48 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.46 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.44 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.42 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.40 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.38 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.36 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.34 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.32 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.30 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.28 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.26 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.24 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.22 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.20 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.18 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.16 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.14 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.12 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.10 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.8 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.6 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.4 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.2 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.1.0.2 pkgsrc-2010Q2-base:1.1; locks; strict; comment @# @; 1.4 date 2023.11.04.23.56.40; author wiz; state dead; branches; next 1.3; commitid ArQhQfJb8x7sQlLE; 1.3 date 2010.06.27.08.49.32; author obache; state Exp; branches; next 1.2; 1.2 date 2010.06.27.08.05.31; author obache; state Exp; branches; next 1.1; 1.1 date 2010.05.28.09.31.35; author obache; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2010.07.04.07.18.43; author agc; state Exp; branches; next ; desc @@ 1.4 log @scim-tomoe: remove Used removed tomoe-gtk @ text @$NetBSD: patch-ab,v 1.3 2010/06/27 08:49:32 obache Exp $ * GtkSpinButton: setting an adjustment with non-zero page size is deprecated * support gucharmap-2 --- src/scim_tomoe_prefs_widget.cpp.orig 2007-05-07 07:49:15.000000000 +0000 +++ src/scim_tomoe_prefs_widget.cpp @@@@ -170,7 +170,7 @@@@ create_spin_button (ScimTomoePrefsWidget gtk_widget_show (label); GtkObject *adj = gtk_adjustment_new (value, min, max, step, - page_size, page_size); + page_size, 0.0); GtkWidget *spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0.0, 0); g_object_set_data (G_OBJECT (spin), OBJECT_DATA_CONFIG_KEY, (gpointer) key); @@@@ -472,9 +472,13 @@@@ apply_config (ScimTomoePrefsWidget *pref String (SCIM_TOMOE_CONFIG_UNICODE_TABLE_FONT_DEFAULT)); if (font.length() > 0) { - gucharmap_charmap_set_font (charmap, font.c_str ()); + PangoFontDescription *desc = pango_font_description_from_string(font.c_str ()); + gucharmap_charmap_set_font_desc (charmap, desc); + pango_font_description_free (desc); } else { - gucharmap_charmap_set_font (charmap, NULL); + PangoFontDescription *desc = pango_font_description_new (); + gucharmap_charmap_set_font_desc (charmap, desc); + pango_font_description_free (desc); set_default_font (prefs, SCIM_TOMOE_CONFIG_CAND_FONT, GTK_WIDGET (charmap)); } @ 1.3 log @Fixes a warning: GtkSpinButton: setting an adjustment with non-zero page size is deprecated Ride on last bump. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2010/06/27 08:05:31 obache Exp $ @ 1.2 log @Update gucharmap-2 patch more better: * fixes memory leak. * made assertion free. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2010/05/28 09:31:35 obache Exp $ d3 2 a4 1 support gucharmap-2 d8 9 @ 1.1 log @Add patch-ab to build with gucharmap-2. taken from gentoo scim-tomoe-0.6.0-gucharmap2.patch. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 @@@@ -472,9 +472,9 @@@@ apply_config (ScimTomoePrefsWidget *pref d12 3 a14 1 + gucharmap_charmap_set_font_desc (charmap, pango_font_description_from_string(font.c_str ())); d17 3 a19 1 + gucharmap_charmap_set_font_desc (charmap, pango_font_description_from_string(NULL)); @ 1.1.2.1 log @Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching error, and to sync with reality. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2010/06/27 08:49:32 obache Exp $ d3 1 a3 2 * GtkSpinButton: setting an adjustment with non-zero page size is deprecated * support gucharmap-2 d7 1 a7 10 @@@@ -170,7 +170,7 @@@@ create_spin_button (ScimTomoePrefsWidget gtk_widget_show (label); GtkObject *adj = gtk_adjustment_new (value, min, max, step, - page_size, page_size); + page_size, 0.0); GtkWidget *spin = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0.0, 0); g_object_set_data (G_OBJECT (spin), OBJECT_DATA_CONFIG_KEY, (gpointer) key); @@@@ -472,9 +472,13 @@@@ apply_config (ScimTomoePrefsWidget *pref d12 1 a12 3 + PangoFontDescription *desc = pango_font_description_from_string(font.c_str ()); + gucharmap_charmap_set_font_desc (charmap, desc); + pango_font_description_free (desc); d15 1 a15 3 + PangoFontDescription *desc = pango_font_description_new (); + gucharmap_charmap_set_font_desc (charmap, desc); + pango_font_description_free (desc); @