Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 May 2019 11:35:27 +0000 (UTC)
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r502783 - in head/x11/gmrun: . files
Message-ID:  <201905271135.x4RBZRrj010638@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: garga
Date: Mon May 27 11:35:27 2019
New Revision: 502783
URL: https://svnweb.freebsd.org/changeset/ports/502783

Log:
  x11/gmrun: Fix build with GCC architectures [1]
  
  - Add USES=compiler:c++11-lang [1]
  - Include cstring in src/ci_string.h [1]
  - Add USES=gnome localbase:ldflags [1]
  - While here, add mising dependencies and pet portlint
  
  PR:		237871 [1]
  Submitted by:	pkubaj@
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Added:
  head/x11/gmrun/files/patch-src_ci__string.h   (contents, props changed)
Modified:
  head/x11/gmrun/Makefile
  head/x11/gmrun/files/patch-src__gtkcompletionline.cc
  head/x11/gmrun/files/patch-src__gtkcompletionline.h

Modified: head/x11/gmrun/Makefile
==============================================================================
--- head/x11/gmrun/Makefile	Mon May 27 10:49:00 2019	(r502782)
+++ head/x11/gmrun/Makefile	Mon May 27 11:35:27 2019	(r502783)
@@ -3,32 +3,35 @@
 
 PORTNAME=	gmrun
 PORTVERSION=	0.9.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	x11
 MASTER_SITES=	SF
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Customizable program to run programs, with tab-completion
 
-LIB_DEPENDS=	libpopt.so:devel/popt
+LICENSE=	GPLv2
 
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libpopt.so:devel/popt
+
+USES=		compiler:c++11-lang gmake gnome localbase:ldflags pkgconfig
+
 OPTIONS_DEFINE=	DOCS
 
-USES=		gmake pkgconfig
-USE_GNOME=	gtk20
+USE_GNOME=	cairo gdkpixbuf2 gtk20
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-stlport
 
 PORTDOCS=	README
-PLIST_FILES=	bin/gmrun %%DATADIR%%/gmrunrc
+PLIST_FILES=	bin/gmrun ${DATADIR}/gmrunrc
 
 post-patch:
 	@${REINPLACE_CMD} -e '/my_alphasort/s#const void\*#const struct dirent**#g' \
 		${WRKSRC}/src/gtkcompletionline.cc
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 

Modified: head/x11/gmrun/files/patch-src__gtkcompletionline.cc
==============================================================================
--- head/x11/gmrun/files/patch-src__gtkcompletionline.cc	Mon May 27 10:49:00 2019	(r502782)
+++ head/x11/gmrun/files/patch-src__gtkcompletionline.cc	Mon May 27 11:35:27 2019	(r502783)
@@ -1,6 +1,6 @@
---- ./src/gtkcompletionline.cc.orig	2003-11-16 13:55:07.000000000 +0300
-+++ ./src/gtkcompletionline.cc	2010-01-20 21:25:08.847480188 +0300
-@@ -39,6 +39,8 @@
+--- src/gtkcompletionline.cc.orig	2003-11-16 10:55:07 UTC
++++ src/gtkcompletionline.cc
+@@ -39,6 +39,8 @@ static int on_key_press_handler = 0;
  
  /* GLOBALS */
  
@@ -9,7 +9,7 @@
  /* signals */
  enum {
    UNIQUE,
-@@ -76,14 +78,13 @@
+@@ -76,14 +78,13 @@ static gboolean
  on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data);
  
  /* get_type */
@@ -26,7 +26,7 @@
        sizeof(GtkCompletionLine),
        sizeof(GtkCompletionLineClass),
        (GtkClassInitFunc)gtk_completion_line_class_init,
-@@ -551,10 +552,10 @@
+@@ -551,10 +552,10 @@ parse_tilda(GtkCompletionLine *object)
  {
    string text = gtk_entry_get_text(GTK_ENTRY(object));
    gint where = (gint)text.find("~");

Modified: head/x11/gmrun/files/patch-src__gtkcompletionline.h
==============================================================================
--- head/x11/gmrun/files/patch-src__gtkcompletionline.h	Mon May 27 10:49:00 2019	(r502782)
+++ head/x11/gmrun/files/patch-src__gtkcompletionline.h	Mon May 27 11:35:27 2019	(r502783)
@@ -1,6 +1,6 @@
---- ./src/gtkcompletionline.h.orig	2003-11-16 13:43:32.000000000 +0300
-+++ ./src/gtkcompletionline.h	2010-01-20 21:24:57.489100621 +0300
-@@ -76,7 +76,7 @@
+--- src/gtkcompletionline.h.orig	2003-11-16 10:43:32 UTC
++++ src/gtkcompletionline.h
+@@ -76,7 +76,7 @@ extern "C++" {
      void (* cancel)(GtkCompletionLine *cl);
    };
  

Added: head/x11/gmrun/files/patch-src_ci__string.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/gmrun/files/patch-src_ci__string.h	Mon May 27 11:35:27 2019	(r502783)
@@ -0,0 +1,10 @@
+--- src/ci_string.h.orig	2019-05-27 11:24:56 UTC
++++ src/ci_string.h
+@@ -6,6 +6,7 @@
+ #ifndef __CI_STRING_H__
+ #define __CI_STRING_H__
+ 
++#include <cstring>
+ #include <string>
+ #include <ctype.h>
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905271135.x4RBZRrj010638>