Attachment #232572 for bug #262635

Lines 1-8 Link Here

(-)b/devel/glib20/Makefile (-3 / +2 lines)
1	# Created by: Vanilla I. Shu <vanilla@FreeBSD.org>	1	# Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
2		2
3	PORTNAME= glib	3	PORTNAME= glib
4	DISTVERSION= 2.70.4	4	DISTVERSION= 2.72.0
5	PORTREVISION= 1
6	PORTEPOCH= 2	5	PORTEPOCH= 2
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= GNOME	7	MASTER_SITES= GNOME
Lines 37-43 CPE_VENDOR= gnome Link Here
37		36
38	CONFLICTS_INSTALL= p5-Giovanni	37	CONFLICTS_INSTALL= p5-Giovanni
39		38
40	_LIBVERSION= 0.7000.4	39	_LIBVERSION= 0.7200.0
41	PLIST_SUB= LIBVERSION=${_LIBVERSION}	40	PLIST_SUB= LIBVERSION=${_LIBVERSION}
42		41
43	OPTIONS_DEFINE= DEBUG FAM_ALTBACKEND MANPAGES NLS TEST	42	OPTIONS_DEFINE= DEBUG FAM_ALTBACKEND MANPAGES NLS TEST

Lines 1-3 Link Here

(-)b/devel/glib20/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1644582506	1	TIMESTAMP = 1647529291
2	SHA256 (gnome/glib-2.70.4.tar.xz) = ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33	2	SHA256 (gnome/glib-2.72.0.tar.xz) = d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
3	SIZE (gnome/glib-2.70.4.tar.xz) = 4824296	3	SIZE (gnome/glib-2.72.0.tar.xz) = 4879172




--- gio/tests/meson.build.orig	2021-06-10 18:57:57 UTC
+++ gio/tests/meson.build
@@ -49,7 +49,6 @@ gio_tests = {
   'buffered-output-stream' : {},
   'cancellable' : {},
   'contexts' : {},
-  'contenttype' : {},
   'converter-stream' : {},
   'credentials' : {},
   'data-input-stream' : {},
@@ -94,7 +93,6 @@ gio_tests = {
   'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
   'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
   'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']},
-  'gdbus-address-get-session' : {},
   'win32-appinfo' : {},
 }
 
@@ -151,10 +149,6 @@ endif
 if host_machine.system() != 'windows'
   gio_tests += {
     'file' : {},
-    'gdbus-peer' : {
-      'dependencies' : [libgdbus_example_objectmanager_dep],
-      'install_rpath' : installed_tests_execdir
-    },
     'gdbus-peer-object-manager' : {},
     'live-g-file' : {},
     'socket-address' : {},
@@ -190,31 +184,14 @@ if host_machine.system() != 'windows'
     }
   endif
 
-  # Uninstalled because of the check-for-executable logic in DesktopAppInfo
-  # unable to find the installed executable
-  if not glib_have_cocoa
-    gio_tests += {
-      'appinfo' : {
-        'install' : false,
-      },
-      'desktop-app-info' : {
-        'install' : false,
-      },
-    }
-  endif
-
   test_extra_programs += {
     'basic-application' : {},
     'dbus-launch' : {},
-    'appinfo-test' : {},
   }
 
   if not glib_have_cocoa
     test_extra_programs += {
       'apps' : {},
-    }
-    gio_tests += {
-      'mimeapps' : {},
     }
   endif
 

Lines 1-9 Link Here

(-)b/devel/glib20/files/patch-glib_meson.build (-3 / +3 lines)
1	--- glib/meson.build.orig 2021-09-17 10:17:56 UTC	1	--- glib/meson.build.orig 2022-03-17 15:01:31 UTC
2	+++ glib/meson.build	2	+++ glib/meson.build
3	@@ -367,7 +367,7 @@ libglib = library('glib-2.0',	3	@@ -375,7 +375,7 @@ libglib = library('glib-2.0',
4	# intl.lib is not compatible with SAFESEH
5	link_args : [noseh_link_args, glib_link_flags, win32_ldflags],	4	link_args : [noseh_link_args, glib_link_flags, win32_ldflags],
6	include_directories : configinc,	5	include_directories : configinc,
		6	link_with: [charset_lib, gnulib_lib],
7	- dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],	7	- dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],
8	+ dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep] + libutil,	8	+ dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep] + libutil,
9	c_args : glib_c_args,	9	c_args : glib_c_args,

