From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: ncurses conflicts between master and core-updates Date: Fri, 6 Jan 2017 00:19:40 -0500 Message-ID: <20170106051940.GA22423@jasmine> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="pf9I7BMVVzbSWLtt" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPMwM-0003CJ-UP for guix-devel@gnu.org; Fri, 06 Jan 2017 00:19:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cPMwJ-0006sJ-Ql for guix-devel@gnu.org; Fri, 06 Jan 2017 00:19:46 -0500 Content-Disposition: inline List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --pf9I7BMVVzbSWLtt Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable There's a tricky conflict in the ncurses package definition between master and core-updates. On core-updates, there is 57742b35dc026 (gnu: ncurses: Install pkg-config =E2=80=98.pc=E2=80=99 files.), and on master, it's d230cf61f6a (= gnu: ncurses: support mingw.). The mingw commit added some conditionals relating to mingw, and I'm not sure if the pkg-config change should be applied for mingw builds or not. Can you give me advice about how to resolve this, or merge master into core-updates yourself? There are a few other conflicts, but they are easy to resolve. --pf9I7BMVVzbSWLtt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlhvKOkACgkQJkb6MLrK fwjFLA/8DERpy/wetlH9/1imPkMar+rWNsiwTCBk6aiYBjyZFwPjZAz4LSXk1Szs zB05OHCkhIBR+CB2VgyOjMROX1GL21sEln/kZhNWUUre0j/2OdpwTVoTwFccbKSI SpTcxCt/LTDu3I2osFn6SqI99P0Mz88Ne2KxHUhWl2vdIkE7BkJtfowQDMVKqMaH uwgnCKR1ngP29rB1ocAr5FO2vK1kRhlb9wSfOFVRePlwKR4x5p25/0WHjNWd/xPI KPl00cTsK3esjnH4ndKkGnVBA0wKw3VUb/ag6xro5tG/00tZuIBzStPHOqqEs2ss jfiCqgWCoHrhYF8EbBw7DoBlSkUUdT51MEoQD6KHMjja2NLaexQB/nFk7kBy4ErI tROjaWQbjJYlC+Qt5f2nkGOuwqh68xqVWpszHcCmRrlrjUQVcA+FJ9RhlinlT/O0 jz3oncbxHtyMyTkRKqB+IJwnBi1MTM6QdXUvMk4jglTh9xNpArF80CHz4+FNkEaT lumDdcGpz2xb4s0ag1gjHNiR53xs3hHSZeXQObXdjyQhByHbTkvNjbw6aEq3yYhJ eIIWs+gebnwJjEkJ7l8Vuz0xDusxAE4JMlgjTaPpLA0xKxrsm1YYRBnp8H7f2fp1 k6lwUv2j4orhiFxTQagjhZLOBRPrmSkrtafF5t4jSBiX5vVJi0M= =btWa -----END PGP SIGNATURE----- --pf9I7BMVVzbSWLtt--