microtherion
/
fink-experimental-packages
1
0
Fork 0
Code Issues 0 Pull Requests 0 Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1 Commit
1 Branch
68 KiB
 
Branch: master
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'master'
${ noResults }
fink-experimental-packages/glib2-shlibs.patch

576 lines
23 KiB
Raw Permalink Blame History 

  1. diff -Nurd -x'*~' glib-2.22.4.orig/configure glib-2.22.4/configure

  2. --- glib-2.22.4.orig/configure	2010-01-06 19:48:41.000000000 -0500

  3. +++ glib-2.22.4/configure	2010-01-13 08:56:35.000000000 -0500

  4. @@ -4801,7 +4801,7 @@

  5.  #define HAVE_CARBON 1

  6.  _ACEOF

  7.  

  8. -  LDFLAGS="$LDFLAGS -framework Carbon"

  9. +  LDFLAGS="$LDFLAGS -Wl,-framework,Carbon"

  10.  fi

  11.  

  12.  

  13. @@ -8323,13 +8323,13 @@

  14.  

  15.          if test -n "$PYTHON"; then

  16.        # If the user set $PYTHON, use it and don't search something else.

  17. -      { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.4" >&5

  18. -$as_echo_n "checking whether $PYTHON version >= 2.4... " >&6; }

  19. +      { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.3" >&5

  20. +$as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; }

  21.        prog="import sys

  22.  # split strings by '.' and convert to numeric.  Append some zeros

  23.  # because we need at least 4 digits for the hex conversion.

  24.  # map returns an iterator in Python 3.0 and a list in 2.x

  25. -minver = list(map(int, '2.4'.split('.'))) + [0, 0, 0]

  26. +minver = list(map(int, '2.3'.split('.'))) + [0, 0, 0]

  27.  minverhex = 0

  28.  # xrange is not present in Python 3.0 and range returns an iterator

  29.  for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]

  30. @@ -40056,6 +40056,9 @@

  31.  			G_THREAD_CFLAGS="-D_THREAD_SAFE"

  32.  		fi

  33.  		;;

  34. +	*-darwin*)

  35. +		# Nothing needed.

  36. +		;;

  37.  	*-dg-dgux*)  # DG/UX

  38.  		G_THREAD_CFLAGS="-D_REENTRANT -D_POSIX4A_DRAFT10_SOURCE"

  39.  		;;

  40. diff -Nurd -x'*~' glib-2.22.4.orig/gio/Makefile.in glib-2.22.4/gio/Makefile.in

  41. --- glib-2.22.4.orig/gio/Makefile.in	2010-01-06 19:48:36.000000000 -0500

  42. +++ glib-2.22.4/gio/Makefile.in	2010-01-13 09:57:06.000000000 -0500

  43. @@ -677,6 +677,7 @@

  44.  	$(SELINUX_LIBS) 				\

  45.  	$(GLIB_LIBS) 					\

  46.  	$(XATTR_LIBS) 					\

  47. +	-lresolv					\

  48.  	$(NULL)

  49.  

  50.  @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined

  51. diff -Nurd -x'*~' glib-2.22.4.orig/gio/gdesktopappinfo.c glib-2.22.4/gio/gdesktopappinfo.c

  52. --- glib-2.22.4.orig/gio/gdesktopappinfo.c	2010-01-06 19:24:28.000000000 -0500

  53. +++ glib-2.22.4/gio/gdesktopappinfo.c	2010-01-13 08:35:24.000000000 -0500

  54. @@ -1396,7 +1396,7 @@

  55.        g_file_set_contents (filename, contents, -1, NULL);

  56.        g_free (contents);

  57.  

  58. -      run_update_command ("update-mime-database", "mime");

  59. +      run_update_command ("@PREFIX@/bin/update-mime-database", "mime");

  60.      }

  61.    g_free (filename);

  62.    

  63. @@ -1527,7 +1527,7 @@

  64.    info->filename = filename;

  65.    info->desktop_id = desktop_id;

  66.    

  67. -  run_update_command ("update-desktop-database", "applications");

  68. +  run_update_command ("@PREFIX@/bin/update-desktop-database", "applications");

  69.    

  70.    return TRUE;

  71.  }

  72. diff -Nurd -x'*~' glib-2.22.4.orig/gio/gdrive.h glib-2.22.4/gio/gdrive.h

  73. --- glib-2.22.4.orig/gio/gdrive.h	2009-08-28 22:52:22.000000000 -0400

  74. +++ glib-2.22.4/gio/gdrive.h	2010-01-13 09:13:20.000000000 -0500

  75. @@ -164,7 +164,7 @@

  76.  gboolean g_drive_is_media_check_automatic (GDrive               *drive);

  77.  gboolean g_drive_can_poll_for_media       (GDrive               *drive);

  78.  gboolean g_drive_can_eject                (GDrive               *drive);

  79. -#ifndef G_DISABLE_DEPRECATED

  80. +#if 1

  81.  void     g_drive_eject                    (GDrive               *drive,

  82.  					   GMountUnmountFlags    flags,

  83.                                             GCancellable         *cancellable,

  84. diff -Nurd -x'*~' glib-2.22.4.orig/gio/gfile.h glib-2.22.4/gio/gfile.h

  85. --- glib-2.22.4.orig/gio/gfile.h	2010-01-06 19:19:12.000000000 -0500

  86. +++ glib-2.22.4/gio/gfile.h	2010-01-13 09:13:13.000000000 -0500

  87. @@ -867,7 +867,7 @@

  88.  GFile *                 g_file_mount_mountable_finish     (GFile                      *file,

  89.  							   GAsyncResult               *result,

  90.  							   GError                    **error);

  91. -#ifndef G_DISABLE_DEPRECATED

  92. +#if 1

  93.  void                    g_file_unmount_mountable          (GFile                      *file,

  94.  							   GMountUnmountFlags          flags,

  95.  							   GCancellable               *cancellable,

  96. @@ -886,7 +886,7 @@

  97.  gboolean                g_file_unmount_mountable_with_operation_finish (GFile         *file,

  98.  							   GAsyncResult               *result,

  99.  							   GError                    **error);

  100. -#ifndef G_DISABLE_DEPRECATED

  101. +#if 1

  102.  void                    g_file_eject_mountable            (GFile                      *file,

  103.  							   GMountUnmountFlags          flags,

  104.  							   GCancellable               *cancellable,

  105. diff -Nurd -x'*~' glib-2.22.4.orig/gio/gmount.h glib-2.22.4/gio/gmount.h

  106. --- glib-2.22.4.orig/gio/gmount.h	2010-01-06 19:19:12.000000000 -0500

  107. +++ glib-2.22.4/gio/gmount.h	2010-01-13 09:12:58.000000000 -0500

  108. @@ -167,7 +167,7 @@

  109.  gboolean    g_mount_can_unmount               (GMount              *mount);

  110.  gboolean    g_mount_can_eject                 (GMount              *mount);

  111.  

  112. -#ifndef G_DISABLE_DEPRECATED

  113. +#if 1

  114.  void        g_mount_unmount                   (GMount              *mount,

  115.                                                 GMountUnmountFlags   flags,

  116.                                                 GCancellable        *cancellable,

  117. diff -Nurd -x'*~' glib-2.22.4.orig/gio/gunixmounts.c glib-2.22.4/gio/gunixmounts.c

  118. --- glib-2.22.4.orig/gio/gunixmounts.c	2009-03-31 19:04:20.000000000 -0400

  119. +++ glib-2.22.4/gio/gunixmounts.c	2010-01-13 08:39:56.000000000 -0500

  120. @@ -243,6 +243,7 @@

  121.      "/proc",

  122.      "/sbin",

  123.      "/net",

  124. +    "@PERFIX@",

  125.      NULL

  126.    };

  127.  

  128. diff -Nurd -x'*~' glib-2.22.4.orig/gio/gvolume.h glib-2.22.4/gio/gvolume.h

  129. --- glib-2.22.4.orig/gio/gvolume.h	2009-08-28 22:52:23.000000000 -0400

  130. +++ glib-2.22.4/gio/gvolume.h	2010-01-13 09:12:51.000000000 -0500

  131. @@ -180,7 +180,7 @@

  132.  gboolean g_volume_mount_finish          (GVolume              *volume,

  133.  					 GAsyncResult         *result,

  134.  					 GError              **error);

  135. -#ifndef G_DISABLE_DEPRECATED

  136. +#if 1

  137.  void     g_volume_eject                 (GVolume              *volume,

  138.  					 GMountUnmountFlags    flags,

  139.  					 GCancellable         *cancellable,

  140. diff -Nurd -x'*~' glib-2.22.4.orig/gio/gvolumemonitor.h glib-2.22.4/gio/gvolumemonitor.h

  141. --- glib-2.22.4.orig/gio/gvolumemonitor.h	2009-08-28 22:52:23.000000000 -0400

  142. +++ glib-2.22.4/gio/gvolumemonitor.h	2010-01-13 09:11:16.000000000 -0500

  143. @@ -142,7 +142,7 @@

  144.  GMount *        g_volume_monitor_get_mount_for_uuid   (GVolumeMonitor *volume_monitor,

  145.                                                         const char     *uuid);

  146.  

  147. -#ifndef G_DISABLE_DEPRECATED

  148. +#if 1

  149.  GVolume *       g_volume_monitor_adopt_orphan_mount   (GMount         *mount);

  150.  #endif

  151.  

  152. diff -Nurd -x'*~' glib-2.22.4.orig/gio/xdgmime/xdgmime.c glib-2.22.4/gio/xdgmime/xdgmime.c

  153. --- glib-2.22.4.orig/gio/xdgmime/xdgmime.c	2009-10-06 16:07:59.000000000 -0400

  154. +++ glib-2.22.4/gio/xdgmime/xdgmime.c	2010-01-13 08:35:09.000000000 -0500

  155. @@ -257,7 +257,7 @@

  156.  

  157.    xdg_data_dirs = getenv ("XDG_DATA_DIRS");

  158.    if (xdg_data_dirs == NULL)

  159. -    xdg_data_dirs = "/usr/local/share/:/usr/share/";

  160. +    xdg_data_dirs = "@PREFIX@/share:/usr/local/share/:/usr/share/";

  161.  

  162.    ptr = xdg_data_dirs;

  163.  

  164. diff -Nurd -x'*~' glib-2.22.4.orig/glib/gconvert.c glib-2.22.4/glib/gconvert.c

  165. --- glib-2.22.4.orig/glib/gconvert.c	2009-11-01 15:01:21.000000000 -0500

  166. +++ glib-2.22.4/glib/gconvert.c	2014-02-21 12:28:25.000000000 -0500

  167. @@ -539,7 +539,9 @@

  168.   * g_convert_with_iconv:

  169.   * @str:           the string to convert

  170.   * @len:           the length of the string, or -1 if the string is 

  171. - *                 nul-terminated<footnoteref linkend="nul-unsafe"/>. 

  172. + *                 nul-terminated (Note that some encodings may allow nul

  173. + *                 bytes to occur inside strings. In that case, using -1

  174. + *                 for the @len parameter is unsafe)

  175.   * @converter:     conversion descriptor from g_iconv_open()

  176.   * @bytes_read:    location to store the number of bytes in the

  177.   *                 input string that were successfully converted, or %NULL.

  178. @@ -556,20 +558,15 @@

  179.   *

  180.   * Converts a string from one character set to another. 

  181.   * 

  182. - * Note that you should use g_iconv() for streaming 

  183. - * conversions<footnote id="streaming-state">

  184. - *  <para>

  185. + * Note that you should use g_iconv() for streaming conversions. 

  186.   * Despite the fact that @byes_read can return information about partial 

  187. - * characters, the <literal>g_convert_...</literal> functions

  188. - * are not generally suitable for streaming. If the underlying converter 

  189. - * being used maintains internal state, then this won't be preserved 

  190. - * across successive calls to g_convert(), g_convert_with_iconv() or 

  191. - * g_convert_with_fallback(). (An example of this is the GNU C converter 

  192. - * for CP1255 which does not emit a base character until it knows that 

  193. - * the next character is not a mark that could combine with the base 

  194. - * character.)

  195. - *  </para>

  196. - * </footnote>. 

  197. + * characters, the g_convert_... functions are not generally suitable

  198. + * for streaming. If the underlying converter maintains internal state,

  199. + * then this won't be preserved across successive calls to g_convert(),

  200. + * g_convert_with_iconv() or g_convert_with_fallback(). (An example of

  201. + * this is the GNU C converter for CP1255 which does not emit a base

  202. + * character until it knows that the next character is not a mark that

  203. + * could combine with the base character.)

  204.   *

  205.   * Return value: If the conversion was successful, a newly allocated

  206.   *               nul-terminated string, which must be freed with

  207. @@ -697,13 +694,9 @@

  208.   * g_convert:

  209.   * @str:           the string to convert

  210.   * @len:           the length of the string, or -1 if the string is 

  211. - *                 nul-terminated<footnote id="nul-unsafe">

  212. -                     <para>

  213. -                       Note that some encodings may allow nul bytes to 

  214. -                       occur inside strings. In that case, using -1 for 

  215. -                       the @len parameter is unsafe.

  216. -                     </para>

  217. -                   </footnote>. 

  218. + *                 nul-terminated (Note that some encodings may allow nul

  219. + *                 bytes to occur inside strings. In that case, using -1

  220. + *                 for the @len parameter is unsafe)

  221.   * @to_codeset:    name of character set into which to convert @str

  222.   * @from_codeset:  character set of @str.

  223.   * @bytes_read:    location to store the number of bytes in the

  224. @@ -721,8 +714,15 @@

  225.   *

  226.   * Converts a string from one character set to another.

  227.   *

  228. - * Note that you should use g_iconv() for streaming 

  229. - * conversions<footnoteref linkend="streaming-state"/>.

  230. + * Note that you should use g_iconv() for streaming conversions. 

  231. + * Despite the fact that @byes_read can return information about partial 

  232. + * characters, the g_convert_... functions are not generally suitable

  233. + * for streaming. If the underlying converter maintains internal state,

  234. + * then this won't be preserved across successive calls to g_convert(),

  235. + * g_convert_with_iconv() or g_convert_with_fallback(). (An example of

  236. + * this is the GNU C converter for CP1255 which does not emit a base

  237. + * character until it knows that the next character is not a mark that

  238. + * could combine with the base character.)

  239.   *

  240.   * Return value: If the conversion was successful, a newly allocated

  241.   *               nul-terminated string, which must be freed with

  242. @@ -770,7 +770,9 @@

  243.   * g_convert_with_fallback:

  244.   * @str:          the string to convert

  245.   * @len:          the length of the string, or -1 if the string is 

  246. - *                nul-terminated<footnoteref linkend="nul-unsafe"/>. 

  247. + *                 nul-terminated (Note that some encodings may allow nul

  248. + *                 bytes to occur inside strings. In that case, using -1

  249. + *                 for the @len parameter is unsafe)

  250.   * @to_codeset:   name of character set into which to convert @str

  251.   * @from_codeset: character set of @str.

  252.   * @fallback:     UTF-8 string to use in place of character not

  253. @@ -796,8 +798,15 @@

  254.   * to @to_codeset in their iconv() functions, 

  255.   * in which case GLib will simply return that approximate conversion.

  256.   *

  257. - * Note that you should use g_iconv() for streaming 

  258. - * conversions<footnoteref linkend="streaming-state"/>.

  259. + * Note that you should use g_iconv() for streaming conversions. 

  260. + * Despite the fact that @byes_read can return information about partial 

  261. + * characters, the g_convert_... functions are not generally suitable

  262. + * for streaming. If the underlying converter maintains internal state,

  263. + * then this won't be preserved across successive calls to g_convert(),

  264. + * g_convert_with_iconv() or g_convert_with_fallback(). (An example of

  265. + * this is the GNU C converter for CP1255 which does not emit a base

  266. + * character until it knows that the next character is not a mark that

  267. + * could combine with the base character.)

  268.   *

  269.   * Return value: If the conversion was successful, a newly allocated

  270.   *               nul-terminated string, which must be freed with

  271. @@ -1055,7 +1064,9 @@

  272.   * @opsysstring:   a string in the encoding of the current locale. On Windows

  273.   *                 this means the system codepage.

  274.   * @len:           the length of the string, or -1 if the string is

  275. - *                 nul-terminated<footnoteref linkend="nul-unsafe"/>. 

  276. + *                 nul-terminated (Note that some encodings may allow nul

  277. + *                 bytes to occur inside strings. In that case, using -1

  278. + *                 for the @len parameter is unsafe)

  279.   * @bytes_read:    location to store the number of bytes in the

  280.   *                 input string that were successfully converted, or %NULL.

  281.   *                 Even if the conversion was successful, this may be 

  282. @@ -1096,7 +1107,9 @@

  283.   * g_locale_from_utf8:

  284.   * @utf8string:    a UTF-8 encoded string 

  285.   * @len:           the length of the string, or -1 if the string is

  286. - *                 nul-terminated<footnoteref linkend="nul-unsafe"/>. 

  287. + *                 nul-terminated (Note that some encodings may allow nul

  288. + *                 bytes to occur inside strings. In that case, using -1

  289. + *                 for the @len parameter is unsafe)

  290.   * @bytes_read:    location to store the number of bytes in the

  291.   *                 input string that were successfully converted, or %NULL.

  292.   *                 Even if the conversion was successful, this may be 

  293. @@ -1308,7 +1321,9 @@

  294.   * g_filename_to_utf8:

  295.   * @opsysstring:   a string in the encoding for filenames

  296.   * @len:           the length of the string, or -1 if the string is

  297. - *                 nul-terminated<footnoteref linkend="nul-unsafe"/>. 

  298. + *                 nul-terminated (Note that some encodings may allow nul

  299. + *                 bytes to occur inside strings. In that case, using -1

  300. + *                 for the @len parameter is unsafe)

  301.   * @bytes_read:    location to store the number of bytes in the

  302.   *                 input string that were successfully converted, or %NULL.

  303.   *                 Even if the conversion was successful, this may be 

  304. diff -Nurd -x'*~' glib-2.22.4.orig/glib/gmacros.h glib-2.22.4/glib/gmacros.h

  305. --- glib-2.22.4.orig/glib/gmacros.h	2009-03-31 19:04:20.000000000 -0400

  306. +++ glib-2.22.4/glib/gmacros.h	2010-01-13 09:11:26.000000000 -0500

  307. @@ -120,7 +120,8 @@

  308.  #define G_GNUC_WARN_UNUSED_RESULT

  309.  #endif /* __GNUC__ */

  310.  

  311. -#ifndef G_DISABLE_DEPRECATED

  312. +#if 1

  313. +/* don't supress (if G_DISABLE_DEPRECATED) for fink yet */

  314.  /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with

  315.   * macros, so we can refer to them as strings unconditionally.

  316.   * usage not-recommended since gcc-3.0

  317. diff -Nurd -x'*~' glib-2.22.4.orig/glib/gmessages.h glib-2.22.4/glib/gmessages.h

  318. --- glib-2.22.4.orig/glib/gmessages.h	2009-08-28 22:52:23.000000000 -0400

  319. +++ glib-2.22.4/glib/gmessages.h	2010-01-13 09:11:36.000000000 -0500

  320. @@ -121,7 +121,8 @@

  321.                                 int             line,

  322.                                 const char     *func,

  323.                                 const char     *warnexpr);

  324. -#ifndef G_DISABLE_DEPRECATED

  325. +#if 1

  326. +/* don't supress (if G_DISABLE_DEPRECATED) for fink yet */

  327.  void g_assert_warning         (const char *log_domain,

  328.  			       const char *file,

  329.  			       const int   line,

  330. diff -Nurd -x'*~' glib-2.22.4.orig/glib/gslice.c glib-2.22.4/glib/gslice.c

  331. --- glib-2.22.4.orig/glib/gslice.c	2009-03-31 19:04:20.000000000 -0400

  332. +++ glib-2.22.4/glib/gslice.c	2010-01-13 09:06:27.000000000 -0500

  333. @@ -1131,19 +1131,18 @@

  334.                      gsize memsize)

  335.  {

  336.    gpointer aligned_memory = NULL;

  337. -  gint err = ENOMEM;

  338.  #if     HAVE_COMPLIANT_POSIX_MEMALIGN

  339. +  gint err;

  340.    err = posix_memalign (&aligned_memory, alignment, memsize);

  341. +  if (!aligned_memory)

  342. +    errno = err;

  343.  #elif   HAVE_MEMALIGN

  344. -  errno = 0;

  345.    aligned_memory = memalign (alignment, memsize);

  346. -  err = errno;

  347.  #elif   HAVE_VALLOC

  348. -  errno = 0;

  349.    aligned_memory = valloc (memsize);

  350. -  err = errno;

  351.  #else

  352.    /* simplistic non-freeing page allocator */

  353. +  gint err = ENOMEM;

  354.    mem_assert (alignment == sys_page_size);

  355.    mem_assert (memsize <= sys_page_size);

  356.    if (!compat_valloc_trash)

  357. @@ -1162,9 +1161,9 @@

  358.          }

  359.      }

  360.    aligned_memory = g_trash_stack_pop (&compat_valloc_trash);

  361. -#endif

  362.    if (!aligned_memory)

  363.      errno = err;

  364. +#endif

  365.    return aligned_memory;

  366.  }

  367.  

  368. diff -Nurd -x'*~' glib-2.22.4.orig/glib/gutils.c glib-2.22.4/glib/gutils.c

  369. --- glib-2.22.4.orig/glib/gutils.c	2009-12-21 09:20:17.000000000 -0500

  370. +++ glib-2.22.4/glib/gutils.c	2010-01-13 08:34:24.000000000 -0500

  371. @@ -2779,7 +2779,7 @@

  372.        gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");

  373.  

  374.        if (!data_dirs || !data_dirs[0])

  375. -          data_dirs = "/usr/local/share/:/usr/share/";

  376. +          data_dirs = "@PREFIX@/share:/usr/local/share/:/usr/share/";

  377.  

  378.        data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);

  379.  #endif

  380. @@ -2833,7 +2833,7 @@

  381.        conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");

  382.  

  383.        if (!conf_dirs || !conf_dirs[0])

  384. -          conf_dirs = "/etc/xdg";

  385. +          conf_dirs = "@PREFIX@/etc/xdg";

  386.  

  387.        conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);

  388.  #endif

  389. diff -Nurd -x'*~' glib-2.22.4.orig/glib/gutils.h glib-2.22.4/glib/gutils.h

  390. --- glib-2.22.4.orig/glib/gutils.h	2010-01-06 19:19:20.000000000 -0500

  391. +++ glib-2.22.4/glib/gutils.h	2010-01-13 08:33:50.000000000 -0500

  392. @@ -101,7 +101,11 @@

  393.  #  define G_INLINE_FUNC

  394.  #  undef  G_CAN_INLINE

  395.  #elif defined (__GNUC__) 

  396. +#if defined(__APPLE_CC__) && (__APPLE_CC__ >= 5400)

  397. +#  define G_INLINE_FUNC static inline

  398. +#else

  399.  #  define G_INLINE_FUNC static __inline __attribute__ ((unused))

  400. +#endif

  401.  #elif defined (G_CAN_INLINE) 

  402.  #  define G_INLINE_FUNC static inline

  403.  #else /* can't inline */

  404. diff -Nurd -x'*~' glib-2.22.4.orig/glib/libcharset/Makefile.in glib-2.22.4/glib/libcharset/Makefile.in

  405. --- glib-2.22.4.orig/glib/libcharset/Makefile.in	2010-01-06 19:48:38.000000000 -0500

  406. +++ glib-2.22.4/glib/libcharset/Makefile.in	2010-01-13 08:33:32.000000000 -0500

  407. @@ -310,7 +310,7 @@

  408.  	codeset.m4 update.sh make-patch.sh libcharset-glib.patch

  409.  TEST_PROGS = 

  410.  INCLUDES = \

  411. -	-DLIBDIR=\"$(libdir)\" -I$(top_srcdir)

  412. +	-DLIBDIR=\"$(sysconfdir)/glib-2.0\" -I$(top_srcdir)

  413.  

  414.  noinst_LTLIBRARIES = libcharset.la

  415.  libcharset_la_SOURCES = \

  416. @@ -318,8 +318,8 @@

  417.  	localcharset.h		\

  418.  	localcharset.c

  419.  

  420. -charset_alias = $(DESTDIR)$(libdir)/charset.alias

  421. -charset_tmp = $(DESTDIR)$(libdir)/charset.tmp

  422. +charset_alias = $(DESTDIR)$(sysconfdir)/glib-2.0/charset.alias

  423. +charset_tmp = $(DESTDIR)$(sysconfdir)/glib-2.0/charset.tmp

  424.  SUFFIXES = .sed .sin

  425.  CLEANFILES = charset.alias ref-add.sed ref-del.sed

  426.  all: all-am

  427. @@ -658,7 +658,7 @@

  428.  # run make test as part of make check

  429.  check-local: test

  430.  install-exec-local: all-local

  431. -	$(mkinstalldirs) $(DESTDIR)$(libdir)

  432. +	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/glib-2.0

  433.  	if test -f $(charset_alias); then \

  434.  	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \

  435.  	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \

  436. diff -Nurd -x'*~' glib-2.22.4.orig/glib/libcharset/charset.alias glib-2.22.4/glib/libcharset/charset.alias

  437. --- glib-2.22.4.orig/glib/libcharset/charset.alias	1969-12-31 19:00:00.000000000 -0500

  438. +++ glib-2.22.4/glib/libcharset/charset.alias	2010-01-13 08:32:49.000000000 -0500

  439. @@ -0,0 +1,111 @@

  440. +# This file contains a table of character encoding aliases,

  441. +# suitable for operating system 'darwin'.

  442. +C			ASCII

  443. +bg_BG			UTF-8

  444. +bg_BG.CP1251		CP1251

  445. +cs_CZ			UTF-8

  446. +cs_CZ.ISO8859-2		ISO-8859-2

  447. +da_DK			UTF-8

  448. +da_DK.ISO8859-1		ISO-8859-1

  449. +da_DK.ISO8859-15	ISO-8859-15

  450. +de_AT			UTF-8

  451. +de_AT.ISO8859-1		ISO-8859-1

  452. +de_AT.ISO8859-15	ISO-8859-15

  453. +de_CH			UTF-8

  454. +de_CH.ISO8859-1		ISO-8859-1

  455. +de_CH.ISO8859-15	ISO-8859-15

  456. +de_DE			UTF-8

  457. +de_DE.ISO8859-1		ISO-8859-1

  458. +de_DE.ISO8859-15	ISO-8859-15

  459. +en_AU			UTF-8

  460. +en_AU.ISO8859-1		ISO-8859-1

  461. +en_AU.ISO8859-15	ISO-8859-15

  462. +en_AU.US-ASCII		ASCII

  463. +en_CA			UTF-8

  464. +en_CA.ISO8859-1		ISO-8859-1

  465. +en_CA.ISO8859-15	ISO-8859-15

  466. +en_CA.US-ASCII		ASCII

  467. +en_GB			UTF-8

  468. +en_GB.ISO8859-1		ISO-8859-1

  469. +en_GB.ISO8859-15	ISO-8859-15

  470. +en_GB.US-ASCII		ASCII

  471. +en_US			UTF-8

  472. +en_US.ISO8859-1		ISO-8859-1

  473. +en_US.ISO8859-15	ISO-8859-15

  474. +en_US.US-ASCII		ASCII

  475. +es_ES			UTF-8

  476. +es_ES.ISO8859-1		ISO-8859-1

  477. +es_ES.ISO8859-15	ISO-8859-15

  478. +fi_FI			UTF-8

  479. +fi_FI.ISO8859-1		ISO-8859-1

  480. +fi_FI.ISO8859-15	ISO-8859-15

  481. +fr_BE			UTF-8

  482. +fr_BE.ISO8859-1		ISO-8859-1

  483. +fr_BE.ISO8859-15	ISO-8859-15

  484. +fr_CA			UTF-8

  485. +fr_CA.ISO8859-1		ISO-8859-1

  486. +fr_CA.ISO8859-15	ISO-8859-15

  487. +fr_CH			UTF-8

  488. +fr_CH.ISO8859-1		ISO-8859-1

  489. +fr_CH.ISO8859-15	ISO-8859-15

  490. +fr_FR			UTF-8

  491. +fr_FR.ISO8859-1		ISO-8859-1

  492. +fr_FR.ISO8859-15	ISO-8859-15

  493. +hr_HR			UTF-8

  494. +hr_HR.ISO8859-2		ISO-8859-2

  495. +hu_HU			UTF-8

  496. +hu_HU.ISO8859-2		ISO-8859-2

  497. +is_IS			UTF-8

  498. +is_IS.ISO8859-1		ISO-8859-1

  499. +is_IS.ISO8859-15	ISO-8859-15

  500. +it_CH			UTF-8

  501. +it_CH.ISO8859-1		ISO-8859-1

  502. +it_CH.ISO8859-15	ISO-8859-15

  503. +it_IT			UTF-8

  504. +it_IT.ISO8859-1		ISO-8859-1

  505. +it_IT.ISO8859-15	ISO-8859-15

  506. +ja_JP			UTF-8

  507. +ja_JP.EUC		EUC-JP

  508. +ja_JP.SJIS		SHIFT_JIS

  509. +ko_KR			UTF-8

  510. +ko_KR.EUC		EUC-KR

  511. +la_LN			UTF-8

  512. +la_LN.ISO8859-1		ISO-8859-1

  513. +la_LN.ISO8859-2		ISO-8859-2

  514. +la_LN.ISO8859-4		ISO-8859-4

  515. +la_LN.ISO8859-15	ISO-8859-15

  516. +la_LN.US-ASCII		ASCII

  517. +lt_LT			UTF-8

  518. +lt_LT.ISO8859-4		ISO-8859-4

  519. +nl_BE			UTF-8

  520. +nl_BE.ISO8869-1		ISO-8859-1

  521. +nl_BE.ISO8869-15	ISO-8859-15

  522. +nl_NL			UTF-8

  523. +nl_NL.ISO8869-1		ISO-8859-1

  524. +nl_NL.ISO8869-15	ISO-8859-15

  525. +no_NO			UTF-8

  526. +no_NO.ISO8869-1		ISO-8859-1

  527. +no_NO.ISO8869-15	ISO-8859-15

  528. +pl_PL			UTF-8

  529. +pl_PL.ISO8859-2		ISO-8859-2

  530. +pt_PT			UTF-8

  531. +pt_PT.ISO8859-1		ISO-8859-1

  532. +pt_PT.ISO8859-15	ISO-8859-15

  533. +ru_RU			UTF-8

  534. +ru_RU.CP866		CP866

  535. +ru_RU.ISO8859-5		ISO-8859-5

  536. +ru_RU.KOI8-R		KOI8-R

  537. +ru_RU.cp1251		CP1251

  538. +ru_RU.koi8r		KOI8-R

  539. +sl_SI			UTF-8

  540. +sl_SI.ISO8859-2		ISO-8859-2

  541. +sv_SE			UTF-8

  542. +sv_SE.ISO8859-1		ISO-8859-1

  543. +sv_SE.ISO8859-15	ISO-8859-15

  544. +uk_UA			UTF-8

  545. +uk_UA.KOI8-U		KOI8-U

  546. +uk_UA.cp1251		CP1251

  547. +zh_CN			UTF-8

  548. +zh_CN.EUC		GB2312

  549. +zh_TW			UTF-8

  550. +zh_TW.Big5		BIG5

  551. diff -Nurd -x'*~' glib-2.22.4.orig/glib-gettextize.in glib-2.22.4/glib-gettextize.in

  552. --- glib-2.22.4.orig/glib-gettextize.in	2009-03-31 19:04:20.000000000 -0400

  553. +++ glib-2.22.4/glib-gettextize.in	2010-01-13 08:31:30.000000000 -0500

  554. @@ -49,8 +49,8 @@

  555.      ;;

  556.  esac

  557.  

  558. -datadir=@datadir@

  559.  datarootdir=@datarootdir@

  560. +datadir=@datadir@

  561.  

  562.  gettext_dir=$prefix/share/glib-2.0/gettext

  563.  

  564. diff -Nurd -x'*~' glib-2.22.4.orig/tests/child-test.c glib-2.22.4/tests/child-test.c

  565. --- glib-2.22.4.orig/tests/child-test.c	2009-03-31 19:04:20.000000000 -0400

  566. +++ glib-2.22.4/tests/child-test.c	2010-01-13 08:30:21.000000000 -0500

  567. @@ -175,7 +175,7 @@

  568.  #ifdef G_OS_WIN32

  569.    system ("ipconfig /all");

  570.  #else

  571. -  system ("/bin/true");

  572. +  system ("/usr/bin/true");

  573.  #endif

  574.  

  575.    alive = 2;