[kde-freebsd] ports/181146: commit references a PR

[dfilter service]

The following reply was made to PR ports/181146; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/181146: commit references a PR
Date: Thu, 15 Aug 2013 11:39:50 +0000 (UTC)

 Author: rakuco
 Date: Thu Aug 15 11:39:41 2013
 New Revision: 324763
 URL: http://svnweb.freebsd.org/changeset/ports/324763
 
 Log:
   Make the sed(1) call to add a GDB index to generated files work with base sed.
   
   Add my upstream patch to fix it: use a POSIX-compliant call instead of one
   that only works with GNU sed.
   
   Note that it does not still work automatically because `gdb' is called, and
   the version we have in base does not support index generation.
   
   PR:		ports/181146
 
 Added:
   head/devel/qmake4/files/patch-mkspecs__features__unix__gdb_dwarf_index.prf   (contents, props changed)
 Modified:
   head/devel/qmake4/Makefile
 
 Modified: head/devel/qmake4/Makefile
 ==============================================================================
 --- head/devel/qmake4/Makefile	Thu Aug 15 11:37:57 2013	(r324762)
 +++ head/devel/qmake4/Makefile	Thu Aug 15 11:39:41 2013	(r324763)
 @@ -3,6 +3,7 @@
  
  PORTNAME=	qmake
  DISTVERSION=	${QT4_VERSION}
 +PORTREVISION=	1
  CATEGORIES=	devel
  PKGNAMEPREFIX=	qt4-
  
 
 Added: head/devel/qmake4/files/patch-mkspecs__features__unix__gdb_dwarf_index.prf
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/devel/qmake4/files/patch-mkspecs__features__unix__gdb_dwarf_index.prf	Thu Aug 15 11:39:41 2013	(r324763)
 @@ -0,0 +1,36 @@
 +From fdecdc39399994d2c0309005922590e2f106bbef Mon Sep 17 00:00:00 2001
 +From: Raphael Kubo da Costa <rakuco at FreeBSD.org>
 +Date: Sun, 11 Aug 2013 15:08:48 +0300
 +Subject: [PATCH] gdb_dwarf_index: Use a sed call that's more POSIX-compliant.
 +
 +sed versions other than the GNU one often default to being POSIX-compliant,
 +in which case "+" (with and without escaping) is always an ordinary
 +character.
 +
 +Achieve the same functionality in a way that works with both GNU and BSD
 +seds by using "xx*" insted of "x\+".
 +
 +Cherry-picked from qtbase/faea8d1056e4b034404febd0ef44a00e7784018d.
 +
 +Change-Id: I462e070992ff214a7261d45c208f2e5f3e962e8f
 +Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen at digia.com>
 +---
 + mkspecs/features/unix/gdb_dwarf_index.prf | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf
 +index e3f79cd..84b4e18 100644
 +--- mkspecs/features/unix/gdb_dwarf_index.prf
 ++++ mkspecs/features/unix/gdb_dwarf_index.prf
 +@@ -9,7 +9,7 @@
 +     }
 + 
 +     QMAKE_GDB_INDEX += \
 +-      test \$\$(gdb --version | sed -e \'s,[^0-9]\\+\\([0-9]\\)\\.\\([0-9]\\).*,\\1\\2,;q\') -gt 72 && \
 ++      test \$\$(gdb --version | sed -e \'s,[^0-9][^0-9]*\\([0-9]\\)\\.\\([0-9]\\).*,\\1\\2,;q\') -gt 72 && \
 +       gdb --nx --batch --quiet -ex \'set confirm off\' -ex \"save gdb-index $$QMAKE_GDB_DIR\" -ex quit \'$(TARGET)\'  && \
 +       test -f $(TARGET).gdb-index && \
 +       $$QMAKE_OBJCOPY --add-section \'.gdb_index=$(TARGET).gdb-index\' --set-section-flags \'.gdb_index=readonly\' \'$(TARGET)\' \'$(TARGET)\' && \
 +-- 
 +1.8.3.4
 +
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"