diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2005-04-11 03:31:29 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2005-04-11 03:31:29 +0000 |
| commit | 5a7e7032ea27c3b462b30cfd831472a5d02c1bd1 (patch) | |
| tree | f0a194c3c87eef4b6f1e13afcc8d4361ae1eeb0b /x11 | |
| parent | Support use on AMD64. (diff) | |
Add a painfully simplistic patch to use GTK2 instead of GTK1.
It does some assumption-making, but it works. The project
seems to have been abandoned (the WWW site is long-gone), so
this is the only way to bring the app into this millenium.
In the words of someone who asked to remain nameless lest he
be implicated in contributing to this commit: "GTK1 must die!"
Seriously. It's time that everything that uses GTK1 by default
to move away from it.
Notes
Notes:
svn path=/head/; revision=132987
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xbindkeys_config/Makefile | 9 | ||||
| -rw-r--r-- | x11/xbindkeys_config/files/patch-gtk2 | 36 |
2 files changed, 40 insertions, 5 deletions
diff --git a/x11/xbindkeys_config/Makefile b/x11/xbindkeys_config/Makefile index a178e4f7087c..9e96381beedb 100644 --- a/x11/xbindkeys_config/Makefile +++ b/x11/xbindkeys_config/Makefile @@ -1,14 +1,13 @@ # ex:ts=8 # Ports collection makefile for: xbindkeys_config -# Date created: Mar 4, 2002 -# Whom: ijliao +# Date created: Mar 4, 2002 # Whom: ijliao # # $FreeBSD$ # PORTNAME= xbindkeys_config PORTVERSION= 0.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= trevor @@ -17,12 +16,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An easy to use gtk program for configuring Xbindkeys PLIST_FILES= bin/xbindkeys_config -USE_GNOME= gtk12 +USE_GNOME= gtk20 USE_REINPLACE= yes MAKE_ENV= CC="${CC} ${CFLAGS}" post-patch: - @${REINPLACE_CMD} -e "s,gtk-config,${GTK_CONFIG},g ; \ + @${REINPLACE_CMD} -e "s,gtk-config,pkg-config gtk+-2.0,g ; \ s,^CC,#CC,g" ${WRKSRC}/Makefile do-install: diff --git a/x11/xbindkeys_config/files/patch-gtk2 b/x11/xbindkeys_config/files/patch-gtk2 new file mode 100644 index 000000000000..49ebdb299512 --- /dev/null +++ b/x11/xbindkeys_config/files/patch-gtk2 @@ -0,0 +1,36 @@ +diff -udp menu.c.orig menu.c +--- menu.c.orig Sun Apr 10 22:51:26 2005 ++++ menu.c Sun Apr 10 22:58:43 2005 +@@ -296,7 +296,7 @@ void menu_manual (GtkMenuItem *menuitem, + text = gtk_text_new(NULL,NULL); + + +- gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL, ++ gtk_text_insert (text, NULL, NULL, NULL, + MANUAL_TEXT, sizeof(MANUAL_TEXT)-1); + gtk_box_pack_start(GTK_BOX(vbox), text, TRUE, TRUE, 0); + gtk_widget_set_usize(text,300,250); +diff -udp middle.c.orig middle.c +--- middle.c.orig Sun Apr 10 22:59:11 2005 ++++ middle.c Sun Apr 10 23:00:21 2005 +@@ -565,7 +565,7 @@ void view_generated_file() + gtk_container_add (GTK_CONTAINER(src), text); + + while (fgets (line, sizeof(line), f)) +- gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL, ++ gtk_text_insert (text, NULL, NULL, NULL, + line, strlen(line)); + + gtk_container_add(GTK_CONTAINER(window),src); +Binary files work.orig/xbindkeys_config-0.1.3/xbindkeys_config and work/xbindkeys_config-0.1.3/xbindkeys_config differ +diff -udp xbindkeys_config.c.orig xbindkeys_config.c +--- xbindkeys_config.c.orig Sun Apr 10 22:49:47 2005 ++++ xbindkeys_config.c Sun Apr 10 22:50:56 2005 +@@ -95,7 +95,6 @@ int main (int argc, char *argv[]) + accel_group = gtk_accel_group_new(); + menu=xbindkeys_config_menu(accel_group); + gtk_box_pack_start(GTK_BOX(vbox),menu,FALSE,FALSE,0); +- gtk_accel_group_attach(accel_group, GTK_OBJECT(window)); + + middle= xbindkeys_config_middle(); + gtk_box_pack_start(GTK_BOX(vbox),middle,TRUE,TRUE,0); |