Unbreak: Fix build with glib > 2.10 and run on amd64

PR:		ports/143027
Submitted by:	Yuri Pankov <yuri.pankov@gmail.com>

3 files changed, 62 insertions, 9 deletions

diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index f58829c02707..fbcbd72ca318 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmrun
 PORTVERSION=	0.9.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	SF
 
@@ -28,16 +28,8 @@ PORTDOCS=	README
 PLIST_FILES=	bin/gmrun %%DATADIR%%/gmrunrc
 PLIST_DIRS=	%%DATADIR%%
 
-BROKEN=		Does not build with recent GTK
-DEPRECATED=	yes
-EXPIRATION_DATE=	2010-03-20
-
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e '/select_executables_only(const struct dirent/ s,const ,,' \
-		${WRKSRC}/src/gtkcompletionline.cc
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/x11/gmrun/files/patch-src__gtkcompletionline.cc b/x11/gmrun/files/patch-src__gtkcompletionline.cc
new file mode 100644
index 000000000000..9626af5786b5
--- /dev/null
+++ b/x11/gmrun/files/patch-src__gtkcompletionline.cc
@@ -0,0 +1,50 @@
+--- ./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 @@
+ 
+ /* GLOBALS */
+ 
++GtkType type = 0;
++
+ /* signals */
+ enum {
+   UNIQUE,
+@@ -76,14 +78,13 @@
+ on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data);
+ 
+ /* get_type */
+-guint gtk_completion_line_get_type(void)
++GtkType gtk_completion_line_get_type(void)
+ {
+-  static guint type = 0;
+   if (type == 0)
+   {
+     GtkTypeInfo type_info =
+     {
+-      "GtkCompletionLine",
++      (gchar *)"GtkCompletionLine",
+       sizeof(GtkCompletionLine),
+       sizeof(GtkCompletionLineClass),
+       (GtkClassInitFunc)gtk_completion_line_class_init,
+@@ -376,7 +377,7 @@
+   return 0;
+ }
+ 
+-int my_alphasort(const void* va, const void* vb) {
++int my_alphasort(const struct dirent** va, const struct dirent** vb) {
+   const struct dirent** a = (const struct dirent**)va;
+   const struct dirent** b = (const struct dirent**)vb;
+ 
+@@ -551,10 +552,10 @@
+ {
+   string text = gtk_entry_get_text(GTK_ENTRY(object));
+   gint where = (gint)text.find("~");
+-  if (where != string::npos) {
++  if (where != (gint)string::npos) {
+     if ((where > 0) && (text[where - 1] != ' '))
+       return 0;
+-    if (where < text.size() - 1 && text[where + 1] != '/') {
++    if (where < (gint)text.size() - 1 && text[where + 1] != '/') {
+       // FIXME: Parse another user's home
+     } else {
+       string home = g_get_home_dir();
diff --git a/x11/gmrun/files/patch-src__gtkcompletionline.h b/x11/gmrun/files/patch-src__gtkcompletionline.h
new file mode 100644
index 000000000000..9db0e9267ad4
--- /dev/null
+++ b/x11/gmrun/files/patch-src__gtkcompletionline.h
@@ -0,0 +1,11 @@
+--- ./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 @@
+     void (* cancel)(GtkCompletionLine *cl);
+   };
+ 
+-  guint gtk_completion_line_get_type(void);
++  GtkType gtk_completion_line_get_type(void);
+   GtkWidget *gtk_completion_line_new();
+ 
+   void gtk_completion_line_last_history_item(GtkCompletionLine*);