Re: pkg/45465 (Update x11/xproto 7.0.18 to 7.0.22)

To: cheusov%NetBSD.org@localhost, gnats-admin%netbsd.org@localhost, pkgsrc-bugs%netbsd.org@localhost, makoto%ki.nu@localhost
Subject: Re: pkg/45465 (Update x11/xproto 7.0.18 to 7.0.22)
From: Aleksey Cheusov <cheusov%tut.by@localhost>
Date: Sat, 22 Oct 2011 16:35:01 +0000 (UTC)
The following reply was made to PR pkg/45465; it has been noted by GNATS.

From: Aleksey Cheusov <cheusov%tut.by@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/45465 (Update x11/xproto 7.0.18 to 7.0.22)
Date: Sat, 22 Oct 2011 19:31:06 +0300

 > The following reply was made to PR pkg/45465; it has been noted by GNATS.
 
 > From: Joerg Sonnenberger <joerg%britannica.bec.de@localhost>
 > To: gnats-bugs%NetBSD.org@localhost
 > Cc: 
 > Subject: Re: pkg/45465 (Update x11/xproto 7.0.18 to 7.0.22)
 > Date: Sat, 22 Oct 2011 08:40:15 -0700
 
 >  On Sat, Oct 22, 2011 at 12:49:59PM +0000, cheusov%NetBSD.org@localhost 
 > wrote:
  >> Synopsis: Update x11/xproto 7.0.18 to 7.0.22
  >> 
  >> Responsible-Changed-From-To: joerg->cheusov
  >> Responsible-Changed-By: cheusov%NetBSD.org@localhost
  >> Responsible-Changed-When: Sat, 22 Oct 2011 12:49:58 +0000
  >> Responsible-Changed-Why:
  >> I'm working on it.
 >  
 >  Don't.
 
 Already done. The following + removed x11/xproto/patches/patch-ac
 works fine for me.
 
 Index: devel/xorg-util-macros/Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/xorg-util-macros/Makefile,v
 retrieving revision 1.7
 diff -u -r1.7 Makefile
 --- devel/xorg-util-macros/Makefile    9 Apr 2010 09:31:34 -0000       1.7
 +++ devel/xorg-util-macros/Makefile    22 Oct 2011 16:24:52 -0000
 @@ -1,7 +1,7 @@
  # $NetBSD: Makefile,v 1.7 2010/04/09 09:31:34 tnn Exp $
  #
  
 -DISTNAME=             util-macros-1.7.0
 +DISTNAME=             util-macros-1.15.0
  PKGNAME=              xorg-${DISTNAME}
  CATEGORIES=           devel x11
  MASTER_SITES=         ${MASTER_SITE_XORG:=util/}
 @@ -10,6 +10,7 @@
  MAINTAINER=           joerg%NetBSD.org@localhost
  HOMEPAGE=             http://xorg.freedesktop.org/
  COMMENT=              Xorg autotool macros
 +LICENSE=              mit
  
  PKG_DESTDIR_SUPPORT=  user-destdir
  
 Index: devel/xorg-util-macros/distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/xorg-util-macros/distinfo,v
 retrieving revision 1.6
 diff -u -r1.6 distinfo
 --- devel/xorg-util-macros/distinfo    9 Apr 2010 09:31:34 -0000       1.6
 +++ devel/xorg-util-macros/distinfo    22 Oct 2011 16:24:52 -0000
 @@ -1,5 +1,5 @@
  $NetBSD: distinfo,v 1.6 2010/04/09 09:31:34 tnn Exp $
  
 -SHA1 (util-macros-1.7.0.tar.bz2) = 82f832a47ab6ea6aca11f29161e88b14958d883d
 -RMD160 (util-macros-1.7.0.tar.bz2) = a32f0aff46070e44b2335c74419c91a60241fa72
 -Size (util-macros-1.7.0.tar.bz2) = 62507 bytes
 +SHA1 (util-macros-1.15.0.tar.bz2) = 1c4871ba4b4c6cac894b64489053d85e0a122e60
 +RMD160 (util-macros-1.15.0.tar.bz2) = 093040f60d5b89e11f64cf4f71a1c0821a27e795
 +Size (util-macros-1.15.0.tar.bz2) = 72149 bytes
 Index: x11/xproto/Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/x11/xproto/Makefile,v
 retrieving revision 1.17
 diff -u -r1.17 Makefile
 --- x11/xproto/Makefile        10 Sep 2010 20:07:29 -0000      1.17
 +++ x11/xproto/Makefile        22 Oct 2011 16:24:52 -0000
 @@ -1,7 +1,7 @@
  # $NetBSD: Makefile,v 1.17 2010/09/10 20:07:29 joerg Exp $
  #
  
 -DISTNAME=             xproto-7.0.18
 +DISTNAME=             xproto-7.0.22
  CATEGORIES=           x11 devel
  MASTER_SITES=         ${MASTER_SITE_XORG:=proto/}
  EXTRACT_SUFX=         .tar.bz2
 @@ -11,6 +11,8 @@
  COMMENT=              X protocol and ancillary headers from Xorg X11
  LICENSE=              mit
  
 +BUILD_DEPENDS+=               
