pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/gnopernicus Added a bunch of patches needed for gc...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2cd53a6a0a7b
branches:  trunk
changeset: 492415:2cd53a6a0a7b
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Apr 12 00:59:36 2005 +0000

description:
Added a bunch of patches needed for gcc-2.95. Approved by jlam.

diffstat:

 x11/gnopernicus/distinfo         |   7 ++++-
 x11/gnopernicus/patches/patch-ae |  18 +++++++++++++
 x11/gnopernicus/patches/patch-af |  32 ++++++++++++++++++++++++
 x11/gnopernicus/patches/patch-ag |  53 ++++++++++++++++++++++++++++++++++++++++
 x11/gnopernicus/patches/patch-ah |  27 ++++++++++++++++++++
 x11/gnopernicus/patches/patch-ai |  18 +++++++++++++
 6 files changed, 154 insertions(+), 1 deletions(-)

diffs (186 lines):

diff -r f49ed20b88f9 -r 2cd53a6a0a7b x11/gnopernicus/distinfo
--- a/x11/gnopernicus/distinfo  Tue Apr 12 00:51:22 2005 +0000
+++ b/x11/gnopernicus/distinfo  Tue Apr 12 00:59:36 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2005/03/22 16:32:32 jmmv Exp $
+$NetBSD: distinfo,v 1.12 2005/04/12 00:59:36 rillig Exp $
 
 SHA1 (gnopernicus-0.10.4.tar.bz2) = 0845e3d21edd74bfa997cc0fbc8c186f62fa3967
 RMD160 (gnopernicus-0.10.4.tar.bz2) = 3a88c853c8bd1263b5785c50ba4baeb40a54411b
@@ -6,3 +6,8 @@
 SHA1 (patch-ab) = d17ba1a57ad795f018bd224444c987b9e0c57b16
 SHA1 (patch-ac) = 29fbb4e5c0a71d86f288cdbf21320775abbc104f
 SHA1 (patch-ad) = f8ebe0b5eb2a8f454f264ab7682e5b8f8d113e93
