[patch] patch internal glib for Cygwin

0001-dev-util-pkgconfig-patch-internal-glib-for-Cygwin.patch (text/plain), 5.90 KB, created by Michael Haubenwallner (RETIRED) on 2016-05-27 11:36:31 UTC

From cf5e68847e9cfc823651ce6bcdc6714b0aff9a7d Mon Sep 17 00:00:00 2001
From: Michael Haubenwallner <[e-mail]>
Date: Wed, 27 Apr 2016 07:37:51 +0000
Subject: [PATCH] dev-util/pkgconfig: patch internal glib for Cygwin

---
 dev-util/pkgconfig/Manifest                |  1 +
 dev-util/pkgconfig/pkgconfig-0.29.1.ebuild | 14 +++++++++++++-
 dev-util/pkgconfig/pkgconfig-9999.ebuild   | 16 ++++++++++++++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 264fd89..e683c35 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -1,3 +1,4 @@
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
 DIST pkg-config-0.29.1.tar.gz 2013454 SHA256 beb43c9e064555469bd4390dcfd8030b1536e0aa103f08d7abf7ae8cac0cb001 SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2 WHIRLPOOL 6e7ff88253a4ff2e5b8c7e07bd9b5ab9b78b7f13dfe3af0a8607a8a20205a2340d02a400857d43aca5265ddb299c889b4a71c0c840c2d1b0e956434eb1980341
 DIST pkg-config-0.29.tar.gz 1973875 SHA256 c8507705d2a10c67f385d66ca2aae31e81770cc0734b4191eb8c489e864a006b SHA512 c2857cd67801c0db5d204912453ff6bdc7da3ea61f8b1c6b38983d48dffb958725e7723f909abbc057c7b34a85c27290eec6943808312a75909306076064aa63 WHIRLPOOL 06355dfebc42d3f090ffd02e0e680a0a1d74eb009f4d013f7fe6269d42964c1cdfc2d3ea6e82d3261b818c9b57d30f2c2c82042e97ea0da822875586ba20aa5d
+DIST pkgconfig-glib-cygwin-patches-2.38.2.zip 7057 SHA256 08a006bc73175cb942179be3cfc38656e855c71c012aaf284271237a4803db13 SHA512 a9b8c0bfec83b022cfb74a4a4b53b17f29ea3b3b0cb12fed8e34a27258b5524c87ddbae1e2d88e452408948795a09506e6782dc87916cb4748a455261f583b62 WHIRLPOOL 390b040d9d1f16a427ffa04a8820cd7de9a756ba9c1f32cbe22d560b385f9eb38441569b68ec1ac38319123bd585f82dd52d19764e6a2520b74bbc9dcd37c631
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
index a17e4be..2dcc0dc 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
@@ -19,14 +19,21 @@ if [[ ${PV} == *9999* ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
+	INTERNAL_GLIB_CYGWIN_PATCHES=2.38.2
 fi
 
+[[ -n ${INTERNAL_GLIB_CYGWIN_PATCHES} ]] &&
+SRC_URI+=" internal-glib? ( elibc_Cygwin? (
+	https://github.com/haubi/pkgconfig-glib-cygwin-patches/archive/v${INTERNAL_GLIB_CYGWIN_PATCHES}.zip
+	-> pkgconfig-glib-cygwin-patches-${INTERNAL_GLIB_CYGWIN_PATCHES}.zip
+) )"
+
 DESCRIPTION="Package config system that manages compile/link flags"
 HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
+IUSE="elibc_FreeBSD elibc_glibc elibc_Cygwin hardened internal-glib"
 
 RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
 	!dev-util/pkgconf[pkg-config]
@@ -41,6 +48,11 @@ DOCS=( AUTHORS NEWS README )
 src_prepare() {
 	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
 
+	[[ -n ${INTERNAL_GLIB_CYGWIN_PATCHES} ]] &&
+	use internal-glib && use elibc_Cygwin &&
+	EPATCH_FORCE=yes EPATCH_SUFFIX=patch \
+	epatch "${WORKDIR}"/pkgconfig-glib-cygwin-patches-${INTERNAL_GLIB_CYGWIN_PATCHES}
+
 	eapply_user
 
 	if [[ ${PV} == *9999* ]]; then
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index b21d533..54a7294 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,14 +19,21 @@ if [[ ${PV} == *9999* ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
+	INTERNAL_GLIB_CYGWIN_PATCHES=2.38.2
 fi
 
+[[ -n ${INTERNAL_GLIB_CYGWIN_PATCHES} ]] &&
+SRC_URI+=" internal-glib? ( elibc_Cygwin? (
+	https://github.com/haubi/pkgconfig-glib-cygwin-patches/archive/v${INTERNAL_GLIB_CYGWIN_PATCHES}.zip
+	-> pkgconfig-glib-cygwin-patches-${INTERNAL_GLIB_CYGWIN_PATCHES}.zip
+) )"
+
 DESCRIPTION="Package config system that manages compile/link flags"
 HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
+IUSE="elibc_FreeBSD elibc_glibc elibc_Cygwin hardened internal-glib"
 
 RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
 	!dev-util/pkgconf[pkg-config]
@@ -41,6 +48,11 @@ DOCS=( AUTHORS NEWS README )
 src_prepare() {
 	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
 
+	[[ -n ${INTERNAL_GLIB_CYGWIN_PATCHES} ]] &&
+	use internal-glib && use elibc_Cygwin &&
+	EPATCH_FORCE=yes EPATCH_SUFFIX=patch \
+	epatch "${WORKDIR}"/pkgconfig-glib-cygwin-patches-${INTERNAL_GLIB_CYGWIN_PATCHES}
+
 	epatch_user
 
 	if [[ ${PV} == *9999* ]]; then
-- 
2.7.3