diff options
author | rh <rh> | 2003-04-20 14:06:43 +0000 |
---|---|---|
committer | rh <rh> | 2003-04-20 14:06:43 +0000 |
commit | ebc2dd7532e6d3b4ebab7694182e224cfc20480f (patch) | |
tree | 4bf2752f46799df64630bd654dc5c928a8a4b2ec /x11/gnome-panel | |
parent | 2af6b1ff6e55f42024b75695085311442e44f112 (diff) | |
download | pkgsrc-ebc2dd7532e6d3b4ebab7694182e224cfc20480f.tar.gz |
Update gnome-panel to 2.2.1. Changes include:
Package
-------
* Remove program-transform patches now that we have a fine grained
gnome-core
Panel
-----
* Make global keybindings work on multi-screen setups (Erwann, Mark)
* Destroy "Create Launcher" dialogs when the panel is destrored (Arvind)
* Allow the GNOME foot icon on the Main Menu to be themed (Raj)
* Support themeing of the action button icons (Raj)
* Query deletion of a drawer when it is deleted by removing the button
* Delete child drawer panels when deleting panels (Arvind)
* Fix various leaks (Kjartan)
* Fix typo with the launchers "zoom animation" (Paul Gammans)
* Do not query the deletion of a panel if there are no objects on it
* Make the "Delete Panel?" dialog modal (Arvind)
* Avoid rare panel hang when moving applets (Sunil Mohan Adapa)
* Actually load the panel background color preference (Greg Hudson)
* Fix crash related to drawers (Arvind)
* Fix various issues with egg-recent-files (James)
* Don't save screenshot to UTF8 filenames in G_BROKEN_FILENAMES locales
* Fix crash when the panel background image can't be loaded
* Unescape the tooltip on launchers (Bala)
* Destroy the "Overwrite file?" warning dialog in gnome-panel-screenshot
* Add support for icon theming icons with absolute paths
* Don't crash when clicking on a drawer panel with no parent panel
* Don't load the GNOME 1.4 applet's .desktop files on startup (Mark)
Applets
-------
* Destroy Window List and Workspace Switcher properties dialog when
the applets are destroyed (Arvind)
* Launch the mail received handler on the correct screen
* Ignore any leading and trailing whitespace in a workspace name
* Change the max number of workspaces to 36 in sync with metacity
* Fix issue with the mailcheck animation on mutliscreen setups
* Fix notification area crasher (Havoc)
Miscellanous
------------
* Fix "po/Makefile.in.in not found" build breakage (Clifton Lockhart)
* Add a --with-html-dir configure option (Julio Merino)
* Window List docs updates (Irene Ryan)
* Japanese translations of docs (Takeshi AIHANA)
* Support --disable-schemas-install and --with-gconf-schema-file-dir
* Fix libpanel-applet crash on 64 bit platforms (Matt Wilson)
Translations
------------
* various languages
Diffstat (limited to 'x11/gnome-panel')
-rw-r--r-- | x11/gnome-panel/Makefile | 15 | ||||
-rw-r--r-- | x11/gnome-panel/PLIST | 64 | ||||
-rw-r--r-- | x11/gnome-panel/distinfo | 12 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-ab | 13 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-ac | 37 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-ad | 35 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-af | 40 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-ag | 13 |
8 files changed, 65 insertions, 164 deletions
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 53c400c3a9f..f2748825db4 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2003/02/18 14:56:04 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2003/04/20 14:06:43 rh Exp $ # -DISTNAME= gnome-panel-2.2.0.1 -PKGREVISION= 2 +DISTNAME= gnome-panel-2.2.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.2/} EXTRACT_SUFX= .tar.bz2 @@ -24,14 +23,16 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html +CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/" +MAKE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/" EGDIR= ${PREFIX}/share/examples/gnome-panel .if defined(PKG_SYSCONFDIR.libgnome) -CONF_FILES= ${EGDIR}/sound/events/mailcheck2.soundlist \ - ${PKG_SYSCONFDIR.libgnome}/sound/events/mailcheck2.soundlist +CONF_FILES= ${EGDIR}/sound/events/mailcheck.soundlist \ + ${PKG_SYSCONFDIR.libgnome}/sound/events/mailcheck.soundlist .else -CONF_FILES= ${EGDIR}/sound/events/mailcheck2.soundlist \ - ${PKG_SYSCONFBASE}/sound/events/mailcheck2.soundlist +CONF_FILES= ${EGDIR}/sound/events/mailcheck.soundlist \ + ${PKG_SYSCONFBASE}/sound/events/mailcheck.soundlist .endif GCONF2_SCHEMAS= clock.schemas diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST index 6da1a33da93..c0005578869 100644 --- a/x11/gnome-panel/PLIST +++ b/x11/gnome-panel/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2003/02/18 14:56:04 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/04/20 14:06:44 rh Exp $ bin/gnome-desktop-item-edit bin/gnome-panel bin/gnome-panel-preferences @@ -18,7 +18,7 @@ lib/libpanel-applet-2.a lib/libpanel-applet-2.la lib/libpanel-applet-2.so lib/libpanel-applet-2.so.0 -lib/libpanel-applet-2.so.0.13 +lib/libpanel-applet-2.so.0.14 lib/pkgconfig/libpanelapplet-2.0.pc libexec/fish-applet-2 libexec/notification-area-applet @@ -36,7 +36,7 @@ share/doc/html/panel-applet/panel-signals.html share/doc/html/panel-applet/panelapplet.html share/doc/html/panel-applet/server-files.html share/doc/html/panel-applet/session-saving.html -share/examples/gnome-panel/sound/events/mailcheck2.soundlist +share/examples/gnome-panel/sound/events/mailcheck.soundlist share/fish/fish.glade share/gconf/schemas/clock.schemas share/gconf/schemas/fish.schemas @@ -61,12 +61,21 @@ share/gnome-panelrc share/gnome/help/clock/C/clock.xml share/gnome/help/clock/C/figures/clock_applet.png share/gnome/help/clock/C/legal.xml +share/gnome/help/clock/ja/clock.xml +share/gnome/help/clock/ja/figures/clock_applet.png +share/gnome/help/clock/ja/legal.xml share/gnome/help/fish-applet-2/C/figures/fish_applet.png share/gnome/help/fish-applet-2/C/fish-applet-2.xml share/gnome/help/fish-applet-2/C/legal.xml +share/gnome/help/fish-applet-2/ja/figures/fish_applet.png +share/gnome/help/fish-applet-2/ja/fish-applet-2.xml +share/gnome/help/fish-applet-2/ja/legal.xml share/gnome/help/mailcheck/C/figures/mailcheck_applet.png share/gnome/help/mailcheck/C/legal.xml share/gnome/help/mailcheck/C/mailcheck.xml +share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png +share/gnome/help/mailcheck/ja/legal.xml +share/gnome/help/mailcheck/ja/mailcheck.xml share/gnome/help/notification-area/C/figures/notification-area.png share/gnome/help/notification-area/C/legal.xml share/gnome/help/notification-area/C/notification-area.xml @@ -74,9 +83,16 @@ share/gnome/help/window-list/C/figures/window_list_applet.png share/gnome/help/window-list/C/figures/window_list_group_applet.png share/gnome/help/window-list/C/legal.xml share/gnome/help/window-list/C/window-list.xml +share/gnome/help/window-list/ja/figures/window_list_applet.png +share/gnome/help/window-list/ja/figures/window_list_group_applet.png +share/gnome/help/window-list/ja/legal.xml +share/gnome/help/window-list/ja/window-list.xml share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/C/legal.xml share/gnome/help/workspace-switcher/C/workspace-switcher.xml +share/gnome/help/workspace-switcher/ja/figures/workspace_switcher_applet.png +share/gnome/help/workspace-switcher/ja/legal.xml +share/gnome/help/workspace-switcher/ja/workspace-switcher.xml share/gnome/panel2/gnome-panel-preferences.glade share/gnome/panel2/gnome-panel-screenshot.glade share/idl/gnome-panel-2.0/GNOME_Panel.idl @@ -91,9 +107,11 @@ ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo +${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-panel-2.0.mo +${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo @@ -103,6 +121,7 @@ ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo +${PKGLOCALEDIR}/locale/li/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo @@ -130,44 +149,59 @@ ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo share/omf/gnome-panel/clock-C.omf +share/omf/gnome-panel/clock-ja.omf share/omf/gnome-panel/fish-applet-2-C.omf +share/omf/gnome-panel/fish-applet-2-ja.omf share/omf/gnome-panel/mailcheck-C.omf +share/omf/gnome-panel/mailcheck-ja.omf share/omf/gnome-panel/notification-area-C.omf share/omf/gnome-panel/window-list-C.omf +share/omf/gnome-panel/window-list-ja.omf share/omf/gnome-panel/workspace-switcher-C.omf -share/pixmaps/fish2/fishanim.png -share/pixmaps/fish2/footguy.png -share/pixmaps/fish2/monkey.png -share/pixmaps/fish2/oldwanda.png +share/omf/gnome-panel/workspace-switcher-ja.omf +share/pixmaps/fish/fishanim.png +share/pixmaps/fish/footguy.png +share/pixmaps/fish/monkey.png +share/pixmaps/fish/oldwanda.png share/pixmaps/gnome-fish.png share/pixmaps/gnome-show-desktop.png -share/pixmaps/mailcheck2/eclouds.png -share/pixmaps/mailcheck2/email-e.png -share/pixmaps/mailcheck2/email-eclouds.png -share/pixmaps/mailcheck2/email-tiny.png -share/pixmaps/mailcheck2/email.png -share/pixmaps/mailcheck2/tux-anim.png -@dirrm share/pixmaps/mailcheck2 -@dirrm share/pixmaps/fish2 +share/pixmaps/mailcheck/eclouds.png +share/pixmaps/mailcheck/email-e.png +share/pixmaps/mailcheck/email-eclouds.png +share/pixmaps/mailcheck/email-tiny.png +share/pixmaps/mailcheck/email.png +share/pixmaps/mailcheck/tux-anim.png +@dirrm share/pixmaps/mailcheck +@dirrm share/pixmaps/fish @dirrm share/omf/gnome-panel @comment in scrollkeeper: @dirrm share/omf @dirrm share/idl/gnome-panel-2.0 @dirrm share/gnome/panel2 +@dirrm share/gnome/help/workspace-switcher/ja/figures +@dirrm share/gnome/help/workspace-switcher/ja @dirrm share/gnome/help/workspace-switcher/C/figures @dirrm share/gnome/help/workspace-switcher/C @dirrm share/gnome/help/workspace-switcher +@dirrm share/gnome/help/window-list/ja/figures +@dirrm share/gnome/help/window-list/ja @dirrm share/gnome/help/window-list/C/figures @dirrm share/gnome/help/window-list/C @dirrm share/gnome/help/window-list @dirrm share/gnome/help/notification-area/C/figures @dirrm share/gnome/help/notification-area/C @dirrm share/gnome/help/notification-area +@dirrm share/gnome/help/mailcheck/ja/figures +@dirrm share/gnome/help/mailcheck/ja @dirrm share/gnome/help/mailcheck/C/figures @dirrm share/gnome/help/mailcheck/C @dirrm share/gnome/help/mailcheck +@dirrm share/gnome/help/fish-applet-2/ja/figures +@dirrm share/gnome/help/fish-applet-2/ja @dirrm share/gnome/help/fish-applet-2/C/figures @dirrm share/gnome/help/fish-applet-2/C @dirrm share/gnome/help/fish-applet-2 +@dirrm share/gnome/help/clock/ja/figures +@dirrm share/gnome/help/clock/ja @dirrm share/gnome/help/clock/C/figures @dirrm share/gnome/help/clock/C @dirrm share/gnome/help/clock diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index c4c6dcb6b18..a1c5f843f1c 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,10 +1,6 @@ -$NetBSD: distinfo,v 1.5 2003/02/18 20:52:08 jmmv Exp $ +$NetBSD: distinfo,v 1.6 2003/04/20 14:06:44 rh Exp $ -SHA1 (gnome-panel-2.2.0.1.tar.bz2) = 5da094f37dfb5433bcd7eba42ceea9c86e11e586 -Size (gnome-panel-2.2.0.1.tar.bz2) = 1775486 bytes -SHA1 (patch-ab) = 4673a6b83dc31e129e81419275fe3f60ad7b7eda -SHA1 (patch-ac) = fbf30d038322cd2366bcd2c67088d5a5369edd03 -SHA1 (patch-ad) = 68ef55c876e70fb6e8b20eb415e0e31aa111da28 +SHA1 (gnome-panel-2.2.1.tar.bz2) = 909c6f750493860ecf1c7df14e9779084767761d +Size (gnome-panel-2.2.1.tar.bz2) = 1866837 bytes +SHA1 (patch-ac) = fcb8a31916c1752f8779c926e988a518dd2ca006 SHA1 (patch-ae) = 0e2b0efbce597d5517b05216ed3eaaa5ae5b7351 -SHA1 (patch-af) = 78d8cecec09db1743b640b9b516033b1fc8f96d4 -SHA1 (patch-ag) = 6f039752a72d21ae3ad38673c10937adbf403141 diff --git a/x11/gnome-panel/patches/patch-ab b/x11/gnome-panel/patches/patch-ab deleted file mode 100644 index f4a0415d394..00000000000 --- a/x11/gnome-panel/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2003/02/14 21:05:28 jmmv Exp $ - ---- doc/reference/panel-applet/Makefile.in.orig 2003-02-04 00:29:58.000000000 +0100 -+++ doc/reference/panel-applet/Makefile.in -@@ -157,7 +157,7 @@ cxxflags_set = @cxxflags_set@ - DOC_MODULE = panel-applet - - # Where the html is to be installed --HTML_DIR = $(datadir)/gtk-doc/html -+HTML_DIR = $(datadir)/doc/html - - # The top-level SGML file. Change it if you want. - DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml diff --git a/x11/gnome-panel/patches/patch-ac b/x11/gnome-panel/patches/patch-ac index 981b81015ab..38927acc520 100644 --- a/x11/gnome-panel/patches/patch-ac +++ b/x11/gnome-panel/patches/patch-ac @@ -1,13 +1,9 @@ -$NetBSD: patch-ac,v 1.4 2003/02/18 20:52:09 jmmv Exp $ +$NetBSD: patch-ac,v 1.5 2003/04/20 14:06:44 rh Exp $ ---- applets/gen_util/Makefile.in.orig 2003-02-04 00:29:54.000000000 +0100 +--- applets/gen_util/Makefile.in.orig 2003-03-11 08:54:40.000000000 +1000 +++ applets/gen_util/Makefile.in -@@ -182,10 +182,10 @@ PRINTER_BITMAPS = print.xpm - MAILCHECK_BITMAPS = email.png email-e.png tux-anim.png email-eclouds.png email-tiny.png eclouds.png - - --mailcheckbitmapsdir = $(datadir)/pixmaps/mailcheck -+mailcheckbitmapsdir = $(datadir)/pixmaps/mailcheck2 +@@ -186,7 +186,7 @@ MAILCHECK_BITMAPS = email.png email-e.pn + mailcheckbitmapsdir = $(datadir)/pixmaps/mailcheck mailcheckbitmaps_DATA = $(MAILCHECK_BITMAPS) -soundlistdir = $(sysconfdir)/sound/events @@ -15,28 +11,3 @@ $NetBSD: patch-ac,v 1.4 2003/02/18 20:52:09 jmmv Exp $ soundlist_in_files = mailcheck.soundlist.in soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist) -@@ -197,7 +197,7 @@ serverdir = $(libdir)/bonobo/servers - server_in_files = GNOME_GenUtilApplet_Factory.server.in - server_DATA = $(server_in_files:.server.in=.server) - --schemasdir = $(sysconfdir)/gconf/schemas -+schemasdir = $(datadir)/gconf/schemas - schemas_in_files = mailcheck.schemas.in pager.schemas.in tasklist.schemas.in clock.schemas.in - - schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) -@@ -423,12 +423,13 @@ install-soundlistDATA: $(soundlist_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(soundlistdir) - @list='$(soundlist_DATA)'; for p in $$list; do \ -+ inst=`echo "$$p" | sed s/mailcheck/mailcheck2/`; \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(soundlistdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(soundlistdir)/$$p; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(soundlistdir)/$$inst; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(soundlistdir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(soundlistdir)/$$p; \ -+ $(INSTALL_DATA) $$p $(DESTDIR)$(soundlistdir)/$$inst; \ - fi; fi; \ - done - diff --git a/x11/gnome-panel/patches/patch-ad b/x11/gnome-panel/patches/patch-ad deleted file mode 100644 index 106955aed38..00000000000 --- a/x11/gnome-panel/patches/patch-ad +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2003/02/18 20:52:09 jmmv Exp $ - ---- applets/fish/Makefile.in.orig 2003-02-04 00:29:54.000000000 +0100 -+++ applets/fish/Makefile.in -@@ -174,7 +174,7 @@ EXTRA_DIST = $(FISH_BITMAPS) GNOME - gladedir = $(datadir)/fish - glade_DATA = fish.glade - --fishbitmapsdir = $(datadir)/pixmaps/fish -+fishbitmapsdir = $(datadir)/pixmaps/fish2 - fishbitmaps_DATA = $(FISH_BITMAPS) - - pixmapdir = $(datadir)/pixmaps -@@ -187,7 +187,7 @@ serverdir = $(libdir)/bonobo/servers - server_in_files = GNOME_FishApplet_Factory.server.in - server_DATA = $(server_in_files:.server.in=.server) - --schemasdir = $(sysconfdir)/gconf/schemas -+schemasdir = $(datadir)/gconf/schemas - schemas_in_files = fish.schemas.in - schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) - -@@ -249,9 +249,10 @@ install-libexecPROGRAMS: $(libexec_PROGR - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libexecdir) - @list='$(libexec_PROGRAMS)'; for p in $$list; do \ -+ inst=`echo $$p | sed 's/gnome/gnome2/`; \ - if test -f $$p; then \ -- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$inst|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$inst|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - diff --git a/x11/gnome-panel/patches/patch-af b/x11/gnome-panel/patches/patch-af deleted file mode 100644 index 1893ef39c93..00000000000 --- a/x11/gnome-panel/patches/patch-af +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-af,v 1.2 2003/02/14 21:05:28 jmmv Exp $ - ---- applets/fish/fish.c.orig 2003-01-03 21:27:50.000000000 +0100 -+++ applets/fish/fish.c -@@ -295,7 +295,7 @@ display_preferences_dialog (BonoboUIComp - - gnome_window_icon_set_from_file ( - GTK_WINDOW (fish->preferences_dialog), -- GNOME_ICONDIR "/gnome-fish.png"); -+ GNOME_ICONDIR "/gnome2-fish.png"); - - fish->name_entry = glade_xml_get_widget (xml, "name_entry"); - gtk_entry_set_text (GTK_ENTRY (fish->name_entry), fish->name); -@@ -401,7 +401,7 @@ display_about_dialog (BonoboUIComponent - authors [2] = NULL; - - file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, -- "gnome-fish.png", FALSE, NULL); -+ "gnome2-fish.png", FALSE, NULL); - pixbuf = gdk_pixbuf_new_from_file (file, &error); - g_free (file); - -@@ -433,7 +433,7 @@ display_about_dialog (BonoboUIComponent - gtk_window_set_screen (GTK_WINDOW (fish->about_dialog), - gtk_widget_get_screen (GTK_WIDGET (fish))); - gnome_window_icon_set_from_file (GTK_WINDOW (fish->about_dialog), -- GNOME_ICONDIR " /gnome-fish.png"); -+ GNOME_ICONDIR " /gnome2-fish.png"); - - g_signal_connect (fish->about_dialog, "destroy", - G_CALLBACK (gtk_widget_destroyed), -@@ -607,7 +607,7 @@ display_fortune_dialog (FishApplet *fish - - gtk_window_set_wmclass (GTK_WINDOW (fish->fortune_dialog), "fish", "Fish"); - gnome_window_icon_set_from_file (GTK_WINDOW (fish->fortune_dialog), -- GNOME_ICONDIR"/gnome-fish.png"); -+ GNOME_ICONDIR"/gnome2-fish.png"); - - screen = gtk_widget_get_screen (GTK_WIDGET (fish)); - diff --git a/x11/gnome-panel/patches/patch-ag b/x11/gnome-panel/patches/patch-ag deleted file mode 100644 index 3a77bd7e69b..00000000000 --- a/x11/gnome-panel/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2003/02/18 20:52:09 jmmv Exp $ - ---- gnome-panel/Makefile.in.orig 2003-02-04 00:29:51.000000000 +0100 -+++ gnome-panel/Makefile.in -@@ -256,7 +256,7 @@ server_DATA = $(server_in_files:.server. - rcdir = $(datadir) - rc_DATA = gnome-panelrc - --schemasdir = $(sysconfdir)/gconf/schemas -+schemasdir = $(datadir)/gconf/schemas - schemas_in_files = panel-global-config.schemas.in panel-per-panel-config.schemas.in gnome-panel-screenshot.schemas.in $(NULL) - - schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) |