From owner-freebsd-ports Fri Aug 23 14:10:20 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB24A37B400 for ; Fri, 23 Aug 2002 14:10:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D0D743E72 for ; Fri, 23 Aug 2002 14:10:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7NLA2JU043448 for ; Fri, 23 Aug 2002 14:10:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7NLA2Bm043447; Fri, 23 Aug 2002 14:10:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88BF037B400 for ; Fri, 23 Aug 2002 14:03:01 -0700 (PDT) Received: from ncc-1701.webonaut.com (static62-99-136-018.adsl.inode.at [62.99.136.18]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9618D43E6A for ; Fri, 23 Aug 2002 14:02:59 -0700 (PDT) (envelope-from klammer@ncc-1701.webonaut.com) Received: by ncc-1701.webonaut.com (Postfix, from userid 1001) id 3B6DE6FB4C; Fri, 23 Aug 2002 23:03:06 +0200 (CEST) Message-Id: <20020823210306.3B6DE6FB4C@ncc-1701.webonaut.com> Date: Fri, 23 Aug 2002 23:03:06 +0200 (CEST) From: Franz Klammer Reply-To: Franz Klammer To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/41955: change file_menu_applet to support USE_GNOMENG Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 41955 >Category: ports >Synopsis: change file_menu_applet to support USE_GNOMENG >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 23 14:10:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Franz Klammer >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD ncc-1701.webonaut.com 4.6-STABLE FreeBSD 4.6-STABLE #0: Fri Aug 16 22:56:40 CEST 2002 root@ncc-1701.webonaut.com:/usr/obj/usr/src/sys/NCC-1701 i386 >Description: add USE_GNOMENG - support this port doesn't run with gnome2(-panel) - add a check. add to pkg-descr that the content is a excerpt from the developers site. >How-To-Repeat: >Fix: --- file_menu_applet.shar begins here --- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # file_menu_applet # file_menu_applet/Makefile # file_menu_applet/distinfo # file_menu_applet/files # file_menu_applet/files/patch-src::main.c # file_menu_applet/files/patch-src::flist-mime-icon.c # file_menu_applet/pkg-comment # file_menu_applet/pkg-descr # file_menu_applet/pkg-plist # file_menu_applet/pkg-install # echo c - file_menu_applet mkdir -p file_menu_applet > /dev/null 2>&1 echo x - file_menu_applet/Makefile sed 's/^X//' >file_menu_applet/Makefile << 'END-of-file_menu_applet/Makefile' X# New ports collection makefile for: file_menu_applet X# Date created: 4 May 2002 X# Whom: Franz Klammer X# X# $FreeBSD: ports/x11-fm/file_menu_applet/Makefile,v 1.2 2002/06/15 19:19:26 marcus Exp $ X# X XPORTNAME= file_menu_applet XPORTVERSION= 0.5 XCATEGORIES= x11-fm gnome XMASTER_SITES= http://www.zoned.net:8000/~xkahn/file_menu_applet/ X XMAINTAINER= klammer@webonaut.com X XUSE_X_PREFIX= yes XUSE_GMAKE= yes XUSE_GNOMENG= yes XUSE_GNOME= gnomeprefix gnomehack libpanel XGNU_CONFIGURE= yes X Xpre-everything: X @${SH} ${PKGINSTALL} ${PKGNAME} ${PREFIX} X X.include END-of-file_menu_applet/Makefile echo x - file_menu_applet/distinfo sed 's/^X//' >file_menu_applet/distinfo << 'END-of-file_menu_applet/distinfo' XMD5 (file_menu_applet-0.5.tar.gz) = 2038c3bf76485c17f6e8c8096d69cfd5 END-of-file_menu_applet/distinfo echo c - file_menu_applet/files mkdir -p file_menu_applet/files > /dev/null 2>&1 echo x - file_menu_applet/files/patch-src::main.c sed 's/^X//' >file_menu_applet/files/patch-src::main.c << 'END-of-file_menu_applet/files/patch-src::main.c' X--- src/main.c.orig Thu May 30 22:31:15 2002 X+++ src/main.c Fri Jun 14 23:13:34 2002 X@@ -318,13 +318,12 @@ X g_timer_start (dm->timer); X g_timer_elapsed (dm->timer, &dm->last_time); X X- if (fma->icon_menus) { X+ if (!fma->icon_menus) { X options = GNOME_VFS_FILE_INFO_FOLLOW_LINKS X- | GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE X | GNOME_VFS_FILE_INFO_GET_MIME_TYPE; X } else { X options = GNOME_VFS_FILE_INFO_FOLLOW_LINKS X- | GNOME_VFS_FILE_INFO_GET_MIME_TYPE; X+ | GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE; X } X X result = gnome_vfs_directory_visit X@@ -559,6 +558,10 @@ X X if (!fma->menu_label) X fma->menu_label = strdup ("Home Directory"); X+ if (!fma->dir_watch) X+ fma->dir_watch = strdup ("~/"); X+ if (fma->icon_menus == "(null)") X+ fma->icon_menus = strdup ("true"); X X /* Create */ X fma->menu_bar = gtk_menu_bar_new (); END-of-file_menu_applet/files/patch-src::main.c echo x - file_menu_applet/files/patch-src::flist-mime-icon.c sed 's/^X//' >file_menu_applet/files/patch-src::flist-mime-icon.c << 'END-of-file_menu_applet/files/patch-src::flist-mime-icon.c' X--- src/flist-mime-icon.c.orig Wed May 29 03:31:00 2002 X+++ src/flist-mime-icon.c Fri Jun 14 21:24:00 2002 X@@ -132,7 +132,7 @@ X const char * X flist_mime_get_icon (const char *mime_type) X { X- gchar *mime_part, *index, *icon_name, *icon_name2; X+ gchar *mime_part, *index, *icon_name, *icon_name2, *icon_name3; X X if (!mime_type) X goto skip_theme_stuff; X@@ -170,6 +170,19 @@ X X skip_theme_stuff: X X+ mime_part = g_strdup (mime_type); X+ index = strchr (mime_part, '/'); X+ *index = '-'; X+ X+ icon_name3 = g_strconcat (MIMEICONDIR, "document-icons/gnome-", mime_part, ".png", NULL); X+ X+ g_free(mime_part); X+ X+ if (g_file_exists (icon_name3)) X+ return icon_name3; X+ X+ g_free (icon_name3); X+ X return gnome_vfs_mime_get_icon (mime_type); X } X X@@ -218,6 +231,9 @@ X if (!file) { X if (!icon) return NULL; X flist_nautilus_theme_load (); X+ X+ if (!strstr(icon, ".png")) X+ icon = g_strconcat(icon, ".png", NULL); X X if (!g_file_exists (icon)) { X if (nautilus_theme_dir) file = g_concat_dir_and_file (nautilus_theme_dir, icon); END-of-file_menu_applet/files/patch-src::flist-mime-icon.c echo x - file_menu_applet/pkg-comment sed 's/^X//' >file_menu_applet/pkg-comment << 'END-of-file_menu_applet/pkg-comment' XA small GNOME panel application which creates a file manager END-of-file_menu_applet/pkg-comment echo x - file_menu_applet/pkg-descr sed 's/^X//' >file_menu_applet/pkg-descr << 'END-of-file_menu_applet/pkg-descr' X[ excerpt from developer's site ] XFile Menu Applet is a small GNOME panel application which Xcreates a file manager. X XFile Menu Applet is not designed to replace your existing Xfile manager, but instead work with it. It supports standard Xdrag and drop, GNOME file types, and Nautilus icons. XI use it for small tasks such a easily attaching files to Xemails in Evolution by dragging them out of File Menu Applet Xinto the Evolution composer window. XIt's also excellent for selecting songs to play from your XMP3 or OGG collection. X XWWW: http://www.zoned.net:8000/~xkahn/file_menu_applet/ END-of-file_menu_applet/pkg-descr echo x - file_menu_applet/pkg-plist sed 's/^X//' >file_menu_applet/pkg-plist << 'END-of-file_menu_applet/pkg-plist' Xbin/file_menu_applet Xetc/CORBA/servers/file_menu_applet.gnorba Xshare/gnome/applets/Utility/file_menu_applet.desktop Xshare/gnome/file_menu_applet/fma_prefs.glade Xshare/gnome/pixmaps/file_menu_applet.png X@dirrm share/gnome/file_menu_applet END-of-file_menu_applet/pkg-plist echo x - file_menu_applet/pkg-install sed 's/^X//' >file_menu_applet/pkg-install << 'END-of-file_menu_applet/pkg-install' X#!/bin/sh X Xif [ -n "${PACKAGE_BUILDING}" ]; then X exit 0 Xfi X XPATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH} Xexport PATH X Xif [ ! -f ${2}/libdata/pkgconfig/libpanelapplet-2.0.pc ]; then X exit 0 Xfi X Xecho "================================================================" Xecho "" Xecho "The GNOME 2.0 package libpanelapplet was detected on the system." Xecho "file_menu_applet works only with the GNOME 1.0 panel." Xecho "" Xecho "================================================================" Xfalse END-of-file_menu_applet/pkg-install exit --- file_menu_applet.shar ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message