+SHA1 (patch-ae) = 1483adda42d01f807871cac84dd3edcd7aadb56c
+SHA1 (patch-af) = 4deb837de9fe3585d835b92c90ce47c6bdb4d454
+SHA1 (patch-ag) = b238ecd7baa2f9a6cfbab6d141b690fe28413dce
+SHA1 (patch-ah) = a19fb9359f8b164d2852fff6b3e5be7fc2b5a389
+SHA1 (patch-ai) = c2b06326ab2bdb70251ac8da591f31de17dbb205
diff -r f49ed20b88f9 -r 2cd53a6a0a7b x11/gnopernicus/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnopernicus/patches/patch-ae  Tue Apr 12 00:59:36 2005 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.1 2005/04/12 00:59:36 rillig Exp $
+
+Needed for gcc-2.95.
+
+--- braille/libbrl/brlxml.c.orig       Tue Aug 10 11:51:24 2004
++++ braille/libbrl/brlxml.c    Mon Apr 11 02:00:27 2005
+@@ -730,10 +730,10 @@ brl_start_element (void            *ctx,
+                       /* fprintf (stderr, "\n attr_val; %s", *attrs); */
+                       if (g_strcasecmp ((gchar*)*attrs, "mode") == 0)
+                       {
+-                          ++attrs;
+                           gint16 new_offset = 0;
+                           gshort sign = 1;
+                                       
++                          ++attrs;
+                           attr_val = g_strdup ((gchar*)*attrs);
+                           tattr_val = g_strdup (attr_val);
+                                       
diff -r f49ed20b88f9 -r 2cd53a6a0a7b x11/gnopernicus/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnopernicus/patches/patch-af  Tue Apr 12 00:59:36 2005 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-af,v 1.1 2005/04/12 00:59:36 rillig Exp $
+
+Needed for gcc-2.95.
+
+--- gnopi/gnopi.c.orig Tue Jan 18 11:11:56 2005
++++ gnopi/gnopi.c      Mon Apr 11 02:12:22 2005
+@@ -530,6 +530,7 @@ gn_check_accessibility_key (void)
+     GladeXML  *xml    = NULL;
+     gint         response_id;
+     gboolean     accessibility_on;
++    AtkObject *obj;
+     
+     /* check if accessibility flag is TRUE */
+     accessibility_on =        gnopiconf_get_bool (ACCESSIBILITY_GCONF_KEY, 
+@@ -550,7 +551,7 @@ gn_check_accessibility_key (void)
+     
+     g_object_unref (G_OBJECT (xml));
+     
+-    AtkObject *obj = gtk_widget_get_accessible (dialog);
++    obj = gtk_widget_get_accessible (dialog);
+     atk_object_set_role (obj, ATK_ROLE_ALERT);
+     
+     response_id = gtk_dialog_run (GTK_DIALOG (dialog));
+@@ -570,7 +571,7 @@ gn_check_accessibility_key (void)
+       
+       g_object_unref (G_OBJECT (xml));
+       
+-        AtkObject *obj = gtk_widget_get_accessible (dialog);
++        obj = gtk_widget_get_accessible (dialog);
+         atk_object_set_role (obj, ATK_ROLE_ALERT);
+         
+       response_id = gtk_dialog_run (GTK_DIALOG (dialog));
diff -r f49ed20b88f9 -r 2cd53a6a0a7b x11/gnopernicus/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnopernicus/patches/patch-ag  Tue Apr 12 00:59:36 2005 +0000
@@ -0,0 +1,53 @@
+$NetBSD: patch-ag,v 1.1 2005/04/12 00:59:36 rillig Exp $
+
+Needed for gcc-2.95.
+
+--- srcore/srbrl.c.orig        Tue Oct  5 16:00:07 2004
++++ srcore/srbrl.c     Mon Apr 11 02:10:13 2005
+@@ -762,6 +762,9 @@ src_braille_setting_new ()
+ static void
+ src_braille_load_values (SRCBraille *braille)
+ {
++    gint default_pos_sensor = DEFAULT_BRAILLE_POSITION_SENSOR;
++    gint default_opt_sensor = DEFAULT_BRAILLE_OPTICAL_SENSOR;
++
+     sru_assert (braille);
+     
+     if (!braille->device)
+@@ -788,10 +791,9 @@ src_braille_load_values (SRCBraille *bra
+       }                                         
+     }    
+     
+-    gchar *default_braille_transaltion_table = DEFAULT_BRAILLE_TRANSLATION;
+     GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_TRANSLATION, CFGT_STRING, 
+                                         &braille->translation_table, 
+-                                        default_braille_transaltion_table);           
++                                        DEFAULT_BRAILLE_TRANSLATION);
+     if (!src_braille_translation_table_exist (braille->translation_table))
+     {
+         srconf_set_config_data (BRAILLE_TRANSLATION, CFGT_STRING, 
+@@ -800,22 +802,18 @@ src_braille_load_values (SRCBraille *bra
+     }
+       
+     
+-    gchar *default_braille_style = DEFAULT_BRAILLE_STYLE;
+     GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_STYLE, CFGT_STRING, 
+                                         &braille->style, 
+-                                        default_braille_style);
++                                        DEFAULT_BRAILLE_STYLE);
+                                         
+-    gchar *default_braille_cursor_style = DEFAULT_BRAILLE_CURSOR_STYLE;
+     GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_CURSOR_STYLE, CFGT_STRING, 
+                                         &braille->cursor_style, 
+-                                        default_braille_cursor_style);
++                                        DEFAULT_BRAILLE_CURSOR_STYLE);
+                                         
+-    gint default_pos_sensor = DEFAULT_BRAILLE_POSITION_SENSOR;
+     GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_POSITION_SENSOR, CFGT_INT, 
+                                         &braille->position_sensor, 
+                                         &default_pos_sensor);
+     
+-    gint default_opt_sensor = DEFAULT_BRAILLE_OPTICAL_SENSOR;
+     GET_BRAILLE_CONFIG_DATA_WITH_DEFAULT (BRAILLE_OPTICAL_SENSOR, CFGT_INT, 
+                                         &braille->optical_sensor, 
+                                         &default_opt_sensor);
diff -r f49ed20b88f9 -r 2cd53a6a0a7b x11/gnopernicus/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnopernicus/patches/patch-ah  Tue Apr 12 00:59:36 2005 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-ah,v 1.1 2005/04/12 00:59:36 rillig Exp $
+
+Needed for gcc-2.95.
+
+--- srcore/srmain.c.orig       Mon Feb 28 15:13:33 2005
++++ srcore/srmain.c    Mon Apr 11 02:05:24 2005
+@@ -666,8 +666,7 @@ src_process_config_changed_for_braille (
+     {
+       sru_assert (config->newvalue && config->type == CFGT_STRING);
+       
+-      gboolean rv = src_braille_set_device ((gchar*)config->newvalue);   
+-      if (!rv)
++      if (!src_braille_set_device ((gchar*)config->newvalue))
+       {
+           sru_message ("SR: process config changed for braille: brl_device did not change!!!");
+       }
+@@ -700,9 +699,7 @@ src_process_config_changed_for_braille (
+     {
+       sru_assert (config->type == CFGT_STRING && config->newvalue);
+       
+-      gboolean rv = src_braille_set_translation_table ((gchar*)config->newvalue);
+-      
+-      if (!rv)
++      if (!src_braille_set_translation_table ((gchar*)config->newvalue))
+       {
+           return;
+       }
diff -r f49ed20b88f9 -r 2cd53a6a0a7b x11/gnopernicus/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnopernicus/patches/patch-ai  Tue Apr 12 00:59:36 2005 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ai,v 1.1 2005/04/12 00:59:36 rillig Exp $
+
+Needed for gcc-2.95.
+
+--- srlow/libsrlow/SRObject.c.orig     Mon Feb 28 14:19:32 2005
++++ srlow/libsrlow/SRObject.c  Mon Apr 11 02:02:19 2005
+@@ -4206,9 +4206,10 @@ sro_text_get_caret_location (SRObject *o
+     offset = AccessibleText_getCaretOffset (acc_text);
+     if (offset == AccessibleText_getCharacterCount (acc_text) && offset > 0)
+       {
++              char *ret;
+               offset--;
+               last = TRUE;/*the char is the last char in the text*/
+-              char *ret = AccessibleText_getTextBeforeOffset (acc_text, offset+1, 
++              ret = AccessibleText_getTextBeforeOffset (acc_text, offset+1, 
+                                       SPI_TEXT_BOUNDARY_LINE_START, &line_start_offset, &line_end_offset);
+               SPI_freeString (ret);
+               if (offset == line_start_offset && offset > 0)



Home | Main Index | Thread Index | Old Index