commit: 21ec96d581bdc46be9a6ec64bc5cbf581f2403dd Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> AuthorDate: Fri Feb 15 12:16:27 2019 +0000 Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> CommitDate: Fri Feb 15 12:16:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=21ec96d5
dev-libs/glib: bump cygwin patches Package-Manager: Portage-2.3.55.1-prefix, Repoman-2.3.12 Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org> dev-libs/glib/Manifest | 3 +- dev-libs/glib/files/2.56-gmodule-cygwin.patch | 149 ++++++++++++++++++++++++++ dev-libs/glib/glib-2.56.2.ebuild | 29 ++--- 3 files changed, 168 insertions(+), 13 deletions(-) diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 1a2a1b7d65..654849c16b 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,5 +1,6 @@ -DIST 07d4a86e74b9b12a562b57ce5fa3a275bf0fe774.zip 13852 SHA256 decff3d1b7f259154940153cc65994fdc9d6a6ffe32e0e99334fe2163844ac4f SHA512 971a0519b53e066adcce27176bc134f6ccd6660d85113d5be10fa7cd421ef1e089a1780459de63234de618abd68df62d308f409a7097fe6a9e91e20510af40b9 WHIRLPOOL 0d2908fdd3c355479886387fd2619ae16470e971948a1af4a4a499a3d00dcbaeaf3b0dbe6115f06eca74bb99a40ce5e670bc8c14a1deb15450fd4a06aa642320 +DIST 07d4a86e74b9b12a562b57ce5fa3a275bf0fe774.zip 13852 BLAKE2B a272281e4850b11b1632593155ed6bcbea73ccae4e6a7083c70dfd1ba207b5ae66d981445e08aca34287a6631ddcee7c832be152a9a3f62f470b17819c7949b6 SHA512 971a0519b53e066adcce27176bc134f6ccd6660d85113d5be10fa7cd421ef1e089a1780459de63234de618abd68df62d308f409a7097fe6a9e91e20510af40b9 DIST glib-2.50.2.tar.xz 7582312 BLAKE2B 1faa4bec57b0dc9538a5d86b6530b5b60c37d01c6b1e3d3667c1e0204bb78fa5890699456425f302f33b48792af0fe448c17760614895d10b27358a5c187a518 SHA512 63d7b5ece8d7d15b10e06ef10a8e0a4446f30a8d9c97daa3352ec00dfef622728bd42ed24cbf67e553166a0f9e29a3e3d024d1d085b9804fd67608db438b6771 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017 DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4 +DIST glib-cygwinports-3a873fdd1b9a9e649563fe8e6b8ae6951b0dd3be.zip 13038 BLAKE2B 08f217e204c8518137722dcd535c100cbdc56e43dcf3d16a339c93353c594287670215c130b2c7f83235145632fad6d30903ae099f5999bf72ec070a12da4484 SHA512 fd4925d6a2380c5ff551e812a182de20f7b59e5d134a2c54b985efe85ab334499b0050097ca5c3271f14e2c3c5e89650e134a01e4c5be06bad05a12eaaf9fe53 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 diff --git a/dev-libs/glib/files/2.56-gmodule-cygwin.patch b/dev-libs/glib/files/2.56-gmodule-cygwin.patch new file mode 100644 index 0000000000..4665a2901a --- /dev/null +++ b/dev-libs/glib/files/2.56-gmodule-cygwin.patch @@ -0,0 +1,149 @@ +This is derived from github/cygwinports/glib2.0/2.50-gmodule-cygwin.patch +as of commit id 3a873fdd1b9a9e649563fe8e6b8ae6951b0dd3be for glib-2.54.3, +and rebased for glib-2.56.2. +--- origsrc/glib-2.50.3/gmodule/gmodule-win32.c ++++ src/glib-2.50.3/gmodule/gmodule-win32.c +@@ -37,7 +37,20 @@ + + #ifdef G_WITH_CYGWIN + #include <sys/cygwin.h> +-#endif ++#include <dlfcn.h> ++ ++static gchar* ++fetch_dlerror (gboolean replace_null) ++{ ++ gchar *msg = dlerror (); ++ ++ if (!msg && replace_null) ++ return "unknown dl-error"; ++ ++ return msg; ++} ++ ++#else + + static void + set_error (const gchar *format, +@@ -62,22 +75,26 @@ set_error (const gchar *format, + g_free (error); + } + ++#endif /* G_WITH_CYGWIN */ ++ + /* --- functions --- */ + static gpointer + _g_module_open (const gchar *file_name, + gboolean bind_lazy, + gboolean bind_local) + { ++#ifdef G_WITH_CYGWIN ++ gpointer handle; ++ ++ handle = dlopen (file_name, ++ (bind_local ? RTLD_LOCAL : RTLD_GLOBAL) | (bind_lazy ? RTLD_LAZY : RTLD_NOW)); ++ if (!handle) ++ g_module_set_error (fetch_dlerror (TRUE)); ++#else + HINSTANCE handle; + wchar_t *wfilename; + DWORD old_mode; + BOOL success; +-#ifdef G_WITH_CYGWIN +- gchar tmp[MAX_PATH]; +- +- cygwin_conv_to_win32_path(file_name, tmp); +- file_name = tmp; +-#endif + wfilename = g_utf8_to_utf16 (file_name, -1, NULL, NULL, NULL); + + /* suppress error dialog */ +@@ -91,26 +108,44 @@ _g_module_open (const gchar *file_name, + + if (!handle) + set_error ("'%s': ", file_name); ++#endif + + return handle; + } + ++#ifndef G_WITH_CYGWIN + static gint dummy; + static gpointer null_module_handle = &dummy; ++#endif + + static gpointer + _g_module_self (void) + { ++#ifdef G_WITH_CYGWIN ++ gpointer handle; ++ ++ handle = dlopen (NULL, RTLD_GLOBAL | RTLD_LAZY); ++ if (!handle) ++ g_module_set_error (fetch_dlerror (TRUE)); ++ ++ return handle; ++#else + return null_module_handle; ++#endif + } + + static void + _g_module_close (gpointer handle, + gboolean is_unref) + { ++#ifdef G_WITH_CYGWIN ++ if (dlclose (handle) != 0) ++ g_module_set_error (fetch_dlerror (TRUE)); ++#else + if (handle != null_module_handle) + if (!FreeLibrary (handle)) + set_error (""); ++#endif + } + + static gpointer +@@ -129,8 +164,19 @@ find_in_any_module_using_toolhelp (const + if (Module32First (snapshot, &me32)) + { + do { +- if ((p = GetProcAddress (me32.hModule, symbol_name)) != NULL) +- break; ++ if ((p = GetProcAddress (me32.hModule, symbol_name)) != NULL) { ++#ifdef G_WITH_CYGWIN ++ /* if symbol is found in another module, we probably do not want it */ ++ ssize_t size = cygwin_conv_path (CCP_WIN_A_TO_POSIX, me32.szExePath, NULL, 0); ++ char *posix = (char *) alloca (size); ++ cygwin_conv_path (CCP_WIN_A_TO_POSIX, me32.szExePath, posix, size); ++ if (g_strstr_len (posix, size, "/usr/lib") ++ || g_strstr_len (posix, size, "/usr/local/lib")) ++ p = NULL; ++ else ++#endif ++ break; ++ } + } while (Module32Next (snapshot, &me32)); + } + +@@ -156,6 +202,13 @@ _g_module_symbol (gpointer handle, + { + gpointer p; + ++#ifdef G_WITH_CYGWIN ++ p = dlsym (handle, symbol_name); ++ if (!p) ++ p = find_in_any_module (symbol_name); ++ if (!p) ++ g_module_set_error (fetch_dlerror (FALSE)); ++#else + if (handle == null_module_handle) + { + if ((p = GetProcAddress (GetModuleHandle (NULL), symbol_name)) == NULL) +@@ -166,6 +219,7 @@ _g_module_symbol (gpointer handle, + + if (!p) + set_error (""); ++#endif + + return p; + } diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild index d9775a178c..31cbe3d8a8 100644 --- a/dev-libs/glib/glib-2.56.2.ebuild +++ b/dev-libs/glib/glib-2.56.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,10 +16,12 @@ DESCRIPTION="The GLib library of C routines" HOMEPAGE="https://www.gtk.org/" SRC_URI="${SRC_URI} https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf -#needs update CYGWINPORTS_GITREV="07d4a86e74b9b12a562b57ce5fa3a275bf0fe774" +CYGWINPORTS_GITREV="3a873fdd1b9a9e649563fe8e6b8ae6951b0dd3be" [[ -n ${CYGWINPORTS_GITREV} ]] && -SRC_URI+=" elibc_Cygwin? ( https://github.com/cygwinports/glib2.0/archive/${CYGWINPORTS_GITREV}.zip )" +SRC_URI+=" elibc_Cygwin? ( + https://github.com/cygwinports/glib2.0/archive/${CYGWINPORTS_GITREV}.zip + -> ${PN}-cygwinports-${CYGWINPORTS_GITREV}.zip )" LICENSE="LGPL-2.1+" SLOT="2" @@ -123,15 +125,18 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch if [[ -n ${CYGWINPORTS_GITREV} ]] && use elibc_Cygwin; then - local p d="${WORKDIR}/glib2.0-${CYGWINPORTS_GITREV}" - for p in $( - eval "$(sed -ne '/PATCH_URI="/,/"/p' < "${d}"/glib2.0.cygport)" - echo ${PATCH_URI} - ); do - # Cygwin hasn't updated to 2.50.2 yet, which has patches merged. - [[ ${p} == 2.46-glocalfilemonitor.patch ]] && continue - epatch "${d}/${p}" - done + local p d="${WORKDIR}/glib2.0-${CYGWINPORTS_GITREV}" + for p in $( + sed -ne '/PATCH_URI="/,/"/{s/.*="//;s/".*//;p}' \ + < "${d}"/glib2.0.cygport + ); do + if [[ ${p} == 2.50-gmodule-cygwin.patch ]]; then + # Cygwinports has not upgraded to 2.56 yet + epatch "${FILESDIR}"/2.56-gmodule-cygwin.patch + continue + fi + epatch "${d}/${p}" + done fi # make default sane for us