View | Details | Raw Unified | Return to bug 193625 | Differences between
and this patch

Collapse All | Expand All

(-)glib20/Makefile (-12 / +24 lines)
Lines 3-10 Link Here
3
#   $MCom: ports/trunk/devel/glib20/Makefile 18634 2013-07-26 10:42:35Z kwm $
3
#   $MCom: ports/trunk/devel/glib20/Makefile 18634 2013-07-26 10:42:35Z kwm $
4
4
5
PORTNAME=	glib
5
PORTNAME=	glib
6
PORTVERSION=	2.36.3
6
PORTVERSION=	2.40.0
7
PORTREVISION=	4
8
CATEGORIES=	devel
7
CATEGORIES=	devel
9
MASTER_SITES=	GNOME
8
MASTER_SITES=	GNOME
10
DIST_SUBDIR=	gnome2
9
DIST_SUBDIR=	gnome2
Lines 14-35 Link Here
14
13
15
LICENSE=	LGPL20
14
LICENSE=	LGPL20
16
15
17
USES=		tar:xz
18
PORTSCOUT=	limitw:1,even
16
PORTSCOUT=	limitw:1,even
19
17
18
USES=		tar:xz
19
20
.if !defined(REFERENCE_PORT)
20
.if !defined(REFERENCE_PORT)
21
21
22
LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
22
LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
23
		libffi.so:${PORTSDIR}/devel/libffi
23
		libffi.so:${PORTSDIR}/devel/libffi
24
24
25
GNU_CONFIGURE=	yes
26
USE_LDCONFIG=	yes
25
USE_LDCONFIG=	yes
27
# iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo)
26
# iconv:wchar_t - our iconv in base doesn't support utf-8 -> wchar_t (boooo)
28
# (wchar_t is used by glibmm, rawtherapee triggered this)
27
# (wchar_t is used by glibmm, rawtherapee triggered this)
29
USES+=		gettext gmake iconv:wchar_t libtool pathfix perl5 \
28
USES+=		gettext gmake iconv:wchar_t libtool:keepla pathfix pkgconfig shebangfix perl5
30
		pkgconfig python shebangfix
29
USE_PYTHON=	yes
31
USE_PYTHON=	py3kplist
30
PYTHON_PY3K_PLIST_HACK=	yes
32
CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
31
GNU_CONFIGURE=	yes
32
CONFIGURE_ARGS=	--enable-static \
33
		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
33
		--disable-man --without-xml-catalog \
34
		--disable-man --without-xml-catalog \
34
		--enable-static \
35
		--enable-static \
35
		--with-pcre=system \
36
		--with-pcre=system \
Lines 41-50 Link Here
41
42
42
SHEBANG_FILES=	*/*.pl glib/gen-iswide-table.py
43
SHEBANG_FILES=	*/*.pl glib/gen-iswide-table.py
43
44
44
LIBVERSION=	0.3600.3
45
OPTIONS_DEFINE=	BASH_COMPLETIONS COLLATION_FIX DEBUG NLS
45
PLIST_SUB+=	LIBVERSION=${LIBVERSION}
46
BASH_COMPLETIONS_DESC=	Install bash completions
46
47
OPTIONS_DEFINE=	COLLATION_FIX DEBUG
48
COLLATION_FIX_DESC=	fix string collation
47
COLLATION_FIX_DESC=	fix string collation
49
48
50
.include <bsd.port.pre.mk>
49
.include <bsd.port.pre.mk>
Lines 78-83 Link Here
78
.endif
77
.endif
79
CONFIGURE_TARGET=${GLIB_ARCH}-portbld-freebsd${OSREL}
78
CONFIGURE_TARGET=${GLIB_ARCH}-portbld-freebsd${OSREL}
80
79
80
.if ${PORT_OPTIONS:MBASH_COMPLETIONS}
81
PLIST_SUB+=	BASH_COMPLETIONS=""
82
.else
83
PLIST_SUB+=	BASH_COMPLETIONS="@comment "
84
.endif
85
81
.if ${PORT_OPTIONS:MCOLLATION_FIX}
86
.if ${PORT_OPTIONS:MCOLLATION_FIX}
82
LIB_DEPENDS+=	libicui18n.so:${PORTSDIR}/devel/icu
87
LIB_DEPENDS+=	libicui18n.so:${PORTSDIR}/devel/icu
83
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-glib_Makefile.in \
88
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-glib_Makefile.in \
Lines 94-99 Link Here
94
CONFIGURE_ARGS+=	--disable-modular-tests
99
CONFIGURE_ARGS+=	--disable-modular-tests
95
.endif
100
.endif
96
101
102
NLS_CONFIGURE_ENABLE=	nls	
103
.if ${PORT_OPTIONS:MNLS}
104
PLIST_SUB+=	NLS=""
105
.else
106
PLIST_SUB+=	NLS="@comment "
107
.endif
108
97
post-patch:
109
post-patch:
98
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
110
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
99
		s|/usr/share/locale/locale|${LOCALBASE}/share/locale/locale|g' \
111
		s|/usr/share/locale/locale|${LOCALBASE}/share/locale/locale|g' \
(-)glib20/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (gnome2/glib-2.36.3.tar.xz) = 5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e
1
SHA256 (gnome2/glib-2.40.0.tar.xz) = 0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5
2
SIZE (gnome2/glib-2.36.3.tar.xz) = 6626972
2
SIZE (gnome2/glib-2.40.0.tar.xz) = 7016228
(-)glib20/files/extra-arch-powerpc64 (-7 / +4 lines)
Lines 1-7 Link Here
1
1
--- gio/glib-compile-schemas.c.orig	2014-02-03 23:40:41.000000000 +0600
2
--- gio/glib-compile-schemas.c.orig	2010-11-24 21:32:15.000000000 +0100
2
+++ gio/glib-compile-schemas.c
3
+++ gio/glib-compile-schemas.c	2010-11-24 21:33:42.000000000 +0100
3
@@ -1528,7 +1528,7 @@
4
@@ -1458,7 +1458,7 @@
5
 }
4
 }
6
 /* Text {{{2 */
5
 /* Text {{{2 */
7
 static void
6
 static void
Lines 10-16 Link Here
10
       const gchar          *text,
9
       const gchar          *text,
11
       gsize                 text_len,
10
       gsize                 text_len,
12
       gpointer              user_data,
11
       gpointer              user_data,
13
@@ -1590,7 +1590,7 @@
12
@@ -1693,7 +1693,7 @@
14
 parse_gschema_files (gchar    **files,
13
 parse_gschema_files (gchar    **files,
15
                      gboolean   strict)
14
                      gboolean   strict)
16
 {
15
 {
Lines 19-23 Link Here
19
   ParseState state = { 0, };
18
   ParseState state = { 0, };
20
   const gchar *filename;
19
   const gchar *filename;
21
   GError *error = NULL;
20
   GError *error = NULL;
22
23
(-)glib20/files/extra-patch-glib_Makefile.in (-3 / +3 lines)
Lines 1-6 Link Here
1
--- glib/Makefile.in.orig	2012-09-27 15:07:28.000000000 +0000
1
--- glib/Makefile.in.orig	2014-08-04 23:54:37.000000000 +0600
2
+++ glib/Makefile.in	2012-09-27 15:08:02.000000000 +0000
2
+++ glib/Makefile.in
3
@@ -415,7 +415,7 @@
3
@@ -706,7 +706,7 @@
4
 INSTOBJEXT = @INSTOBJEXT@
4
 INSTOBJEXT = @INSTOBJEXT@
5
 INTLLIBS = @INTLLIBS@
5
 INTLLIBS = @INTLLIBS@
6
 LD = @LD@
6
 LD = @LD@
(-)glib20/files/extra-patch-glib_gunicollate.c (-29 / +29 lines)
Lines 1-6 Link Here
1
--- glib/gunicollate.c.orig	2012-11-24 20:50:39.000000000 +0000
1
--- glib/gunicollate.c.orig	2014-02-22 21:29:07.000000000 +0600
2
+++ glib/gunicollate.c	2013-03-08 12:16:59.000000000 +0000
2
+++ glib/gunicollate.c
3
@@ -26,6 +26,10 @@
3
@@ -25,6 +25,10 @@
4
 #include <wchar.h>
4
 #include <wchar.h>
5
 #endif
5
 #endif
6
 
6
 
Lines 11-17 Link Here
11
 #ifdef HAVE_CARBON
11
 #ifdef HAVE_CARBON
12
 #include <CoreServices/CoreServices.h>
12
 #include <CoreServices/CoreServices.h>
13
 #endif
13
 #endif
14
@@ -36,11 +40,54 @@
14
@@ -35,11 +39,54 @@
15
 #include "gstring.h"
15
 #include "gstring.h"
16
 #include "gstrfuncs.h"
16
 #include "gstrfuncs.h"
17
 #include "gtestutils.h"
17
 #include "gtestutils.h"
Lines 66-72 Link Here
66
 
66
 
67
 #ifdef _MSC_VER
67
 #ifdef _MSC_VER
68
 /* Workaround for bug in MSVCR80.DLL */
68
 /* Workaround for bug in MSVCR80.DLL */
69
@@ -128,6 +175,28 @@
69
@@ -110,6 +157,28 @@
70
   g_return_val_if_fail (str1 != NULL, 0);
70
   g_return_val_if_fail (str1 != NULL, 0);
71
   g_return_val_if_fail (str2 != NULL, 0);
71
   g_return_val_if_fail (str2 != NULL, 0);
72
 
72
 
Lines 76-101 Link Here
76
+      int32_t wstr1_len;
76
+      int32_t wstr1_len;
77
+      UChar *wstr1 = utf8_to_uchar(str1, -1, &wstr1_len);
77
+      UChar *wstr1 = utf8_to_uchar(str1, -1, &wstr1_len);
78
+      if (wstr1 != NULL)
78
+      if (wstr1 != NULL)
79
+	{
79
+       {
80
+	  int32_t wstr2_len;
80
+         int32_t wstr2_len;
81
+	  UChar *wstr2 = utf8_to_uchar(str2, -1, &wstr2_len);
81
+         UChar *wstr2 = utf8_to_uchar(str2, -1, &wstr2_len);
82
+	  if (wstr2 != NULL)
82
+         if (wstr2 != NULL)
83
+	    {
83
+           {
84
+	      result = ucol_strcoll(icu_collator, wstr1, wstr1_len, wstr2, wstr2_len);
84
+             result = ucol_strcoll(icu_collator, wstr1, wstr1_len, wstr2, wstr2_len);
85
+
85
+
86
+	      g_free(wstr1);
86
+             g_free(wstr1);
87
+	      g_free(wstr2);
87
+             g_free(wstr2);
88
+
88
+
89
+	      return result;
89
+             return result;
90
+	    }
90
+           }
91
+	  g_free(wstr1);
91
+         g_free(wstr1);
92
+	}
92
+       }
93
+    }
93
+    }
94
+
94
+
95
   str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE);
