Search
lxdream.org :: lxdream/android/deps/glib-2.26.0.diff :: diff
Latest Version
lxdream 0.9.1
released Jun 29
Download Now
Navigation
News Download Mailing Lists Mercurial Issues Dreamcast Wiki FAQ Forums
tree revision 1245:01e0020adf88
Jump to:
summary | tree | shortlog | changelog | graph | changeset

 

filename android/deps/glib-2.26.0.diff
changeset 1239:be3121267597
author nkeynes
date Fri Mar 02 23:49:10 2012 +1000 (12 years ago)
permissions -rw-r--r--
last change Android WIP:
* Rename gui_jni.c to gui_android.c - now quite android specific.
* Implement generic EGL driver with very minimal Java wrapper
* Run emulation in separate thread, and implement simple queue for
inter-thread communication.
* Add menu/action-bar items for start + reset
file annotate diff log raw 
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000

     1.2 +++ b/android/deps/glib-2.26.0.diff	Fri Mar 02 23:49:10 2012 +1000

     1.3 @@ -0,0 +1,57 @@

     1.4 +diff -ur glib-2.26.0/glib/gstrfuncs.c glib-2.26.0/glib/gstrfuncs.c

     1.5 +--- glib-2.26.0/glib/gstrfuncs.c	2010-09-14 01:57:51.000000000 +1000

     1.6 ++++ glib-2.26.0/glib/gstrfuncs.c	2012-02-16 17:36:27.000000000 +1000

     1.7 +@@ -442,8 +442,12 @@

     1.8 + 

     1.9 +   fail_pos = NULL;

    1.10 + 

    1.11 ++#ifdef __ANDROID__

    1.12 ++  decimal_point = ".";

    1.13 ++#else

    1.14 +   locale_data = localeconv ();

    1.15 +   decimal_point = locale_data->decimal_point;

    1.16 ++#endif

    1.17 +   decimal_point_len = strlen (decimal_point);

    1.18 + 

    1.19 +   g_assert (decimal_point_len != 0);

    1.20 +@@ -656,8 +660,12 @@

    1.21 + 

    1.22 +   _g_snprintf (buffer, buf_len, format, d);

    1.23 + 

    1.24 ++#ifdef __ANDROID__

    1.25 ++  decimal_point = ".";

    1.26 ++#else

    1.27 +   locale_data = localeconv ();

    1.28 +   decimal_point = locale_data->decimal_point;

    1.29 ++#endif

    1.30 +   decimal_point_len = strlen (decimal_point);

    1.31 + 

    1.32 +   g_assert (decimal_point_len != 0);

    1.33 +diff -ur glib-2.26.0/glib/gutils.c glib-2.26.0/glib/gutils.c

    1.34 +--- glib-2.26.0/glib/gutils.c	2010-09-14 01:57:51.000000000 +1000

    1.35 ++++ glib-2.26.0/glib/gutils.c	2012-02-16 17:35:33.000000000 +1000

    1.36 +@@ -1694,14 +1694,12 @@

    1.37 +     

    1.38 +     if (!pw)

    1.39 +       {

    1.40 +-	setpwent ();

    1.41 + 	pw = getpwuid (getuid ());

    1.42 +-	endpwent ();

    1.43 +       }

    1.44 +     if (pw)

    1.45 +       {

    1.46 + 	g_user_name = g_strdup (pw->pw_name);

    1.47 +-

    1.48 ++#ifndef __ANDROID__

    1.49 + 	if (pw->pw_gecos && *pw->pw_gecos != '\0') 

    1.50 + 	  {

    1.51 + 	    gchar **gecos_fields;

    1.52 +@@ -1715,7 +1713,7 @@

    1.53 + 	    g_strfreev (gecos_fields);

    1.54 + 	    g_strfreev (name_parts);

    1.55 + 	  }

    1.56 +-

    1.57 ++#endif

    1.58 + 	if (!g_home_dir)

    1.59 + 	  g_home_dir = g_strdup (pw->pw_dir);

    1.60 +       }
.