Date: Wed, 20 Jan 2010 21:30:29 +0300 (MSK) From: Yuri Pankov <yuri.pankov@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/143027: [PATCH] x11/gmrun: fix build and amd64 runtime Message-ID: <201001201830.o0KIUTT5021298@darklight.org.ru> Resent-Message-ID: <201001201840.o0KIe6EU054290@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143027
>Category: ports
>Synopsis: [PATCH] x11/gmrun: fix build and amd64 runtime
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 20 18:40:06 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Yuri Pankov
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD darklight.org.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #1 r202594: Wed Jan 20 00:24:18 MSK
>Description:
- Fix build with devel/glib20 >= 2.10
- Fix amd64 runtime
- Do not de-orbit yet
Added file(s):
- files/patch-src__gtkcompletionline.cc
- files/patch-src__gtkcompletionline.h
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- gmrun-0.9.2_6.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/gmrun/Makefile,v
retrieving revision 1.30
diff -u -u -r1.30 Makefile
--- Makefile 20 Jan 2010 14:52:04 -0000 1.30
+++ Makefile 20 Jan 2010 18:24:24 -0000
@@ -28,16 +28,8 @@
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}
Index: files/patch-src__gtkcompletionline.cc
===================================================================
RCS file: files/patch-src__gtkcompletionline.cc
diff -N files/patch-src__gtkcompletionline.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-src__gtkcompletionline.cc 20 Jan 2010 18:24:24 -0000
@@ -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();
Index: files/patch-src__gtkcompletionline.h
===================================================================
RCS file: files/patch-src__gtkcompletionline.h
diff -N files/patch-src__gtkcompletionline.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-src__gtkcompletionline.h 20 Jan 2010 18:24:24 -0000
@@ -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*);
--- gmrun-0.9.2_6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001201830.o0KIUTT5021298>