95
   str1_norm = _g_utf8_normalize_wc (str1, -1, G_NORMALIZE_ALL_COMPOSE);
96
   str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE);
96
   str2_norm = _g_utf8_normalize_wc (str2, -1, G_NORMALIZE_ALL_COMPOSE);
97
 
97
 
98
@@ -419,6 +488,26 @@
98
@@ -417,6 +486,26 @@
99
 
99
 
100
   g_return_val_if_fail (str != NULL, NULL);
100
   g_return_val_if_fail (str != NULL, NULL);
101
 
101
 
Lines 105-122 Link Here
105
+      int32_t wstr_len;
105
+      int32_t wstr_len;
106
+      UChar *wstr = utf8_to_uchar(str, len, &wstr_len);
106
+      UChar *wstr = utf8_to_uchar(str, len, &wstr_len);
107
+      if (wstr != NULL)
107
+      if (wstr != NULL)
108
+	{
108
+       {
109
+	  int32_t result_len;
109
+         int32_t result_len;
110
+
110
+
111
+	  /* get size of result */
111
+         /* get size of result */
112
+	  result_len = ucol_getSortKey(icu_collator, wstr, wstr_len, NULL, 0);
112
+         result_len = ucol_getSortKey(icu_collator, wstr, wstr_len, NULL, 0);
113
+
113
+
114
+	  result = g_new(char, result_len);
114
+         result = g_new(char, result_len);
115
+	  ucol_getSortKey(icu_collator, wstr, wstr_len, result, result_len);
115
+         ucol_getSortKey(icu_collator, wstr, wstr_len, result, result_len);
116
+	  g_free(wstr);
116
+         g_free(wstr);
117
+
117
+
118
+	  return result;
118
+         return result;
119
+	}
119
+       }
120
+    }
120
+    }
121
+
121
+
122
   str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE);
122
   str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE);
(-)glib20/files/patch-configure (-28 / +9 lines)
Lines 1-16 Link Here
1
--- configure.orig	2013-08-29 23:29:13.255661322 +0200
1
--- configure.orig	2014-08-03 18:25:47.000000000 +0600
2
+++ configure	2013-08-29 23:48:08.845647995 +0200
2
+++ configure	2014-08-03 18:27:38.000000000 +0600
3
@@ -603,6 +603,9 @@
3
@@ -5968,7 +5968,7 @@
4
 #ifdef HAVE_SYS_TYPES_H
5
 # include <sys/types.h>
6
 #endif
7
+#ifdef HAVE_SYS_PARAM_H
8
+# include <sys/param.h>
9
+#endif
10
 #ifdef HAVE_SYS_STAT_H
11
 # include <sys/stat.h>
12
 #endif
13
@@ -5778,7 +5781,7 @@
14
 fi
4
 fi
15
 
5
 
16
 GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
6
 GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
Lines 19-25 Link Here
19
 
9
 
20
 
10
 
21
  if test "x$with_runtime_libdir" != "x"; then
11
  if test "x$with_runtime_libdir" != "x"; then
22
@@ -7444,13 +7447,12 @@
12
@@ -7634,13 +7634,12 @@
23
 
13
 
24
       ;;
14
       ;;
25
     native)
15
     native)
Lines 35-41 Link Here
35
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
25
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
36
 /* end confdefs.h.  */
26
 /* end confdefs.h.  */
37
 
27
 
38
@@ -8648,6 +8650,7 @@
28
@@ -8675,6 +8674,7 @@
39
     ;;
29
     ;;
40
   native)
30
   native)
41
 
31
 
Lines 43-61 Link Here
43
 $as_echo "#define USE_LIBICONV_NATIVE 1" >>confdefs.h
33
 $as_echo "#define USE_LIBICONV_NATIVE 1" >>confdefs.h
44
 
34
 
45
     ;;
35
     ;;
46
@@ -23201,7 +23204,7 @@
36
@@ -26738,10 +26738,10 @@
47
 fi
37
   *android*)
48
 done
38
     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
49
 
39
     ;;
50
-for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid
51
+for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid sysctlbyname
52
 do :
53
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
54
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
55
@@ -26741,10 +26744,10 @@
56
 #  b) FreeBSD doesn't do this either.
57
 #
58
 case $host in
59
-  *-*-freebsd*|*-*-linux*)
40
-  *-*-freebsd*|*-*-linux*)
60
+  *-*-linux*)
41
+  *-*-linux*)
61
     G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`"
42
     G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`"
(-)glib20/files/patch-doc_reference_Makefile.in (-6 / +6 lines)
Lines 1-9 Link Here
1
--- docs/reference/Makefile.in.orig	2007-12-21 16:54:10.000000000 -0500
1
--- docs/reference/Makefile.in.orig	2014-08-18 16:59:37.000000000 +0600
2
+++ docs/reference/Makefile.in	2007-12-21 16:54:40.000000000 -0500
2
+++ docs/reference/Makefile.in	2014-08-18 16:59:37.000000000 +0600
3
@@ -268,7 +268,7 @@ GTESTER_REPORT = $(top_builddir)/glib/gt
3
@@ -424,7 +424,7 @@
4
 # initialize variables for unconditional += appending
4
 top_build_prefix = @top_build_prefix@
5
 EXTRA_DIST = 
5
 top_builddir = @top_builddir@
6
 TEST_PROGS = 
6
 top_srcdir = @top_srcdir@
7
-SUBDIRS = glib gobject gio
7
-SUBDIRS = glib gobject gio
8
+SUBDIRS = #glib gobject gio
8
+SUBDIRS = #glib gobject gio
9
 all: all-recursive
9
 all: all-recursive
(-)glib20/files/patch-gio_fam_Makefile.in (-8 / +8 lines)
Lines 1-8 Link Here
1
--- gio/fam/Makefile.in.orig	2012-03-07 21:07:42.000000000 +0100
1
--- gio/fam/Makefile.in.orig	2014-03-25 00:54:27.000000000 +0600
2
+++ gio/fam/Makefile.in	2012-03-07 21:08:30.000000000 +0100
2
+++ gio/fam/Makefile.in
3
@@ -87,9 +87,7 @@
3
@@ -175,9 +175,7 @@
4
 am__installdirs = "$(DESTDIR)$(giomoduledir)"
4
 LTLIBRARIES = $(giomodule_LTLIBRARIES) $(installed_test_LTLIBRARIES) \
5
 LTLIBRARIES = $(giomodule_LTLIBRARIES)
5
 	$(noinst_LTLIBRARIES)
6
 am__DEPENDENCIES_1 =
6
 am__DEPENDENCIES_1 =
7
-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
7
-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
8
-	$(top_builddir)/gobject/libgobject-2.0.la \
8
-	$(top_builddir)/gobject/libgobject-2.0.la \
Lines 11-17 Link Here
11
 	$(am__DEPENDENCIES_1)
11
 	$(am__DEPENDENCIES_1)
12
 am__objects_1 =
12
 am__objects_1 =
13
 am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
13
 am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
14
@@ -402,9 +400,9 @@
14
@@ -793,9 +791,9 @@
15
 
15
 
16
 libgiofam_la_LDFLAGS = $(module_flags)
16
 libgiofam_la_LDFLAGS = $(module_flags)
17
 libgiofam_la_LIBADD = \
17
 libgiofam_la_LIBADD = \
Lines 24-35 Link Here
24
 		$(GLIB_LIBS) \
24
 		$(GLIB_LIBS) \
25
 		$(FAM_LIBS) \
25
 		$(FAM_LIBS) \
26
 		$(NULL)
26
 		$(NULL)
27
@@ -843,7 +841,7 @@
27
@@ -1587,7 +1585,7 @@
28
 
28
 
29
 install-data-hook:
29
 install-data-hook:
30
 	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
30
 	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
31
-		$(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
31
-		$(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
32
+		gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
32
+		gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \
33
 	fi
33
 	fi
34
 
34
 
35
 uninstall-local:
35
 uninstall-local:
(-)glib20/files/patch-gio_glib-compile-schemas.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- gio/glib-compile-schemas.c.orig	2012-06-14 16:39:22.000000000 +0200
1
--- gio/glib-compile-schemas.c.orig	2014-02-03 23:40:41.000000000 +0600
2
+++ gio/glib-compile-schemas.c	2012-06-14 16:39:55.000000000 +0200
2
+++ gio/glib-compile-schemas.c
3
@@ -1204,11 +1204,13 @@
3
@@ -1202,11 +1202,13 @@
4
       return;
4
       return;
5
     }
5
     }
6
 
6
 