Return to bug 262635

Removed Link Here

(-)a/devel/glib20/files/patch-gio_tests_meson.build (-61 lines)
1	--- gio/tests/meson.build.orig 2021-06-10 18:57:57 UTC
2	+++ gio/tests/meson.build
3	@@ -49,7 +49,6 @@ gio_tests = {
4	'buffered-output-stream' : {},
5	'cancellable' : {},
6	'contexts' : {},
7	- 'contenttype' : {},
8	'converter-stream' : {},
9	'credentials' : {},
10	'data-input-stream' : {},
11	@@ -94,7 +93,6 @@ gio_tests = {
12	'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']},
13	'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']},
14	'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']},
15	- 'gdbus-address-get-session' : {},
16	'win32-appinfo' : {},
17	}
18
19	@@ -151,10 +149,6 @@ endif
20	if host_machine.system() != 'windows'
21	gio_tests += {
22	'file' : {},
23	- 'gdbus-peer' : {
24	- 'dependencies' : [libgdbus_example_objectmanager_dep],
25	- 'install_rpath' : installed_tests_execdir
26	- },
27	'gdbus-peer-object-manager' : {},
28	'live-g-file' : {},
29	'socket-address' : {},
30	@@ -190,31 +184,14 @@ if host_machine.system() != 'windows'
31	}
32	endif
33
34	- # Uninstalled because of the check-for-executable logic in DesktopAppInfo
35	- # unable to find the installed executable
36	- if not glib_have_cocoa
37	- gio_tests += {
38	- 'appinfo' : {
39	- 'install' : false,
40	- },
41	- 'desktop-app-info' : {
42	- 'install' : false,
43	- },
44	- }
45	- endif
46	-
47	test_extra_programs += {
48	'basic-application' : {},
49	'dbus-launch' : {},
50	- 'appinfo-test' : {},
51	}
52
53	if not glib_have_cocoa
54	test_extra_programs += {
55	'apps' : {},
56	- }
57	- gio_tests += {
58	- 'mimeapps' : {},
59	}
60	endif
61

Lines 15-28 bin/gtester Link Here

(-)b/devel/glib20/pkg-plist (-3 / +10 lines)
15	bin/gtester-report	15	bin/gtester-report
16	include/gio-unix-2.0/gio/gdesktopappinfo.h	16	include/gio-unix-2.0/gio/gdesktopappinfo.h
17	include/gio-unix-2.0/gio/gfiledescriptorbased.h	17	include/gio-unix-2.0/gio/gfiledescriptorbased.h
18	include/gio-unix-2.0/gio/gunixconnection.h
19	include/gio-unix-2.0/gio/gunixcredentialsmessage.h
20	include/gio-unix-2.0/gio/gunixfdlist.h	18	include/gio-unix-2.0/gio/gunixfdlist.h
21	include/gio-unix-2.0/gio/gunixfdmessage.h	19	include/gio-unix-2.0/gio/gunixfdmessage.h
22	include/gio-unix-2.0/gio/gunixinputstream.h	20	include/gio-unix-2.0/gio/gunixinputstream.h
23	include/gio-unix-2.0/gio/gunixmounts.h	21	include/gio-unix-2.0/gio/gunixmounts.h
24	include/gio-unix-2.0/gio/gunixoutputstream.h	22	include/gio-unix-2.0/gio/gunixoutputstream.h
25	include/gio-unix-2.0/gio/gunixsocketaddress.h
26	include/glib-2.0/gio/gaction.h	23	include/glib-2.0/gio/gaction.h
27	include/glib-2.0/gio/gactiongroup.h	24	include/glib-2.0/gio/gactiongroup.h
28	include/glib-2.0/gio/gactiongroupexporter.h	25	include/glib-2.0/gio/gactiongroupexporter.h
Lines 67-72 include/glib-2.0/gio/gdbusobjectskeleton.h Link Here
67	include/glib-2.0/gio/gdbusproxy.h	64	include/glib-2.0/gio/gdbusproxy.h
68	include/glib-2.0/gio/gdbusserver.h	65	include/glib-2.0/gio/gdbusserver.h
69	include/glib-2.0/gio/gdbusutils.h	66	include/glib-2.0/gio/gdbusutils.h
		67	include/glib-2.0/gio/gdebugcontroller.h
		68	include/glib-2.0/gio/gdebugcontrollerdbus.h
