FreeBSD Bugzilla – Attachment 147617 Details for
Bug 193625
www/webkit-gtk3: Update to 2.4.4, Make NLS and HTML docs conditional for multiple ports
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
devel/glib20
glib20.svndif (text/plain), 48.37 KB, created by
Anonymized Account
on 2014-09-23 19:46:25 UTC
(
hide
)
Description:
devel/glib20
Filename:
MIME Type:
Creator:
Anonymized Account
Created:
2014-09-23 19:46:25 UTC
Size:
48.37 KB
patch
obsolete
>Index: devel/glib20/Makefile >=================================================================== >--- devel/glib20/Makefile (revision 368159) >+++ devel/glib20/Makefile (working copy) >@@ -3,8 +3,7 @@ > # $MCom: ports/trunk/devel/glib20/Makefile 18634 2013-07-26 10:42:35Z kwm $ > > PORTNAME= glib >-PORTVERSION= 2.36.3 >-PORTREVISION= 4 >+PORTVERSION= 2.40.0 > CATEGORIES= devel > MASTER_SITES= GNOME > DIST_SUBDIR= gnome2 >@@ -14,22 +13,25 @@ > > LICENSE= LGPL20 > >-USES= tar:xz > PORTSCOUT= limitw:1,even > >+USES= tar:xz >+ > .if !defined(REFERENCE_PORT) > > LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \ > libffi.so:${PORTSDIR}/devel/libffi > >-GNU_CONFIGURE= yes > USE_LDCONFIG= yes > # iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo) > # (wchar_t is used by glibmm, rawtherapee triggered this) >-USES+= gettext gmake iconv:wchar_t libtool pathfix perl5 \ >- pkgconfig python shebangfix >-USE_PYTHON= py3kplist >-CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ >+USES+= gettext gmake iconv:wchar_t libtool:keepla pathfix pkgconfig shebangfix perl5 >+USE_GNOME= ltverhack >+USE_PYTHON= yes >+PYTHON_PY3K_PLIST_HACK= yes >+GNU_CONFIGURE= yes >+CONFIGURE_ARGS= --enable-static \ >+ --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \ > --disable-man --without-xml-catalog \ > --enable-static \ > --with-pcre=system \ >@@ -41,10 +43,8 @@ > > SHEBANG_FILES= */*.pl glib/gen-iswide-table.py > >-LIBVERSION= 0.3600.3 >-PLIST_SUB+= LIBVERSION=${LIBVERSION} >- >-OPTIONS_DEFINE= COLLATION_FIX DEBUG >+OPTIONS_DEFINE= BASH_COMPLETIONS COLLATION_FIX DEBUG NLS >+BASH_COMPLETIONS_DESC= Install bash completions > COLLATION_FIX_DESC= fix string collation > > .include <bsd.port.pre.mk> >@@ -78,6 +78,12 @@ > .endif > CONFIGURE_TARGET=${GLIB_ARCH}-portbld-freebsd${OSREL} > >+.if ${PORT_OPTIONS:MBASH_COMPLETIONS} >+PLIST_SUB+= BASH_COMPLETIONS="" >+.else >+PLIST_SUB+= BASH_COMPLETIONS="@comment " >+.endif >+ > .if ${PORT_OPTIONS:MCOLLATION_FIX} > LIB_DEPENDS+= libicui18n.so:${PORTSDIR}/devel/icu > EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ >@@ -94,6 +100,13 @@ > CONFIGURE_ARGS+= --disable-modular-tests > .endif > >+NLS_CONFIGURE_ENABLE= nls >+.if ${PORT_OPTIONS:MNLS} >+PLIST_SUB+= NLS="" >+.else >+PLIST_SUB+= NLS="@comment " >+.endif >+ > post-patch: > @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ > s|/usr/share/locale/locale|${LOCALBASE}/share/locale/locale|g' \ >Index: devel/glib20/distinfo >=================================================================== >--- devel/glib20/distinfo (revision 368159) >+++ devel/glib20/distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (gnome2/glib-2.36.3.tar.xz) = 5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e >-SIZE (gnome2/glib-2.36.3.tar.xz) = 6626972 >+SHA256 (gnome2/glib-2.40.0.tar.xz) = 0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5 >+SIZE (gnome2/glib-2.40.0.tar.xz) = 7016228 >Index: devel/glib20/files/extra-arch-powerpc64 >=================================================================== >--- devel/glib20/files/extra-arch-powerpc64 (revision 368159) >+++ devel/glib20/files/extra-arch-powerpc64 (working copy) >@@ -1,7 +1,6 @@ >- >---- gio/glib-compile-schemas.c.orig 2010-11-24 21:32:15.000000000 +0100 >-+++ gio/glib-compile-schemas.c 2010-11-24 21:33:42.000000000 +0100 >-@@ -1458,7 +1458,7 @@ >+--- gio/glib-compile-schemas.c.orig 2014-02-03 23:40:41.000000000 +0600 >++++ gio/glib-compile-schemas.c >+@@ -1528,7 +1528,7 @@ > } > /* Text {{{2 */ > static void >@@ -10,7 +9,7 @@ > const gchar *text, > gsize text_len, > gpointer user_data, >-@@ -1590,7 +1590,7 @@ >+@@ -1693,7 +1693,7 @@ > parse_gschema_files (gchar **files, > gboolean strict) > { >@@ -19,5 +18,3 @@ > ParseState state = { 0, }; > const gchar *filename; > GError *error = NULL; >- >- >Index: devel/glib20/files/extra-patch-glib_Makefile.in >=================================================================== >--- devel/glib20/files/extra-patch-glib_Makefile.in (revision 368159) >+++ devel/glib20/files/extra-patch-glib_Makefile.in (working copy) >@@ -1,6 +1,6 @@ >---- glib/Makefile.in.orig 2012-09-27 15:07:28.000000000 +0000 >-+++ glib/Makefile.in 2012-09-27 15:08:02.000000000 +0000 >-@@ -415,7 +415,7 @@ >+--- glib/Makefile.in.orig 2014-08-04 23:54:37.000000000 +0600 >++++ glib/Makefile.in >+@@ -706,7 +706,7 @@ > INSTOBJEXT = @INSTOBJEXT@ > INTLLIBS = @INTLLIBS@ > LD = @LD@ >Index: devel/glib20/files/extra-patch-glib_gunicollate.c >=================================================================== >--- devel/glib20/files/extra-patch-glib_gunicollate.c (revision 368159) >+++ devel/glib20/files/extra-patch-glib_gunicollate.c (working copy) >@@ -1,6 +1,6 @@ >---- glib/gunicollate.c.orig 2012-11-24 20:50:39.000000000 +0000 >-+++ glib/gunicollate.c 2013-03-08 12:16:59.000000000 +0000 >-@@ -26,6 +26,10 @@ >+--- glib/gunicollate.c.orig 2014-02-22 21:29:07.000000000 +0600 >++++ glib/gunicollate.c >+@@ -25,6 +25,10 @@ > #include <wchar.h> > #endif > >@@ -11,7 +11,7 @@ > #ifdef HAVE_CARBON > #include <CoreServices/CoreServices.h> > #endif >-@@ -36,11 +40,54 @@ >+@@ -35,11 +39,54 @@ > #include "gstring.h" > #include "gstrfuncs.h" > #include "gtestutils.h" >@@ -66,7 +66,7 @@ > > #ifdef _MSC_VER > /* Workaround for bug in MSVCR80.DLL */ >-@@ -128,6 +175,28 @@ >+@@ -110,6 +157,28 @@ > g_return_val_if_fail (str1 != NULL, 0); > g_return_val_if_fail (str2 != NULL, 0); > >@@ -76,26 +76,26 @@ > + int32_t wstr1_len; > + UChar *wstr1 = utf8_to_uchar(str1, -1, &wstr1_len); > + if (wstr1 != NULL) >-+ { >-+ int32_t wstr2_len; >-+ UChar *wstr2 = utf8_to_uchar(str2, -1, &wstr2_len); >-+ if (wstr2 != NULL) >-+ { >-+ result = ucol_strcoll(icu_collator, wstr1, wstr1_len, wstr2, wstr2_len); >++ { >++ int32_t wstr2_len; >++ UChar *wstr2 = utf8_to_uchar(str2, -1, &wstr2_len); >++ if (wstr2 != NULL) >++ { >++ result = ucol_strcoll(icu_collator, wstr1, wstr1_len, wstr2, wstr2_len); > + >-+ g_free(wstr1); >-+ g_free(wstr2); >++ g_free(wstr1); >++ g_free(wstr2); > + >-+ return result; >-+ } >-+ g_free(wstr1); >-+ } >++ return result; >++ } >++ g_free(wstr1); >++ } > + } > + >- str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE); >- str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE); >+ str1_norm = _g_utf8_normalize_wc (str1, -1, G_NORMALIZE_ALL_COMPOSE); >+ str2_norm = _g_utf8_normalize_wc (str2, -1, G_NORMALIZE_ALL_COMPOSE); > >-@@ -419,6 +488,26 @@ >+@@ -417,6 +486,26 @@ > > g_return_val_if_fail (str != NULL, NULL); > >@@ -105,18 +105,18 @@ > + int32_t wstr_len; > + UChar *wstr = utf8_to_uchar(str, len, &wstr_len); > + if (wstr != NULL) >-+ { >-+ int32_t result_len; >++ { >++ int32_t result_len; > + >-+ /* get size of result */ >-+ result_len = ucol_getSortKey(icu_collator, wstr, wstr_len, NULL, 0); >++ /* get size of result */ >++ result_len = ucol_getSortKey(icu_collator, wstr, wstr_len, NULL, 0); > + >-+ result = g_new(char, result_len); >-+ ucol_getSortKey(icu_collator, wstr, wstr_len, result, result_len); >-+ g_free(wstr); >++ result = g_new(char, result_len); >++ ucol_getSortKey(icu_collator, wstr, wstr_len, result, result_len); >++ g_free(wstr); > + >-+ return result; >-+ } >++ return result; >++ } > + } > + > str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE); >Index: devel/glib20/files/patch-configure >=================================================================== >--- devel/glib20/files/patch-configure (revision 368159) >+++ devel/glib20/files/patch-configure (working copy) >@@ -1,16 +1,6 @@ >---- configure.orig 2013-08-29 23:29:13.255661322 +0200 >-+++ configure 2013-08-29 23:48:08.845647995 +0200 >-@@ -603,6 +603,9 @@ >- #ifdef HAVE_SYS_TYPES_H >- # include <sys/types.h> >- #endif >-+#ifdef HAVE_SYS_PARAM_H >-+# include <sys/param.h> >-+#endif >- #ifdef HAVE_SYS_STAT_H >- # include <sys/stat.h> >- #endif >-@@ -5778,7 +5781,7 @@ >+--- configure.orig 2014-08-03 18:25:47.000000000 +0600 >++++ configure 2014-08-03 18:27:38.000000000 +0600 >+@@ -5968,7 +5968,7 @@ > fi > > GLIB_RUNTIME_LIBDIR="$with_runtime_libdir" >@@ -19,7 +9,7 @@ > > > if test "x$with_runtime_libdir" != "x"; then >-@@ -7444,13 +7447,12 @@ >+@@ -7634,13 +7634,12 @@ > > ;; > native) >@@ -35,7 +25,7 @@ > cat confdefs.h - <<_ACEOF >conftest.$ac_ext > /* end confdefs.h. */ > >-@@ -8648,6 +8650,7 @@ >+@@ -8675,6 +8674,7 @@ > ;; > native) > >@@ -43,19 +33,10 @@ > $as_echo "#define USE_LIBICONV_NATIVE 1" >>confdefs.h > > ;; >-@@ -23201,7 +23204,7 @@ >- fi >- done >- >--for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid >-+for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid sysctlbyname >- do : >- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` >- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" >-@@ -26741,10 +26744,10 @@ >- # b) FreeBSD doesn't do this either. >- # >- case $host in >+@@ -26738,10 +26738,10 @@ >+ *android*) >+ G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" >+ ;; > - *-*-freebsd*|*-*-linux*) > + *-*-linux*) > G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`" >Index: devel/glib20/files/patch-doc_reference_Makefile.in >=================================================================== >--- devel/glib20/files/patch-doc_reference_Makefile.in (revision 368159) >+++ devel/glib20/files/patch-doc_reference_Makefile.in (working copy) >@@ -1,9 +1,9 @@ >---- docs/reference/Makefile.in.orig 2007-12-21 16:54:10.000000000 -0500 >-+++ docs/reference/Makefile.in 2007-12-21 16:54:40.000000000 -0500 >-@@ -268,7 +268,7 @@ GTESTER_REPORT = $(top_builddir)/glib/gt >- # initialize variables for unconditional += appending >- EXTRA_DIST = >- TEST_PROGS = >+--- docs/reference/Makefile.in.orig 2014-08-18 16:59:37.000000000 +0600 >++++ docs/reference/Makefile.in 2014-08-18 16:59:37.000000000 +0600 >+@@ -424,7 +424,7 @@ >+ top_build_prefix = @top_build_prefix@ >+ top_builddir = @top_builddir@ >+ top_srcdir = @top_srcdir@ > -SUBDIRS = glib gobject gio > +SUBDIRS = #glib gobject gio > all: all-recursive >Index: devel/glib20/files/patch-gio_fam_Makefile.in >=================================================================== >--- devel/glib20/files/patch-gio_fam_Makefile.in (revision 368159) >+++ devel/glib20/files/patch-gio_fam_Makefile.in (working copy) >@@ -1,8 +1,8 @@ >---- gio/fam/Makefile.in.orig 2012-03-07 21:07:42.000000000 +0100 >-+++ gio/fam/Makefile.in 2012-03-07 21:08:30.000000000 +0100 >-@@ -87,9 +87,7 @@ >- am__installdirs = "$(DESTDIR)$(giomoduledir)" >- LTLIBRARIES = $(giomodule_LTLIBRARIES) >+--- gio/fam/Makefile.in.orig 2014-03-25 00:54:27.000000000 +0600 >++++ gio/fam/Makefile.in >+@@ -175,9 +175,7 @@ >+ LTLIBRARIES = $(giomodule_LTLIBRARIES) $(installed_test_LTLIBRARIES) \ >+ $(noinst_LTLIBRARIES) > am__DEPENDENCIES_1 = > -libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \ > - $(top_builddir)/gobject/libgobject-2.0.la \ >@@ -11,7 +11,7 @@ > $(am__DEPENDENCIES_1) > am__objects_1 = > am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \ >-@@ -402,9 +400,9 @@ >+@@ -793,9 +791,9 @@ > > libgiofam_la_LDFLAGS = $(module_flags) > libgiofam_la_LIBADD = \ >@@ -24,12 +24,12 @@ > $(GLIB_LIBS) \ > $(FAM_LIBS) \ > $(NULL) >-@@ -843,7 +841,7 @@ >+@@ -1587,7 +1585,7 @@ > > install-data-hook: > if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \ > - $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ >-+ gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ >++ gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \ > fi > > uninstall-local: >Index: devel/glib20/files/patch-gio_glib-compile-schemas.c >=================================================================== >--- devel/glib20/files/patch-gio_glib-compile-schemas.c (revision 368159) >+++ devel/glib20/files/patch-gio_glib-compile-schemas.c (working copy) >@@ -1,6 +1,6 @@ >---- gio/glib-compile-schemas.c.orig 2012-06-14 16:39:22.000000000 +0200 >-+++ gio/glib-compile-schemas.c 2012-06-14 16:39:55.000000000 +0200 >-@@ -1204,11 +1204,13 @@ >+--- gio/glib-compile-schemas.c.orig 2014-02-03 23:40:41.000000000 +0600 >++++ gio/glib-compile-schemas.c >+@@ -1202,11 +1202,13 @@ > return; > } > >Index: devel/glib20/files/patch-gio_gunixmount.c >=================================================================== >--- devel/glib20/files/patch-gio_gunixmount.c (revision 368159) >+++ devel/glib20/files/patch-gio_gunixmount.c (working copy) >@@ -1,6 +1,6 @@ >---- gio/gunixmount.c.orig 2011-08-31 19:47:35.000000000 +0200 >-+++ gio/gunixmount.c 2011-09-15 17:50:24.000000000 +0200 >-@@ -449,12 +449,18 @@ g_unix_mount_eject (GMount * >+--- gio/gunixmount.c.orig 2014-03-20 09:50:45.000000000 +0600 >++++ gio/gunixmount.c >+@@ -353,12 +353,18 @@ g_unix_mount_eject (GMount * > gpointer user_data) > { > GUnixMount *unix_mount = G_UNIX_MOUNT (mount); >Index: devel/glib20/files/patch-gio_gunixmounts.c >=================================================================== >--- devel/glib20/files/patch-gio_gunixmounts.c (revision 368159) >+++ devel/glib20/files/patch-gio_gunixmounts.c (working copy) >@@ -1,6 +1,6 @@ >---- gio/gunixmounts.c.orig 2013-06-09 18:03:17.000000000 -0400 >-+++ gio/gunixmounts.c 2013-12-14 11:45:36.749181267 -0500 >-@@ -155,6 +155,9 @@ struct _GUnixMountMonitor { >+--- gio/gunixmounts.c.orig 2014-02-13 02:08:36.000000000 +0600 >++++ gio/gunixmounts.c >+@@ -150,6 +150,9 @@ struct _GUnixMountMonitor { > GFileMonitor *fstab_monitor; > GFileMonitor *mtab_monitor; > >@@ -10,7 +10,7 @@ > GSource *proc_mounts_watch_source; > }; > >-@@ -167,6 +170,8 @@ static GUnixMountMonitor *the_mount_moni >+@@ -162,6 +165,8 @@ static GUnixMountMonitor *the_mount_moni > static GList *_g_get_unix_mounts (void); > static GList *_g_get_unix_mount_points (void); > >@@ -19,7 +19,7 @@ > G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT); > > #define MOUNT_POLL_INTERVAL 4000 >-@@ -193,6 +198,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix >+@@ -188,6 +193,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix > #endif > > #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) >@@ -27,48 +27,7 @@ > #include <sys/ucred.h> > #include <sys/mount.h> > #include <fstab.h> >-@@ -243,22 +249,29 @@ g_unix_is_mount_path_system_internal (co >- "/", /* we already have "Filesystem root" in Nautilus */ >- "/bin", >- "/boot", >-+ "/compat/linux/proc", >-+ "/compat/linux/sys", >- "/dev", >- "/etc", >- "/home", >- "/lib", >- "/lib64", >-+ "/libexec", >- "/live/cow", >- "/live/image", >- "/media", >- "/mnt", >- "/opt", >-+ "/rescue", >- "/root", >- "/sbin", >- "/srv", >- "/tmp", >- "/usr", >- "/usr/local", >-+ "/usr/obj", >-+ "/usr/ports", >-+ "/usr/src", >- "/var", >- "/var/crash", >- "/var/local", >-@@ -299,8 +312,10 @@ guess_system_internal (const char *mount >- "devfs", >- "devpts", >- "ecryptfs", >-+ "fdescfs", >- "kernfs", >- "linprocfs", >-+ "nullfs", >- "proc", >- "procfs", >- "ptyfs", >-@@ -1126,6 +1141,10 @@ get_mounts_timestamp (void) >+@@ -1134,6 +1140,10 @@ get_mounts_timestamp (void) > if (stat (monitor_file, &buf) == 0) > return (guint64)buf.st_mtime; > } >@@ -79,7 +38,7 @@ > return 0; > } > >-@@ -1271,6 +1290,13 @@ g_unix_mount_monitor_finalize (GObject * >+@@ -1279,6 +1289,14 @@ g_unix_mount_monitor_finalize (GObject * > g_object_unref (monitor->mtab_monitor); > } > >@@ -90,10 +49,11 @@ > + g_list_free (monitor->mount_poller_mounts); > + } > + >++ > the_mount_monitor = NULL; > > G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object); >-@@ -1352,6 +1378,52 @@ mtab_file_changed (GFileMonitor *mo >+@@ -1360,6 +1378,52 @@ mtab_file_changed (GFileMonitor *mo > } > > static gboolean >@@ -146,7 +106,7 @@ > proc_mounts_changed (GIOChannel *channel, > GIOCondition cond, > gpointer user_data) >-@@ -1416,6 +1488,12 @@ g_unix_mount_monitor_init (GUnixMountMon >+@@ -1424,6 +1488,12 @@ g_unix_mount_monitor_init (GUnixMountMon > g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor); > } > } >Index: devel/glib20/files/patch-gio_gunixvolume.c >=================================================================== >--- devel/glib20/files/patch-gio_gunixvolume.c (revision 368159) >+++ devel/glib20/files/patch-gio_gunixvolume.c (working copy) >@@ -1,6 +1,6 @@ >---- gio/gunixvolume.c.orig 2009-11-30 04:35:27.000000000 +0100 >-+++ gio/gunixvolume.c 2009-12-08 19:32:03.000000000 +0100 >-@@ -465,9 +465,14 @@ g_unix_volume_eject (GVolume >+--- gio/gunixvolume.c.orig 2014-03-20 09:50:45.000000000 +0600 >++++ gio/gunixvolume.c >+@@ -356,9 +356,14 @@ g_unix_volume_eject (GVolume > gpointer user_data) > { > GUnixVolume *unix_volume = G_UNIX_VOLUME (volume); >@@ -8,7 +8,7 @@ > + char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL}; > + argv[2] = unix_volume->device_path; > +#else >- char *argv[] = { "eject", NULL, NULL }; >+ const gchar *argv[] = { "eject", NULL, NULL }; > > argv[1] = unix_volume->device_path; > +#endif >Index: devel/glib20/files/patch-gio_tests_gdbus-peer.c >=================================================================== >--- devel/glib20/files/patch-gio_tests_gdbus-peer.c (revision 368159) >+++ devel/glib20/files/patch-gio_tests_gdbus-peer.c (working copy) >@@ -1,11 +0,0 @@ >---- gio/tests/gdbus-peer.c.orig 2010-08-16 21:30:03.000000000 +0200 >-+++ gio/tests/gdbus-peer.c 2010-08-16 23:13:32.000000000 +0200 >-@@ -42,6 +42,8 @@ >- #include <sys/socket.h> >- #endif >- >-+#include <sys/socket.h> >-+ >- /* used in test_overflow */ >- #ifdef G_OS_UNIX >- #include <gio/gunixconnection.h> >Index: devel/glib20/files/patch-gio_tests_include.c >=================================================================== >--- devel/glib20/files/patch-gio_tests_include.c (revision 368159) >+++ devel/glib20/files/patch-gio_tests_include.c (working copy) >@@ -1,7 +1,7 @@ >---- glib/tests/include.c.orig 2012-03-06 12:11:39.000000000 +0100 >-+++ glib/tests/include.c 2012-03-06 12:13:17.000000000 +0100 >+--- glib/tests/include.c.orig 2014-01-07 01:02:48.000000000 +0600 >++++ glib/tests/include.c > @@ -3,6 +3,7 @@ >- #define _POSIX_C_SOURCE 0 >+ #define _POSIX_C_SOURCE 199309L > #undef _GNU_SOURCE > #undef _XOPEN_SOURCE > +#include <sys/types.h> >Index: devel/glib20/files/patch-gio_xdgmime_xdgmime.c >=================================================================== >--- devel/glib20/files/patch-gio_xdgmime_xdgmime.c (revision 368159) >+++ devel/glib20/files/patch-gio_xdgmime_xdgmime.c (working copy) >@@ -1,6 +1,6 @@ >---- gio/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004 >-+++ gio/xdgmime/xdgmime.c Sat Nov 13 10:27:22 2004 >-@@ -204,7 +204,7 @@ >+--- gio/xdgmime/xdgmime.c.orig 2014-02-03 23:40:41.000000000 +0600 >++++ gio/xdgmime/xdgmime.c 2014-08-03 16:57:53.000000000 +0600 >+@@ -255,7 +255,7 @@ > > xdg_data_dirs = getenv ("XDG_DATA_DIRS"); > if (xdg_data_dirs == NULL) >Index: devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h >=================================================================== >--- devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h (revision 368159) >+++ devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h (working copy) >@@ -1,6 +1,6 @@ >---- gio/xdgmime/xdgmimecache.h.orig 2008-06-12 10:25:40.000000000 -0400 >-+++ gio/xdgmime/xdgmimecache.h 2008-06-14 00:49:59.000000000 -0400 >-@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach >+--- gio/xdgmime/xdgmimecache.h.orig 2014-02-03 23:40:41.000000000 +0600 >++++ gio/xdgmime/xdgmimecache.h >+@@ -44,6 +44,9 @@ > #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) > #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) > #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) >Index: devel/glib20/files/patch-glib-2.0.pc.in >=================================================================== >--- devel/glib20/files/patch-glib-2.0.pc.in (revision 368159) >+++ devel/glib20/files/patch-glib-2.0.pc.in (working copy) >@@ -1,5 +1,5 @@ >---- glib-2.0.pc.in.orig 2012-01-16 04:12:06.000000000 +0100 >-+++ glib-2.0.pc.in 2012-03-06 12:30:11.000000000 +0100 >+--- glib-2.0.pc.in.orig 2014-03-20 09:51:57.000000000 +0600 >++++ glib-2.0.pc.in > @@ -13,4 +13,4 @@ > Requires.private: @PCRE_REQUIRES@ > Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ >Index: devel/glib20/files/patch-glib_Makefile.in >=================================================================== >--- devel/glib20/files/patch-glib_Makefile.in (revision 368159) >+++ devel/glib20/files/patch-glib_Makefile.in (working copy) >@@ -1,24 +1,24 @@ >---- glib/Makefile.in.orig 2012-09-24 01:59:13.000000000 +0000 >-+++ glib/Makefile.in 2012-09-24 02:02:07.000000000 +0000 >-@@ -585,7 +585,7 @@ >- # >- DISTCLEANFILES = glibconfig-stamp glibconfig.h >- CLEANFILES = libglib-gdb.py glib-public-headers.txt $(am__append_6) >+--- glib/Makefile.in.orig 2014-08-03 16:57:28.000000000 +0600 >++++ glib/Makefile.in >+@@ -963,7 +963,7 @@ >+ @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts) >+ >+ @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test) > -configexecincludedir = $(libdir)/glib-2.0/include > +configexecincludedir = $(includedir)/glib-2.0 > nodist_configexecinclude_HEADERS = glibconfig.h > @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib > @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la >-@@ -1617,7 +1617,7 @@ >+@@ -2834,7 +2834,7 @@ > info-am: > > install-data-am: install-data-local install-deprecatedincludeHEADERS \ > - install-dist_gdbSCRIPTS install-glibincludeHEADERS \ > + install-glibincludeHEADERS \ >- install-glibsubincludeHEADERS install-tapsetDATA >- @$(NORMAL_INSTALL) >- $(MAKE) $(AM_MAKEFLAGS) install-data-hook >-@@ -1906,9 +1906,7 @@ >+ install-glibsubincludeHEADERS \ >+ install-installed_testLTLIBRARIES \ >+ install-installed_testPROGRAMS install-installed_testSCRIPTS \ >+@@ -3083,9 +3083,7 @@ > libglib-gdb.py: libglib-gdb.py.in > $(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py > >Index: devel/glib20/files/patch-glib__libcharset__Makefile.in >=================================================================== >--- devel/glib20/files/patch-glib__libcharset__Makefile.in (revision 368159) >+++ devel/glib20/files/patch-glib__libcharset__Makefile.in (working copy) >@@ -1,6 +1,6 @@ >---- glib/libcharset/Makefile.in.orig 2010-08-08 12:46:01.000000000 +0200 >-+++ glib/libcharset/Makefile.in 2010-08-08 12:46:01.000000000 +0200 >-@@ -566,7 +566,7 @@ install-dvi: install-dvi-am >+--- glib/libcharset/Makefile.in.orig 2014-08-03 16:57:28.000000000 +0600 >++++ glib/libcharset/Makefile.in >+@@ -1384,7 +1384,7 @@ > > install-dvi-am: > >Index: devel/glib20/files/patch-glib_deprecated_gthread.h >=================================================================== >--- devel/glib20/files/patch-glib_deprecated_gthread.h (revision 368159) >+++ devel/glib20/files/patch-glib_deprecated_gthread.h (working copy) >@@ -1,10 +0,0 @@ >---- ./glib/deprecated/gthread.h.orig 2012-05-27 17:07:04.000000000 +0200 >-+++ ./glib/deprecated/gthread.h 2012-05-27 17:07:19.000000000 +0200 >-@@ -120,6 +120,7 @@ >- gpointer user_data); >- >- #ifndef G_OS_WIN32 >-+#include <sys/types.h> >- #include <pthread.h> >- #endif >- >Index: devel/glib20/files/patch-glib_fix_hidden >=================================================================== >--- devel/glib20/files/patch-glib_fix_hidden (revision 368159) >+++ devel/glib20/files/patch-glib_fix_hidden (working copy) >@@ -1,6 +1,6 @@ >---- glib/gmem.c.orig 2011-02-10 00:31:42.000000000 +0100 >-+++ glib/gmem.c 2011-12-07 00:21:38.000000000 +0100 >-@@ -39,6 +39,7 @@ >+--- glib/gmem.c.orig 2014-02-22 21:29:07.000000000 +0600 >++++ glib/gmem.c >+@@ -38,6 +38,7 @@ > #include "gbacktrace.h" > #include "gtestutils.h" > #include "gthread.h" >@@ -7,4 +7,4 @@ > +#include "gthreadprivate.h" > #include "glib_trace.h" > >- >+ #define MEM_PROFILE_TABLE_SIZE 4096 >Index: devel/glib20/files/patch-glib_gconvert.c >=================================================================== >--- devel/glib20/files/patch-glib_gconvert.c (revision 368159) >+++ devel/glib20/files/patch-glib_gconvert.c (working copy) >@@ -1,9 +1,9 @@ > Work around our situation of having both libiconv in libc and libiconv from > ports installed. > >---- glib/gconvert.c.orig 2014-02-08 10:15:50.000000000 +0100 >-+++ glib/gconvert.c 2014-02-08 10:16:52.000000000 +0100 >-@@ -62,7 +62,7 @@ >+--- glib/gconvert.c.orig 2014-02-22 21:29:07.000000000 +0600 >++++ glib/gconvert.c >+@@ -55,7 +55,7 @@ > #error GNU libiconv in use but included iconv.h not from libiconv > #endif > #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) \ >Index: devel/glib20/files/patch-glib_gmain.c >=================================================================== >--- devel/glib20/files/patch-glib_gmain.c (revision 368159) >+++ devel/glib20/files/patch-glib_gmain.c (working copy) >@@ -1,38 +0,0 @@ >-From 0513c855cba69b96e4c9d2200719249a8a0c586e Mon Sep 17 00:00:00 2001 >-From: Dan Winship <danw@gnome.org> >-Date: Wed, 10 Apr 2013 11:39:12 -0400 >-Subject: [PATCH] gmain: fix double-unlock in g_main_context_unref() >- >-When unreffing a context with sources still attached, it would end up >-unlocking an already-unlocked context, causing crashes on platforms >-that (unlike Linux) actually check for that. >- >-https://bugzilla.gnome.org/show_bug.cgi?id=697595 >---- >- glib/gmain.c | 6 +++++- >- 1 file changed, 5 insertions(+), 1 deletion(-) >- >-diff --git a/glib/gmain.c b/glib/gmain.c >-index 68a7f8e..d6037ba 100644 >---- glib/gmain.c >-+++ glib/gmain.c >-@@ -520,12 +520,16 @@ g_main_context_unref (GMainContext *context) >- main_context_list = g_slist_remove (main_context_list, context); >- G_UNLOCK (main_context_list); >- >-+ /* g_source_iter_next() assumes the context is locked. */ >-+ LOCK_CONTEXT (context); >- g_source_iter_init (&iter, context, TRUE); >- while (g_source_iter_next (&iter, &source)) >- { >- source->context = NULL; >-- g_source_destroy_internal (source, context, FALSE); >-+ g_source_destroy_internal (source, context, TRUE); >- } >-+ UNLOCK_CONTEXT (context); >-+ >- for (sl_iter = context->source_lists; sl_iter; sl_iter = sl_iter->next) >- { >- list = sl_iter->data; >--- >-1.8.1.4 >Index: devel/glib20/files/patch-glib_gthread-posix.c >=================================================================== >--- devel/glib20/files/patch-glib_gthread-posix.c (revision 368159) >+++ devel/glib20/files/patch-glib_gthread-posix.c (working copy) >@@ -1,6 +1,6 @@ >---- glib/gthread-posix.c.orig 2012-11-10 03:24:06.000000000 +0000 >-+++ glib/gthread-posix.c 2012-11-12 18:06:36.000000000 +0000 >-@@ -89,7 +89,7 @@ >+--- glib/gthread-posix.c.orig 2014-02-22 21:29:07.000000000 +0600 >++++ glib/gthread-posix.c >+@@ -88,7 +88,7 @@ > if G_UNLIKELY (mutex == NULL) > g_thread_abort (errno, "malloc"); > >@@ -9,7 +9,7 @@ > { > pthread_mutexattr_t attr; > pthread_mutexattr_init (&attr); >-@@ -101,7 +101,7 @@ >+@@ -100,7 +100,7 @@ > if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0) > g_thread_abort (status, "pthread_mutex_init"); > >Index: devel/glib20/files/patch-glib_gutils.c >=================================================================== >--- devel/glib20/files/patch-glib_gutils.c (revision 368159) >+++ devel/glib20/files/patch-glib_gutils.c (working copy) >@@ -1,7 +1,7 @@ >---- glib/gutils.c.orig Wed Mar 23 09:55:02 2005 >-+++ glib/gutils.c Thu Apr 7 01:06:16 2005 >-@@ -1929,7 +1929,7 @@ g_get_system_data_dirs (void) >- data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); >+--- glib/gutils.c.orig 2014-08-03 16:57:28.000000000 +0600 >++++ glib/gutils.c >+@@ -1940,7 +1940,7 @@ g_get_system_data_dirs (void) >+ gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); > > if (!data_dirs || !data_dirs[0]) > - data_dirs = "/usr/local/share/:/usr/share/"; >@@ -9,7 +9,7 @@ > > data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0); > #endif >-@@ -1983,7 +1983,7 @@ g_get_system_config_dirs (void) >+@@ -2002,7 +2002,7 @@ g_get_system_config_dirs (void) > conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS"); > > if (!conf_dirs || !conf_dirs[0]) >Index: devel/glib20/files/patch-glib_tests_gdatetime.c >=================================================================== >--- devel/glib20/files/patch-glib_tests_gdatetime.c (revision 368159) >+++ devel/glib20/files/patch-glib_tests_gdatetime.c (working copy) >@@ -1,20 +0,0 @@ >---- glib/tests/gdatetime.c.orig 2013-03-13 13:39:09.000000000 +0000 >-+++ glib/tests/gdatetime.c 2013-03-28 10:15:49.000000000 +0000 >-@@ -1276,7 +1276,7 @@ >- gint i1, i2; >- >- #ifdef G_OS_UNIX >-- tz = g_time_zone_new ("Canada/Eastern"); >-+ tz = g_time_zone_new ("America/Montreal"); >- #elif defined G_OS_WIN32 >- tz = g_time_zone_new ("Eastern Standard Time"); >- #endif >-@@ -1309,7 +1309,7 @@ >- gint i1, i2; >- >- #ifdef G_OS_UNIX >-- tz = g_time_zone_new ("Canada/Eastern"); >-+ tz = g_time_zone_new ("America/Montreal"); >- #elif defined G_OS_WIN32 >- tz = g_time_zone_new ("Eastern Standard Time"); >- #endif >Index: devel/glib20/files/patch-glib_tests_utils.c >=================================================================== >--- devel/glib20/files/patch-glib_tests_utils.c (revision 368159) >+++ devel/glib20/files/patch-glib_tests_utils.c (working copy) >@@ -1,6 +1,6 @@ >---- glib/tests/utils.c.orig 2012-09-24 02:19:54.000000000 +0000 >-+++ glib/tests/utils.c 2012-09-24 02:20:48.000000000 +0000 >-@@ -416,7 +416,7 @@ >+--- glib/tests/utils.c.orig 2014-01-07 01:02:48.000000000 +0600 >++++ glib/tests/utils.c >+@@ -440,7 +440,7 @@ > > xdg = (gchar *)g_getenv ("XDG_CONFIG_DIRS"); > if (!xdg) >Index: devel/glib20/files/patch-gmodule__gmodule-dl.c >=================================================================== >--- devel/glib20/files/patch-gmodule__gmodule-dl.c (revision 368159) >+++ devel/glib20/files/patch-gmodule__gmodule-dl.c (working copy) >@@ -1,6 +1,6 @@ >---- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001 >-+++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002 >-@@ -104,6 +104,7 @@ >+--- gmodule/gmodule-dl.c.orig 2014-02-03 23:40:41.000000000 +0600 >++++ gmodule/gmodule-dl.c >+@@ -105,6 +105,7 @@ > static gpointer > _g_module_self (void) > { >@@ -8,7 +8,7 @@ > gpointer handle; > > /* to query symbols from the program itself, special link options >-@@ -115,6 +116,9 @@ >+@@ -120,6 +121,9 @@ > g_module_set_error (fetch_dlerror (TRUE)); > > return handle; >Index: devel/glib20/files/patch-gobject_Makefile.in >=================================================================== >--- devel/glib20/files/patch-gobject_Makefile.in (revision 368159) >+++ devel/glib20/files/patch-gobject_Makefile.in (working copy) >@@ -1,6 +1,6 @@ >---- gobject/Makefile.in.orig 2012-05-03 11:42:11.000000000 +0200 >-+++ gobject/Makefile.in 2012-05-03 11:42:51.000000000 +0200 >-@@ -566,6 +566,7 @@ >+--- gobject/Makefile.in.orig 2014-08-03 16:57:28.000000000 +0600 >++++ gobject/Makefile.in >+@@ -870,6 +870,7 @@ > @OS_WIN32_AND_DLL_COMPILATION_TRUE@gobject_win32_res_ldflag = -Wl,$(gobject_win32_res) > libgobjectincludedir = $(includedir)/glib-2.0/gobject > libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \ >@@ -8,16 +8,16 @@ > $(gobject_win32_res_ldflag) \ > -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ > -export-dynamic $(no_undefined) >-@@ -1331,7 +1332,7 @@ >+@@ -2003,7 +2004,7 @@ > > info-am: > > -install-data-am: install-data-local install-dist_gdbSCRIPTS \ > +install-data-am: install-data-local \ >- install-libgobjectincludeHEADERS install-tapsetDATA >- @$(NORMAL_INSTALL) >- $(MAKE) $(AM_MAKEFLAGS) install-data-hook >-@@ -1586,9 +1587,7 @@ >+ install-installed_testLTLIBRARIES \ >+ install-installed_testPROGRAMS install-installed_testSCRIPTS \ >+ install-installed_test_metaDATA \ >+@@ -2230,9 +2231,7 @@ > uninstall-gdb: > -rm -r $(DESTDIR)$(datadir)/gdb > >Index: devel/glib20/pkg-plist >=================================================================== >--- devel/glib20/pkg-plist (revision 368159) >+++ devel/glib20/pkg-plist (working copy) >@@ -1,3 +1,4 @@ >+bin/gapplication > bin/gdbus > bin/gdbus-codegen > bin/gio-querymodules >@@ -11,9 +12,6 @@ > bin/gsettings > bin/gtester > bin/gtester-report >-share/bash-completion/completions/gdbus >-share/bash-completion/completions/gsettings >-share/bash-completion/completions/gresource > include/gio-unix-2.0/gio/gdesktopappinfo.h > include/gio-unix-2.0/gio/gfiledescriptorbased.h > include/gio-unix-2.0/gio/gunixconnection.h >@@ -35,6 +33,7 @@ > include/glib-2.0/gio/gasyncresult.h > include/glib-2.0/gio/gbufferedinputstream.h > include/glib-2.0/gio/gbufferedoutputstream.h >+include/glib-2.0/gio/gbytesicon.h > include/glib-2.0/gio/gcancellable.h > include/glib-2.0/gio/gcharsetconverter.h > include/glib-2.0/gio/gcontenttype.h >@@ -108,11 +107,13 @@ > include/glib-2.0/gio/gnetworking.h > include/glib-2.0/gio/gnetworkmonitor.h > include/glib-2.0/gio/gnetworkservice.h >+include/glib-2.0/gio/gnotification.h > include/glib-2.0/gio/goutputstream.h > include/glib-2.0/gio/gpermission.h > include/glib-2.0/gio/gpollableinputstream.h > include/glib-2.0/gio/gpollableoutputstream.h > include/glib-2.0/gio/gpollableutils.h >+include/glib-2.0/gio/gpropertyaction.h > include/glib-2.0/gio/gproxy.h > include/glib-2.0/gio/gproxyaddress.h > include/glib-2.0/gio/gproxyaddressenumerator.h >@@ -126,9 +127,9 @@ > include/glib-2.0/gio/gsettingsschema.h > include/glib-2.0/gio/gsimpleaction.h > include/glib-2.0/gio/gsimpleactiongroup.h >-include/glib-2.0/gio/gsimpleproxyresolver.h > include/glib-2.0/gio/gsimpleasyncresult.h > include/glib-2.0/gio/gsimplepermission.h >+include/glib-2.0/gio/gsimpleproxyresolver.h > include/glib-2.0/gio/gsocket.h > include/glib-2.0/gio/gsocketaddress.h > include/glib-2.0/gio/gsocketaddressenumerator.h >@@ -139,6 +140,8 @@ > include/glib-2.0/gio/gsocketlistener.h > include/glib-2.0/gio/gsocketservice.h > include/glib-2.0/gio/gsrvtarget.h >+include/glib-2.0/gio/gsubprocess.h >+include/glib-2.0/gio/gsubprocesslauncher.h > include/glib-2.0/gio/gtask.h > include/glib-2.0/gio/gtcpconnection.h > include/glib-2.0/gio/gtcpwrapperconnection.h >@@ -264,23 +267,23 @@ > lib/libgio-2.0.a > lib/libgio-2.0.so > lib/libgio-2.0.so.0 >-lib/libgio-2.0.so.%%LIBVERSION%% >+lib/libgio-2.0.so.0.4000.0 > lib/libglib-2.0.a > lib/libglib-2.0.so > lib/libglib-2.0.so.0 >-lib/libglib-2.0.so.%%LIBVERSION%% >+lib/libglib-2.0.so.0.4000.0 > lib/libgmodule-2.0.a > lib/libgmodule-2.0.so > lib/libgmodule-2.0.so.0 >-lib/libgmodule-2.0.so.%%LIBVERSION%% >+lib/libgmodule-2.0.so.0.4000.0 > lib/libgobject-2.0.a > lib/libgobject-2.0.so > lib/libgobject-2.0.so.0 >-lib/libgobject-2.0.so.%%LIBVERSION%% >+lib/libgobject-2.0.so.0.4000.0 > lib/libgthread-2.0.a > lib/libgthread-2.0.so > lib/libgthread-2.0.so.0 >-lib/libgthread-2.0.so.%%LIBVERSION%% >+lib/libgthread-2.0.so.0.4000.0 > libdata/pkgconfig/gio-2.0.pc > libdata/pkgconfig/gio-unix-2.0.pc > libdata/pkgconfig/glib-2.0.pc >@@ -292,6 +295,10 @@ > share/aclocal/glib-2.0.m4 > share/aclocal/glib-gettext.m4 > share/aclocal/gsettings.m4 >+%%BASH_COMPLETIONS%%share/bash-completion/completions/gapplication >+%%BASH_COMPLETIONS%%share/bash-completion/completions/gdbus >+%%BASH_COMPLETIONS%%share/bash-completion/completions/gresource >+%%BASH_COMPLETIONS%%share/bash-completion/completions/gsettings > share/glib-2.0/codegen/__init__.py > share/glib-2.0/codegen/__init__.pyc > share/glib-2.0/codegen/__init__.pyo >@@ -318,175 +325,178 @@ > share/glib-2.0/codegen/utils.pyo > share/glib-2.0/gettext/po/Makefile.in.in > share/glib-2.0/schemas/gschema.dtd >-share/locale/af/LC_MESSAGES/glib20.mo >-share/locale/am/LC_MESSAGES/glib20.mo >-share/locale/ar/LC_MESSAGES/glib20.mo >-share/locale/as/LC_MESSAGES/glib20.mo >-share/locale/ast/LC_MESSAGES/glib20.mo >-share/locale/az/LC_MESSAGES/glib20.mo >-share/locale/be/LC_MESSAGES/glib20.mo >-share/locale/be@latin/LC_MESSAGES/glib20.mo >-share/locale/bg/LC_MESSAGES/glib20.mo >-share/locale/bn/LC_MESSAGES/glib20.mo >-share/locale/bn_IN/LC_MESSAGES/glib20.mo >-share/locale/bs/LC_MESSAGES/glib20.mo >-share/locale/ca/LC_MESSAGES/glib20.mo >-share/locale/ca@valencia/LC_MESSAGES/glib20.mo >-share/locale/cs/LC_MESSAGES/glib20.mo >-share/locale/cy/LC_MESSAGES/glib20.mo >-share/locale/da/LC_MESSAGES/glib20.mo >-share/locale/de/LC_MESSAGES/glib20.mo >-share/locale/dz/LC_MESSAGES/glib20.mo >-share/locale/el/LC_MESSAGES/glib20.mo >-share/locale/en@shaw/LC_MESSAGES/glib20.mo >-share/locale/en_CA/LC_MESSAGES/glib20.mo >-share/locale/en_GB/LC_MESSAGES/glib20.mo >-share/locale/eo/LC_MESSAGES/glib20.mo >-share/locale/es/LC_MESSAGES/glib20.mo >-share/locale/et/LC_MESSAGES/glib20.mo >-share/locale/eu/LC_MESSAGES/glib20.mo >-share/locale/fa/LC_MESSAGES/glib20.mo >-share/locale/fi/LC_MESSAGES/glib20.mo >-share/locale/fr/LC_MESSAGES/glib20.mo >-share/locale/ga/LC_MESSAGES/glib20.mo >-share/locale/gl/LC_MESSAGES/glib20.mo >-share/locale/gu/LC_MESSAGES/glib20.mo >-share/locale/he/LC_MESSAGES/glib20.mo >-share/locale/hi/LC_MESSAGES/glib20.mo >-share/locale/hr/LC_MESSAGES/glib20.mo >-share/locale/hu/LC_MESSAGES/glib20.mo >-share/locale/hy/LC_MESSAGES/glib20.mo >-share/locale/id/LC_MESSAGES/glib20.mo >-share/locale/is/LC_MESSAGES/glib20.mo >-share/locale/it/LC_MESSAGES/glib20.mo >-share/locale/ja/LC_MESSAGES/glib20.mo >-share/locale/ka/LC_MESSAGES/glib20.mo >-share/locale/kk/LC_MESSAGES/glib20.mo >-share/locale/kn/LC_MESSAGES/glib20.mo >-share/locale/ko/LC_MESSAGES/glib20.mo >-share/locale/ku/LC_MESSAGES/glib20.mo >-share/locale/lt/LC_MESSAGES/glib20.mo >-share/locale/lv/LC_MESSAGES/glib20.mo >-share/locale/mai/LC_MESSAGES/glib20.mo >-share/locale/mg/LC_MESSAGES/glib20.mo >-share/locale/mk/LC_MESSAGES/glib20.mo >-share/locale/ml/LC_MESSAGES/glib20.mo >-share/locale/mn/LC_MESSAGES/glib20.mo >-share/locale/mr/LC_MESSAGES/glib20.mo >-share/locale/ms/LC_MESSAGES/glib20.mo >-share/locale/nb/LC_MESSAGES/glib20.mo >-share/locale/nds/LC_MESSAGES/glib20.mo >-share/locale/ne/LC_MESSAGES/glib20.mo >-share/locale/nl/LC_MESSAGES/glib20.mo >-share/locale/nn/LC_MESSAGES/glib20.mo >-share/locale/oc/LC_MESSAGES/glib20.mo >-share/locale/or/LC_MESSAGES/glib20.mo >-share/locale/pa/LC_MESSAGES/glib20.mo >-share/locale/pl/LC_MESSAGES/glib20.mo >-share/locale/ps/LC_MESSAGES/glib20.mo >-share/locale/pt/LC_MESSAGES/glib20.mo >-share/locale/pt_BR/LC_MESSAGES/glib20.mo >-share/locale/ro/LC_MESSAGES/glib20.mo >-share/locale/ru/LC_MESSAGES/glib20.mo >-share/locale/rw/LC_MESSAGES/glib20.mo >-share/locale/si/LC_MESSAGES/glib20.mo >-share/locale/sk/LC_MESSAGES/glib20.mo >-share/locale/sl/LC_MESSAGES/glib20.mo >-share/locale/sq/LC_MESSAGES/glib20.mo >-share/locale/sr/LC_MESSAGES/glib20.mo >-share/locale/sr@ije/LC_MESSAGES/glib20.mo >-share/locale/sr@latin/LC_MESSAGES/glib20.mo >-share/locale/sv/LC_MESSAGES/glib20.mo >-share/locale/ta/LC_MESSAGES/glib20.mo >-share/locale/te/LC_MESSAGES/glib20.mo >-share/locale/tg/LC_MESSAGES/glib20.mo >-share/locale/th/LC_MESSAGES/glib20.mo >-share/locale/tl/LC_MESSAGES/glib20.mo >-share/locale/tr/LC_MESSAGES/glib20.mo >-share/locale/tt/LC_MESSAGES/glib20.mo >-share/locale/ug/LC_MESSAGES/glib20.mo >-share/locale/uk/LC_MESSAGES/glib20.mo >-share/locale/vi/LC_MESSAGES/glib20.mo >-share/locale/wa/LC_MESSAGES/glib20.mo >-share/locale/xh/LC_MESSAGES/glib20.mo >-share/locale/yi/LC_MESSAGES/glib20.mo >-share/locale/zh_CN/LC_MESSAGES/glib20.mo >-share/locale/zh_HK/LC_MESSAGES/glib20.mo >-share/locale/zh_TW/LC_MESSAGES/glib20.mo >-@dirrmtry share/locale/zh_HK/LC_MESSAGES >-@dirrmtry share/locale/zh_HK >-@dirrmtry share/locale/yi/LC_MESSAGES >-@dirrmtry share/locale/yi >-@dirrmtry share/locale/xh/LC_MESSAGES >-@dirrmtry share/locale/xh >-@dirrmtry share/locale/ug/LC_MESSAGES >-@dirrmtry share/locale/ug >-@dirrmtry share/locale/tt/LC_MESSAGES >-@dirrmtry share/locale/tt >-@dirrmtry share/locale/tl/LC_MESSAGES >-@dirrmtry share/locale/tl >-@dirrmtry share/locale/te/LC_MESSAGES >-@dirrmtry share/locale/te >-@dirrmtry share/locale/sr@latin/LC_MESSAGES >-@dirrmtry share/locale/sr@latin >-@dirrmtry share/locale/sr@ije/LC_MESSAGES >-@dirrmtry share/locale/sr@ije >-@dirrmtry share/locale/si/LC_MESSAGES >-@dirrmtry share/locale/si >-@dirrmtry share/locale/rw/LC_MESSAGES >-@dirrmtry share/locale/rw >-@dirrmtry share/locale/ps/LC_MESSAGES >-@dirrmtry share/locale/ps >-@dirrmtry share/locale/oc/LC_MESSAGES >-@dirrmtry share/locale/oc >-@dirrmtry share/locale/nds/LC_MESSAGES >-@dirrmtry share/locale/nds >-@dirrmtry share/locale/mr/LC_MESSAGES >-@dirrmtry share/locale/mr >-@dirrmtry share/locale/mg/LC_MESSAGES >-@dirrmtry share/locale/mg >-@dirrmtry share/locale/mai/LC_MESSAGES >-@dirrmtry share/locale/mai >-@dirrmtry share/locale/ku/LC_MESSAGES >-@dirrmtry share/locale/ku >-@dirrmtry share/locale/kk/LC_MESSAGES >-@dirrmtry share/locale/kk >-@dirrmtry share/locale/hy/LC_MESSAGES >-@dirrmtry share/locale/hy >-@dirrmtry share/locale/en@shaw/LC_MESSAGES >-@dirrmtry share/locale/en@shaw >-@dirrmtry share/locale/dz/LC_MESSAGES >-@dirrmtry share/locale/dz >-@dirrmtry share/locale/ca@valencia/LC_MESSAGES >-@dirrmtry share/locale/ca@valencia >-@dirrmtry share/locale/bn_IN/LC_MESSAGES >-@dirrmtry share/locale/bn_IN >-@dirrmtry share/locale/be@latin/LC_MESSAGES >-@dirrmtry share/locale/be@latin >-@dirrmtry share/locale/ast/LC_MESSAGES >-@dirrmtry share/locale/ast >-@dirrmtry share/locale/as/LC_MESSAGES >-@dirrmtry share/locale/as >+%%NLS%%share/locale/af/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/am/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/an/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ar/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/as/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ast/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/az/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/be/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/be@latin/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/bg/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/bn/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/bn_IN/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/bs/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ca/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/cs/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/cy/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/da/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/de/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/dz/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/el/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/en@shaw/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/en_CA/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/en_GB/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/eo/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/es/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/et/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/eu/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/fa/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/fi/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/fr/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ga/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/gl/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/gu/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/he/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/hi/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/hr/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/hu/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/hy/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/id/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/is/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/it/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ja/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ka/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/kk/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/kn/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ko/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ku/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/lt/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/lv/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/mai/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/mg/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/mk/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ml/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/mn/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/mr/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ms/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/nb/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/nds/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ne/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/nl/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/nn/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/oc/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/or/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/pa/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/pl/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ps/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/pt/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/pt_BR/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ro/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ru/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/rw/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/si/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/sk/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/sl/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/sq/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/sr/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/sr@ije/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/sr@latin/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/sv/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ta/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/te/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/tg/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/th/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/tl/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/tr/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/tt/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/ug/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/uk/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/vi/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/wa/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/xh/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/yi/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/zh_CN/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/zh_HK/LC_MESSAGES/glib20.mo >+%%NLS%%share/locale/zh_TW/LC_MESSAGES/glib20.mo >+%%BASH_COMPLETIONS%%@dirrmtry share/bash-completion/completions >+%%BASH_COMPLETIONS%%@dirrmtry share/bash-completion >+%%NLS%%@dirrmtry share/locale/an/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/an >+%%NLS%%@dirrmtry share/locale/as/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/as >+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/ast >+%%NLS%%@dirrmtry share/locale/be@latin/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/be@latin >+%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/bn_IN >+%%NLS%%@dirrmtry share/locale/ca@valencia/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/ca@valencia >+%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/dz >+%%NLS%%@dirrmtry share/locale/en@shaw/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/en@shaw >+%%NLS%%@dirrmtry share/locale/hy/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/hy >+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/kk >+%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/ku >+%%NLS%%@dirrmtry share/locale/mai/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/mai >+%%NLS%%@dirrmtry share/locale/mg/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/mg >+%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/mr >+%%NLS%%@dirrmtry share/locale/nds/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/nds >+%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/oc >+%%NLS%%@dirrmtry share/locale/ps/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/ps >+%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/rw >+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/si >+%%NLS%%@dirrmtry share/locale/sr@ije/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/sr@ije >+%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/sr@latin >+%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/te >+%%NLS%%@dirrmtry share/locale/tl/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/tl >+%%NLS%%@dirrmtry share/locale/tt/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/tt >+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/ug >+%%NLS%%@dirrmtry share/locale/xh/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/xh >+%%NLS%%@dirrmtry share/locale/yi/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/yi >+%%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES >+%%NLS%%@dirrmtry share/locale/zh_HK > @exec mkdir -p %D/share/glib-2.0/schemas > @exec glib-compile-schemas %D/share/glib-2.0/schemas >+@dirrm share/glib-2.0/codegen >+%%NLS%%@dirrm share/glib-2.0/gettext/po >+%%NLS%%@dirrm share/glib-2.0/gettext > @dirrm share/glib-2.0/schemas >-@dirrm share/glib-2.0/gettext/po >-@dirrm share/glib-2.0/gettext >-@dirrm share/glib-2.0/codegen > @dirrm share/glib-2.0 >-@dirrmtry share/bash-completion/completions >-@dirrmtry share/bash-completion > @exec mkdir -p %D/share/GConf/gsettings > @dirrm share/GConf/gsettings > @dirrm share/GConf > @exec mkdir -p %D/lib/gio/modules > @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true >-@dirrmtry lib/gio/modules >-@dirrmtry lib/gio >-@dirrm include/glib-2.0/gobject >+@dirrm lib/gio/modules >+@dirrm lib/gio >+@dirrm include/gio-unix-2.0/gio >+@dirrm include/gio-unix-2.0 >+@dirrm include/glib-2.0/gio > @dirrm include/glib-2.0/glib/deprecated > @dirrm include/glib-2.0/glib >-@dirrm include/glib-2.0/gio >+@dirrm include/glib-2.0/gobject > @dirrm include/glib-2.0 >-@dirrm include/gio-unix-2.0/gio >-@dirrm include/gio-unix-2.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=147617">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 193625
:
147292
|
147299
|
147302
|
147615
|
147616
|
147617
|
147618
|
147620
|
147621
|
147622
|
147623
|
147726
|
147981
|
148304
|
148462
|
148852
|
148853
|
148854
|
148855
|
148856
|
148857
|
148858
|
148859
|
149838
|
149839
|
149840
|
149841