(-)glib20/files/patch-gio_gunixmount.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- gio/gunixmount.c.orig	2011-08-31 19:47:35.000000000 +0200
1
--- gio/gunixmount.c.orig	2014-03-20 09:50:45.000000000 +0600
2
+++ gio/gunixmount.c	2011-09-15 17:50:24.000000000 +0200
2
+++ gio/gunixmount.c
3
@@ -449,12 +449,18 @@ g_unix_mount_eject (GMount             *
3
@@ -353,12 +353,18 @@  g_unix_mount_eject (GMount             *
4
                     gpointer             user_data)
4
                     gpointer             user_data)
5
 {
5
 {
6
   GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
6
   GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
(-)glib20/files/patch-gio_gunixmounts.c (-50 / +10 lines)
Lines 1-6 Link Here
1
--- gio/gunixmounts.c.orig	2013-06-09 18:03:17.000000000 -0400
1
--- gio/gunixmounts.c.orig	2014-02-13 02:08:36.000000000 +0600
2
+++ gio/gunixmounts.c	2013-12-14 11:45:36.749181267 -0500
2
+++ gio/gunixmounts.c
3
@@ -155,6 +155,9 @@ struct _GUnixMountMonitor {
3
@@ -150,6 +150,9 @@  struct _GUnixMountMonitor {
4
   GFileMonitor *fstab_monitor;
4
   GFileMonitor *fstab_monitor;
5
   GFileMonitor *mtab_monitor;
5
   GFileMonitor *mtab_monitor;
6
 
6
 
Lines 10-16 Link Here
10
   GSource *proc_mounts_watch_source;
10
   GSource *proc_mounts_watch_source;
11
 };
11
 };
12
 
12
 
13
@@ -167,6 +170,8 @@ static GUnixMountMonitor *the_mount_moni
13
@@ -162,6 +165,8 @@ static GUnixMountMonitor *the_mount_moni
14
 static GList *_g_get_unix_mounts (void);
14
 static GList *_g_get_unix_mounts (void);
15
 static GList *_g_get_unix_mount_points (void);
15
 static GList *_g_get_unix_mount_points (void);
16
 
16
 
Lines 19-25 Link Here
19
 G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
19
 G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
20
 
20
 
21
 #define MOUNT_POLL_INTERVAL 4000
21
 #define MOUNT_POLL_INTERVAL 4000
22
@@ -193,6 +198,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
22
@@ -188,6 +193,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
23
 #endif
23
 #endif
24
 
24
 
25
 #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
25
 #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
Lines 27-74 Link Here
27
 #include <sys/ucred.h>
27
 #include <sys/ucred.h>
28
 #include <sys/mount.h>
28
 #include <sys/mount.h>
29
 #include <fstab.h>
29
 #include <fstab.h>
30
@@ -243,22 +249,29 @@ g_unix_is_mount_path_system_internal (co
30
@@ -1134,6 +1140,10 @@ get_mounts_timestamp (void)
31
     "/",              /* we already have "Filesystem root" in Nautilus */ 
32
     "/bin",
33
     "/boot",
34
+    "/compat/linux/proc",
35
+    "/compat/linux/sys",
36
     "/dev",
37
     "/etc",
38
     "/home",
39
     "/lib",
40
     "/lib64",
41
+    "/libexec",
42
     "/live/cow",
43
     "/live/image",
44
     "/media",
45
     "/mnt",
46
     "/opt",
47
+    "/rescue",
48
     "/root",
49
     "/sbin",
50
     "/srv",
51
     "/tmp",
52
     "/usr",
53
     "/usr/local",
54
+    "/usr/obj",
55
+    "/usr/ports",
56
+    "/usr/src",
57
     "/var",
58
     "/var/crash",
59
     "/var/local",
60
@@ -299,8 +312,10 @@ guess_system_internal (const char *mount
61
     "devfs",
62
     "devpts",
63
     "ecryptfs",
64
+    "fdescfs",
65
     "kernfs",
66
     "linprocfs",
67
+    "nullfs",
68
     "proc",
69
     "procfs",
70
     "ptyfs",
71
@@ -1126,6 +1141,10 @@ get_mounts_timestamp (void)
72
       if (stat (monitor_file, &buf) == 0)
31
       if (stat (monitor_file, &buf) == 0)
73
 	return (guint64)buf.st_mtime;
32
 	return (guint64)buf.st_mtime;
74
     }
33
     }
Lines 79-85 Link Here
79
   return 0;
38
   return 0;
80
 }
39
 }
81
 
40
 
82
@@ -1271,6 +1290,13 @@ g_unix_mount_monitor_finalize (GObject *
41
@@ -1279,6 +1289,14 @@ g_unix_mount_monitor_finalize (GObject *
83
       g_object_unref (monitor->mtab_monitor);
42
       g_object_unref (monitor->mtab_monitor);
84
     }
43
     }
85
 
44
 
Lines 90-99 Link Here
90
+      g_list_free (monitor->mount_poller_mounts);
49
+      g_list_free (monitor->mount_poller_mounts);
91
+    }
50
+    }
92
+
51
+
52
+
93
   the_mount_monitor = NULL;
53
   the_mount_monitor = NULL;
94
 
54
 
95
   G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
55
   G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
96
@@ -1352,6 +1378,52 @@ mtab_file_changed (GFileMonitor      *mo
56
@@ -1360,6 +1378,52 @@ mtab_file_changed (GFileMonitor      *mo
97
 }
57
 }
98
 
58
 
99
 static gboolean
59
 static gboolean
Lines 146-152 Link Here
146
 proc_mounts_changed (GIOChannel   *channel,
106
 proc_mounts_changed (GIOChannel   *channel,
147
                      GIOCondition  cond,
107
                      GIOCondition  cond,
148
                      gpointer      user_data)
108
                      gpointer      user_data)
149
@@ -1416,6 +1488,12 @@ g_unix_mount_monitor_init (GUnixMountMon
109
@@ -1424,6 +1488,12 @@ g_unix_mount_monitor_init (GUnixMountMon
150
           g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
110
           g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
151
         }
111
         }
152
     }
112
     }
(-)glib20/files/patch-gio_gunixvolume.c (-4 / +4 lines)
Lines 1-6 Link Here
1
--- gio/gunixvolume.c.orig	2009-11-30 04:35:27.000000000 +0100
1
--- gio/gunixvolume.c.orig	2014-03-20 09:50:45.000000000 +0600
2
+++ gio/gunixvolume.c	2009-12-08 19:32:03.000000000 +0100
2
+++ gio/gunixvolume.c
3
@@ -465,9 +465,14 @@ g_unix_volume_eject (GVolume            
3
@@ -356,9 +356,14 @@ g_unix_volume_eject (GVolume
4
                      gpointer             user_data)
4
                      gpointer             user_data)
