aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2003-06-13 07:16:54 +0800
committermarcus <marcus@FreeBSD.org>2003-06-13 07:16:54 +0800
commit217862ff04c59e37b2a7bbafa04b4b15dbde5254 (patch)
tree713764bf9bd9eb54262fdc75f08585345d8781fd
parentdc92d860ce900185b07c68915e2b5ce0d24afd32 (diff)
downloadfreebsd-ports-gnome-217862ff04c59e37b2a7bbafa04b4b15dbde5254.tar.gz
freebsd-ports-gnome-217862ff04c59e37b2a7bbafa04b4b15dbde5254.tar.zst
freebsd-ports-gnome-217862ff04c59e37b2a7bbafa04b4b15dbde5254.zip
* Fix build with latest GTK+-2 [1]
* Convert to new GNOME infrastructure PR: 53262 [1] Submitted by: Pav Lucistnik <pav@oook.cz> [1]
-rw-r--r--ftp/downloader/Makefile5
-rw-r--r--ftp/downloader/files/patch-main_face_prefs.cc23
2 files changed, 24 insertions, 4 deletions
diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index be5b9064dbe6..f8abd4cf10b1 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -19,13 +19,10 @@ DISTNAME= d4x-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Program for downloading via ftp or http with GUI
-LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
-
-USE_GNOME= esound
+USE_GNOME= esound gtk20
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --enable-release
diff --git a/ftp/downloader/files/patch-main_face_prefs.cc b/ftp/downloader/files/patch-main_face_prefs.cc
new file mode 100644
index 000000000000..289f7f97efa6
--- /dev/null
+++ b/ftp/downloader/files/patch-main_face_prefs.cc
@@ -0,0 +1,23 @@
+--- main/face/prefs.cc.orig Wed Nov 6 07:53:28 2002
++++ main/face/prefs.cc Fri Jun 13 00:50:49 2003
+@@ -810,7 +810,7 @@
+ gint i;
+ for (i = 0; (unsigned int)i <count; i++){
+ menu_item = gtk_radio_menu_item_new_with_label (group, labels[i]);
+- group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menu_item));
++ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_item));
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+ if (i==TMPCFG.SEARCH_HOST)
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM (menu_item), TRUE);
+@@ -1465,9 +1465,10 @@
+ return;
+ };
+ if (equal(label,_("FTP search"))){
++ GSList *group;
+ sscanf(gtk_entry_get_text(GTK_ENTRY(D4XPWS.search_ping_times)),"%u",&TMPCFG.SEARCH_PING_TIMES);
+ sscanf(gtk_entry_get_text(GTK_ENTRY(D4XPWS.search_entries)),"%u",&TMPCFG.SEARCH_ENTRIES);
+- GSList *group=gtk_radio_menu_item_group((GtkRadioMenuItem *)((GtkOptionMenu *)D4XPWS.search_host)->menu_item);
++ group = gtk_radio_menu_item_get_group((GtkRadioMenuItem *)((GtkOptionMenu *)D4XPWS.search_host)->menu_item);
+ int i=D4X_SEARCH_ENGINES.count()-1;
+ if (i<0) i=0;
+ while(group && !((GtkCheckMenuItem *)(group->data))->active){