From 4ddb12e400fc1ae9296ccc87bc60f2498c3af283 Mon Sep 17 00:00:00 2001 From: ahze Date: Thu, 1 Nov 2007 12:52:46 +0000 Subject: - Update to 2.21.1 - Switch from using n-c-b to 'gnome-eject' for ejcting cd's git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9895 df743ca5-7f9a-e211-a948-0013205c9059 --- sysutils/gnome-control-center/Makefile | 18 ++++++++--- sysutils/gnome-control-center/distinfo | 6 ++-- .../files/patch-capplets_common_gnome-theme-info.c | 14 ++++----- ...e-settings-daemon_gnome-settings-keyboard-xkb.c | 27 ---------------- ...ettings-daemon_gnome-settings-multimedia-keys.c | 36 +++------------------- sysutils/gnome-control-center/pkg-plist | 3 +- 6 files changed, 31 insertions(+), 73 deletions(-) delete mode 100644 sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-keyboard-xkb.c (limited to 'sysutils') diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 7ba778b56..216d0ae0c 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.159 2007/10/29 12:28:45 ahze Exp $ +# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.160 2007/10/31 20:12:43 ahze Exp $ # PORTNAME= gnome-control-center -PORTVERSION= 2.20.1 -PORTREVISION= 4 +PORTVERSION= 2.21.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -18,6 +17,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for GNOME 2 project LIB_DEPENDS= xklavier.11:${PORTSDIR}/x11/libxklavier +RUN_DEPENDS= gnome-eject:${PORTSDIR}/sysutils/gnome-mount USE_BZIP2= yes USE_GETTEXT= yes @@ -26,7 +26,7 @@ USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 USE_GSTREAMER= good WANT_GNOME= yes -USE_GNOME= gnomeprefix gnomehack intlhack metacity nautiluscdburner \ +USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \ gnomemenus desktopfileutils libgnomekbd gnomepanel GNU_CONFIGURE= yes INSTALLS_OMF= yes @@ -50,6 +50,8 @@ GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \ WITH_GNOME= yes .endif +DEFAULT_CDROM_DEVICE?=/dev/acd0 + .include .if ${HAVE_GNOME:Mevolutiondataserver}!="" @@ -61,7 +63,15 @@ CONFIGURE_ARGS+=--disable-aboutme PLIST_SUB+= ABOUTME="@comment " .endif +pre-everything:: + @${ECHO_CMD} "===> The default CD/DVD device is '${DEFAULT_CDROM_DEVICE}'" + @${ECHO_CMD} "===> Define DEFAULT_CDROM_DEVICE if you want to change the default" + @${ECHO_MSG} "===> For example, 'make WITH_DVD_DEVICE=\"/dev/somedevice\"'" + @${ECHO_MSG} "===>" + post-patch: + @${REINPLACE_CMD} -e 's|%%CDROM%%|${DEFAULT_CDROM_DEVICE}|' \ + ${WRKSRC}/gnome-settings-daemon/gnome-settings-multimedia-keys.c @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/capplets/common/gnome-theme-info.c diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index 8d9a2d632..2e9206509 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-control-center-2.20.1.tar.bz2) = d7420f0fc28937573a13bc5c1633b23b -SHA256 (gnome2/gnome-control-center-2.20.1.tar.bz2) = 631d7621584a27a0edc43f05c6e2b45d6c44c1bc570abaa155472ca9b321d4d0 -SIZE (gnome2/gnome-control-center-2.20.1.tar.bz2) = 2292719 +MD5 (gnome2/gnome-control-center-2.21.1.tar.bz2) = 8574413e363469db19d8296fdccdde68 +SHA256 (gnome2/gnome-control-center-2.21.1.tar.bz2) = 9b79c3aa19f72c9176491a102855a7201f5d5b0d031e802969a6a09ce0faa4db +SIZE (gnome2/gnome-control-center-2.21.1.tar.bz2) = 2322532 diff --git a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c index 5f5eb4bc1..ac875d14d 100644 --- a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c +++ b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c @@ -1,15 +1,15 @@ ---- capplets/common/gnome-theme-info.c.orig 2007-08-27 04:09:06.000000000 -0400 -+++ capplets/common/gnome-theme-info.c 2007-09-20 15:24:56.000000000 -0400 -@@ -1845,7 +1845,7 @@ read_cursor_fonts (void) +--- capplets/common/gnome-theme-info.c.orig 2007-10-30 18:58:26.000000000 -0400 ++++ capplets/common/gnome-theme-info.c 2007-11-01 08:43:25.067405773 -0400 +@@ -661,7 +661,7 @@ theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); -- theme_info->name = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL); +- theme_info->path = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL); + theme_info->name = g_build_filename (INSTALL_PREFIX, "share", builtins[i][0], NULL); - theme_info->path = g_strdup (theme_info->name); + theme_info->name = g_strdup (theme_info->path); if (!strcmp (theme_info->path, cursor_font)) -@@ -1974,7 +1974,7 @@ gnome_theme_init (gboolean *monitor_not_ +@@ -1922,7 +1922,7 @@ gnome_vfs_uri_unref (top_theme_dir_uri); /* The weird /usr/share/icons */ @@ -17,4 +17,4 @@ + top_theme_dir_uri = gnome_vfs_uri_new ("%%LOCALBASE%%/lib/X11/icons"); if (!gnome_vfs_uri_exists (top_theme_dir_uri)) gnome_vfs_make_directory_for_uri (top_theme_dir_uri, 0775); - result = add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL); + add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL); diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-keyboard-xkb.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-keyboard-xkb.c deleted file mode 100644 index 76c847540..000000000 --- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-keyboard-xkb.c +++ /dev/null @@ -1,27 +0,0 @@ ---- gnome-settings-daemon/gnome-settings-keyboard-xkb.c.orig 2007-10-29 08:19:27.351818736 -0400 -+++ gnome-settings-daemon/gnome-settings-keyboard-xkb.c 2007-10-29 08:19:52.087524252 -0400 -@@ -35,7 +35,6 @@ - #include - #include - --#include - #include - #include - -@@ -392,7 +391,6 @@ - void - gnome_settings_keyboard_xkb_init (GConfClient * client) - { -- GObject *reg = NULL; - #ifdef GSDKX - xkl_set_debug_level (200); - logfile = fopen ("/tmp/gsdkx.log", "a"); -@@ -425,8 +423,6 @@ - XKLL_MANAGE_LAYOUTS | - XKLL_MANAGE_WINDOW_STATES); - -- reg = -- g_object_new (gkbd_config_registry_get_type (), NULL); - } - } - diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c index 89ab3f5f5..658f19839 100644 --- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c +++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c @@ -1,41 +1,15 @@ --- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig 2007-09-18 05:32:43.000000000 -0400 -+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c 2007-10-31 16:01:14.953632933 -0400 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include "eggaccelerators.h" - -@@ -609,9 +610,24 @@ - GCONF_MISC_DIR "/eject_command", NULL); ++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c 2007-11-01 08:29:46.987143617 -0400 +@@ -610,7 +610,7 @@ if ((command != NULL) && (strcmp (command, "") != 0)) execute (acme, command, FALSE, FALSE); -- else + else - execute (acme, "eject -T", FALSE, FALSE); -+ else { -+ g_type_init (); -+ nautilus_burn_init (); -+ GList *drives, *drivelist; -+ NautilusBurnDriveMonitor *monitor; -+ -+ monitor = nautilus_burn_get_drive_monitor (); -+ drives = nautilus_burn_drive_monitor_get_drives (monitor); -+ -+ for (drivelist = drives; drivelist != NULL; drivelist = drivelist->next) { -+ NautilusBurnDrive *drive; -+ drive = drivelist->data; ++ execute (acme, "gnome-eject -b --device=%%CDROM%%", FALSE, FALSE); -+ nautilus_burn_drive_eject (drive); -+ } -+ nautilus_burn_shutdown (); -+ } -+ g_free (command); } - -@@ -708,7 +724,7 @@ +@@ -708,7 +708,7 @@ do_mail_action (acme); break; case SLEEP_KEY: diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 6832272be..148bba612 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -21,6 +21,7 @@ bin/themus-theme-applier etc/gnome-vfs-2.0/modules/font-method.conf etc/gnome-vfs-2.0/modules/theme-method.conf etc/xdg/menus/gnomecc.menu +etc/xdg/autostart/gnome-at-session.desktop include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h include/gnome-window-settings-2.0/gnome-window-manager.h include/gnome-window-settings-2.0/gnome-wm-manager.h @@ -128,7 +129,6 @@ share/desktop-directories/theme-method.directory %%DATADIR%%/xrdb/Motif.ad %%DATADIR%%/xrdb/Tk.ad %%DATADIR%%/xrdb/Xaw.ad -share/gnome/autostart/gnome-at-session.desktop share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf share/gnome/cursor-fonts/cursor-white.pcf @@ -332,3 +332,4 @@ share/omf/control-center/control-center-zh_CN.omf @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin @dirrmtry share/applications +@dirrmtry etc/xdg/autostart -- cgit v1.2.3