5
 {
5
 {
6
   GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
6
   GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
Lines 8-14 Link Here
8
+  char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
8
+  char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
9
+  argv[2] = unix_volume->device_path;
9
+  argv[2] = unix_volume->device_path;
10
+#else
10
+#else
11
   char *argv[] = { "eject", NULL, NULL };
11
   const gchar *argv[] = { "eject", NULL, NULL };
12
 
12
 
13
   argv[1] = unix_volume->device_path;
13
   argv[1] = unix_volume->device_path;
14
+#endif
14
+#endif
(-)glib20/files/patch-gio_tests_gdbus-peer.c (-11 lines)
Lines 1-11 Link Here
1
--- gio/tests/gdbus-peer.c.orig	2010-08-16 21:30:03.000000000 +0200
2
+++ gio/tests/gdbus-peer.c	2010-08-16 23:13:32.000000000 +0200
3
@@ -42,6 +42,8 @@
4
 #include <sys/socket.h>
5
 #endif
6
 
7
+#include <sys/socket.h>
8
+
9
 /* used in test_overflow */
10
 #ifdef G_OS_UNIX
11
 #include <gio/gunixconnection.h>
(-)glib20/files/patch-gio_tests_include.c (-3 / +3 lines)
Lines 1-7 Link Here
1
--- glib/tests/include.c.orig	2012-03-06 12:11:39.000000000 +0100
1
--- glib/tests/include.c.orig	2014-01-07 01:02:48.000000000 +0600
2
+++ glib/tests/include.c	2012-03-06 12:13:17.000000000 +0100
2
+++ glib/tests/include.c
3
@@ -3,6 +3,7 @@
3
@@ -3,6 +3,7 @@
4
 #define _POSIX_C_SOURCE 0
4
 #define _POSIX_C_SOURCE 199309L
5
 #undef _GNU_SOURCE
5
 #undef _GNU_SOURCE
6
 #undef _XOPEN_SOURCE
6
 #undef _XOPEN_SOURCE
7
+#include <sys/types.h>
7
+#include <sys/types.h>
(-)glib20/files/patch-gio_xdgmime_xdgmime.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- gio/xdgmime/xdgmime.c.orig	Mon Nov  8 22:25:27 2004
1
--- gio/xdgmime/xdgmime.c.orig	2014-02-03 23:40:41.000000000 +0600
2
+++ gio/xdgmime/xdgmime.c	Sat Nov 13 10:27:22 2004
2
+++ gio/xdgmime/xdgmime.c	2014-08-03 16:57:53.000000000 +0600
3
@@ -204,7 +204,7 @@
3
@@ -255,7 +255,7 @@
4
 
4
 
5
   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
5
   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
6
   if (xdg_data_dirs == NULL)
6
   if (xdg_data_dirs == NULL)
(-)glib20/files/patch-gio_xdgmime_xdgmimecache.h (-3 / +3 lines)
Lines 1-6 Link Here
1
--- gio/xdgmime/xdgmimecache.h.orig	2008-06-12 10:25:40.000000000 -0400
1
--- gio/xdgmime/xdgmimecache.h.orig	2014-02-03 23:40:41.000000000 +0600
2
+++ gio/xdgmime/xdgmimecache.h	2008-06-14 00:49:59.000000000 -0400
2
+++ gio/xdgmime/xdgmimecache.h
3
@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach
3
@@ -44,6 +44,9 @@
4
 #define _xdg_mime_cache_get_icon                      XDG_RESERVED_ENTRY(cache_get_icon)
4
 #define _xdg_mime_cache_get_icon                      XDG_RESERVED_ENTRY(cache_get_icon)
5
 #define _xdg_mime_cache_get_generic_icon              XDG_RESERVED_ENTRY(cache_get_generic_icon)
5
 #define _xdg_mime_cache_get_generic_icon              XDG_RESERVED_ENTRY(cache_get_generic_icon)
6
 #define _xdg_mime_cache_glob_dump                     XDG_RESERVED_ENTRY(cache_glob_dump)
6
 #define _xdg_mime_cache_glob_dump                     XDG_RESERVED_ENTRY(cache_glob_dump)
(-)glib20/files/patch-glib-2.0.pc.in (-2 / +2 lines)
Lines 1-5 Link Here
1
--- glib-2.0.pc.in.orig	2012-01-16 04:12:06.000000000 +0100
1
--- glib-2.0.pc.in.orig	2014-03-20 09:51:57.000000000 +0600
2
+++ glib-2.0.pc.in	2012-03-06 12:30:11.000000000 +0100
2
+++ glib-2.0.pc.in
3
@@ -13,4 +13,4 @@
3
@@ -13,4 +13,4 @@
4
 Requires.private: @PCRE_REQUIRES@
4
 Requires.private: @PCRE_REQUIRES@
5
 Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
5
 Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
(-)glib20/files/patch-glib_Makefile.in (-11 / +11 lines)
Lines 1-24 Link Here
1
--- glib/Makefile.in.orig	2012-09-24 01:59:13.000000000 +0000
1
--- glib/Makefile.in.orig	2014-08-03 16:57:28.000000000 +0600
2
+++ glib/Makefile.in	2012-09-24 02:02:07.000000000 +0000
2
+++ glib/Makefile.in
3
@@ -585,7 +585,7 @@
3
@@ -963,7 +963,7 @@
4
 #
4
 @ENABLE_INSTALLED_TESTS_TRUE@                      $(dist_test_scripts) $(dist_installed_test_scripts)
5
 DISTCLEANFILES = glibconfig-stamp glibconfig.h
5
 
6
 CLEANFILES = libglib-gdb.py glib-public-headers.txt $(am__append_6)
6
 @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
7
-configexecincludedir = $(libdir)/glib-2.0/include
7
-configexecincludedir = $(libdir)/glib-2.0/include
8
+configexecincludedir = $(includedir)/glib-2.0
8
+configexecincludedir = $(includedir)/glib-2.0
9
 nodist_configexecinclude_HEADERS = glibconfig.h
9
 nodist_configexecinclude_HEADERS = glibconfig.h
10
 @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
10
 @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
11
 @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
11
 @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
12
@@ -1617,7 +1617,7 @@
12
@@ -2834,7 +2834,7 @@
13
 info-am:
13
 info-am:
14
 
14
 
15
 install-data-am: install-data-local install-deprecatedincludeHEADERS \
15
 install-data-am: install-data-local install-deprecatedincludeHEADERS \
16
-	install-dist_gdbSCRIPTS install-glibincludeHEADERS \
16
-	install-dist_gdbSCRIPTS install-glibincludeHEADERS \
17
+	install-glibincludeHEADERS \
17
+	install-glibincludeHEADERS \
18
 	install-glibsubincludeHEADERS install-tapsetDATA
18
 	install-glibsubincludeHEADERS \
19
 	@$(NORMAL_INSTALL)
19
 	install-installed_testLTLIBRARIES \
20
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
20
 	install-installed_testPROGRAMS install-installed_testSCRIPTS \
21
@@ -1906,9 +1906,7 @@
21
@@ -3083,9 +3083,7 @@
22
 libglib-gdb.py: libglib-gdb.py.in
22
 libglib-gdb.py: libglib-gdb.py.in
23
 	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
23
 	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
24
 
24
 
(-)glib20/files/patch-glib__libcharset__Makefile.in (-3 / +3 lines)
Lines 1-6 Link Here
1
--- glib/libcharset/Makefile.in.orig	2010-08-08 12:46:01.000000000 +0200
1
--- glib/libcharset/Makefile.in.orig	2014-08-03 16:57:28.000000000 +0600
2
+++ glib/libcharset/Makefile.in	2010-08-08 12:46:01.000000000 +0200
2
+++ glib/libcharset/Makefile.in
3
@@ -566,7 +566,7 @@ install-dvi: install-dvi-am
3
@@ -1384,7 +1384,7 @@
4
 
4
 
5
 install-dvi-am:
5
 install-dvi-am:
6
 
6
 
(-)glib20/files/patch-glib_deprecated_gthread.h (-10 lines)
Lines 1-10 Link Here
1
--- ./glib/deprecated/gthread.h.orig	2012-05-27 17:07:04.000000000 +0200
2
+++ ./glib/deprecated/gthread.h	2012-05-27 17:07:19.000000000 +0200
3
@@ -120,6 +120,7 @@
4
                                 gpointer          user_data);
5
 
6
 #ifndef G_OS_WIN32
7
+#include <sys/types.h>
8
 #include <pthread.h>
9
 #endif
10
 
(-)glib20/files/patch-glib_fix_hidden (-4 / +4 lines)
Lines 1-6 Link Here
1
--- glib/gmem.c.orig	2011-02-10 00:31:42.000000000 +0100
1
--- glib/gmem.c.orig	2014-02-22 21:29:07.000000000 +0600
2
+++ glib/gmem.c	2011-12-07 00:21:38.000000000 +0100
2
+++ glib/gmem.c
3
@@ -39,6 +39,7 @@
3
@@ -38,6 +38,7 @@
4
 #include "gbacktrace.h"
4
 #include "gbacktrace.h"
5
 #include "gtestutils.h"
5
 #include "gtestutils.h"
6
 #include "gthread.h"
6
 #include "gthread.h"
Lines 7-10 Link Here
7
+#include "gthreadprivate.h"
7
+#include "gthreadprivate.h"
8
 #include "glib_trace.h"
8
 #include "glib_trace.h"
9
 
9
 
10
 
10
 #define MEM_PROFILE_TABLE_SIZE 4096
(-)glib20/files/patch-glib_gconvert.c (-3 / +3 lines)
Lines 1-9 Link Here
1
Work around our situation of having both libiconv in libc and libiconv from
1
Work around our situation of having both libiconv in libc and libiconv from
2
ports installed.
2
ports installed.
3
3
4
--- glib/gconvert.c.orig	2014-02-08 10:15:50.000000000 +0100
4
--- glib/gconvert.c.orig	2014-02-22 21:29:07.000000000 +0600
5
+++ glib/gconvert.c	2014-02-08 10:16:52.000000000 +0100
5
+++ glib/gconvert.c
6
@@ -62,7 +62,7 @@
6
@@ -55,7 +55,7 @@
7
 #error GNU libiconv in use but included iconv.h not from libiconv
7
 #error GNU libiconv in use but included iconv.h not from libiconv
8
 #endif
8
 #endif
9
 #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) \
9
 #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) \
(-)glib20/files/patch-glib_gmain.c (-38 lines)
Lines 1-38 Link Here
1
From 0513c855cba69b96e4c9d2200719249a8a0c586e Mon Sep 17 00:00:00 2001
2
From: Dan Winship <danw@gnome.org>
3
Date: Wed, 10 Apr 2013 11:39:12 -0400
4
Subject: [PATCH] gmain: fix double-unlock in g_main_context_unref()
5
6
When unreffing a context with sources still attached, it would end up
7
unlocking an already-unlocked context, causing crashes on platforms
8
that (unlike Linux) actually check for that.
9
10
https://bugzilla.gnome.org/show_bug.cgi?id=697595
11
---
12
 glib/gmain.c | 6 +++++-
13
 1 file changed, 5 insertions(+), 1 deletion(-)
14
15
diff --git a/glib/gmain.c b/glib/gmain.c
16
index 68a7f8e..d6037ba 100644
17
--- glib/gmain.c
18
+++ glib/gmain.c
19
@@ -520,12 +520,16 @@ g_main_context_unref (GMainContext *context)
20
   main_context_list = g_slist_remove (main_context_list, context);
21
   G_UNLOCK (main_context_list);
22
 
23
+  /* g_source_iter_next() assumes the context is locked. */
24
+  LOCK_CONTEXT (context);
25
   g_source_iter_init (&iter, context, TRUE);
26
   while (g_source_iter_next (&iter, &source))
27
     {
28
       source->context = NULL;
29
-      g_source_destroy_internal (source, context, FALSE);
30
+      g_source_destroy_internal (source, context, TRUE);
31
     }
32
+  UNLOCK_CONTEXT (context);
33
+
34
   for (sl_iter = context->source_lists; sl_iter; sl_iter = sl_iter->next)
35
     {
36
       list = sl_iter->data;
37
-- 
38
1.8.1.4
(-)glib20/files/patch-glib_gthread-posix.c (-4 / +4 lines)
Lines 1-6 Link Here
1
--- glib/gthread-posix.c.orig	2012-11-10 03:24:06.000000000 +0000
1
--- glib/gthread-posix.c.orig	2014-02-22 21:29:07.000000000 +0600
2
+++ glib/gthread-posix.c	2012-11-12 18:06:36.000000000 +0000
2
+++ glib/gthread-posix.c
3
@@ -89,7 +89,7 @@
3
@@ -88,7 +88,7 @@
4
   if G_UNLIKELY (mutex == NULL)
4
   if G_UNLIKELY (mutex == NULL)
5
     g_thread_abort (errno, "malloc");
5
     g_thread_abort (errno, "malloc");
6
 
6
 
Lines 9-15 Link Here
9
   {
9
   {
10
     pthread_mutexattr_t attr;
10
     pthread_mutexattr_t attr;
11
     pthread_mutexattr_init (&attr);
11
     pthread_mutexattr_init (&attr);
12
@@ -101,7 +101,7 @@
12
@@ -100,7 +100,7 @@
13
   if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0)
13
   if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0)
14
     g_thread_abort (status, "pthread_mutex_init");
14
     g_thread_abort (status, "pthread_mutex_init");
15
 
15
 
(-)glib20/files/patch-glib_gutils.c (-5 / +5 lines)
Lines 1-7 Link Here
1
--- glib/gutils.c.orig	Wed Mar 23 09:55:02 2005
1
--- glib/gutils.c.orig	2014-08-03 16:57:28.000000000 +0600
2
+++ glib/gutils.c	Thu Apr  7 01:06:16 2005
2
+++ glib/gutils.c
3
@@ -1929,7 +1929,7 @@ g_get_system_data_dirs (void)
3
@@ -1940,7 +1940,7 @@ g_get_system_data_dirs (void)
4
       data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
4
       gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
5
 
5
 
6
       if (!data_dirs || !data_dirs[0])
6
       if (!data_dirs || !data_dirs[0])
7
-          data_dirs = "/usr/local/share/:/usr/share/";
7
-          data_dirs = "/usr/local/share/:/usr/share/";
Lines 9-15 Link Here
9
 
9
 
10
       data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
10
       data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
11
 #endif
11
 #endif
12
@@ -1983,7 +1983,7 @@ g_get_system_config_dirs (void)
12
@@ -2002,7 +2002,7 @@ g_get_system_config_dirs (void)
13
       conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
13
       conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS");
14
 
14
 
15
       if (!conf_dirs || !conf_dirs[0])
15
       if (!conf_dirs || !conf_dirs[0])
(-)glib20/files/patch-glib_tests_gdatetime.c (-20 lines)
Lines 1-20 Link Here
1
--- glib/tests/gdatetime.c.orig	2013-03-13 13:39:09.000000000 +0000
2
+++ glib/tests/gdatetime.c	2013-03-28 10:15:49.000000000 +0000
3
@@ -1276,7 +1276,7 @@
4
   gint i1, i2;
5
 
6
 #ifdef G_OS_UNIX
7
-  tz = g_time_zone_new ("Canada/Eastern");
8
+  tz = g_time_zone_new ("America/Montreal");
9
 #elif defined G_OS_WIN32
10
   tz = g_time_zone_new ("Eastern Standard Time");
11
 #endif
12
@@ -1309,7 +1309,7 @@
13
   gint i1, i2;
14
 
15
 #ifdef G_OS_UNIX
16
-  tz = g_time_zone_new ("Canada/Eastern");
17
+  tz = g_time_zone_new ("America/Montreal");
18
 #elif defined G_OS_WIN32
19
   tz = g_time_zone_new ("Eastern Standard Time");
20
 #endif
(-)glib20/files/patch-glib_tests_utils.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- glib/tests/utils.c.orig	2012-09-24 02:19:54.000000000 +0000
1
--- glib/tests/utils.c.orig	2014-01-07 01:02:48.000000000 +0600
2
+++ glib/tests/utils.c	2012-09-24 02:20:48.000000000 +0000
2
+++ glib/tests/utils.c
3
@@ -416,7 +416,7 @@
3
@@ -440,7 +440,7 @@
4
 
4
 
5
   xdg = (gchar *)g_getenv ("XDG_CONFIG_DIRS");
5
   xdg = (gchar *)g_getenv ("XDG_CONFIG_DIRS");
6
   if (!xdg)
6
   if (!xdg)
(-)glib20/files/patch-gmodule__gmodule-dl.c (-4 / +4 lines)
Lines 1-6 Link Here
1
--- gmodule/gmodule-dl.c.orig	Sat Feb 17 08:28:07 2001
1
--- gmodule/gmodule-dl.c.orig	2014-02-03 23:40:41.000000000 +0600
2
+++ gmodule/gmodule-dl.c	Fri Jan 18 09:48:45 2002
2
+++ gmodule/gmodule-dl.c
3
@@ -104,6 +104,7 @@
3
@@ -105,6 +105,7 @@
4
 static gpointer
4
 static gpointer
5
 _g_module_self (void)
5
 _g_module_self (void)
6
 {
6
 {
Lines 8-14 Link Here
8
   gpointer handle;
8
   gpointer handle;
9
   
9
   
10
   /* to query symbols from the program itself, special link options
10
   /* to query symbols from the program itself, special link options
11
@@ -115,6 +116,9 @@
11
@@ -120,6 +121,9 @@
12
     g_module_set_error (fetch_dlerror (TRUE));
12
     g_module_set_error (fetch_dlerror (TRUE));
13
   
13
   
14
   return handle;
14
   return handle;
(-)glib20/files/patch-gobject_Makefile.in (-8 / +8 lines)
Lines 1-6 Link Here
1
--- gobject/Makefile.in.orig	2012-05-03 11:42:11.000000000 +0200
1
--- gobject/Makefile.in.orig	2014-08-03 16:57:28.000000000 +0600
2
+++ gobject/Makefile.in	2012-05-03 11:42:51.000000000 +0200
2
+++ gobject/Makefile.in
3
@@ -566,6 +566,7 @@
3
@@ -870,6 +870,7 @@
4
 @OS_WIN32_AND_DLL_COMPILATION_TRUE@gobject_win32_res_ldflag = -Wl,$(gobject_win32_res)
4
 @OS_WIN32_AND_DLL_COMPILATION_TRUE@gobject_win32_res_ldflag = -Wl,$(gobject_win32_res)
5
 libgobjectincludedir = $(includedir)/glib-2.0/gobject
5
 libgobjectincludedir = $(includedir)/glib-2.0/gobject
6
 libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
6
 libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
Lines 8-23 Link Here
8
   $(gobject_win32_res_ldflag) \
8
   $(gobject_win32_res_ldflag) \
9
   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
9
   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
10
   -export-dynamic $(no_undefined)
10
   -export-dynamic $(no_undefined)
11
@@ -1331,7 +1332,7 @@
11
@@ -2003,7 +2004,7 @@
12
 
12
 
13
 info-am:
13
 info-am:
14
 
14
 
15
-install-data-am: install-data-local install-dist_gdbSCRIPTS \
15
-install-data-am: install-data-local install-dist_gdbSCRIPTS \
16
+install-data-am: install-data-local \
16
+install-data-am: install-data-local \
17
 	install-libgobjectincludeHEADERS install-tapsetDATA
17
 	install-installed_testLTLIBRARIES \
18
 	@$(NORMAL_INSTALL)
18
 	install-installed_testPROGRAMS install-installed_testSCRIPTS \
19
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
19
 	install-installed_test_metaDATA \
20
@@ -1586,9 +1587,7 @@
20
@@ -2230,9 +2231,7 @@
21
 uninstall-gdb:
21
 uninstall-gdb:
22
 	-rm -r $(DESTDIR)$(datadir)/gdb
22
 	-rm -r $(DESTDIR)$(datadir)/gdb
23
 
23
 
(-)glib20/pkg-plist (-169 / +179 lines)
Lines 1-3 Link Here
1
bin/gapplication
1
bin/gdbus
2
bin/gdbus
2
bin/gdbus-codegen
3
bin/gdbus-codegen
3
bin/gio-querymodules
4
bin/gio-querymodules
Lines 11-19 Link Here
11
bin/gsettings
12
bin/gsettings
12
bin/gtester
13
bin/gtester
13
bin/gtester-report
14
bin/gtester-report
14
share/bash-completion/completions/gdbus
15
share/bash-completion/completions/gsettings
16
share/bash-completion/completions/gresource
17
include/gio-unix-2.0/gio/gdesktopappinfo.h
15
include/gio-unix-2.0/gio/gdesktopappinfo.h
18
include/gio-unix-2.0/gio/gfiledescriptorbased.h
16
include/gio-unix-2.0/gio/gfiledescriptorbased.h
19
include/gio-unix-2.0/gio/gunixconnection.h
17
include/gio-unix-2.0/gio/gunixconnection.h
Lines 35-40 Link Here
35
include/glib-2.0/gio/gasyncresult.h
33
include/glib-2.0/gio/gasyncresult.h
36
include/glib-2.0/gio/gbufferedinputstream.h
34
include/glib-2.0/gio/gbufferedinputstream.h
37
include/glib-2.0/gio/gbufferedoutputstream.h
35
include/glib-2.0/gio/gbufferedoutputstream.h
36
include/glib-2.0/gio/gbytesicon.h
38
include/glib-2.0/gio/gcancellable.h
37
include/glib-2.0/gio/gcancellable.h
39
include/glib-2.0/gio/gcharsetconverter.h
38
include/glib-2.0/gio/gcharsetconverter.h
40
include/glib-2.0/gio/gcontenttype.h
39
include/glib-2.0/gio/gcontenttype.h
Lines 108-118 Link Here
108
include/glib-2.0/gio/gnetworking.h
107
include/glib-2.0/gio/gnetworking.h
109
include/glib-2.0/gio/gnetworkmonitor.h
108
include/glib-2.0/gio/gnetworkmonitor.h
110
include/glib-2.0/gio/gnetworkservice.h
109
include/glib-2.0/gio/gnetworkservice.h
110
include/glib-2.0/gio/gnotification.h
111
include/glib-2.0/gio/goutputstream.h
111
include/glib-2.0/gio/goutputstream.h
112
include/glib-2.0/gio/gpermission.h
112
include/glib-2.0/gio/gpermission.h
113
include/glib-2.0/gio/gpollableinputstream.h
113
include/glib-2.0/gio/gpollableinputstream.h
114
include/glib-2.0/gio/gpollableoutputstream.h
114
include/glib-2.0/gio/gpollableoutputstream.h
115
include/glib-2.0/gio/gpollableutils.h
115
include/glib-2.0/gio/gpollableutils.h
116
include/glib-2.0/gio/gpropertyaction.h
116
include/glib-2.0/gio/gproxy.h
117
include/glib-2.0/gio/gproxy.h
117
include/glib-2.0/gio/gproxyaddress.h
118
include/glib-2.0/gio/gproxyaddress.h
118
include/glib-2.0/gio/gproxyaddressenumerator.h
119
include/glib-2.0/gio/gproxyaddressenumerator.h
Lines 126-134 Link Here
126
include/glib-2.0/gio/gsettingsschema.h
127
include/glib-2.0/gio/gsettingsschema.h
127
include/glib-2.0/gio/gsimpleaction.h
128
include/glib-2.0/gio/gsimpleaction.h
128
include/glib-2.0/gio/gsimpleactiongroup.h
129
include/glib-2.0/gio/gsimpleactiongroup.h
129
include/glib-2.0/gio/gsimpleproxyresolver.h
130
include/glib-2.0/gio/gsimpleasyncresult.h
130
include/glib-2.0/gio/gsimpleasyncresult.h
131
include/glib-2.0/gio/gsimplepermission.h
131
include/glib-2.0/gio/gsimplepermission.h
132
include/glib-2.0/gio/gsimpleproxyresolver.h
132
include/glib-2.0/gio/gsocket.h
133
include/glib-2.0/gio/gsocket.h
133
include/glib-2.0/gio/gsocketaddress.h
134
include/glib-2.0/gio/gsocketaddress.h
134
include/glib-2.0/gio/gsocketaddressenumerator.h
135
include/glib-2.0/gio/gsocketaddressenumerator.h
Lines 139-144 Link Here
139
include/glib-2.0/gio/gsocketlistener.h
140
include/glib-2.0/gio/gsocketlistener.h
140
include/glib-2.0/gio/gsocketservice.h
141
include/glib-2.0/gio/gsocketservice.h
141
include/glib-2.0/gio/gsrvtarget.h
142
include/glib-2.0/gio/gsrvtarget.h
143
include/glib-2.0/gio/gsubprocess.h
144
include/glib-2.0/gio/gsubprocesslauncher.h
142
include/glib-2.0/gio/gtask.h
145
include/glib-2.0/gio/gtask.h
143
include/glib-2.0/gio/gtcpconnection.h
146
include/glib-2.0/gio/gtcpconnection.h
144
include/glib-2.0/gio/gtcpwrapperconnection.h
147
include/glib-2.0/gio/gtcpwrapperconnection.h
Lines 264-286 Link Here
264
lib/libgio-2.0.a
267
lib/libgio-2.0.a
265
lib/libgio-2.0.so
268
lib/libgio-2.0.so
266
lib/libgio-2.0.so.0
269
lib/libgio-2.0.so.0
267
lib/libgio-2.0.so.%%LIBVERSION%%
270
lib/libgio-2.0.so.0.4000.0
268
lib/libglib-2.0.a
271
lib/libglib-2.0.a
269
lib/libglib-2.0.so
272
lib/libglib-2.0.so
270
lib/libglib-2.0.so.0
273
lib/libglib-2.0.so.0
271
lib/libglib-2.0.so.%%LIBVERSION%%
274
lib/libglib-2.0.so.0.4000.0
272
lib/libgmodule-2.0.a
275
lib/libgmodule-2.0.a
273
lib/libgmodule-2.0.so
276
lib/libgmodule-2.0.so
274
lib/libgmodule-2.0.so.0
277
lib/libgmodule-2.0.so.0
275
lib/libgmodule-2.0.so.%%LIBVERSION%%
278
lib/libgmodule-2.0.so.0.4000.0
276
lib/libgobject-2.0.a
279
lib/libgobject-2.0.a
277
lib/libgobject-2.0.so
280
lib/libgobject-2.0.so
278
lib/libgobject-2.0.so.0
281
lib/libgobject-2.0.so.0
279
lib/libgobject-2.0.so.%%LIBVERSION%%
282
lib/libgobject-2.0.so.0.4000.0
280
lib/libgthread-2.0.a
283
lib/libgthread-2.0.a
281
lib/libgthread-2.0.so
284
lib/libgthread-2.0.so
282
lib/libgthread-2.0.so.0
285
lib/libgthread-2.0.so.0
283
lib/libgthread-2.0.so.%%LIBVERSION%%
286
lib/libgthread-2.0.so.0.4000.0
284
libdata/pkgconfig/gio-2.0.pc
287
libdata/pkgconfig/gio-2.0.pc
285
libdata/pkgconfig/gio-unix-2.0.pc
288
libdata/pkgconfig/gio-unix-2.0.pc
286
libdata/pkgconfig/glib-2.0.pc
289
libdata/pkgconfig/glib-2.0.pc
Lines 292-297 Link Here
292
share/aclocal/glib-2.0.m4
295
share/aclocal/glib-2.0.m4
293
share/aclocal/glib-gettext.m4
296
share/aclocal/glib-gettext.m4
294
share/aclocal/gsettings.m4
297
share/aclocal/gsettings.m4
298
%%BASH_COMPLETIONS%%share/bash-completion/completions/gapplication
299
%%BASH_COMPLETIONS%%share/bash-completion/completions/gdbus
300
%%BASH_COMPLETIONS%%share/bash-completion/completions/gresource
301
%%BASH_COMPLETIONS%%share/bash-completion/completions/gsettings
295
share/glib-2.0/codegen/__init__.py
302
share/glib-2.0/codegen/__init__.py
296
share/glib-2.0/codegen/__init__.pyc
303
share/glib-2.0/codegen/__init__.pyc
297
share/glib-2.0/codegen/__init__.pyo
304
share/glib-2.0/codegen/__init__.pyo
Lines 318-492 Link Here
318
share/glib-2.0/codegen/utils.pyo
325
share/glib-2.0/codegen/utils.pyo
319
share/glib-2.0/gettext/po/Makefile.in.in
326
share/glib-2.0/gettext/po/Makefile.in.in
320
share/glib-2.0/schemas/gschema.dtd
327
share/glib-2.0/schemas/gschema.dtd
321
share/locale/af/LC_MESSAGES/glib20.mo
328
%%NLS%%share/locale/af/LC_MESSAGES/glib20.mo
322
share/locale/am/LC_MESSAGES/glib20.mo
329
%%NLS%%share/locale/am/LC_MESSAGES/glib20.mo
323
share/locale/ar/LC_MESSAGES/glib20.mo
330
%%NLS%%share/locale/an/LC_MESSAGES/glib20.mo
324
share/locale/as/LC_MESSAGES/glib20.mo
331
%%NLS%%share/locale/ar/LC_MESSAGES/glib20.mo
325
share/locale/ast/LC_MESSAGES/glib20.mo
332
%%NLS%%share/locale/as/LC_MESSAGES/glib20.mo
326
share/locale/az/LC_MESSAGES/glib20.mo
333
%%NLS%%share/locale/ast/LC_MESSAGES/glib20.mo
327
share/locale/be/LC_MESSAGES/glib20.mo
334
%%NLS%%share/locale/az/LC_MESSAGES/glib20.mo
328
share/locale/be@latin/LC_MESSAGES/glib20.mo
335
%%NLS%%share/locale/be/LC_MESSAGES/glib20.mo
329
share/locale/bg/LC_MESSAGES/glib20.mo
336
%%NLS%%share/locale/be@latin/LC_MESSAGES/glib20.mo
330
share/locale/bn/LC_MESSAGES/glib20.mo
337
%%NLS%%share/locale/bg/LC_MESSAGES/glib20.mo
331
share/locale/bn_IN/LC_MESSAGES/glib20.mo
338
%%NLS%%share/locale/bn/LC_MESSAGES/glib20.mo
332
share/locale/bs/LC_MESSAGES/glib20.mo
339
%%NLS%%share/locale/bn_IN/LC_MESSAGES/glib20.mo
333
share/locale/ca/LC_MESSAGES/glib20.mo
340
%%NLS%%share/locale/bs/LC_MESSAGES/glib20.mo
334
share/locale/ca@valencia/LC_MESSAGES/glib20.mo
341
%%NLS%%share/locale/ca/LC_MESSAGES/glib20.mo
335
share/locale/cs/LC_MESSAGES/glib20.mo
342
%%NLS%%share/locale/ca@valencia/LC_MESSAGES/glib20.mo
336
share/locale/cy/LC_MESSAGES/glib20.mo
343
%%NLS%%share/locale/cs/LC_MESSAGES/glib20.mo
337
share/locale/da/LC_MESSAGES/glib20.mo
344
%%NLS%%share/locale/cy/LC_MESSAGES/glib20.mo
338
share/locale/de/LC_MESSAGES/glib20.mo
345
%%NLS%%share/locale/da/LC_MESSAGES/glib20.mo
339
share/locale/dz/LC_MESSAGES/glib20.mo
346
%%NLS%%share/locale/de/LC_MESSAGES/glib20.mo
340
share/locale/el/LC_MESSAGES/glib20.mo
347
%%NLS%%share/locale/dz/LC_MESSAGES/glib20.mo
341
share/locale/en@shaw/LC_MESSAGES/glib20.mo
348
%%NLS%%share/locale/el/LC_MESSAGES/glib20.mo
342
share/locale/en_CA/LC_MESSAGES/glib20.mo
349
%%NLS%%share/locale/en@shaw/LC_MESSAGES/glib20.mo
343
share/locale/en_GB/LC_MESSAGES/glib20.mo
350
%%NLS%%share/locale/en_CA/LC_MESSAGES/glib20.mo
344
share/locale/eo/LC_MESSAGES/glib20.mo
351
%%NLS%%share/locale/en_GB/LC_MESSAGES/glib20.mo
345
share/locale/es/LC_MESSAGES/glib20.mo
352
%%NLS%%share/locale/eo/LC_MESSAGES/glib20.mo
346
share/locale/et/LC_MESSAGES/glib20.mo
353
%%NLS%%share/locale/es/LC_MESSAGES/glib20.mo
347
share/locale/eu/LC_MESSAGES/glib20.mo
354
%%NLS%%share/locale/et/LC_MESSAGES/glib20.mo
348
share/locale/fa/LC_MESSAGES/glib20.mo
355
%%NLS%%share/locale/eu/LC_MESSAGES/glib20.mo
349
share/locale/fi/LC_MESSAGES/glib20.mo
356
%%NLS%%share/locale/fa/LC_MESSAGES/glib20.mo
350
share/locale/fr/LC_MESSAGES/glib20.mo
357
%%NLS%%share/locale/fi/LC_MESSAGES/glib20.mo
351
share/locale/ga/LC_MESSAGES/glib20.mo
358
%%NLS%%share/locale/fr/LC_MESSAGES/glib20.mo
352
share/locale/gl/LC_MESSAGES/glib20.mo
359
%%NLS%%share/locale/ga/LC_MESSAGES/glib20.mo
353
share/locale/gu/LC_MESSAGES/glib20.mo
360
%%NLS%%share/locale/gl/LC_MESSAGES/glib20.mo
354
share/locale/he/LC_MESSAGES/glib20.mo
361
%%NLS%%share/locale/gu/LC_MESSAGES/glib20.mo
355
share/locale/hi/LC_MESSAGES/glib20.mo
362
%%NLS%%share/locale/he/LC_MESSAGES/glib20.mo
356
share/locale/hr/LC_MESSAGES/glib20.mo
363
%%NLS%%share/locale/hi/LC_MESSAGES/glib20.mo
357
share/locale/hu/LC_MESSAGES/glib20.mo
364
%%NLS%%share/locale/hr/LC_MESSAGES/glib20.mo
358
share/locale/hy/LC_MESSAGES/glib20.mo
365
%%NLS%%share/locale/hu/LC_MESSAGES/glib20.mo
359
share/locale/id/LC_MESSAGES/glib20.mo
366
%%NLS%%share/locale/hy/LC_MESSAGES/glib20.mo
360
share/locale/is/LC_MESSAGES/glib20.mo
367
%%NLS%%share/locale/id/LC_MESSAGES/glib20.mo
361
share/locale/it/LC_MESSAGES/glib20.mo
368
%%NLS%%share/locale/is/LC_MESSAGES/glib20.mo
362
share/locale/ja/LC_MESSAGES/glib20.mo
369
%%NLS%%share/locale/it/LC_MESSAGES/glib20.mo
363
share/locale/ka/LC_MESSAGES/glib20.mo
370
%%NLS%%share/locale/ja/LC_MESSAGES/glib20.mo
364
share/locale/kk/LC_MESSAGES/glib20.mo
371
%%NLS%%share/locale/ka/LC_MESSAGES/glib20.mo
365
share/locale/kn/LC_MESSAGES/glib20.mo
372
%%NLS%%share/locale/kk/LC_MESSAGES/glib20.mo
366
share/locale/ko/LC_MESSAGES/glib20.mo
373
%%NLS%%share/locale/kn/LC_MESSAGES/glib20.mo
367
share/locale/ku/LC_MESSAGES/glib20.mo
374
%%NLS%%share/locale/ko/LC_MESSAGES/glib20.mo
368
share/locale/lt/LC_MESSAGES/glib20.mo
375
%%NLS%%share/locale/ku/LC_MESSAGES/glib20.mo
369
share/locale/lv/LC_MESSAGES/glib20.mo
376
%%NLS%%share/locale/lt/LC_MESSAGES/glib20.mo
370
share/locale/mai/LC_MESSAGES/glib20.mo
377
%%NLS%%share/locale/lv/LC_MESSAGES/glib20.mo
371
share/locale/mg/LC_MESSAGES/glib20.mo
378
%%NLS%%share/locale/mai/LC_MESSAGES/glib20.mo
372
share/locale/mk/LC_MESSAGES/glib20.mo
379
%%NLS%%share/locale/mg/LC_MESSAGES/glib20.mo
373
share/locale/ml/LC_MESSAGES/glib20.mo
380
%%NLS%%share/locale/mk/LC_MESSAGES/glib20.mo
374
share/locale/mn/LC_MESSAGES/glib20.mo
381
%%NLS%%share/locale/ml/LC_MESSAGES/glib20.mo
375
share/locale/mr/LC_MESSAGES/glib20.mo
382
%%NLS%%share/locale/mn/LC_MESSAGES/glib20.mo
376
share/locale/ms/LC_MESSAGES/glib20.mo
383
%%NLS%%share/locale/mr/LC_MESSAGES/glib20.mo
377
share/locale/nb/LC_MESSAGES/glib20.mo
384
%%NLS%%share/locale/ms/LC_MESSAGES/glib20.mo
378
share/locale/nds/LC_MESSAGES/glib20.mo
385
%%NLS%%share/locale/nb/LC_MESSAGES/glib20.mo
379
share/locale/ne/LC_MESSAGES/glib20.mo
386
%%NLS%%share/locale/nds/LC_MESSAGES/glib20.mo
380
share/locale/nl/LC_MESSAGES/glib20.mo
387
%%NLS%%share/locale/ne/LC_MESSAGES/glib20.mo
381
share/locale/nn/LC_MESSAGES/glib20.mo
388
%%NLS%%share/locale/nl/LC_MESSAGES/glib20.mo
382
share/locale/oc/LC_MESSAGES/glib20.mo
389
%%NLS%%share/locale/nn/LC_MESSAGES/glib20.mo
383
share/locale/or/LC_MESSAGES/glib20.mo
390
%%NLS%%share/locale/oc/LC_MESSAGES/glib20.mo
384
share/locale/pa/LC_MESSAGES/glib20.mo
391
%%NLS%%share/locale/or/LC_MESSAGES/glib20.mo
385
share/locale/pl/LC_MESSAGES/glib20.mo
392
%%NLS%%share/locale/pa/LC_MESSAGES/glib20.mo
386
share/locale/ps/LC_MESSAGES/glib20.mo
393
%%NLS%%share/locale/pl/LC_MESSAGES/glib20.mo
387
share/locale/pt/LC_MESSAGES/glib20.mo
394
%%NLS%%share/locale/ps/LC_MESSAGES/glib20.mo
388
share/locale/pt_BR/LC_MESSAGES/glib20.mo
395
%%NLS%%share/locale/pt/LC_MESSAGES/glib20.mo
389
share/locale/ro/LC_MESSAGES/glib20.mo
396
%%NLS%%share/locale/pt_BR/LC_MESSAGES/glib20.mo
390
share/locale/ru/LC_MESSAGES/glib20.mo
397
%%NLS%%share/locale/ro/LC_MESSAGES/glib20.mo
391
share/locale/rw/LC_MESSAGES/glib20.mo
398
%%NLS%%share/locale/ru/LC_MESSAGES/glib20.mo
392
share/locale/si/LC_MESSAGES/glib20.mo
399
%%NLS%%share/locale/rw/LC_MESSAGES/glib20.mo
393
share/locale/sk/LC_MESSAGES/glib20.mo
400
%%NLS%%share/locale/si/LC_MESSAGES/glib20.mo
394
share/locale/sl/LC_MESSAGES/glib20.mo
401
%%NLS%%share/locale/sk/LC_MESSAGES/glib20.mo
395
share/locale/sq/LC_MESSAGES/glib20.mo
402
%%NLS%%share/locale/sl/LC_MESSAGES/glib20.mo
396
share/locale/sr/LC_MESSAGES/glib20.mo
403
%%NLS%%share/locale/sq/LC_MESSAGES/glib20.mo
397
share/locale/sr@ije/LC_MESSAGES/glib20.mo
404
%%NLS%%share/locale/sr/LC_MESSAGES/glib20.mo
398
share/locale/sr@latin/LC_MESSAGES/glib20.mo
405
%%NLS%%share/locale/sr@ije/LC_MESSAGES/glib20.mo
399
share/locale/sv/LC_MESSAGES/glib20.mo
406
%%NLS%%share/locale/sr@latin/LC_MESSAGES/glib20.mo
400
share/locale/ta/LC_MESSAGES/glib20.mo
407
%%NLS%%share/locale/sv/LC_MESSAGES/glib20.mo
401
share/locale/te/LC_MESSAGES/glib20.mo
408
%%NLS%%share/locale/ta/LC_MESSAGES/glib20.mo
402
share/locale/tg/LC_MESSAGES/glib20.mo
409
%%NLS%%share/locale/te/LC_MESSAGES/glib20.mo
403
share/locale/th/LC_MESSAGES/glib20.mo
410
%%NLS%%share/locale/tg/LC_MESSAGES/glib20.mo
404
share/locale/tl/LC_MESSAGES/glib20.mo
411
%%NLS%%share/locale/th/LC_MESSAGES/glib20.mo
405
share/locale/tr/LC_MESSAGES/glib20.mo
412
%%NLS%%share/locale/tl/LC_MESSAGES/glib20.mo
406
share/locale/tt/LC_MESSAGES/glib20.mo
413
%%NLS%%share/locale/tr/LC_MESSAGES/glib20.mo
407
share/locale/ug/LC_MESSAGES/glib20.mo
414
%%NLS%%share/locale/tt/LC_MESSAGES/glib20.mo
408
share/locale/uk/LC_MESSAGES/glib20.mo
415
%%NLS%%share/locale/ug/LC_MESSAGES/glib20.mo
409
share/locale/vi/LC_MESSAGES/glib20.mo
416
%%NLS%%share/locale/uk/LC_MESSAGES/glib20.mo
410
share/locale/wa/LC_MESSAGES/glib20.mo
417
%%NLS%%share/locale/vi/LC_MESSAGES/glib20.mo
411
share/locale/xh/LC_MESSAGES/glib20.mo
418
%%NLS%%share/locale/wa/LC_MESSAGES/glib20.mo
412
share/locale/yi/LC_MESSAGES/glib20.mo
419
%%NLS%%share/locale/xh/LC_MESSAGES/glib20.mo
413
share/locale/zh_CN/LC_MESSAGES/glib20.mo
420
%%NLS%%share/locale/yi/LC_MESSAGES/glib20.mo
414
share/locale/zh_HK/LC_MESSAGES/glib20.mo
421
%%NLS%%share/locale/zh_CN/LC_MESSAGES/glib20.mo
415
share/locale/zh_TW/LC_MESSAGES/glib20.mo
422
%%NLS%%share/locale/zh_HK/LC_MESSAGES/glib20.mo
416
@dirrmtry share/locale/zh_HK/LC_MESSAGES
423
%%NLS%%share/locale/zh_TW/LC_MESSAGES/glib20.mo
417
@dirrmtry share/locale/zh_HK
424
%%BASH_COMPLETIONS%%@dirrmtry share/bash-completion/completions
418
@dirrmtry share/locale/yi/LC_MESSAGES
425
%%BASH_COMPLETIONS%%@dirrmtry share/bash-completion
419
@dirrmtry share/locale/yi
426
%%NLS%%@dirrmtry share/locale/an/LC_MESSAGES
420
@dirrmtry share/locale/xh/LC_MESSAGES
427
%%NLS%%@dirrmtry share/locale/an
421
@dirrmtry share/locale/xh
428
%%NLS%%@dirrmtry share/locale/as/LC_MESSAGES
422
@dirrmtry share/locale/ug/LC_MESSAGES
429
%%NLS%%@dirrmtry share/locale/as
423
@dirrmtry share/locale/ug
430
%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
424
@dirrmtry share/locale/tt/LC_MESSAGES
431
%%NLS%%@dirrmtry share/locale/ast
425
@dirrmtry share/locale/tt
432
%%NLS%%@dirrmtry share/locale/be@latin/LC_MESSAGES
426
@dirrmtry share/locale/tl/LC_MESSAGES
433
%%NLS%%@dirrmtry share/locale/be@latin
427
@dirrmtry share/locale/tl
434
%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
428
@dirrmtry share/locale/te/LC_MESSAGES
435
%%NLS%%@dirrmtry share/locale/bn_IN
429
@dirrmtry share/locale/te
436
%%NLS%%@dirrmtry share/locale/ca@valencia/LC_MESSAGES
430
@dirrmtry share/locale/sr@latin/LC_MESSAGES
437
%%NLS%%@dirrmtry share/locale/ca@valencia
431
@dirrmtry share/locale/sr@latin
438
%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
432
@dirrmtry share/locale/sr@ije/LC_MESSAGES
439
%%NLS%%@dirrmtry share/locale/dz
433
@dirrmtry share/locale/sr@ije
440
%%NLS%%@dirrmtry share/locale/en@shaw/LC_MESSAGES
434
@dirrmtry share/locale/si/LC_MESSAGES
441
%%NLS%%@dirrmtry share/locale/en@shaw
435
@dirrmtry share/locale/si
442
%%NLS%%@dirrmtry share/locale/hy/LC_MESSAGES
436
@dirrmtry share/locale/rw/LC_MESSAGES
443
%%NLS%%@dirrmtry share/locale/hy
437
@dirrmtry share/locale/rw
444
%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
438
@dirrmtry share/locale/ps/LC_MESSAGES
445
%%NLS%%@dirrmtry share/locale/kk
439
@dirrmtry share/locale/ps
446
%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
440
@dirrmtry share/locale/oc/LC_MESSAGES
447
%%NLS%%@dirrmtry share/locale/ku
441
@dirrmtry share/locale/oc
448
%%NLS%%@dirrmtry share/locale/mai/LC_MESSAGES
442
@dirrmtry share/locale/nds/LC_MESSAGES
449
%%NLS%%@dirrmtry share/locale/mai
443
@dirrmtry share/locale/nds
450
%%NLS%%@dirrmtry share/locale/mg/LC_MESSAGES
444
@dirrmtry share/locale/mr/LC_MESSAGES
451
%%NLS%%@dirrmtry share/locale/mg
445
@dirrmtry share/locale/mr
452
%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
446
@dirrmtry share/locale/mg/LC_MESSAGES
453
%%NLS%%@dirrmtry share/locale/mr
447
@dirrmtry share/locale/mg
454
%%NLS%%@dirrmtry share/locale/nds/LC_MESSAGES
448
@dirrmtry share/locale/mai/LC_MESSAGES
455
%%NLS%%@dirrmtry share/locale/nds
449
@dirrmtry share/locale/mai
456
%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
450
@dirrmtry share/locale/ku/LC_MESSAGES
457
%%NLS%%@dirrmtry share/locale/oc
451
@dirrmtry share/locale/ku
458
%%NLS%%@dirrmtry share/locale/ps/LC_MESSAGES
452
@dirrmtry share/locale/kk/LC_MESSAGES
459
%%NLS%%@dirrmtry share/locale/ps
453
@dirrmtry share/locale/kk
460
%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
454
@dirrmtry share/locale/hy/LC_MESSAGES
461
%%NLS%%@dirrmtry share/locale/rw
455
@dirrmtry share/locale/hy
462
%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
456
@dirrmtry share/locale/en@shaw/LC_MESSAGES
463
%%NLS%%@dirrmtry share/locale/si
457
@dirrmtry share/locale/en@shaw
464
%%NLS%%@dirrmtry share/locale/sr@ije/LC_MESSAGES
458
@dirrmtry share/locale/dz/LC_MESSAGES
465
%%NLS%%@dirrmtry share/locale/sr@ije
459
@dirrmtry share/locale/dz
466
%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
460
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
467
%%NLS%%@dirrmtry share/locale/sr@latin
461
@dirrmtry share/locale/ca@valencia
468
%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
462
@dirrmtry share/locale/bn_IN/LC_MESSAGES
469
%%NLS%%@dirrmtry share/locale/te
463
@dirrmtry share/locale/bn_IN
470
%%NLS%%@dirrmtry share/locale/tl/LC_MESSAGES
464
@dirrmtry share/locale/be@latin/LC_MESSAGES
471
%%NLS%%@dirrmtry share/locale/tl
465
@dirrmtry share/locale/be@latin
472
%%NLS%%@dirrmtry share/locale/tt/LC_MESSAGES
466
@dirrmtry share/locale/ast/LC_MESSAGES
473
%%NLS%%@dirrmtry share/locale/tt
467
@dirrmtry share/locale/ast
474
%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
468
@dirrmtry share/locale/as/LC_MESSAGES
475
%%NLS%%@dirrmtry share/locale/ug
469
@dirrmtry share/locale/as
476
%%NLS%%@dirrmtry share/locale/xh/LC_MESSAGES
477
%%NLS%%@dirrmtry share/locale/xh
478
%%NLS%%@dirrmtry share/locale/yi/LC_MESSAGES
479
%%NLS%%@dirrmtry share/locale/yi
480
%%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES
481
%%NLS%%@dirrmtry share/locale/zh_HK
470
@exec mkdir -p %D/share/glib-2.0/schemas
482
@exec mkdir -p %D/share/glib-2.0/schemas
471
@exec glib-compile-schemas %D/share/glib-2.0/schemas
483
@exec glib-compile-schemas %D/share/glib-2.0/schemas
484
@dirrm share/glib-2.0/codegen
485
%%NLS%%@dirrm share/glib-2.0/gettext/po
486
%%NLS%%@dirrm share/glib-2.0/gettext
472
@dirrm share/glib-2.0/schemas
487
@dirrm share/glib-2.0/schemas
473
@dirrm share/glib-2.0/gettext/po
474
@dirrm share/glib-2.0/gettext
475
@dirrm share/glib-2.0/codegen
476
@dirrm share/glib-2.0
488
@dirrm share/glib-2.0
477
@dirrmtry share/bash-completion/completions
478
@dirrmtry share/bash-completion
479
@exec mkdir -p %D/share/GConf/gsettings
489
@exec mkdir -p %D/share/GConf/gsettings
480
@dirrm share/GConf/gsettings
490
@dirrm share/GConf/gsettings
481
@dirrm share/GConf
491
@dirrm share/GConf
482
@exec mkdir -p %D/lib/gio/modules
492
@exec mkdir -p %D/lib/gio/modules
483
@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
493
@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
484
@dirrmtry lib/gio/modules
494
@dirrm lib/gio/modules
485
@dirrmtry lib/gio
495
@dirrm lib/gio
486
@dirrm include/glib-2.0/gobject
496
@dirrm include/gio-unix-2.0/gio
497
@dirrm include/gio-unix-2.0
498
@dirrm include/glib-2.0/gio
487
@dirrm include/glib-2.0/glib/deprecated
499
@dirrm include/glib-2.0/glib/deprecated
488
@dirrm include/glib-2.0/glib
500
@dirrm include/glib-2.0/glib
489
@dirrm include/glib-2.0/gio
501
@dirrm include/glib-2.0/gobject
490
@dirrm include/glib-2.0
502
@dirrm include/glib-2.0
491
@dirrm include/gio-unix-2.0/gio
492
@dirrm include/gio-unix-2.0

Return to bug 193625