pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
frida-glib2: Regenerate configure and drop local patches
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Mon Mar 12 22:19:05 2018 +0100
Changeset: e2879a800a4f3d79457387508e46320e9fdcfc3c
Modified Files:
frida-glib2/Makefile
frida-glib2/Makefile.common
frida-glib2/distinfo
frida-glib2/patches/patch-glib_gthread-posix.c
Removed Files:
frida-glib2/patches/patch-Makefile.in
frida-glib2/patches/patch-aa
frida-glib2/patches/patch-ab
frida-glib2/patches/patch-ac
frida-glib2/patches/patch-ae
frida-glib2/patches/patch-af
frida-glib2/patches/patch-ah
frida-glib2/patches/patch-aha
frida-glib2/patches/patch-ak
frida-glib2/patches/patch-al
frida-glib2/patches/patch-am
frida-glib2/patches/patch-an
frida-glib2/patches/patch-cb
frida-glib2/patches/patch-cc
frida-glib2/patches/patch-cd
frida-glib2/patches/patch-ck
frida-glib2/patches/patch-cl
frida-glib2/patches/patch-cm
frida-glib2/patches/patch-gio_gdbus-2.0_codegen_gdbus-codegen.in
frida-glib2/patches/patch-gio_gdbusauthmechanismsha1.c
frida-glib2/patches/patch-gio_giomodule.c
frida-glib2/patches/patch-gio_glocalfileinfo.c
frida-glib2/patches/patch-gio_gresource-tool.c
frida-glib2/patches/patch-gio_inotify_inotify-kernel.c
frida-glib2/patches/patch-gio_tests_Makefile.in
frida-glib2/patches/patch-glib_gmain.c
frida-glib2/patches/patch-glib_gtimezone.c
frida-glib2/patches/patch-gobject_Makefile.am
frida-glib2/patches/patch-gobject_Makefile.in
frida-glib2/patches/patch-gobject_glib-genmarshal.in
frida-glib2/patches/patch-gobject_glib-mkenums.in
Log Message:
frida-glib2: Regenerate configure and drop local patches
Drop local patches termporarily as they no longer apply.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e2879a800a4f3d79457387508e46320e9fdcfc3c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
frida-glib2/Makefile | 6 +-
frida-glib2/Makefile.common | 12 +-
frida-glib2/distinfo | 41 +---
frida-glib2/patches/patch-Makefile.in | 16 --
frida-glib2/patches/patch-aa | 237 ---------------------
frida-glib2/patches/patch-ab | 76 -------
frida-glib2/patches/patch-ac | 21 --
frida-glib2/patches/patch-ae | 16 --
frida-glib2/patches/patch-af | 23 --
frida-glib2/patches/patch-ah | 24 ---
frida-glib2/patches/patch-aha | 13 --
frida-glib2/patches/patch-ak | 137 ------------
frida-glib2/patches/patch-al | 22 --
frida-glib2/patches/patch-am | 14 --
frida-glib2/patches/patch-an | 155 --------------
frida-glib2/patches/patch-cb | 13 --
frida-glib2/patches/patch-cc | 16 --
frida-glib2/patches/patch-cd | 41 ----
frida-glib2/patches/patch-ck | 23 --
frida-glib2/patches/patch-cl | 40 ----
frida-glib2/patches/patch-cm | 32 ---
.../patch-gio_gdbus-2.0_codegen_gdbus-codegen.in | 13 --
.../patches/patch-gio_gdbusauthmechanismsha1.c | 15 --
frida-glib2/patches/patch-gio_giomodule.c | 37 ----
frida-glib2/patches/patch-gio_glocalfileinfo.c | 15 --
frida-glib2/patches/patch-gio_gresource-tool.c | 16 --
.../patches/patch-gio_inotify_inotify-kernel.c | 16 --
frida-glib2/patches/patch-gio_tests_Makefile.in | 48 -----
frida-glib2/patches/patch-glib_gmain.c | 81 -------
frida-glib2/patches/patch-glib_gthread-posix.c | 10 +-
frida-glib2/patches/patch-glib_gtimezone.c | 20 --
frida-glib2/patches/patch-gobject_Makefile.am | 14 --
frida-glib2/patches/patch-gobject_Makefile.in | 14 --
.../patches/patch-gobject_glib-genmarshal.in | 13 --
frida-glib2/patches/patch-gobject_glib-mkenums.in | 13 --
35 files changed, 21 insertions(+), 1282 deletions(-)
diffs:
diff --git a/frida-glib2/Makefile b/frida-glib2/Makefile
index 4f98344b36..f81fd736a0 100644
--- a/frida-glib2/Makefile
+++ b/frida-glib2/Makefile
@@ -6,7 +6,7 @@ CATEGORIES= devel gnome
COMMENT= Some useful routines for C programming (glib2)
-USE_TOOLS+= msgfmt perl:run readlink
+USE_TOOLS+= msgfmt perl:run readlink automake autoconf
PKGCONFIG_OVERRIDE+= glib-2.0.pc.in
PKGCONFIG_OVERRIDE+= gmodule-2.0.pc.in
@@ -61,11 +61,15 @@ CONFIGURE_ENV+= ac_cv_prog_GTKDOC_CHECK= \
ac_cv_path_GTKDOC_REBASE= \
ac_cv_path_GTKDOC_MKPDF=
+pre-configure:
+ ${RUN} cd ${WRKSRC} && ${SH} autogen.sh
+
# to run gdbus-codegen to generate gdbus-daemon-generated.{h,c}
TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
PYTHON_FOR_BUILD_ONLY?= yes
.include "../../lang/python/pyversion.mk"
+
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
diff --git a/frida-glib2/Makefile.common b/frida-glib2/Makefile.common
index a3455f60d2..5cd2036f14 100644
--- a/frida-glib2/Makefile.common
+++ b/frida-glib2/Makefile.common
@@ -8,10 +8,12 @@
# When updating this package, please apply patch-ak to configure.in and
# then run a matching version of autoconf to regen patch-aa.
DISTNAME= glib-2.54.3
-PKGNAME= ${DISTNAME:S/glib/glib2/}
+PKGNAME= frida-${DISTNAME:S/glib/glib2/}
CATEGORIES= # empty; redefined in Makefile
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
-EXTRACT_SUFX= .tar.xz
+MASTER_SITES= ${MASTER_SITE_GITHUB:=frida/}
+GITHUB_TAG= d8a2acabac5c04d3ca5eb4f0aa050582b8a9c7ac
+
+GITHUB_PROJECT= glib
MAINTAINER= prlw1%cam.ac.uk@localhost
HOMEPAGE= https://developer.gnome.org/glib/
@@ -24,8 +26,8 @@ USE_LANGUAGES= c c++ c99
USE_LIBTOOL= yes
TEST_TARGET= check
-DISTINFO_FILE= ${.CURDIR}/../../devel/glib2/distinfo
-PATCHDIR= ${.CURDIR}/../../devel/glib2/patches
+DISTINFO_FILE= ${.CURDIR}/../../wip/frida-glib2/distinfo
+PATCHDIR= ${.CURDIR}/../../wip/frida-glib2/patches
GNU_CONFIGURE= yes
CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
diff --git a/frida-glib2/distinfo b/frida-glib2/distinfo
index 689d6bacbf..3b435a5772 100644
--- a/frida-glib2/distinfo
+++ b/frida-glib2/distinfo
@@ -1,38 +1,7 @@
$NetBSD: distinfo,v 1.228 2018/01/28 16:51:50 wiz Exp $
-SHA1 (glib-2.54.3.tar.xz) = 12d7466550156ac8a765f603b0df7604cdf34cfd
-RMD160 (glib-2.54.3.tar.xz) = 7439dbf9d661352e7f2c1beae84b76e401798675
-SHA512 (glib-2.54.3.tar.xz) = 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
-Size (glib-2.54.3.tar.xz) = 7836536 bytes
-SHA1 (patch-Makefile.in) = 4d587eb9ff27ff2b3489c59388319142e2fb6ced
-SHA1 (patch-aa) = 938e6fb29a2190eaa65b929b986c2f73c46d15ae
-SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
-SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
-SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
-SHA1 (patch-af) = 6da2f31b5052a9b1d02b9a87f47896be238a88bd
-SHA1 (patch-ah) = d523967c88fc06f46de1d7f2eb04be65db04ada2
-SHA1 (patch-aha) = ade66edd87a5e76a1256bd8bcdc9bc3dd614885c
-SHA1 (patch-ak) = a7dd9b100b05424a76476754c2ee9896b5ae6d26
-SHA1 (patch-al) = 533755a1b450956d7fc2f7e5a38b7f9602358c18
-SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
-SHA1 (patch-an) = a1308a37f60c4bbbe4e8bc43ea9ae4a50bc09ce4
-SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
-SHA1 (patch-cc) = f3d37cbb483863aab602f9c1209650e3e4795871
-SHA1 (patch-cd) = a8a90eca84a687400a92b0e26fafe4b9b6014ec3
-SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
-SHA1 (patch-cl) = 18f34d749a8ca5a996a1be0ebd3c8df9dc012839
-SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
-SHA1 (patch-gio_gdbus-2.0_codegen_gdbus-codegen.in) = ccbb10335fb477e347993444d68d5e88d9e93050
-SHA1 (patch-gio_gdbusauthmechanismsha1.c) = 39b9e9375bc8832c2c177c8e89228790d9ae9e7b
-SHA1 (patch-gio_giomodule.c) = 08181ad8d46dde1a028faa246a4852e474610eaa
-SHA1 (patch-gio_glocalfileinfo.c) = 57b38e4cfa3a3858b632c8387a9bdb3000b16655
-SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
-SHA1 (patch-gio_inotify_inotify-kernel.c) = 18fc55be06dfa4ebf7128b8d1888aaff3b2b95c0
-SHA1 (patch-gio_tests_Makefile.in) = eaf244c54c0a5578149919c2dd939b993e618919
-SHA1 (patch-glib_gmain.c) = d09ff66e475ee52d37ac0dcb463110f690ce6511
-SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888
-SHA1 (patch-glib_gtimezone.c) = d9686da52f171a073d80cfd9f80aa490088a00a3
-SHA1 (patch-gobject_Makefile.am) = 6eed6b57f5ff0aa0dfb623110b23a3ff78aa4e75
-SHA1 (patch-gobject_Makefile.in) = a4768ff7b0607a8a4dfbb2cff087a987b451fd18
-SHA1 (patch-gobject_glib-genmarshal.in) = f21ca416d4eb4ad5a8ce3ffa053f8bcd2be8953a
-SHA1 (patch-gobject_glib-mkenums.in) = 22676989e47dfd13583d89469810af6ce7d01ab7
+SHA1 (glib-2.54.3-d8a2acabac5c04d3ca5eb4f0aa050582b8a9c7ac.tar.gz) = 5eae4e940ae516ec85f94a5f8ffb822ad4029f53
+RMD160 (glib-2.54.3-d8a2acabac5c04d3ca5eb4f0aa050582b8a9c7ac.tar.gz) = b399e316fdbb3f83a88bdd107de721581bed8db7
+SHA512 (glib-2.54.3-d8a2acabac5c04d3ca5eb4f0aa050582b8a9c7ac.tar.gz) = c1f8f2e37a778f77b3e27566e18004c484be7626eaafb644a288ef93f253e48d1c57c88cb03dc0dde001437f6d57d098452ed327b891382b682b6a0aa2e35b46
+Size (glib-2.54.3-d8a2acabac5c04d3ca5eb4f0aa050582b8a9c7ac.tar.gz) = 8068479 bytes
+SHA1 (patch-glib_gthread-posix.c) = b0689e3c6729ef31f0c5e3be75ea7211d4f3023e
diff --git a/frida-glib2/patches/patch-Makefile.in b/frida-glib2/patches/patch-Makefile.in
deleted file mode 100644
index b838766d24..0000000000
--- a/frida-glib2/patches/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2017/10/13 15:35:10 prlw1 Exp $
-
-tests/gobject requires python to generate testmarshal.h so avoid
-tests directory.
-
---- Makefile.in.orig 2017-10-13 13:38:33.856486834 +0000
-+++ Makefile.in
-@@ -835,7 +835,7 @@ all_test_ltlibs = $(test_ltlibraries) $(
-
- @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
- ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
--SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
- DIST_SUBDIRS = $(SUBDIRS) build win32
- bin_SCRIPTS = glib-gettextize
- AM_CPPFLAGS = \
diff --git a/frida-glib2/patches/patch-aa b/frida-glib2/patches/patch-aa
deleted file mode 100644
index 3f75e85167..0000000000
--- a/frida-glib2/patches/patch-aa
+++ /dev/null
@@ -1,237 +0,0 @@
-$NetBSD: patch-aa,v 1.60 2017/10/13 15:35:10 prlw1 Exp $
-
-- solaris sun studio check and fix
-- use pkgsrc libtool
-- broken dlopen(NULL,0) detection and workaround
- http://bugzilla.gnome.org/show_bug.cgi?id=140329
-
---- configure.orig 2017-06-22 13:16:20.000000000 +0000
-+++ configure
-@@ -736,6 +736,7 @@ GIO
- GSPAWN
- GLIB_DEBUG_FLAGS
- G_MODULE_NEED_USCORE
-+G_MODULE_BROKEN_DLOPEN_NULL
- G_MODULE_BROKEN_RTLD_GLOBAL
- G_MODULE_HAVE_DLERROR
- G_MODULE_LDFLAGS
-@@ -21652,6 +21653,8 @@ else
- # ifdef _MSC_VER
- # include <malloc.h>
- # define alloca _alloca
-+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
-+# include <stdlib.h>
- # else
- # ifdef HAVE_ALLOCA_H
- # include <alloca.h>
-@@ -22487,8 +22490,8 @@ else
- fi
-
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler" >&5
--$as_echo_n "checking whether using Sun Studio C compiler... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler visibility" >&5
-+$as_echo_n "checking whether using Sun Studio C compiler visibility... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
-@@ -24302,16 +24305,48 @@ fi
-
- case $host in
- *-*-solaris* )
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler with C99" >&5
-+$as_echo_n "checking whether using Sun Studio C compiler with C99... " >&6; }
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#if defined(__STDC_VERSION__) || (__STDC_VERSION__ - 0 >= 199901L)
-+#else
-+# include "error: this is STD C99."
-+#endif
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ g_have_sunstudio_c99=yes
-+else
-+ g_have_sunstudio_c99=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $g_have_sunstudio_c99" >&5
-+$as_echo "$g_have_sunstudio_c99" >&6; }
-+ if test $g_have_sunstudio_c99 = yes; then
-+
-+$as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
-+
-+ else
-
- $as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
-
-
- $as_echo "#define _XOPEN_SOURCE 2" >>confdefs.h
-
-+ fi
-+
-
- $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-
-- ;;
-+ ;;
- esac
-
- if test "$ac_cv_func_statfs" = yes; then :
-@@ -25383,6 +25418,7 @@ else
- fi
- G_MODULE_NEED_USCORE=0
- G_MODULE_BROKEN_RTLD_GLOBAL=0
-+G_MODULE_BROKEN_DLOPEN_NULL=0
- G_MODULE_HAVE_DLERROR=0
- if test -z "$G_MODULE_IMPL"; then
- case "$host" in
-@@ -25508,9 +25544,9 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IM
- LIBS="$G_MODULE_LIBS $LIBS"
- LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
- echo "void glib_plugin_test(void) { }" > plugin.c
-- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
-+ ${SHELL} libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
- ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
-- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
-+ ${SHELL} libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
- ${LDFLAGS} -module -o plugin.la -export-dynamic \
- -shrext ".o" -avoid-version plugin.lo \
- -rpath /dont/care >/dev/null 2>&1
-@@ -25624,6 +25660,56 @@ fi
- LIBS="$LIBS_orig"
-
- fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen(NULL, 0) brokenness" >&5
-+$as_echo_n "checking for dlopen(NULL, 0) brokenness... " >&6; }
-+if ${glib_cv_dlopennull_broken+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+
-+ if test "$cross_compiling" = yes; then :
-+ glib_cv_dlopennull_broken=no
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#ifndef RTLD_GLOBAL
-+# define RTLD_GLOBAL 0
-+#endif
-+#ifndef RTLD_LAZY
-+# define RTLD_LAZY 0
-+#endif
-+int gettext;
-+int main () {
-+ void *handle;
-+ handle = dlopen ("libm.so", RTLD_GLOBAL | RTLD_LAZY);
-+ if (!handle) return 0;
-+ handle = dlopen (NULL, 0);
-+ if (!handle) return 0;
-+ handle = dlsym (handle, "sin");
-+ return handle == NULL;
-+}
-+
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ glib_cv_dlopennull_broken=no
-+else
-+ glib_cv_dlopennull_broken=yes
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv_dlopennull_broken" >&5
-+$as_echo "$glib_cv_dlopennull_broken" >&6; }
-+ if test "x$glib_cv_dlopennull_broken" = "xyes"; then
-+ G_MODULE_BROKEN_DLOPEN_NULL=1
-+ else
-+ G_MODULE_BROKEN_DLOPEN_NULL=0
-+ fi
- if test -z "$G_MODULE_IMPL"; then
- G_MODULE_IMPL=0
- G_MODULE_SUPPORTED=false
-@@ -25658,6 +25744,7 @@ fi
-
-
-
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5
- $as_echo_n "checking for gspawn implementation... " >&6; }
- case "$host" in
-@@ -26727,62 +26814,8 @@ if test x"$have_threads" = xposix; then
- G_THREAD_LIBS="-lpthread -lthread"
- ;;
- *)
-- for flag in pthread pthreads mt; do
-- glib_save_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -$flag"
-- if test "$cross_compiling" = yes; then :
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <pthread.h>
--int check_me = 0;
--void* func(void* data) {check_me = 42; return &check_me;}
--int main()
-- { pthread_t t;
-- void *ret;
-- pthread_create (&t, 0, func, 0);
-- pthread_join (t, &ret);
-- return (check_me != 42 || ret != &check_me);
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
-- glib_flag_works=yes
--else
-- glib_flag_works=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--else
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--#include <pthread.h>
--int check_me = 0;
--void* func(void* data) {check_me = 42; return &check_me;}
--int main()
-- { pthread_t t;
-- void *ret;
-- pthread_create (&t, 0, func, 0);
-- pthread_join (t, &ret);
-- return (check_me != 42 || ret != &check_me);
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
-- glib_flag_works=yes
--else
-- glib_flag_works=no
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-- conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
-- CFLAGS="$glib_save_CFLAGS"
-- if test $glib_flag_works = yes ; then
-- G_THREAD_CFLAGS=-$flag
-- G_THREAD_LIBS=-$flag
-- break;
-- fi
-- done
-+ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
- ;;
- esac
-
diff --git a/frida-glib2/patches/patch-ab b/frida-glib2/patches/patch-ab
deleted file mode 100644
index af9b46fbc6..0000000000
--- a/frida-glib2/patches/patch-ab
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ab,v 1.14 2012/04/30 13:53:48 drochner Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=140329
-
---- gmodule/gmodule.c.orig 2012-03-12 00:42:42.000000000 +0000
-+++ gmodule/gmodule.c
-@@ -800,6 +800,31 @@ g_module_error (void)
- return g_private_get (&module_error_private);
- }
-
-+static void
-+g_module_symbol_aux (GModule *module,
-+ const gchar *symbol_name,
-+ gpointer *symbol)
-+{
-+ gpointer hdl = module->handle;
-+#if defined (G_MODULE_BROKEN_DLOPEN_NULL) && defined(__NetBSD__) && defined(RTLD_DEFAULT)
-+ /* use some special handle to access global namespace */
-+ if (module == main_module)
-+ hdl = RTLD_DEFAULT;
-+#endif
-+
-+#ifdef G_MODULE_NEED_USCORE
-+ {
-+ gchar *name;
-+
-+ name = g_strconcat ("_", symbol_name, NULL);
-+ *symbol = _g_module_symbol (module->handle, name);
-+ g_free (name);
-+ }
-+#else
-+ *symbol = _g_module_symbol (module->handle, symbol_name);
-+#endif
-+}
-+
- /**
- * g_module_symbol:
- * @module: a #GModule
-@@ -828,17 +853,28 @@ g_module_symbol (GModule *module,
-
- g_rec_mutex_lock (&g_module_global_lock);
-
--#ifdef G_MODULE_NEED_USCORE
-+#ifdef G_MODULE_BROKEN_DLOPEN_NULL
-+ if (module == main_module)
- {
-- gchar *name;
--
-- name = g_strconcat ("_", symbol_name, NULL);
-- *symbol = _g_module_symbol (module->handle, name);
-- g_free (name);
-+ g_module_symbol_aux(module, symbol_name, symbol);
-+ if (*symbol == NULL)
-+ {
-+ for (module = modules; module; module = module->next)
-+ {
-+ g_module_symbol_aux(module, symbol_name, symbol);
-+ if (*symbol != NULL)
-+ {
-+ g_module_set_error (NULL);
-+ break;
- }
--#else /* !G_MODULE_NEED_USCORE */
-- *symbol = _g_module_symbol (module->handle, symbol_name);
--#endif /* !G_MODULE_NEED_USCORE */
-+ }
-+ }
-+ }
-+ else
-+ g_module_symbol_aux(module, symbol_name, symbol);
-+#else /* !G_MODULE_BROKEN_DLOPEN_NULL */
-+ g_module_symbol_aux(module, symbol_name, symbol);
-+#endif /* G_MODULE_BROKEN_DLOPEN_NULL */
-
- module_error = g_module_error ();
- if (module_error)
diff --git a/frida-glib2/patches/patch-ac b/frida-glib2/patches/patch-ac
deleted file mode 100644
index aa513a03f6..0000000000
--- a/frida-glib2/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2008/09/06 11:07:20 obache Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=107626
-
---- gmodule/gmodule-dyld.c.orig 2008-09-02 15:09:12.000000000 +0000
-+++ gmodule/gmodule-dyld.c
-@@ -120,7 +120,13 @@ _g_module_symbol (gpointer handle,
- if (NSIsSymbolNameDefined (symbol_name))
- sym = NSLookupAndBindSymbol (symbol_name);
- else
-- sym = NULL;
-+ {
-+ GModule *mod;
-+ for (mod = modules, sym = NULL; mod && !sym; mod = mod->next)
-+ {
-+ sym = NSLookupSymbolInModule (mod->handle, symbol_name);
-+ }
-+ }
- }
- else
- sym = NSLookupSymbolInModule (handle, symbol_name);
diff --git a/frida-glib2/patches/patch-ae b/frida-glib2/patches/patch-ae
deleted file mode 100644
index 469c2f2a5f..0000000000
--- a/frida-glib2/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2004/04/17 10:37:12 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=140329
-
---- gmodule/gmoduleconf.h.in.orig 2004-02-24 15:00:19.000000000 +0100
-+++ gmodule/gmoduleconf.h.in
-@@ -45,6 +45,9 @@ extern "C" {
- #if (@G_MODULE_BROKEN_RTLD_GLOBAL@)
- #define G_MODULE_BROKEN_RTLD_GLOBAL
- #endif
-+#if (@G_MODULE_BROKEN_DLOPEN_NULL@)
-+#define G_MODULE_BROKEN_DLOPEN_NULL
-+#endif
-
- #ifdef __cplusplus
- }
diff --git a/frida-glib2/patches/patch-af b/frida-glib2/patches/patch-af
deleted file mode 100644
index 9ae766e805..0000000000
--- a/frida-glib2/patches/patch-af
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-af,v 1.16 2014/09/05 20:49:55 prlw1 Exp $
-
---- glib/libcharset/Makefile.in.orig 2014-03-24 18:54:29.000000000 +0000
-+++ glib/libcharset/Makefile.in
-@@ -1496,18 +1496,6 @@ check-local: test-nonrecursive
- @ENABLE_INSTALLED_TESTS_TRUE@ echo 'Exec=$(installed_testdir)/$(notdir $<)' >> $@.tmp; \
- @ENABLE_INSTALLED_TESTS_TRUE@ mv $@.tmp $@)
- install-exec-local: all-local
-- $(mkinstalldirs) $(DESTDIR)$(libdir)
-- if test -f $(charset_alias); then \
-- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
-- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-- rm -f $(charset_tmp) ; \
-- else \
-- if test @GLIBC21@ = no; then \
-- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
-- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-- rm -f $(charset_tmp) ; \
-- fi ; \
-- fi
-
- uninstall-local: all-local
- if test -f $(charset_alias); then \
diff --git a/frida-glib2/patches/patch-ah b/frida-glib2/patches/patch-ah
deleted file mode 100644
index 9e0248a6f3..0000000000
--- a/frida-glib2/patches/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ah,v 1.13 2017/10/13 15:35:10 prlw1 Exp $
-
-Set default search paths for pkgsrc.
-
---- glib/gutils.c.orig 2017-08-15 20:27:00.000000000 +0000
-+++ glib/gutils.c
-@@ -2017,7 +2017,7 @@ g_get_system_data_dirs (void)
-
- #ifndef G_OS_WIN32
- if (!data_dirs || !data_dirs[0])
-- data_dirs = "/usr/local/share/:/usr/share/";
-+ data_dirs = PREFIX "/share/";
-
- data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
- #else
-@@ -2093,7 +2093,7 @@ g_get_system_config_dirs (void)
- }
- #else
- if (!conf_dirs || !conf_dirs[0])
-- conf_dirs = "/etc/xdg";
-+ conf_dirs = PKG_SYSCONFDIR "/xdg";
-
- conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
- #endif
diff --git a/frida-glib2/patches/patch-aha b/frida-glib2/patches/patch-aha
deleted file mode 100644
index beb500f9b8..0000000000
--- a/frida-glib2/patches/patch-aha
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aha,v 1.2 2016/05/27 08:19:27 prlw1 Exp $
-
---- glib/gcharset.c.orig 2016-05-10 08:54:30.000000000 +0000
-+++ glib/gcharset.c
-@@ -293,7 +293,7 @@ unalias_lang (char *lang)
- if (g_once_init_enter (&alias_table))
- {
- GHashTable *table = g_hash_table_new (g_str_hash, g_str_equal);
-- read_aliases ("/usr/share/locale/locale.alias", table);
-+ read_aliases (PREFIX "/" PKGLOCALEDIR "/locale/locale.alias", table);
- g_once_init_leave (&alias_table, table);
- }
-
diff --git a/frida-glib2/patches/patch-ak b/frida-glib2/patches/patch-ak
deleted file mode 100644
index 8b78308193..0000000000
--- a/frida-glib2/patches/patch-ak
+++ /dev/null
@@ -1,137 +0,0 @@
-$NetBSD: patch-ak,v 1.20 2017/10/13 15:35:10 prlw1 Exp $
-
-- solaris sun studio check and fix
-- use pkgsrc libtool
-- broken dlopen(NULL,0) detection and workaround
- http://bugzilla.gnome.org/show_bug.cgi?id=140329
-
---- configure.ac.orig 2017-06-22 13:15:19.000000000 +0000
-+++ configure.ac
-@@ -687,7 +687,7 @@ int main (void)
- AC_MSG_RESULT($g_have_gnuc_visibility)
- AM_CONDITIONAL(HAVE_GNUC_VISIBILITY, [test x$g_have_gnuc_visibility = xyes])
-
--AC_MSG_CHECKING([whether using Sun Studio C compiler])
-+AC_MSG_CHECKING([whether using Sun Studio C compiler visibility])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
- #else
- # include "error: this is not Sun Studio."
-@@ -1040,10 +1040,22 @@ AC_CHECK_TYPE([struct ip_mreqn], [
-
- case $host in
- *-*-solaris* )
-- AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
-- AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
-- AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
-- ;;
-+ AC_MSG_CHECKING([whether using Sun Studio C compiler with C99])
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__STDC_VERSION__) || (__STDC_VERSION__ - 0 >= 199901L)
-+#else
-+# include "error: this is STD C99."
-+#endif
-+ ]], [[]])], [ g_have_sunstudio_c99=yes ], [ g_have_sunstudio_c99=no ])
-+ AC_MSG_RESULT($g_have_sunstudio_c99)
-+ if test $g_have_sunstudio_c99 = yes; then
-+ AC_DEFINE(_XOPEN_SOURCE, 600, Needed to get declarations for msg_control and msg_controllen on Solaris)
-+ else
-+ AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
-+ AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris)
-+ fi
-+
-+ AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
-+ ;;
- esac
-
- dnl
-@@ -1383,6 +1395,7 @@ fi
- dnl G_MODULE_IMPL= don't reset, so cmd-line can override
- G_MODULE_NEED_USCORE=0
- G_MODULE_BROKEN_RTLD_GLOBAL=0
-+G_MODULE_BROKEN_DLOPEN_NULL=0
- G_MODULE_HAVE_DLERROR=0
- dnl *** force native WIN32 shared lib loader
- if test -z "$G_MODULE_IMPL"; then
-@@ -1427,9 +1440,9 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODUL
- LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
- dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
- echo "void glib_plugin_test(void) { }" > plugin.c
-- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
-+ ${SHELL} libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
- ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
-- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
-+ ${SHELL} libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
- ${LDFLAGS} -module -o plugin.la -export-dynamic \
- -shrext ".o" -avoid-version plugin.lo \
- -rpath /dont/care >/dev/null 2>&1
-@@ -1496,6 +1509,38 @@ dnl *** check for having dlerror()
- [G_MODULE_HAVE_DLERROR=0])
- LIBS="$LIBS_orig"
- ])
-+dnl *** check for dlopen(NULL, 0) brokenness
-+ AC_CACHE_CHECK([for dlopen(NULL, 0) brokenness],
-+ glib_cv_dlopennull_broken,[
-+ AC_TRY_RUN([
-+#include <stdio.h>
-+#include <dlfcn.h>
-+#ifndef RTLD_GLOBAL
-+# define RTLD_GLOBAL 0
-+#endif
-+#ifndef RTLD_LAZY
-+# define RTLD_LAZY 0
-+#endif
-+int gettext;
-+int main () {
-+ void *handle;
-+ handle = dlopen ("libm.so", RTLD_GLOBAL | RTLD_LAZY);
-+ if (!handle) return 0;
-+ handle = dlopen (NULL, 0);
-+ if (!handle) return 0;
-+ handle = dlsym (handle, "sin");
-+ return handle == NULL;
-+}
-+ ],
-+ [glib_cv_dlopennull_broken=no],
-+ [glib_cv_dlopennull_broken=yes],
-+ [glib_cv_dlopennull_broken=no])
-+ ])
-+ if test "x$glib_cv_dlopennull_broken" = "xyes"; then
-+ G_MODULE_BROKEN_DLOPEN_NULL=1
-+ else
-+ G_MODULE_BROKEN_DLOPEN_NULL=0
-+ fi
- dnl *** done, have we got an implementation?
- if test -z "$G_MODULE_IMPL"; then
- G_MODULE_IMPL=0
-@@ -1525,6 +1570,7 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
- AC_SUBST(G_MODULE_LDFLAGS)
- AC_SUBST(G_MODULE_HAVE_DLERROR)
- AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
-+AC_SUBST(G_MODULE_BROKEN_DLOPEN_NULL)
- AC_SUBST(G_MODULE_NEED_USCORE)
- AC_SUBST(GLIB_DEBUG_FLAGS)
-
-@@ -1919,22 +1965,8 @@ AS_IF([ test x"$have_threads" = xposix],
- G_THREAD_LIBS="-lpthread -lthread"
- ;;
- *)
-- for flag in pthread pthreads mt; do
-- glib_save_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -$flag"
-- AC_TRY_RUN(glib_thread_test(0),
-- glib_flag_works=yes,
-- glib_flag_works=no,
-- [AC_LINK_IFELSE([AC_LANG_SOURCE(glib_thread_test(0))],
-- glib_flag_works=yes,
-- glib_flag_works=no)])
-- CFLAGS="$glib_save_CFLAGS"
-- if test $glib_flag_works = yes ; then
-- G_THREAD_CFLAGS=-$flag
-- G_THREAD_LIBS=-$flag
-- break;
-- fi
-- done
-+ G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-+ G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
- ;;
- esac
- ])
diff --git a/frida-glib2/patches/patch-al b/frida-glib2/patches/patch-al
deleted file mode 100644
index b0366abd21..0000000000
--- a/frida-glib2/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.8 2017/11/22 08:45:59 wiz Exp $
-
-https://bugzilla.gnome.org/show_bug.cgi?id=790698
-
---- glib/tests/convert.c.orig 2013-09-05 10:43:41.000000000 +0000
-+++ glib/tests/convert.c
-@@ -65,6 +65,7 @@ test_one_half (void)
- gsize bytes_written = 0;
- GError *error = NULL;
-
-+#if 0 /* these tests depend on GNU iconv specific behaviour */
- out = g_convert (in, -1,
- "ISO-8859-1", "UTF-8",
- &bytes_read, &bytes_written,
-@@ -99,6 +100,7 @@ test_one_half (void)
- g_assert_cmpint (bytes_written, ==, 1);
- g_assert_cmpstr (out, ==, "a");
- g_free (out);
-+#endif
- }
-
- static void
diff --git a/frida-glib2/patches/patch-am b/frida-glib2/patches/patch-am
deleted file mode 100644
index ae24e2e5b5..0000000000
--- a/frida-glib2/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.9 2012/11/13 21:23:07 adam Exp $
-
---- gio/tests/converter-stream.c.orig 2012-09-03 14:24:05.000000000 +0000
-+++ gio/tests/converter-stream.c
-@@ -1173,7 +1173,9 @@ main (int argc,
- CharsetTest charset_tests[] = {
- { "/converter-input-stream/charset/utf8->latin1", "UTF-8", "\303\205rr Sant\303\251", "ISO-8859-1", "\305rr Sant\351", 0 },
- { "/converter-input-stream/charset/latin1->utf8", "ISO-8859-1", "\305rr Sant\351", "UTF-8", "\303\205rr Sant\303\251", 0 },
-+#if 0 /* this depends on GNU iconv specific behaviour */
- { "/converter-input-stream/charset/fallbacks", "UTF-8", "Some characters just don't fit into latin1: πא", "ISO-8859-1", "Some characters just don't fit into latin1: \\CF\\80\\D7\\90", 4 },
-+#endif
- };
-
- gint i;
diff --git a/frida-glib2/patches/patch-an b/frida-glib2/patches/patch-an
deleted file mode 100644
index c28f1c3e47..0000000000
--- a/frida-glib2/patches/patch-an
+++ /dev/null
@@ -1,155 +0,0 @@
-$NetBSD: patch-an,v 1.15 2017/07/11 11:52:42 jperkin Exp $
-
-- Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
-- Don't compile tests as they include gdbus-codegen tests.
-- Don't install completion data.
-- Re-enable gdesktopappinfo on Darwin.
-
---- gio/Makefile.in.orig 2017-06-22 13:16:23.000000000 +0000
-+++ gio/Makefile.in
-@@ -160,7 +160,7 @@ TESTS = $(am__EXEEXT_2)
- @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_installed_test_data)
- @ENABLE_INSTALLED_TESTS_TRUE@am__append_13 = $(test_ltlibraries) $(installed_test_ltlibraries)
- @ENABLE_INSTALLED_TESTS_TRUE@am__append_14 = $(installed_test_meta_DATA)
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_15 = xdgmime
-+@OS_UNIX_TRUE@am__append_15 = xdgmime
- @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@am__append_16 = gio-2.0.lib
- @OS_WIN32_TRUE@am__append_17 = $(win32_settings_sources)
- @OS_COCOA_TRUE@am__append_18 = $(cocoa_settings_sources)
-@@ -174,9 +174,9 @@ TESTS = $(am__EXEEXT_2)
- @OS_WIN32_TRUE@am__append_26 = win32/libgiowin32.la
- @OS_WIN32_TRUE@am__append_27 = win32/libgiowin32.la
- @HAVE_FAM_TRUE@am__append_28 = fam
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_30 = xdgmime/libxdgmime.la
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_31 = gdesktopappinfo.h
-+@OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la
-+@OS_UNIX_TRUE@am__append_30 = xdgmime/libxdgmime.la
-+@OS_UNIX_TRUE@am__append_31 = gdesktopappinfo.h
- @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_32 = gcocoanotificationbackend.c
- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_33 = \
- @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@ gnetworkmonitornetlink.c \
-@@ -188,10 +188,10 @@ TESTS = $(am__EXEEXT_2)
- @OS_WIN32_TRUE@am__append_34 = gwin32appinfo.c gwin32appinfo.h
- @OS_WIN32_TRUE@am__append_35 = gcontenttype-win32.c
- @OS_WIN32_TRUE@am__append_36 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
--@OS_COCOA_TRUE@am__append_37 = gosxcontenttype.c
--@OS_COCOA_TRUE@am__append_38 = gosxappinfo.c gosxappinfo.h
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_39 = gcontenttype.c
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_40 = gdesktopappinfo.c
-+#@OS_COCOA_TRUE@am__append_37 = gosxcontenttype.c
-+#@OS_COCOA_TRUE@am__append_38 = gosxappinfo.c gosxappinfo.h
-+@OS_UNIX_TRUE@am__append_39 = gcontenttype.c
-+@OS_UNIX_TRUE@am__append_40 = gdesktopappinfo.c
-
- # This is dumb. The ObjC source file should be properly named .m
- @OS_COCOA_TRUE@am__append_41 = -xobjective-c
-@@ -208,7 +208,7 @@ bin_PROGRAMS = gio-querymodules$(EXEEXT)
-
- # ------------------------------------------------------------------------
- # gapplication(1) tool
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_49 = gapplication
-+@OS_UNIX_TRUE@am__append_49 = gapplication
- subdir = gio
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
-@@ -525,13 +525,13 @@ am__objects_5 = libgio_2_0_la-gappinfo.l
- libgio_2_0_la-gliststore.lo $(am__objects_2) $(am__objects_3) \
- $(am__objects_4) $(am__objects_1)
- @OS_WIN32_TRUE@am__objects_6 = libgio_2_0_la-gwin32appinfo.lo
--@OS_COCOA_TRUE@am__objects_7 = libgio_2_0_la-gosxappinfo.lo
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_8 = libgio_2_0_la-gdesktopappinfo.lo
-+#@OS_COCOA_TRUE@am__objects_7 = libgio_2_0_la-gosxappinfo.lo
-+@OS_UNIX_TRUE@am__objects_8 = libgio_2_0_la-gdesktopappinfo.lo
- am__objects_9 = $(am__objects_6) $(am__objects_7) $(am__objects_8)
- @OS_WIN32_TRUE@am__objects_10 = libgio_2_0_la-gcontenttype-win32.lo
--@OS_COCOA_TRUE@am__objects_11 = libgio_2_0_la-gosxcontenttype.lo
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_12 = \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ libgio_2_0_la-gcontenttype.lo
-+#@OS_COCOA_TRUE@am__objects_11 = libgio_2_0_la-gosxcontenttype.lo
-+@OS_UNIX_TRUE@am__objects_12 = \
-+@OS_UNIX_TRUE@ libgio_2_0_la-gcontenttype.lo
- am__objects_13 = $(am__objects_10) $(am__objects_11) $(am__objects_12)
- am__objects_14 = libgio_2_0_la-xdp-dbus.lo
- am__objects_15 = libgio_2_0_la-gnetworkmonitorportal.lo \
-@@ -595,22 +595,22 @@ am__v_lt_1 =
- libgio_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgio_2_0_la_CFLAGS) \
- $(CFLAGS) $(libgio_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
-+@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
- am__EXEEXT_2 =
- @ENABLE_ALWAYS_BUILD_TESTS_FALSE@am__EXEEXT_3 = $(am__EXEEXT_2)
- @ENABLE_ALWAYS_BUILD_TESTS_TRUE@am__EXEEXT_4 = $(am__EXEEXT_2)
- PROGRAMS = $(bin_PROGRAMS) $(installed_test_PROGRAMS) \
- $(noinst_PROGRAMS)
- am__gapplication_SOURCES_DIST = gapplication-tool.c
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am_gapplication_OBJECTS = \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ gapplication-tool.$(OBJEXT)
-+@OS_UNIX_TRUE@am_gapplication_OBJECTS = \
-+@OS_UNIX_TRUE@ gapplication-tool.$(OBJEXT)
- gapplication_OBJECTS = $(am_gapplication_OBJECTS)
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_DEPENDENCIES = \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ libgio-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(am__DEPENDENCIES_1)
-+@OS_UNIX_TRUE@gapplication_DEPENDENCIES = \
-+@OS_UNIX_TRUE@ libgio-2.0.la \
-+@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \
-+@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \
-+@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \
-+@OS_UNIX_TRUE@ $(am__DEPENDENCIES_1)
- am_gdbus_OBJECTS = gdbus-tool.$(OBJEXT)
- gdbus_OBJECTS = $(am_gdbus_OBJECTS)
- gdbus_DEPENDENCIES = libgio-2.0.la \
-@@ -931,8 +931,7 @@ am__set_b = \
- *) \
- b='$*';; \
- esac
--DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . tests \
-- fam
-+DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue win32 . fam
- am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \
- $(srcdir)/gnetworking.h.in $(top_srcdir)/depcomp \
- $(top_srcdir)/glib.mk $(top_srcdir)/test-driver \
-@@ -1315,8 +1314,8 @@ all_test_ltlibs = $(test_ltlibraries) $(
- @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts)
-
- @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
--SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_19) \
-- $(am__append_22) $(am__append_25) . tests $(am__append_28)
-+SUBDIRS = $(am__append_15) $(am__append_19) \
-+ $(am__append_22) $(am__append_25) . $(am__append_28)
- @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
- @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
- AM_CPPFLAGS = \
-@@ -1927,12 +1926,12 @@ gdbus_LDADD = libgio-2.0.la \
- $(top_builddir)/glib/libglib-2.0.la \
- $(NULL)
-
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ $(NULL)
-+@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c
-+@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la \
-+@OS_UNIX_TRUE@ $(top_builddir)/gobject/libgobject-2.0.la \
-+@OS_UNIX_TRUE@ $(top_builddir)/gmodule/libgmodule-2.0.la \
-+@OS_UNIX_TRUE@ $(top_builddir)/glib/libglib-2.0.la \
-+@OS_UNIX_TRUE@ $(NULL)
-
- completiondir = $(datadir)/bash-completion/completions
- completion_DATA = \
-@@ -4800,7 +4799,7 @@ info: info-recursive
-
- info-am:
-
--install-data-am: install-completionDATA install-data-local \
-+install-data-am: install-data-local \
- install-dist_itsDATA install-dist_schemaDATA \
- install-gioincludeHEADERS install-giounixincludeHEADERS \
- install-giowin32includeHEADERS \
diff --git a/frida-glib2/patches/patch-cb b/frida-glib2/patches/patch-cb
deleted file mode 100644
index 3b554df0aa..0000000000
--- a/frida-glib2/patches/patch-cb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cb,v 1.3 2012/05/01 18:45:52 adam Exp $
-
---- gio/xdgmime/xdgmime.c.orig 2008-09-02 15:09:17.000000000 +0000
-+++ gio/xdgmime/xdgmime.c
-@@ -257,7 +257,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun
-
- xdg_data_dirs = getenv ("XDG_DATA_DIRS");
- if (xdg_data_dirs == NULL)
-- xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+ xdg_data_dirs = PREFIX "/share/";
-
- ptr = xdg_data_dirs;
-
diff --git a/frida-glib2/patches/patch-cc b/frida-glib2/patches/patch-cc
deleted file mode 100644
index e696385ad9..0000000000
--- a/frida-glib2/patches/patch-cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-cc,v 1.3 2013/04/19 22:21:41 prlw1 Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=562334
-
---- glib/gbacktrace.h.orig 2013-03-13 13:39:09.000000000 +0000
-+++ glib/gbacktrace.h
-@@ -32,6 +32,9 @@
- #endif
-
- #include <glib/gtypes.h>
-+#ifdef __sun__
-+#include <sys/select.h>
-+#endif
- #include <signal.h>
-
- G_BEGIN_DECLS
diff --git a/frida-glib2/patches/patch-cd b/frida-glib2/patches/patch-cd
deleted file mode 100644
index 68ff3d3306..0000000000
--- a/frida-glib2/patches/patch-cd
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-cd,v 1.9 2016/04/07 18:33:05 prlw1 Exp $
-
-sysutils/gio-fam builds the gio/fam backend as a separate module. Force it
-to link against the installed version of glib2, as it is not rebuilt by the
-package.
-
---- gio/fam/Makefile.in.orig 2016-02-16 11:35:28.000000000 +0000
-+++ gio/fam/Makefile.in
-@@ -183,10 +183,7 @@ am__installdirs = "$(DESTDIR)$(giomodule
- 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 \
-- $(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1)
-+libgiofam_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_libgiofam_la_OBJECTS = libgiofam_la-gfamfilemonitor.lo
- libgiofam_la_OBJECTS = $(am_libgiofam_la_OBJECTS)
- AM_V_lt = $(am__v_lt_@AM_V@)
-@@ -789,9 +786,7 @@ libgiofam_la_CFLAGS = \
-
- libgiofam_la_LDFLAGS = $(module_flags)
- libgiofam_la_LIBADD = \
-- $(top_builddir)/gio/libgio-2.0.la \
-- $(top_builddir)/gobject/libgobject-2.0.la \
-- $(top_builddir)/glib/libglib-2.0.la \
-+ $$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0) \
- $(GLIB_LIBS) \
- $(FAM_LIBS) \
- $(NULL)
-@@ -1559,9 +1554,6 @@ check-local: test-nonrecursive
- @ENABLE_INSTALLED_TESTS_TRUE@ mv $@.tmp $@)
-
- install-data-hook:
-- if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \
-- $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \
-- fi
-
- uninstall-local:
- $(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodule.cache
diff --git a/frida-glib2/patches/patch-ck b/frida-glib2/patches/patch-ck
deleted file mode 100644
index 5a62efcae8..0000000000
--- a/frida-glib2/patches/patch-ck
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ck,v 1.1 2011/10/09 19:40:02 jmmv Exp $
-
---- glib/libcharset/Makefile.am.orig 2011-06-05 23:18:49.000000000 +0000
-+++ glib/libcharset/Makefile.am
-@@ -25,18 +25,6 @@ EXTRA_DIST += \
- charset_alias = $(DESTDIR)$(libdir)/charset.alias
- charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
- install-exec-local: all-local
-- $(mkinstalldirs) $(DESTDIR)$(libdir)
-- if test -f $(charset_alias); then \
-- sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
-- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-- rm -f $(charset_tmp) ; \
-- else \
-- if test @GLIBC21@ = no; then \
-- sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
-- $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-- rm -f $(charset_tmp) ; \
-- fi ; \
-- fi
-
- uninstall-local: all-local
- if test -f $(charset_alias); then \
diff --git a/frida-glib2/patches/patch-cl b/frida-glib2/patches/patch-cl
deleted file mode 100644
index fed09207e4..0000000000
--- a/frida-glib2/patches/patch-cl
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-cl,v 1.12 2017/07/03 17:42:45 prlw1 Exp $
-
-- Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
-- Don't compile tests as they include gdbus-codegen tests.
-- Don't install completion data.
-(patch-an)
---- gio/Makefile.am.orig 2017-06-22 12:53:56.000000000 +0000
-+++ gio/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
-
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS =
-
- if OS_UNIX
- if !OS_COCOA
-@@ -244,7 +244,7 @@ platform_libadd += win32/libgiowin32.la
- platform_deps += win32/libgiowin32.la
- endif
-
--SUBDIRS += . tests
-+SUBDIRS += .
-
- if HAVE_FAM
- SUBDIRS += fam
-@@ -898,14 +898,6 @@ gapplication_LDADD = libgio-2.0.la \
- endif
- endif
-
--completiondir = $(datadir)/bash-completion/completions
--completion_DATA = \
-- completion/gapplication \
-- completion/gdbus \
-- completion/gsettings \
-- completion/gresource
--EXTRA_DIST += $(completion_DATA)
--
- # ------------------------------------------------------------------------
- # gresource tool
-
diff --git a/frida-glib2/patches/patch-cm b/frida-glib2/patches/patch-cm
deleted file mode 100644
index f813946030..0000000000
--- a/frida-glib2/patches/patch-cm
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-cm,v 1.3 2013/12/08 13:08:59 prlw1 Exp $
-
-sysutils/gio-fam builds the gio/fam backend as a separate module. Force it
-to link against the installed version of glib2, as it is not rebuilt by the
-package.
-(patch-cd)
---- gio/fam/Makefile.am.orig 2012-03-11 23:55:40.000000000 +0000
-+++ gio/fam/Makefile.am
-@@ -25,11 +25,9 @@ libgiofam_la_CFLAGS = \
- -DGIO_COMPILATION \
- -DG_DISABLE_DEPRECATED
-
--libgiofam_la_LDFLAGS = $(module_flags)
-+libgiofam_la_LDFLAGS = $(module_flags) \
-+ $$(pkg-config --libs gio-2.0 gobject-2.0 glib-2.0)
- libgiofam_la_LIBADD = \
-- $(top_builddir)/gio/libgio-2.0.la \
-- $(top_builddir)/gobject/libgobject-2.0.la \
-- $(top_builddir)/glib/libglib-2.0.la \
- $(GLIB_LIBS) \
- $(FAM_LIBS) \
- $(NULL)
-@@ -41,9 +39,6 @@ RUN_QUERY_MODULES=true
- endif
-
- install-data-hook:
-- if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then \
-- $(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ; \
-- fi
-
- uninstall-local:
- $(RM) $(DESTDIR)$(GIO_MODULE_DIR)/giomodule.cache
diff --git a/frida-glib2/patches/patch-gio_gdbus-2.0_codegen_gdbus-codegen.in b/frida-glib2/patches/patch-gio_gdbus-2.0_codegen_gdbus-codegen.in
deleted file mode 100644
index 1d58e0f88e..0000000000
--- a/frida-glib2/patches/patch-gio_gdbus-2.0_codegen_gdbus-codegen.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gio_gdbus-2.0_codegen_gdbus-codegen.in,v 1.1 2017/10/15 08:23:06 prlw1 Exp $
-
-Revert 683809d5 Use env for gdbus-codegen's script
-https://bugzilla.gnome.org/show_bug.cgi?id=788527
-
---- gio/gdbus-2.0/codegen/gdbus-codegen.in.orig 2017-07-15 12:05:03.000000000 +0000
-+++ gio/gdbus-2.0/codegen/gdbus-codegen.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/env @PYTHON@
-+#!@PYTHON@
-
- # GDBus - GLib D-Bus Library
- #
diff --git a/frida-glib2/patches/patch-gio_gdbusauthmechanismsha1.c b/frida-glib2/patches/patch-gio_gdbusauthmechanismsha1.c
deleted file mode 100644
index 48eaa0b475..0000000000
--- a/frida-glib2/patches/patch-gio_gdbusauthmechanismsha1.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gio_gdbusauthmechanismsha1.c,v 1.3 2017/07/03 17:42:45 prlw1 Exp $
-
-Suppress format warnings that are converted to errors with gcc 4.8
-
---- gio/gdbusauthmechanismsha1.c.orig 2017-06-22 12:52:49.000000000 +0000
-+++ gio/gdbusauthmechanismsha1.c
-@@ -272,7 +272,7 @@ ensure_keyring_directory (GError **error
- G_IO_ERROR_FAILED,
- _("Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"),
- path,
-- statbuf.st_mode & 0777);
-+ (guint)statbuf.st_mode & 0777);
- g_free (path);
- path = NULL;
- goto out;
diff --git a/frida-glib2/patches/patch-gio_giomodule.c b/frida-glib2/patches/patch-gio_giomodule.c
deleted file mode 100644
index 535951e1fd..0000000000
--- a/frida-glib2/patches/patch-gio_giomodule.c
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-gio_giomodule.c,v 1.1 2017/07/11 11:52:42 jperkin Exp $
-
-Re-enable gdesktopappinfo on Darwin.
-
---- gio/giomodule.c.orig 2017-06-22 12:52:49.000000000 +0000
-+++ gio/giomodule.c
-@@ -43,12 +43,9 @@
- #endif
- #include <glib/gstdio.h>
-
--#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
-+#if defined(G_OS_UNIX)
- #include "gdesktopappinfo.h"
- #endif
--#ifdef HAVE_COCOA
--#include "gosxappinfo.h"
--#endif
-
- #ifdef HAVE_COCOA
- #include <AvailabilityMacros.h>
-@@ -978,7 +975,7 @@ _g_io_modules_ensure_extension_points_re
- {
- registered_extensions = TRUE;
-
--#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
-+#if defined(G_OS_UNIX)
- #if !GLIB_CHECK_VERSION (3, 0, 0)
- ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-@@ -1119,7 +1116,6 @@ _g_io_modules_ensure_loaded (void)
- #endif
- #ifdef HAVE_COCOA
- g_type_ensure (g_nextstep_settings_backend_get_type ());
-- g_type_ensure (g_osx_app_info_get_type ());
- #endif
- #ifdef G_OS_UNIX
- g_type_ensure (_g_unix_volume_monitor_get_type ());
diff --git a/frida-glib2/patches/patch-gio_glocalfileinfo.c b/frida-glib2/patches/patch-gio_glocalfileinfo.c
deleted file mode 100644
index 04ad2bf6fb..0000000000
--- a/frida-glib2/patches/patch-gio_glocalfileinfo.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gio_glocalfileinfo.c,v 1.1 2017/07/11 11:52:42 jperkin Exp $
-
-Re-enable gdesktopappinfo on Darwin.
-
---- gio/glocalfileinfo.c.orig 2017-06-22 12:52:49.000000000 +0000
-+++ gio/glocalfileinfo.c
-@@ -1259,7 +1259,7 @@ get_content_type (const char *b
-
- content_type = g_content_type_guess (basename, NULL, 0, &result_uncertain);
-
--#if !defined(G_OS_WIN32) && !defined(HAVE_COCOA)
-+#if !defined(G_OS_WIN32)
- if (!fast && result_uncertain && path != NULL)
- {
- guchar sniff_buffer[4096];
diff --git a/frida-glib2/patches/patch-gio_gresource-tool.c b/frida-glib2/patches/patch-gio_gresource-tool.c
deleted file mode 100644
index 79ef4e0220..0000000000
--- a/frida-glib2/patches/patch-gio_gresource-tool.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-gio_gresource-tool.c,v 1.1 2012/07/12 14:43:26 jperkin Exp $
-
---- gio/gresource-tool.c.orig Thu Jul 12 09:13:01 2012
-+++ gio/gresource-tool.c Thu Jul 12 09:13:06 2012
-@@ -31,6 +31,11 @@
- #include <locale.h>
-
- #ifdef HAVE_LIBELF
-+/* Solaris native libelf does not support largefile in 32-bit mode */
-+# if defined(__sun) && defined(__i386)
-+# undef _FILE_OFFSET_BITS
-+# define _FILE_OFFSET_BITS 32
-+# endif
- #include <libelf.h>
- #include <gelf.h>
- #include <sys/mman.h>
diff --git a/frida-glib2/patches/patch-gio_inotify_inotify-kernel.c b/frida-glib2/patches/patch-gio_inotify_inotify-kernel.c
deleted file mode 100644
index e2ad322877..0000000000
--- a/frida-glib2/patches/patch-gio_inotify_inotify-kernel.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-gio_inotify_inotify-kernel.c,v 1.1 2016/04/13 10:13:43 jperkin Exp $
-
-Use _XOPEN_NAME_MAX in lieu of NAME_MAX for SunOS.
-
---- gio/inotify/inotify-kernel.c.orig 2016-02-23 22:25:36.000000000 +0000
-+++ gio/inotify/inotify-kernel.c
-@@ -36,6 +36,9 @@
- #include "glib-private.h"
-
- /* From inotify(7) */
-+#if !defined(NAME_MAX) && defined(_XOPEN_NAME_MAX)
-+#define NAME_MAX _XOPEN_NAME_MAX
-+#endif
- #define MAX_EVENT_SIZE (sizeof(struct inotify_event) + NAME_MAX + 1)
-
- /* Amount of time to sleep on receipt of uninteresting events */
diff --git a/frida-glib2/patches/patch-gio_tests_Makefile.in b/frida-glib2/patches/patch-gio_tests_Makefile.in
deleted file mode 100644
index 3306f92341..0000000000
--- a/frida-glib2/patches/patch-gio_tests_Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-gio_tests_Makefile.in,v 1.1 2017/07/11 11:52:42 jperkin Exp $
-
-Re-enable gdesktopappinfo on Darwin.
-
---- gio/tests/Makefile.in.orig 2017-06-22 13:16:24.000000000 +0000
-+++ gio/tests/Makefile.in
-@@ -163,8 +163,8 @@ check_PROGRAMS = $(am__EXEEXT_22)
- @OS_UNIX_TRUE@ gdbus-example-objectmanager-client \
- @OS_UNIX_TRUE@ gdbus-example-objectmanager-server \
- @OS_UNIX_TRUE@ gdbus-test-fixture
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_19 = apps
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_20 = mimeapps
-+@OS_UNIX_TRUE@am__append_19 = apps
-+@OS_UNIX_TRUE@am__append_20 = mimeapps
- @OS_UNIX_TRUE@am__append_21 = gsettings gschema-compile
- @OS_UNIX_FALSE@gsettings_DEPENDENCIES = \
- @OS_UNIX_FALSE@ $(top_builddir)/gio/libgio-2.0.la \
-@@ -332,7 +332,7 @@ am__EXEEXT_1 =
- @OS_UNIX_TRUE@ live-g-file$(EXEEXT) socket-address$(EXEEXT) \
- @OS_UNIX_TRUE@ stream-rw_all$(EXEEXT) unix-fd$(EXEEXT) \
- @OS_UNIX_TRUE@ unix-streams$(EXEEXT) $(am__EXEEXT_1)
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__EXEEXT_3 = mimeapps$(EXEEXT)
-+@OS_UNIX_TRUE@am__EXEEXT_3 = mimeapps$(EXEEXT)
- @OS_UNIX_TRUE@am__EXEEXT_4 = gdbus-connection-flush$(EXEEXT) \
- @OS_UNIX_TRUE@ gdbus-non-socket$(EXEEXT)
- @HAVE_DBUS_DAEMON_TRUE@@OS_UNIX_TRUE@am__EXEEXT_5 = actions$(EXEEXT) \
-@@ -398,7 +398,7 @@ am__EXEEXT_14 = $(am__EXEEXT_1) $(am__EX
- @OS_UNIX_TRUE@am__EXEEXT_15 = basic-application$(EXEEXT) \
- @OS_UNIX_TRUE@ dbus-launch$(EXEEXT) $(am__EXEEXT_1) \
- @OS_UNIX_TRUE@ appinfo-test$(EXEEXT) $(am__EXEEXT_1)
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__EXEEXT_16 = apps$(EXEEXT)
-+@OS_UNIX_TRUE@am__EXEEXT_16 = apps$(EXEEXT)
- @OS_UNIX_TRUE@am__EXEEXT_17 = gsubprocess-testprog$(EXEEXT) \
- @OS_UNIX_TRUE@ gdbus-overflow$(EXEEXT)
- am__EXEEXT_18 = gdbus-connection-flush-helper$(EXEEXT) \
-@@ -4662,9 +4662,9 @@ uninstall-am: uninstall-installed_testLT
- @ENABLE_INSTALLED_TESTS_TRUE@ echo 'Exec=$(installed_testdir)/$(notdir $<) --tap' >> $@.tmp; \
- @ENABLE_INSTALLED_TESTS_TRUE@ echo 'Output=TAP' >> $@.tmp; \
- @ENABLE_INSTALLED_TESTS_TRUE@ mv $@.tmp $@)
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@clean-local: clean-mimeapps
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@clean-mimeapps:
--@OS_COCOA_FALSE@@OS_UNIX_TRUE@ rm -rf xdgdatadir xdgdatahome xdgconfighome
-+@OS_UNIX_TRUE@clean-local: clean-mimeapps
-+@OS_UNIX_TRUE@clean-mimeapps:
-+@OS_UNIX_TRUE@ rm -rf xdgdatadir xdgdatahome xdgconfighome
- @OS_UNIX_TRUE%test.mo@localhost: de.po
- @OS_UNIX_TRUE@ $(AM_V_GEN) $(MSGFMT) -o test.mo $(srcdir)/de.po; \
- @OS_UNIX_TRUE@ $(MKDIR_P) de/LC_MESSAGES; \
diff --git a/frida-glib2/patches/patch-glib_gmain.c b/frida-glib2/patches/patch-glib_gmain.c
deleted file mode 100644
index e87a1ab7ca..0000000000
--- a/frida-glib2/patches/patch-glib_gmain.c
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-glib_gmain.c,v 1.1 2015/01/25 06:54:28 pho Exp $
-
-Imported patch from the upstream Bugzilla:
-
- Bug 728123 - glib2 @2.40.0 issues a "Got weird mach timebase info" error (Macports, PPC)
- https://bugzilla.gnome.org/show_bug.cgi?id=728123
-
-Tested on powerpc-apple-darwin9.
-
---- glib/gmain.c.orig 2014-11-09 21:54:26.000000000 +0000
-+++ glib/gmain.c
-@@ -2694,47 +2694,31 @@ g_get_monotonic_time (void)
- gint64
- g_get_monotonic_time (void)
- {
-- static mach_timebase_info_data_t timebase_info;
-+ mach_timebase_info_data_t timebase_info;
-+ guint64 val;
-
-- if (timebase_info.denom == 0)
-- {
-- /* This is a fraction that we must use to scale
-- * mach_absolute_time() by in order to reach nanoseconds.
-- *
-- * We've only ever observed this to be 1/1, but maybe it could be
-- * 1000/1 if mach time is microseconds already, or 1/1000 if
-- * picoseconds. Try to deal nicely with that.
-- */
-- mach_timebase_info (&timebase_info);
--
-- /* We actually want microseconds... */
-- if (timebase_info.numer % 1000 == 0)
-- timebase_info.numer /= 1000;
-- else
-- timebase_info.denom *= 1000;
--
-- /* We want to make the numer 1 to avoid having to multiply... */
-- if (timebase_info.denom % timebase_info.numer == 0)
-- {
-- timebase_info.denom /= timebase_info.numer;
-- timebase_info.numer = 1;
-- }
-- else
-- {
-- /* We could just multiply by timebase_info.numer below, but why
-- * bother for a case that may never actually exist...
-- *
-- * Plus -- performing the multiplication would risk integer
-- * overflow. If we ever actually end up in this situation, we
-- * should more carefully evaluate the correct course of action.
-- */
-- mach_timebase_info (&timebase_info); /* Get a fresh copy for a better message */
-- g_error ("Got weird mach timebase info of %d/%d. Please file a bug against GLib.",
-- timebase_info.numer, timebase_info.denom);
-- }
-+ /* we get nanoseconds from mach_absolute_time() using timebase_info */
-+ mach_timebase_info (&timebase_info);
-+ val = mach_absolute_time();
-+
-+ if (timebase_info.numer != timebase_info.denom)
-+ {
-+ guint64 t_high, t_low;
-+ guint64 result_high, result_low;
-+
-+ /* 64 bit x 32 bit / 32 bit with 96-bit intermediate
-+ * algorithm lifted from qemu */
-+ t_low = (val & 0xffffffffLL) * (guint64)timebase_info.numer;
-+ t_high = (val >> 32) * (guint64)timebase_info.numer;
-+ t_high += (t_low >> 32);
-+ result_high = t_high / (guint64)timebase_info.denom;
-+ result_low = (((t_high % (guint64)timebase_info.denom) << 32) +
-+ (t_low & 0xffffffff)) / (guint64)timebase_info.denom;
-+ val = ((result_high << 32) | result_low);
- }
-
-- return mach_absolute_time () / timebase_info.denom;
-+ /* nanoseconds to microseconds */
-+ return val / 1000;
- }
- #else
- gint64
diff --git a/frida-glib2/patches/patch-glib_gthread-posix.c b/frida-glib2/patches/patch-glib_gthread-posix.c
index ca948280cb..44d7abc608 100644
--- a/frida-glib2/patches/patch-glib_gthread-posix.c
+++ b/frida-glib2/patches/patch-glib_gthread-posix.c
@@ -1,10 +1,8 @@
-$NetBSD: patch-glib_gthread-posix.c,v 1.2 2014/09/14 23:35:23 prlw1 Exp $
+$NetBSD$
-https://bugzilla.gnome.org/show_bug.cgi?id=736651
-
---- glib/gthread-posix.c.orig 2014-02-22 15:29:07.000000000 +0000
+--- glib/gthread-posix.c.orig 2018-01-18 18:56:06.000000000 +0000
+++ glib/gthread-posix.c
-@@ -644,6 +644,7 @@ g_cond_impl_new (void)
+@@ -716,6 +716,7 @@ g_cond_impl_new (void)
#elif defined (HAVE_PTHREAD_CONDATTR_SETCLOCK) && defined (CLOCK_MONOTONIC)
if G_UNLIKELY ((status = pthread_condattr_setclock (&attr, CLOCK_MONOTONIC)) != 0)
g_thread_abort (status, "pthread_condattr_setclock");
@@ -12,7 +10,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=736651
#else
#error Cannot support GCond on your platform.
#endif
-@@ -892,6 +893,21 @@ g_cond_wait_until (GCond *cond,
+@@ -970,6 +971,21 @@ g_cond_wait_until (GCond *cond,
if ((status = pthread_cond_timedwait (g_cond_get_impl (cond), g_mutex_get_impl (mutex), &ts)) == 0)
return TRUE;
}
diff --git a/frida-glib2/patches/patch-glib_gtimezone.c b/frida-glib2/patches/patch-glib_gtimezone.c
deleted file mode 100644
index fde3356efb..0000000000
--- a/frida-glib2/patches/patch-glib_gtimezone.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-glib_gtimezone.c,v 1.2 2014/09/05 20:49:55 prlw1 Exp $
-
-Bug 730332 - glib uses wrong timezone transition with zoneinfo 2014c
-
-Patch from John Ralls.
-
---- glib/gtimezone.c.orig 2013-11-07 15:29:13.000000000 +0000
-+++ glib/gtimezone.c
-@@ -1558,7 +1558,11 @@ interval_end (GTimeZone *tz,
- guint interval)
- {
- if (tz->transitions && interval < tz->transitions->len)
-+ {
-+ if ((TRANSITION(interval)).time == G_MININT64)
-+ return G_MININT64;
- return (TRANSITION(interval)).time - 1;
-+ }
- return G_MAXINT64;
- }
-
diff --git a/frida-glib2/patches/patch-gobject_Makefile.am b/frida-glib2/patches/patch-gobject_Makefile.am
deleted file mode 100644
index 3bdc07a2e5..0000000000
--- a/frida-glib2/patches/patch-gobject_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gobject_Makefile.am,v 1.1 2017/10/13 15:35:10 prlw1 Exp $
-
-Move python scripts to py-glib2-tools package.
-
---- gobject/Makefile.am.orig 2017-07-13 23:03:39.000000000 +0000
-+++ gobject/Makefile.am
-@@ -187,7 +187,6 @@ libgobject_2_0_la_SOURCES = $(gobject_ta
- # programs to compile and install
- #
- bin_PROGRAMS = gobject-query
--bin_SCRIPTS = glib-mkenums glib-genmarshal
- # source files
- gobject_query_SOURCES = gobject-query.c
- # link programs against libgobject
diff --git a/frida-glib2/patches/patch-gobject_Makefile.in b/frida-glib2/patches/patch-gobject_Makefile.in
deleted file mode 100644
index fd214de9a8..0000000000
--- a/frida-glib2/patches/patch-gobject_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gobject_Makefile.in,v 1.1 2017/10/13 15:35:10 prlw1 Exp $
-
-Move python scripts to py-glib2-tools package.
-
---- gobject/Makefile.in.orig 2017-10-02 15:02:26.000000000 +0000
-+++ gobject/Makefile.in
-@@ -1007,7 +1007,6 @@ gen_sources = xgen-gmh xgen-gmc xgen-gms
- # target platform:
- libgobjectinclude_HEADERS = $(gobject_target_headers)
- libgobject_2_0_la_SOURCES = $(gobject_target_sources)
--bin_SCRIPTS = glib-mkenums glib-genmarshal
- # source files
- gobject_query_SOURCES = gobject-query.c
- # link programs against libgobject
diff --git a/frida-glib2/patches/patch-gobject_glib-genmarshal.in b/frida-glib2/patches/patch-gobject_glib-genmarshal.in
deleted file mode 100644
index bb689af617..0000000000
--- a/frida-glib2/patches/patch-gobject_glib-genmarshal.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gobject_glib-genmarshal.in,v 1.1 2017/10/15 08:23:06 prlw1 Exp $
-
-Revert 4395a897 Use env to run the Python-based tools
-https://bugzilla.gnome.org/show_bug.cgi?id=788527
-
---- gobject/glib-genmarshal.in.orig 2017-09-04 12:42:30.000000000 +0000
-+++ gobject/glib-genmarshal.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/env @PYTHON@
-+#!@PYTHON@
-
- # pylint: disable=too-many-lines, missing-docstring, invalid-name
-
diff --git a/frida-glib2/patches/patch-gobject_glib-mkenums.in b/frida-glib2/patches/patch-gobject_glib-mkenums.in
deleted file mode 100644
index 31dd1075ff..0000000000
--- a/frida-glib2/patches/patch-gobject_glib-mkenums.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gobject_glib-mkenums.in,v 1.3 2018/01/28 16:51:51 wiz Exp $
-
-- Revert 4395a897 Use env to run the Python-based tools
- https://bugzilla.gnome.org/show_bug.cgi?id=788527
-
---- gobject/glib-mkenums.in.orig 2017-10-21 08:20:09.664007702 +0000
-+++ gobject/glib-mkenums.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/env @PYTHON@
-+#!@PYTHON@
-
- # If the code below looks horrible and unpythonic, do not panic.
- #
Home |
Main Index |
Thread Index |
Old Index