mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

Update to 2.10.2.

Browse Source
This commit is contained in:
Jeremy Messenger 2005-06-28 09:12:20 +00:00
parent c7b5c7d5f3
commit 9829151a3b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=138104
8 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11-toolkits/libwnck/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= libwnck
PORTVERSION= 2.10.0
PORTVERSION= 2.10.2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10

4
x11-toolkits/libwnck/distinfo
View File

@ -1,2 +1,2 @@
MD5 (gnome2/libwnck-2.10.0.tar.bz2) = c04c79f1e8576bc930c79d2e7bb8190a
SIZE (gnome2/libwnck-2.10.0.tar.bz2) = 419060
MD5 (gnome2/libwnck-2.10.2.tar.bz2) = d8276da50ce560c5e66ed94e4238d9ef
SIZE (gnome2/libwnck-2.10.2.tar.bz2) = 423399

10
x11-toolkits/libwnck/pkg-plist
View File

@ -97,6 +97,7 @@ share/locale/pt/LC_MESSAGES/libwnck.mo
share/locale/pt_BR/LC_MESSAGES/libwnck.mo
share/locale/ro/LC_MESSAGES/libwnck.mo
share/locale/ru/LC_MESSAGES/libwnck.mo
share/locale/rw/LC_MESSAGES/libwnck.mo
share/locale/sk/LC_MESSAGES/libwnck.mo
share/locale/sl/LC_MESSAGES/libwnck.mo
share/locale/sq/LC_MESSAGES/libwnck.mo
@ -109,8 +110,17 @@ share/locale/tr/LC_MESSAGES/libwnck.mo
share/locale/uk/LC_MESSAGES/libwnck.mo
share/locale/vi/LC_MESSAGES/libwnck.mo
share/locale/wa/LC_MESSAGES/libwnck.mo
share/locale/xh/LC_MESSAGES/libwnck.mo
share/locale/zh_CN/LC_MESSAGES/libwnck.mo
share/locale/zh_TW/LC_MESSAGES/libwnck.mo
@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
@unexec rmdir %D/share/locale/xh 2> /dev/null || true
@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
@unexec rmdir %D/share/locale/rw 2> /dev/null || true
@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true
@unexec rmdir %D/share/locale/mr 2> /dev/null || true
@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true
@unexec rmdir %D/share/locale/mi 2> /dev/null || true
@dirrm %%DOCSDIR%%
@dirrm include/libwnck-1.0/libwnck
@dirrm include/libwnck-1.0

3
x11/gnome-menus/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= gnome-menus
PORTVERSION= 2.10.1
PORTREVISION= 1
PORTVERSION= 2.10.2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10

4
x11/gnome-menus/distinfo
View File

@ -1,2 +1,2 @@
MD5 (gnome2/gnome-menus-2.10.1.tar.bz2) = 83d9695a35ed2215620e8773ee918b8a
SIZE (gnome2/gnome-menus-2.10.1.tar.bz2) = 339964
MD5 (gnome2/gnome-menus-2.10.2.tar.bz2) = 97b0ad03ea219cc8f5c02585db1d237e
SIZE (gnome2/gnome-menus-2.10.2.tar.bz2) = 350941

21
x11/gnome-menus/files/patch-layout::settings.menu
View File

@ -1,17 +1,6 @@
--- layout/settings.menu.orig Wed Mar 9 11:49:53 2005
+++ layout/settings.menu Fri Mar 25 11:45:22 2005
@@ -6,18 +6,15 @@
<Name>Settings</Name>
<Directory>Settings.directory</Directory>
- <!-- Scan legacy dirs first, as later items take priority -->
+ <!-- Scan legacy dirs first, as later items take priority
<KDELegacyDirs/>
<LegacyDir>/etc/X11/applnk</LegacyDir>
- <LegacyDir>/usr/share/gnome/apps</LegacyDir>
+ <LegacyDir>/usr/share/gnome/apps</LegacyDir> -->
<!-- Read standard .directory and .desktop file locations -->
--- layout/settings.menu.orig Tue Jun 28 03:49:13 2005
+++ layout/settings.menu Tue Jun 28 03:50:07 2005
@@ -10,9 +10,6 @@
<DefaultAppDirs/>
<DefaultDirectoryDirs/>
@ -21,7 +10,7 @@
<!-- Merge in these other files as submenus -->
<Menu>
<Name>Preferences</Name>
@@ -30,10 +27,19 @@
@@ -25,10 +22,19 @@
<Directory>System-Settings.directory</Directory>
<Include>
<And>
@ -37,7 +26,7 @@
</Include>
</Menu> <!-- End System Settings -->
+
+ <!-- Read in overrides and child menus from settings-merged/ -->
+ <!-- Read in overrides and child menus from applications-merged/ -->
+ <DefaultMergeDirs/>
</Menu> <!-- End Applications -->

29
x11/gnome-menus/files/patch-libmenu::menu-tree.c
View File