70	include/glib-2.0/gio/gdrive.h	69	include/glib-2.0/gio/gdrive.h
71	include/glib-2.0/gio/gdtlsclientconnection.h	70	include/glib-2.0/gio/gdtlsclientconnection.h
72	include/glib-2.0/gio/gdtlsconnection.h	71	include/glib-2.0/gio/gdtlsconnection.h
Lines 169-174 include/glib-2.0/gio/gtlsfiledatabase.h Link Here
169	include/glib-2.0/gio/gtlsinteraction.h	168	include/glib-2.0/gio/gtlsinteraction.h
170	include/glib-2.0/gio/gtlspassword.h	169	include/glib-2.0/gio/gtlspassword.h
171	include/glib-2.0/gio/gtlsserverconnection.h	170	include/glib-2.0/gio/gtlsserverconnection.h
		171	include/glib-2.0/gio/gunixconnection.h
		172	include/glib-2.0/gio/gunixcredentialsmessage.h
		173	include/glib-2.0/gio/gunixsocketaddress.h
172	include/glib-2.0/gio/gvfs.h	174	include/glib-2.0/gio/gvfs.h
173	include/glib-2.0/gio/gvolume.h	175	include/glib-2.0/gio/gvolume.h
174	include/glib-2.0/gio/gvolumemonitor.h	176	include/glib-2.0/gio/gvolumemonitor.h
Lines 264-269 include/glib-2.0/glib/gversionmacros.h Link Here
264	include/glib-2.0/glib/gwin32.h	266	include/glib-2.0/glib/gwin32.h
265	include/glib-2.0/gmodule.h	267	include/glib-2.0/gmodule.h
266	include/glib-2.0/gobject/gbinding.h	268	include/glib-2.0/gobject/gbinding.h
		269	include/glib-2.0/gobject/gbindinggroup.h
267	include/glib-2.0/gobject/gboxed.h	270	include/glib-2.0/gobject/gboxed.h
268	include/glib-2.0/gobject/gclosure.h	271	include/glib-2.0/gobject/gclosure.h
269	include/glib-2.0/gobject/genums.h	272	include/glib-2.0/gobject/genums.h
Lines 276-281 include/glib-2.0/gobject/gobjectnotifyqueue.c Link Here
276	include/glib-2.0/gobject/gparam.h	279	include/glib-2.0/gobject/gparam.h
277	include/glib-2.0/gobject/gparamspecs.h	280	include/glib-2.0/gobject/gparamspecs.h
278	include/glib-2.0/gobject/gsignal.h	281	include/glib-2.0/gobject/gsignal.h
		282	include/glib-2.0/gobject/gsignalgroup.h
279	include/glib-2.0/gobject/gsourceclosure.h	283	include/glib-2.0/gobject/gsourceclosure.h
280	include/glib-2.0/gobject/gtype.h	284	include/glib-2.0/gobject/gtype.h
281	include/glib-2.0/gobject/gtypemodule.h	285	include/glib-2.0/gobject/gtypemodule.h
Lines 352-357 share/gettext/its/gschema.loc Link Here
352	%%DATADIR%%-2.0/codegen/codegen_main.py	356	%%DATADIR%%-2.0/codegen/codegen_main.py
353	%%DATADIR%%-2.0/codegen/codegen_main.pyc	357	%%DATADIR%%-2.0/codegen/codegen_main.pyc
354	%%DATADIR%%-2.0/codegen/codegen_main.pyo	358	%%DATADIR%%-2.0/codegen/codegen_main.pyo
		359	%%DATADIR%%-2.0/codegen/codegen_rst.py
		360	%%DATADIR%%-2.0/codegen/codegen_rst.pyc
		361	%%DATADIR%%-2.0/codegen/codegen_rst.pyo
355	%%DATADIR%%-2.0/codegen/config.py	362	%%DATADIR%%-2.0/codegen/config.py
356	%%DATADIR%%-2.0/codegen/config.pyc	363	%%DATADIR%%-2.0/codegen/config.pyc
357	%%DATADIR%%-2.0/codegen/config.pyo	364	%%DATADIR%%-2.0/codegen/config.pyo