diff options
author | jmmv <jmmv@pkgsrc.org> | 2003-02-14 21:05:27 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2003-02-14 21:05:27 +0000 |
commit | 679ba13ba733aee259d368d77e412ac020c16016 (patch) | |
tree | 86f1233dfc3e27b825a4c65b790980e9a14c7583 /x11 | |
parent | 9e5ff994f0b520e791b40b31b50f18e537ca3859 (diff) | |
download | pkgsrc-679ba13ba733aee259d368d77e412ac020c16016.tar.gz |
Update to 2.2.0.1. Changes since 2.0.10 are too many to be noted here.
They include new features and translations, as well as bugfixes.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gnome-panel/Makefile | 27 | ||||
-rw-r--r-- | x11/gnome-panel/PLIST | 181 | ||||
-rw-r--r-- | x11/gnome-panel/buildlink2.mk | 13 | ||||
-rw-r--r-- | x11/gnome-panel/distinfo | 18 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-aa | 24 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-ab | 31 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-ac | 26 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-ad | 52 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-ae | 20 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-af | 64 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-ag | 22 |
11 files changed, 210 insertions, 268 deletions
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 549d63efe3c..7b519914e6a 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,19 +1,19 @@ -# $NetBSD: Makefile,v 1.3 2002/12/24 06:10:31 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2003/02/14 21:05:27 jmmv Exp $ # -DISTNAME= gnome-panel-2.0.11 -PKGREVISION= 1 +DISTNAME= gnome-panel-2.2.0.1 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.0/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.2/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@netbsd.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 panel application +DEPENDS= gnome2-dirs>=1.0:../../misc/gnome2-dirs + GNU_CONFIGURE= YES USE_BUILDLINK2= YES -USE_GNU_GETTEXT= YES USE_GMAKE= YES USE_PERL5= YES USE_PKGLOCALEDIR= YES @@ -21,21 +21,26 @@ USE_X11= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +CONFIGURE_ARGS+= --enable-gtk-doc=no +CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html CONFIGURE_ARGS+= --localstatedir=${SCROLLKEEPER_DATADIR} -post-extract: - ${CP} ${WRKSRC}/doc/reference/panel-applet/html/libpanel-applet.html \ - ${WRKSRC}/doc/reference/panel-applet/html/index.html +GCONF2_SCHEMAS= clock.schemas +GCONF2_SCHEMAS+= fish.schemas +GCONF2_SCHEMAS+= gnome-panel-screenshot.schemas +GCONF2_SCHEMAS+= mailcheck.schemas +GCONF2_SCHEMAS+= pager.schemas +GCONF2_SCHEMAS+= panel-global-config.schemas +GCONF2_SCHEMAS+= panel-per-panel-config.schemas +GCONF2_SCHEMAS+= tasklist.schemas -.include "../../devel/GConf2/buildlink2.mk" +.include "../../devel/GConf2/schemas.mk" .include "../../devel/libwnck/buildlink2.mk" .include "../../devel/libglade2/buildlink2.mk" .include "../../devel/libgnomeui/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../sysutils/gnome-vfs2/buildlink2.mk" .include "../../textproc/scrollkeeper/buildlink2.mk" -.include "../../textproc/intltool/buildlink2.mk" -.include "../../textproc/gtk-doc/buildlink2.mk" .include "../../x11/gnome-desktop/buildlink2.mk" .include "../../x11/gnome2-control-center/buildlink2.mk" diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST index 866ec254e1d..f65c9f9077c 100644 --- a/x11/gnome-panel/PLIST +++ b/x11/gnome-panel/PLIST @@ -1,59 +1,16 @@ -@comment $NetBSD: PLIST,v 1.2 2002/12/16 22:55:03 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/02/14 21:05:27 jmmv Exp $ bin/gnome-desktop-item-edit bin/gnome-panel bin/gnome-panel-preferences bin/gnome2-panel-screenshot bin/panel-test-applets -etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/general/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000001/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000002/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000002/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/general/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/00000001/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/panel/global/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs/%gconf.xml -etc/gconf/schemas/clock.schemas -etc/gconf/schemas/fish.schemas -etc/gconf/schemas/mailcheck.schemas -etc/gconf/schemas/pager.schemas -etc/gconf/schemas/panel-global-config.schemas -etc/gconf/schemas/panel-per-panel-config.schemas -etc/gconf/schemas/tasklist.schemas etc/sound/events/mailcheck2.soundlist include/panel-2.0/GNOME_Panel.h include/panel-2.0/panel-applet-gconf.h include/panel-2.0/panel-applet.h lib/bonobo/servers/GNOME_FishApplet_Factory.server lib/bonobo/servers/GNOME_GenUtilApplet_Factory.server +lib/bonobo/servers/GNOME_NotificationAreaApplet.server lib/bonobo/servers/GNOME_Panel.server lib/libgen_util_applet-2.a lib/libgen_util_applet-2.la @@ -62,19 +19,42 @@ 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.9 +lib/libpanel-applet-2.so.0.13 lib/pkgconfig/libpanelapplet-2.0.pc libexec/fish-applet-2 +libexec/notification-area-applet man/man1/gnome-panel-preferences.1 man/man1/gnome-panel.1 share/control-center-2.0/capplets/gnome-panel-preferences.desktop +share/doc/html/panel-applet/applet-popups.html +share/doc/html/panel-applet/applet-porting.html +share/doc/html/panel-applet/applet-writing.html +share/doc/html/panel-applet/index.sgml +share/doc/html/panel-applet/libpanel-applet.html +share/doc/html/panel-applet/multi-applets.html +share/doc/html/panel-applet/panel-applet.html +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/fish/fish.glade +share/gconf/schemas/clock.schemas +share/gconf/schemas/fish.schemas +share/gconf/schemas/gnome-panel-screenshot.schemas +share/gconf/schemas/mailcheck.schemas +share/gconf/schemas/pager.schemas +share/gconf/schemas/panel-global-config.schemas +share/gconf/schemas/panel-per-panel-config.schemas +share/gconf/schemas/tasklist.schemas share/gen_util/pager.glade share/gen_util/tasklist.glade share/gnome-2.0/ui/GNOME_ClockApplet.xml share/gnome-2.0/ui/GNOME_FishApplet.xml share/gnome-2.0/ui/GNOME_MailCheckApplet.xml +share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml share/gnome-2.0/ui/GNOME_PagerApplet.xml share/gnome-2.0/ui/GNOME_Panel_Popup.xml +share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml share/gnome-2.0/ui/GNOME_TasklistApplet.xml share/gnome-panel/glade/panel-test-applets.glade share/gnome-panelrc @@ -82,37 +62,23 @@ 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/fish-applet-2/C/figures/fish_applet.png -share/gnome/help/fish-applet-2/C/figures/fish_settings.png share/gnome/help/fish-applet-2/C/fish-applet-2.xml share/gnome/help/fish-applet-2/C/legal.xml -share/gnome/help/mailcheck/C/figures/mailcheck-applet.png -share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailcheck.png 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/notification-area/C/figures/notification-area.png +share/gnome/help/notification-area/C/legal.xml +share/gnome/help/notification-area/C/notification-area.xml share/gnome/help/window-list/C/figures/window_list_applet.png -share/gnome/help/window-list/C/figures/window_list_group.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/workspace-switcher/C/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/C/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/C/legal.xml share/gnome/help/workspace-switcher/C/workspace-switcher.xml share/gnome/panel2/gnome-panel-preferences.glade share/gnome/panel2/gnome-panel-screenshot.glade -share/gtk-doc/html/panel-applet/applet-popups.html -share/gtk-doc/html/panel-applet/applet-porting.html -share/gtk-doc/html/panel-applet/applet-writing.html -share/gtk-doc/html/panel-applet/index.html -share/gtk-doc/html/panel-applet/libpanel-applet.html -share/gtk-doc/html/panel-applet/multi-applets.html -share/gtk-doc/html/panel-applet/panel-applet.html -share/gtk-doc/html/panel-applet/panel-signals.html -share/gtk-doc/html/panel-applet/panelapplet.html -share/gtk-doc/html/panel-applet/server-files.html -share/gtk-doc/html/panel-applet/session-saving.html share/idl/gnome-panel-2.0/GNOME_Panel.idl ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo @@ -132,6 +98,7 @@ ${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 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo +${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-panel-2.0.mo ${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 @@ -139,6 +106,7 @@ ${PKGLOCALEDIR}/locale/ko/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 +${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo @@ -151,6 +119,7 @@ ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/sp/LC_MESSAGES/gnome-panel-2.0.mo +${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo @@ -163,13 +132,15 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo share/omf/gnome-panel/clock-C.omf share/omf/gnome-panel/fish-applet-2-C.omf share/omf/gnome-panel/mailcheck-C.omf +share/omf/gnome-panel/notification-area-C.omf share/omf/gnome-panel/window-list-C.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/pixmaps/gnome2-fish.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 @@ -179,18 +150,17 @@ share/pixmaps/mailcheck2/tux-anim.png @dirrm share/pixmaps/mailcheck2 @dirrm share/pixmaps/fish2 @dirrm share/omf/gnome-panel -@unexec ${RMDIR} %D/share/omf 2>/dev/null || ${TRUE} @dirrm share/idl/gnome-panel-2.0 -@unexec ${RMDIR} %D/share/idl 2>/dev/null || ${TRUE} -@dirrm share/gtk-doc/html/panel-applet -@unexec ${RMDIR} %D/share/gtk-doc 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome/panel2 2>/dev/null || ${TRUE} +@dirrm share/gnome/panel2 @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/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/C/figures @dirrm share/gnome/help/mailcheck/C @dirrm share/gnome/help/mailcheck @@ -200,68 +170,17 @@ share/pixmaps/mailcheck2/tux-anim.png @dirrm share/gnome/help/clock/C/figures @dirrm share/gnome/help/clock/C @dirrm share/gnome/help/clock -@unexec ${RMDIR} %D/share/gnome/help 2>/dev/null || ${TRUE} +@comment in gnome2-dirs: @dirrm share/gnome/help @dirrm share/gnome-panel/glade @dirrm share/gnome-panel -@unexec ${RMDIR} %D/share/gnome-2.0/ui 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gen_util 2>/dev/null || ${TRUE} +@comment in gnome2-dirs: @dirrm share/gnome-2.0/ui +@comment in gnome2-dirs: @dirrm share/gnome +@dirrm share/gen_util +@comment in GConf2: @dirrm share/gconf/schemas +@dirrm share/fish +@dirrm share/doc/html/panel-applet +@comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets +@comment in bonobo-activation: @dirrm lib/bonobo/servers @dirrm include/panel-2.0 -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/global -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/global -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/panels -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/general -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small/general -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/small -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000002 -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/panels -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000002 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000002 -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004 -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003 -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002 -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000002 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000002 -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels/00000001 -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/panels -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/general -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large/general -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/large -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet -@exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults/apps/panel/global -@dirrm etc/gconf/gconf.xml.defaults/apps/panel/global -@dirrm etc/gconf/gconf.xml.defaults/apps/panel +@dirrm etc/sound/events +@dirrm etc/sound diff --git a/x11/gnome-panel/buildlink2.mk b/x11/gnome-panel/buildlink2.mk index e52fb3c0e23..1262074529b 100644 --- a/x11/gnome-panel/buildlink2.mk +++ b/x11/gnome-panel/buildlink2.mk @@ -1,22 +1,25 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/12/24 06:10:31 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2003/02/14 21:05:27 jmmv Exp $ # # This Makefile fragment is included by packages that use gnome-panel. # -# This file was created automatically using createbuildlink 2.2. +# This file was created automatically using createbuildlink 2.4. # .if !defined(GNOME_PANEL_BUILDLINK2_MK) GNOME_PANEL_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= gnome-panel -BUILDLINK_DEPENDS.gnome-panel?= gnome-panel>=2.0.11nb1 +BUILDLINK_DEPENDS.gnome-panel?= gnome-panel>=2.2.0.1 BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-panel=gnome-panel BUILDLINK_PREFIX.gnome-panel_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.gnome-panel+= include/panel-2.0/*.h +BUILDLINK_FILES.gnome-panel+= include/panel-2.0/GNOME_Panel.h +BUILDLINK_FILES.gnome-panel+= include/panel-2.0/panel-applet-gconf.h +BUILDLINK_FILES.gnome-panel+= include/panel-2.0/panel-applet.h BUILDLINK_FILES.gnome-panel+= lib/bonobo/servers/GNOME_FishApplet_Factory.server BUILDLINK_FILES.gnome-panel+= lib/bonobo/servers/GNOME_GenUtilApplet_Factory.server +BUILDLINK_FILES.gnome-panel+= lib/bonobo/servers/GNOME_NotificationAreaApplet.server BUILDLINK_FILES.gnome-panel+= lib/bonobo/servers/GNOME_Panel.server BUILDLINK_FILES.gnome-panel+= lib/libgen_util_applet-2.* BUILDLINK_FILES.gnome-panel+= lib/libpanel-applet-2.* @@ -29,8 +32,6 @@ BUILDLINK_FILES.gnome-panel+= lib/pkgconfig/libpanelapplet-2.0.pc .include "../../devel/gettext-lib/buildlink2.mk" .include "../../sysutils/gnome-vfs2/buildlink2.mk" .include "../../textproc/scrollkeeper/buildlink2.mk" -.include "../../textproc/intltool/buildlink2.mk" -.include "../../textproc/gtk-doc/buildlink2.mk" .include "../../x11/gnome-desktop/buildlink2.mk" .include "../../x11/gnome2-control-center/buildlink2.mk" diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index f91ffa326a3..db3018d93ba 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.2 2002/12/16 22:55:03 jmmv Exp $ +$NetBSD: distinfo,v 1.3 2003/02/14 21:05:27 jmmv Exp $ -SHA1 (gnome-panel-2.0.11.tar.bz2) = 7e9dc7ddca7153c0fb1dcd86a03ffe5257c8a6ee -Size (gnome-panel-2.0.11.tar.bz2) = 1684529 bytes -SHA1 (patch-aa) = b0fe74dd7a62ae363af20411745f630b6208f6d9 -SHA1 (patch-ab) = 57b266e9795ca58d756a181f403ff211a13e9d0a -SHA1 (patch-ac) = c8b7ab4200cc5406d7597e278f1f8c2185658578 -SHA1 (patch-ad) = 303a1c898ca52dd6afd37467b006b3e6f3bc76b0 -SHA1 (patch-ae) = 35735fc3e0b2b036a9e9941e2273108f17ad5daf -SHA1 (patch-af) = f33a32b3786e7842682d348e891b92514b8c50cd +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) = cab00f662f4a31bccfd673fa50489ba63fac4bc0 +SHA1 (patch-ad) = 137b18f7fcbebbe12126278e94c85a281a5d80ca +SHA1 (patch-ae) = 0e2b0efbce597d5517b05216ed3eaaa5ae5b7351 +SHA1 (patch-af) = 78d8cecec09db1743b640b9b516033b1fc8f96d4 +SHA1 (patch-ag) = be9305fbaa08a946b2850bde2e69aed9dd5a55d9 diff --git a/x11/gnome-panel/patches/patch-aa b/x11/gnome-panel/patches/patch-aa deleted file mode 100644 index eba53ef11f9..00000000000 --- a/x11/gnome-panel/patches/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/11/04 08:28:00 rh Exp $ - ---- doc/reference/panel-applet/Makefile.am.orig Sat Sep 7 16:29:06 2002 -+++ doc/reference/panel-applet/Makefile.am Sat Sep 7 16:29:21 2002 -@@ -218,8 +218,8 @@ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- echo '-- Installing $(srcdir)/html/index.sgml' ; \ -- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ -+ echo '-- Installing $(srcdir)/html/index.html' ; \ -+ $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \ - fi) - - # -@@ -239,7 +239,7 @@ - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml -- -cp $(srcdir)/html/index.sgml $(distdir)/html -+ -cp $(srcdir)/html/index.html $(distdir)/html - -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html - - images=$(HTML_IMAGES) ; \ diff --git a/x11/gnome-panel/patches/patch-ab b/x11/gnome-panel/patches/patch-ab index 2b642cc04d8..f4a0415d394 100644 --- a/x11/gnome-panel/patches/patch-ab +++ b/x11/gnome-panel/patches/patch-ab @@ -1,24 +1,13 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/11/04 08:28:00 rh Exp $ +$NetBSD: patch-ab,v 1.2 2003/02/14 21:05:28 jmmv Exp $ ---- doc/reference/panel-applet/Makefile.in.orig Sat Sep 7 16:29:09 2002 -+++ doc/reference/panel-applet/Makefile.in Sat Sep 7 16:29:34 2002 -@@ -394,8 +394,8 @@ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ -- echo '-- Installing $(srcdir)/html/index.sgml' ; \ -- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ -+ echo '-- Installing $(srcdir)/html/index.html' ; \ -+ $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \ - fi) +--- 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 - # -@@ -412,7 +412,7 @@ - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml -- -cp $(srcdir)/html/index.sgml $(distdir)/html -+ -cp $(srcdir)/html/index.html $(distdir)/html - -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html + # Where the html is to be installed +-HTML_DIR = $(datadir)/gtk-doc/html ++HTML_DIR = $(datadir)/doc/html - images=$(HTML_IMAGES) ; \ + # 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 4135c942b52..469dc9b80b7 100644 --- a/x11/gnome-panel/patches/patch-ac +++ b/x11/gnome-panel/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/11/04 08:28:00 rh Exp $ +$NetBSD: patch-ac,v 1.2 2003/02/14 21:05:28 jmmv Exp $ ---- applets/gen_util/Makefile.in.orig Sun Sep 15 16:18:36 2002 +--- applets/gen_util/Makefile.in.orig 2003-02-04 00:29:54.000000000 +0100 +++ applets/gen_util/Makefile.in -@@ -173,7 +173,7 @@ PRINTER_BITMAPS = print.xpm +@@ -182,7 +182,7 @@ PRINTER_BITMAPS = print.xpm MAILCHECK_BITMAPS = email.png email-e.png tux-anim.png email-eclouds.png email-tiny.png eclouds.png @@ -11,7 +11,16 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/11/04 08:28:00 rh Exp $ mailcheckbitmaps_DATA = $(MAILCHECK_BITMAPS) soundlistdir = $(sysconfdir)/sound/events -@@ -390,12 +390,13 @@ install-soundlistDATA: $(soundlist_DATA) +@@ -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 \ @@ -27,3 +36,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/11/04 08:28:00 rh Exp $ fi; fi; \ done +@@ -641,7 +642,7 @@ GNOME_GenUtilApplet_Factory.server.in: G + + # don't do this if we are building in eg. rpm + install-data-local: +- if test -z "$(DESTDIR)" ; then \ ++ if false; then \ + for p in $(schemas_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/gen_util/$$p ; \ + done \ diff --git a/x11/gnome-panel/patches/patch-ad b/x11/gnome-panel/patches/patch-ad index 3e4eb45bc5f..0bace0bd3a5 100644 --- a/x11/gnome-panel/patches/patch-ad +++ b/x11/gnome-panel/patches/patch-ad @@ -1,30 +1,44 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/11/04 08:28:00 rh Exp $ +$NetBSD: patch-ad,v 1.2 2003/02/14 21:05:28 jmmv Exp $ ---- applets/fish/Makefile.in.orig Sun Sep 15 16:18:36 2002 +--- applets/fish/Makefile.in.orig 2003-02-04 00:29:54.000000000 +0100 +++ applets/fish/Makefile.in -@@ -166,7 +166,7 @@ FISH_BITMAPS = fishanim.png oldwanda. - EXTRA_DIST = $(FISH_BITMAPS) GNOME_FishApplet_Factory.server.in.in gnome-fish.png fish.schemas.in $(ui_DATA) - +@@ -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 -@@ -321,12 +321,13 @@ install-pixmapDATA: $(pixmap_DATA) +@@ -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)$(pixmapdir) - @list='$(pixmap_DATA)'; for p in $$list; do \ -+ inst=`echo $$p | sed s/gnome/gnome2/` ; \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$inst; \ - else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$p; \ -+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$inst"; \ -+ $(INSTALL_DATA) $$p $(DESTDIR)$(pixmapdir)/$$inst; \ - fi; fi; \ + $(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 +@@ -574,7 +575,7 @@ $(server_in_files): $(server_in_files).i + + # don't do this if we are building in eg. rpm + install-data-local: +- if test -z "$(DESTDIR)" ; then \ ++ if false; then \ + for p in $(schemas_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/fish/$$p ; \ + done \ diff --git a/x11/gnome-panel/patches/patch-ae b/x11/gnome-panel/patches/patch-ae index 9239f9b4f9c..de239fbe34b 100644 --- a/x11/gnome-panel/patches/patch-ae +++ b/x11/gnome-panel/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/11/04 08:28:00 rh Exp $ +$NetBSD: patch-ae,v 1.2 2003/02/14 21:05:28 jmmv Exp $ ---- gnome-panel/Makefile.in.orig Mon Oct 14 11:21:55 2002 +--- gnome-panel/Makefile.in.orig 2003-02-04 00:29:51.000000000 +0100 +++ gnome-panel/Makefile.in -@@ -152,7 +152,7 @@ AUTOMAKE_OPTIONS = 1.3 +@@ -156,7 +156,7 @@ AUTOMAKE_OPTIONS = 1.3 NULL = @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/11/04 08:28:00 rh Exp $ # FIXME: -@@ -168,7 +168,7 @@ DISABLE_DEPRECATED_CFLAGS = -DG_DISABL +@@ -172,7 +172,7 @@ DISABLE_DEPRECATED_CFLAGS = -DG_DISABL STANDARD_PROPERTIES_CFLAGS = -DPREFIX=\""$(prefix)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" -DLIBDIR=\""$(libdir)"\" -DDATADIR=\""$(datadir)"\" $(NULL) @@ -20,8 +20,8 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/11/04 08:28:00 rh Exp $ CORBA_SRCLIST = GNOME_Panel-stubs.c GNOME_Panel-skels.c GNOME_Panel-common.c GNOME_Panel.h $(NULL) -@@ -219,7 +219,7 @@ gnome_panel_screenshot_LDFLAGS = -export - gnome_panel_screenshot_LDADD = $(X_LIBS) $(PANELCONFIG_LIBS) $(PNG_LIBS) +@@ -232,7 +232,7 @@ gnome_panel_screenshot_LDFLAGS = -export + gnome_panel_screenshot_LDADD = $(XSHAPE_LIBS) $(X_LIBS) $(PANELCONFIG_LIBS) $(PNG_LIBS) -gladedir = $(datadir)/gnome/panel @@ -29,7 +29,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/11/04 08:28:00 rh Exp $ glade_DATA = gnome-panel-preferences.glade gnome-panel-screenshot.glade -@@ -254,7 +254,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m +@@ -270,7 +270,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = bin_PROGRAMS = gnome-panel$(EXEEXT) gnome-panel-preferences$(EXEEXT) \ @@ -38,14 +38,12 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/11/04 08:28:00 rh Exp $ PROGRAMS = $(bin_PROGRAMS) -@@ -396,8 +396,8 @@ gnome-panel-preferences$(EXEEXT): $(gnom +@@ -418,7 +418,7 @@ gnome-panel-preferences$(EXEEXT): $(gnom @rm -f gnome-panel-preferences$(EXEEXT) $(LINK) $(gnome_panel_preferences_LDFLAGS) $(gnome_panel_preferences_OBJECTS) $(gnome_panel_preferences_LDADD) $(LIBS) -gnome-panel-screenshot$(EXEEXT): $(gnome_panel_screenshot_OBJECTS) $(gnome_panel_screenshot_DEPENDENCIES) -- @rm -f gnome-panel-screenshot$(EXEEXT) +gnome2-panel-screenshot$(EXEEXT): $(gnome_panel_screenshot_OBJECTS) $(gnome_panel_screenshot_DEPENDENCIES) -+ @rm -f gnome2-panel-screenshot$(EXEEXT) + @rm -f gnome-panel-screenshot$(EXEEXT) $(LINK) $(gnome_panel_screenshot_LDFLAGS) $(gnome_panel_screenshot_OBJECTS) $(gnome_panel_screenshot_LDADD) $(LIBS) - gnome-desktop-item-edit$(EXEEXT): $(gnome_desktop_item_edit_OBJECTS) $(gnome_desktop_item_edit_DEPENDENCIES) diff --git a/x11/gnome-panel/patches/patch-af b/x11/gnome-panel/patches/patch-af index 08f350766ca..1893ef39c93 100644 --- a/x11/gnome-panel/patches/patch-af +++ b/x11/gnome-panel/patches/patch-af @@ -1,40 +1,40 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/11/04 08:28:00 rh Exp $ +$NetBSD: patch-af,v 1.2 2003/02/14 21:05:28 jmmv Exp $ ---- applets/fish/fish.c.orig Wed Jul 17 09:33:10 2002 +--- applets/fish/fish.c.orig 2003-01-03 21:27:50.000000000 +0100 +++ applets/fish/fish.c -@@ -711,7 +711,7 @@ display_properties_dialog (BonoboUICompo - gtk_window_set_title (GTK_WINDOW (fish->pb), - _("GNOME Fish Preferences")); - gnome_window_icon_set_from_file (GTK_WINDOW (fish->pb), -- GNOME_ICONDIR "/gnome-fish.png"); -+ GNOME_ICONDIR "/gnome2-fish.png"); - - vbox = gtk_vbox_new (FALSE, GNOME_PAD); - gtk_container_set_border_width (GTK_CONTAINER (vbox), GNOME_PAD); -@@ -952,7 +952,7 @@ update_fortune_dialog (Fish *fish) - G_CALLBACK (response), NULL); - 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"); - - gtk_window_set_default_size (GTK_WINDOW (fish->fortune_dialog), - MIN (600, gdk_screen_width () * 0.9), -@@ -1220,7 +1220,7 @@ display_about_dialog (BonoboUIComponent +@@ -295,7 +295,7 @@ display_preferences_dialog (BonoboUIComp - g_free (name); + gnome_window_icon_set_from_file ( + GTK_WINDOW (fish->preferences_dialog), +- GNOME_ICONDIR "/gnome-fish.png"); ++ GNOME_ICONDIR "/gnome2-fish.png"); -- file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "gnome-fish.png", FALSE, NULL); -+ file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "gnome2-fish.png", FALSE, NULL); + 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"); -@@ -1253,7 +1253,7 @@ display_about_dialog (BonoboUIComponent + screen = gtk_widget_get_screen (GTK_WIDGET (fish)); - gtk_window_set_wmclass (GTK_WINDOW (fish->aboutbox), "fish", "Fish"); - gnome_window_icon_set_from_file (GTK_WINDOW (fish->aboutbox), -- GNOME_ICONDIR"/gnome-fish.png"); -+ GNOME_ICONDIR"/gnome2-fish.png"); - gtk_signal_connect (GTK_OBJECT (fish->aboutbox), "destroy", - GTK_SIGNAL_FUNC(gtk_widget_destroyed), - &fish->aboutbox); diff --git a/x11/gnome-panel/patches/patch-ag b/x11/gnome-panel/patches/patch-ag new file mode 100644 index 00000000000..87a1e381daa --- /dev/null +++ b/x11/gnome-panel/patches/patch-ag @@ -0,0 +1,22 @@ +$NetBSD: patch-ag,v 1.1 2003/02/14 21:05:28 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) +@@ -959,7 +959,7 @@ panel-typebuiltins.h: @REBUILD@ $(panel_ + @INTLTOOL_SCHEMAS_RULE@ + + install-data-local: +- if test -z "$(DESTDIR)" ; then \ ++ if false; then \ + for p in $(schemas_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnome-panel/$$p ; \ + done \ |