xorg-util-macros>=1.12:../../devel/xorg-util-macros
 +
  PKG_INSTALLATION_TYPES=       overwrite pkgviews
  PKG_DESTDIR_SUPPORT=  user-destdir
  
 @@ -18,6 +20,13 @@
  PKGCONFIG_OVERRIDE+=  xproto.pc.in
  USE_LANGUAGES=                c
  
 +AUTOCONF_REQD=                2.50
 +USE_TOOLS+=           autoconf automake
 +
 +pre-configure:
 +      set -e; cd ${WRKSRC}; \
 +      aclocal; autoheader; automake -a --foreign -i; autoconf
 +
  post-extract:
        ${MV} ${WRKSRC}/Xos_r.h ${WRKSRC}/Xos_r.h.in
  
 Index: x11/xproto/PLIST
 ===================================================================
 RCS file: /cvsroot/pkgsrc/x11/xproto/PLIST,v
 retrieving revision 1.2
 diff -u -r1.2 PLIST
 --- x11/xproto/PLIST   14 Jun 2009 18:25:18 -0000      1.2
 +++ x11/xproto/PLIST   22 Oct 2011 16:24:52 -0000
 @@ -1,4 +1,4 @@
 -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:18 joerg Exp $
 +@comment $NetBSD$
  include/X11/DECkeysym.h
  include/X11/HPkeysym.h
  include/X11/Sunkeysym.h
 @@ -26,3 +26,8 @@
  include/X11/keysym.h
  include/X11/keysymdef.h
  lib/pkgconfig/xproto.pc
 +share/doc/xproto/encoding.xml
 +share/doc/xproto/glossary.xml
 +share/doc/xproto/keysyms.xml
 +share/doc/xproto/sect1-9.xml
 +share/doc/xproto/x11protocol.xml
 Index: x11/xproto/distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/x11/xproto/distinfo,v
 retrieving revision 1.16
 diff -u -r1.16 distinfo
 --- x11/xproto/distinfo        10 Sep 2010 20:07:29 -0000      1.16
 +++ x11/xproto/distinfo        22 Oct 2011 16:24:52 -0000
 @@ -1,9 +1,8 @@
  $NetBSD: distinfo,v 1.16 2010/09/10 20:07:29 joerg Exp $
  
 -SHA1 (xproto-7.0.18.tar.bz2) = 252596e7264f3174d535bf67fd1b704b1ba8f699
 -RMD160 (xproto-7.0.18.tar.bz2) = 526f579590bc7dadbd3967d4e8ac5f174e80c6ac
 -Size (xproto-7.0.18.tar.bz2) = 168722 bytes
 +SHA1 (xproto-7.0.22.tar.bz2) = 96d9b37d15591412a94dd0d3620008e20ef500ca
 +RMD160 (xproto-7.0.22.tar.bz2) = 0d3b840e7a584e98ea3576bd521b09d2fd483b6d
 +Size (xproto-7.0.22.tar.bz2) = 281763 bytes
  SHA1 (patch-aa) = 8060c40ed4280fce4a74fd55e17c014eb2c48e3b
 -SHA1 (patch-ab) = 7ef921ce34ab8ba5de1ea9edfd32034db079c0ea
 -SHA1 (patch-ac) = d4d90d2eca33a75e55db463b48a29abecc67eab9
 -SHA1 (patch-ad) = 97331290a7c7ee26896c4f6da74ee2b601a93eda
 +SHA1 (patch-ab) = ccf9896f174b1251e696ba1de99bdbf870de4eb7
 +SHA1 (patch-ad) = f286817e19f3a480458817426ce684cb7b519ec8
 Index: x11/xproto/patches/patch-ab
 ===================================================================
 RCS file: /cvsroot/pkgsrc/x11/xproto/patches/patch-ab,v
 retrieving revision 1.4
 diff -u -r1.4 patch-ab
 --- x11/xproto/patches/patch-ab        10 Sep 2010 20:07:29 -0000      1.4
 +++ x11/xproto/patches/patch-ab        22 Oct 2011 16:24:52 -0000
 @@ -1,8 +1,9 @@
 -$NetBSD: patch-ab,v 1.4 2010/09/10 20:07:29 joerg Exp $
 +$NetBSD$
  
 ---- configure.ac.orig 2010-08-10 14:19:17.000000000 +0000
 -+++ configure.ac
 -@@ -11,6 +11,7 @@ XORG_DEFAULT_OPTIONS
 +
 +--- configure.ac.orig 2011-06-23 08:28:51.000000000 +0900
 ++++ configure.ac      2011-10-13 22:05:38.000000000 +0900
 +@@ -17,6 +17,7 @@
   
   AC_CONFIG_HEADER([do-not-use-config.h])
   AC_CONFIG_HEADER([Xfuncproto.h])
 @@ -10,7 +11,7 @@
   
   AC_CANONICAL_HOST
   
 -@@ -203,6 +204,14 @@ if test "x$WIDEPROTO" = xno; then
 +@@ -209,6 +210,14 @@
        AC_DEFINE(NARROWPROTO, [], [Narrow prototypes])
   fi
   
 @@ -24,4 +25,4 @@
  +AC_CHECK_FUNC(ttyname_r, [AC_DEFINE(_XOS_R_H_MTSAFE_UNISTDAPI,[],[Assume has 
ttyname_r and friends from unistd.h])],)
   
   AC_OUTPUT([Makefile
 -            Xpoll.h
 +            specs/Makefile
 Index: x11/xproto/patches/patch-ad
 ===================================================================
 RCS file: /cvsroot/pkgsrc/x11/xproto/patches/patch-ad,v
 retrieving revision 1.2
 diff -u -r1.2 patch-ad
 --- x11/xproto/patches/patch-ad        10 Sep 2010 20:07:29 -0000      1.2
 +++ x11/xproto/patches/patch-ad        22 Oct 2011 16:24:52 -0000
 @@ -1,11 +1,11 @@
 -$NetBSD: patch-ad,v 1.2 2010/09/10 20:07:29 joerg Exp $
 +$NetBSD$
  
 ---- Xfuncproto.h.in.orig      2010-08-10 14:18:54.000000000 +0000
 -+++ Xfuncproto.h.in
 -@@ -83,7 +83,7 @@ in this Software without prior written a
 - # define _X_ATTRIBUTE_PRINTF(x,y)
 +--- Xfuncproto.h.in.orig      2011-06-16 08:06:04.000000000 +0900
 ++++ Xfuncproto.h.in   2011-10-13 22:12:40.000000000 +0900
 +@@ -83,7 +83,7 @@
   #endif /* GNUC >= 4 */
   
 + /* Added in X11R6.9, so available in any version of modular xproto */
  -#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__)
  +#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) && 
!defined(__sun__)
   # define _X_EXPORT      __attribute__((visibility("default")))
 
 
 -- 
 Best regards, Aleksey Cheusov.
Prev by Date: Re: pkg/45510: OS X bootstrap broken due to liblzma from /usr/local leaking into libarchive
Next by Date: Re: pkg/45509 (menu text corrupt with x11/pixman-0.22.2)
Previous by Thread: Re: pkg/45465 (Update x11/xproto 7.0.18 to 7.0.22)
Next by Thread: Re: pkg/45465 (Update x11/xproto 7.0.18 to 7.0.22)
Indexes:
Home | Main Index | Thread Index | Old Index