@ -1,5 +1,5 @@
--- libmenu/menu-tree.c.orig Tue Mar 22 05:34:24 2005
+++ libmenu/menu-tree.c Wed Mar 23 14:34:04 2005
--- libmenu/menu-tree.c.orig Tue Jun 28 04:05:19 2005
+++ libmenu/menu-tree.c Tue Jun 28 04:05:42 2005
@@ -67,6 +67,12 @@
gpointer user_data;
} MenuTreeMonitor;
@ -21,7 +21,7 @@
GSList *subdirs;
guint refcount : 24;
@@ -747,17 +754,15 @@
@@ -750,17 +757,15 @@
}
}
@ -42,7 +42,7 @@
while (tmp != NULL)
{
retval = g_slist_prepend (retval,
@@ -770,6 +775,22 @@
@@ -773,6 +778,22 @@
}
GSList *
@ -65,7 +65,7 @@
menu_tree_directory_get_subdirs (MenuTreeDirectory *directory)
{
GSList *retval;
@@ -936,6 +957,7 @@
@@ -939,6 +960,7 @@
retval->name = g_strdup (name);
retval->directory_entry = NULL;
retval->entries = NULL;
@ -73,7 +73,7 @@
retval->subdirs = NULL;
retval->only_unallocated = FALSE;
retval->refcount = 1;
@@ -2488,16 +2510,21 @@
@@ -2554,16 +2576,21 @@
}
static void
@ -101,9 +101,9 @@
}
static MenuTreeDirectory *
@@ -2511,11 +2538,14 @@
MenuLayoutNode *layout_iter;
@@ -2576,11 +2603,14 @@
MenuTreeDirectory *directory;
DesktopEntrySet *entry_pool;
DesktopEntrySet *entries;
+ DesktopEntrySet *excluded_entries;
gboolean deleted;
@ -116,15 +116,15 @@
g_assert (menu_layout_node_get_type (layout) == MENU_LAYOUT_NODE_MENU);
g_assert (menu_layout_node_menu_get_name (layout) != NULL);
@@ -2532,6 +2562,7 @@
dir_dirs = menu_layout_node_menu_get_directory_dirs (layout);
@@ -2594,6 +2624,7 @@
only_unallocated = FALSE;
entries = desktop_entry_set_new ();
+ excluded_entries = desktop_entry_set_new ();
allocated_set = desktop_entry_set_new ();
layout_iter = menu_layout_node_get_children (layout);
@@ -2578,6 +2609,7 @@
entry_pool = desktop_entry_set_new ();
@@ -2644,6 +2675,7 @@
if (rule_set != NULL)
{
desktop_entry_set_union (entries, rule_set);
@ -132,7 +132,7 @@
desktop_entry_set_union (allocated_set, rule_set);
desktop_entry_set_unref (rule_set);
}
@@ -2610,6 +2642,7 @@
@@ -2676,6 +2708,7 @@
if (rule_set != NULL)
{
desktop_entry_set_subtract (entries, rule_set);
@ -140,7 +140,7 @@
desktop_entry_set_unref (rule_set);
}
@@ -2707,15 +2740,28 @@
@@ -2775,14 +2808,28 @@
if (deleted)
{
desktop_entry_set_unref (entries);
@ -149,7 +149,6 @@
return NULL;
}
- directory->entries = NULL;
+ foreach_data.directory = directory;
+ foreach_data.list = NULL;
desktop_entry_set_foreach (entries,

11
x11/gnome-menus/pkg-plist
View File

@ -31,15 +31,17 @@ share/locale/cy/LC_MESSAGES/gnome-menus.mo
share/locale/da/LC_MESSAGES/gnome-menus.mo
share/locale/de/LC_MESSAGES/gnome-menus.mo
share/locale/el/LC_MESSAGES/gnome-menus.mo
share/locale/en_GB/LC_MESSAGES/gnome-menus.mo
share/locale/en_CA/LC_MESSAGES/gnome-menus.mo
share/locale/en_GB/LC_MESSAGES/gnome-menus.mo
share/locale/es/LC_MESSAGES/gnome-menus.mo
share/locale/et/LC_MESSAGES/gnome-menus.mo
share/locale/eu/LC_MESSAGES/gnome-menus.mo
share/locale/fa/LC_MESSAGES/gnome-menus.mo
share/locale/fi/LC_MESSAGES/gnome-menus.mo
share/locale/fr/LC_MESSAGES/gnome-menus.mo
share/locale/gl/LC_MESSAGES/gnome-menus.mo
share/locale/gu/LC_MESSAGES/gnome-menus.mo
share/locale/he/LC_MESSAGES/gnome-menus.mo
share/locale/hi/LC_MESSAGES/gnome-menus.mo
share/locale/hu/LC_MESSAGES/gnome-menus.mo
share/locale/id/LC_MESSAGES/gnome-menus.mo
@ -60,7 +62,9 @@ share/locale/pt/LC_MESSAGES/gnome-menus.mo
share/locale/pt_BR/LC_MESSAGES/gnome-menus.mo
share/locale/ro/LC_MESSAGES/gnome-menus.mo
share/locale/ru/LC_MESSAGES/gnome-menus.mo
share/locale/rw/LC_MESSAGES/gnome-menus.mo
share/locale/sk/LC_MESSAGES/gnome-menus.mo
share/locale/sl/LC_MESSAGES/gnome-menus.mo
share/locale/sq/LC_MESSAGES/gnome-menus.mo
share/locale/sr/LC_MESSAGES/gnome-menus.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo
@ -69,8 +73,13 @@ share/locale/th/LC_MESSAGES/gnome-menus.mo
share/locale/tr/LC_MESSAGES/gnome-menus.mo
share/locale/uk/LC_MESSAGES/gnome-menus.mo
share/locale/vi/LC_MESSAGES/gnome-menus.mo
share/locale/xh/LC_MESSAGES/gnome-menus.mo
share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo
share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
@unexec rmdir %D/share/locale/xh 2> /dev/null || true
@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
@unexec rmdir %D/share/locale/rw 2> /dev/null || true
@dirrm share/gnome/desktop-directories
@dirrm include/gnome-menus
@dirrm etc/xdg/menus