diff options
author | xtraeme <xtraeme> | 2003-12-14 23:34:16 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2003-12-14 23:34:16 +0000 |
commit | 76b1fcc8e676124799d15f25ce6aa7549c4ec44a (patch) | |
tree | f9ae2ba7b5f7c2dda84365f471cefaaf2ce0124e | |
parent | ca3b799b0a246a692eb60a71bbd6d147a9932507 (diff) | |
download | pkgsrc-76b1fcc8e676124799d15f25ce6aa7549c4ec44a.tar.gz |
Updated to 2.4.1
Changes:
* Avoid ever scaling up icons when there is a bigger one available
(Owen Taylor)
* Do not auto hide a panel with open drawers (Arvind)
* Delete launcher editing dialog when the panel is deleted
(Arvind)
* Do not focus the panel itself when there is an applet to focus
(Padraig)
* Fix warnings with newer gcc (Kjartan)
* Fix i18n issue with startup notification from the menus
(Christian Neumair)
* Show the localized comment from launchers in the run dialog
(Vincent Untz)
* Query before deleting a non-empty drawer (Arvind)
* Fix loading of icons specified by relative paths (Bala, Mark)
* Fix off-by-one error when computing struts (Rob Adams)
* Fix serious issue with launchers not working on drawers (George)
* Don't create new launchers whose TryExec fails (Arvind)
And more... review Changelog to see a full list of changes.
-rw-r--r-- | x11/gnome-panel/Makefile | 32 | ||||
-rw-r--r-- | x11/gnome-panel/PLIST | 166 | ||||
-rw-r--r-- | x11/gnome-panel/buildlink2.mk | 5 | ||||
-rw-r--r-- | x11/gnome-panel/distinfo | 8 | ||||
-rw-r--r-- | x11/gnome-panel/patches/patch-ae | 57 |
5 files changed, 90 insertions, 178 deletions
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index eebec98cb17..4965f34e85f 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.16 2003/12/13 00:45:26 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2003/12/14 23:34:16 xtraeme Exp $ # -DISTNAME= gnome-panel-2.2.2.2 -PKGREVISION= 4 +DISTNAME= gnome-panel-2.4.1 CATEGORIES= x11 gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.2/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.4/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org @@ -12,6 +11,7 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 panel application DEPENDS= gnome2-dirs>=1.0:../../misc/gnome2-dirs +DEPENDS+= gnome-icon-theme>=1.0.9:../../graphics/gnome-icon-theme GNU_CONFIGURE= YES USE_BUILDLINK2= YES @@ -21,31 +21,26 @@ USE_PKGLOCALEDIR= YES USE_X11= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/libpanel-applet/libpanelapplet-2.0.pc.in 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/mailcheck.soundlist \ - ${PKG_SYSCONFDIR.libgnome}/sound/events/mailcheck.soundlist -.else -CONF_FILES= ${EGDIR}/sound/events/mailcheck.soundlist \ - ${PKG_SYSCONFBASE}/sound/events/mailcheck.soundlist -.endif - 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 +GCONF2_SCHEMAS+= panel-global.schemas +GCONF2_SCHEMAS+= panel-general.schemas +GCONF2_SCHEMAS+= panel-toplevel.schemas +GCONF2_SCHEMAS+= panel-object.schemas +GCONF2_SCHEMAS+= panel-compatibility.schemas +GCONF2_SCHEMAS+= workspace-switcher.schemas +GCONF2_SCHEMAS+= window-list.schemas .include "../../devel/GConf2/schemas.mk" +.include "../../devel/libbonobo/buildlink2.mk" .include "../../devel/libwnck/buildlink2.mk" .include "../../devel/libglade2/buildlink2.mk" .include "../../devel/libgnomeui/buildlink2.mk" @@ -55,5 +50,4 @@ GCONF2_SCHEMAS+= tasklist.schemas .include "../../x11/gnome-desktop/buildlink2.mk" .include "../../x11/gnome2-control-center/buildlink2.mk" .include "../../x11/startup-notification/buildlink2.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST index d27b6feb8fe..c38b651d338 100644 --- a/x11/gnome-panel/PLIST +++ b/x11/gnome-panel/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2003/07/11 19:04:09 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.8 2003/12/14 23:34:16 xtraeme Exp $ bin/gnome-desktop-item-edit bin/gnome-panel bin/gnome-panel-preferences @@ -7,21 +7,23 @@ bin/panel-test-applets 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_ClockApplet_Factory.server 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 -lib/libgen_util_applet-2.so +lib/bonobo/servers/GNOME_Wncklet_Factory.server +lib/libclock-applet-2.a +lib/libclock-applet-2.la +lib/libclock-applet-2.so 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.14 +lib/libpanel-applet-2.so.0.18 lib/pkgconfig/libpanelapplet-2.0.pc libexec/fish-applet-2 libexec/notification-area-applet +libexec/wnck-applet man/man1/gnome-panel-preferences.1 man/man1/gnome-panel.1 share/control-center-2.0/capplets/gnome-panel-preferences.desktop @@ -31,32 +33,35 @@ 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-panel-applet-gconf-utilities.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/examples/gnome-panel/sound/events/mailcheck.soundlist -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/gconf/schemas/panel-compatibility.schemas +share/gconf/schemas/panel-default-setup.entries +share/gconf/schemas/panel-general.schemas +share/gconf/schemas/panel-global.schemas +share/gconf/schemas/panel-object.schemas +share/gconf/schemas/panel-toplevel.schemas +share/gconf/schemas/window-list.schemas +share/gconf/schemas/workspace-switcher.schemas 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-2.0/ui/GNOME_WindowListApplet.xml +share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml +share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml +share/gnome-panel/glade/fish.glade share/gnome-panel/glade/panel-test-applets.glade +share/gnome-panel/glade/window-list.glade +share/gnome-panel/glade/workspace-switcher.glade share/gnome-panelrc share/gnome/help/clock/C/clock.xml share/gnome/help/clock/C/figures/clock_applet.png @@ -126,63 +131,6 @@ share/gnome/help/fish-applet-2/zh_TW/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_TW/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_TW/fish-applet-2.xml share/gnome/help/fish-applet-2/zh_TW/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/de/figures/mailcheck-applet.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/de/figures/mailcheck_applet.png -share/gnome/help/mailcheck/de/legal.xml -share/gnome/help/mailcheck/de/mailcheck.xml -share/gnome/help/mailcheck/es/figures/mailcheck-applet.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/es/figures/mailcheck_applet.png -share/gnome/help/mailcheck/es/legal.xml -share/gnome/help/mailcheck/es/mailcheck.xml -share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png -share/gnome/help/mailcheck/fr/legal.xml -share/gnome/help/mailcheck/fr/mailcheck.xml -share/gnome/help/mailcheck/it/figures/mailcheck-applet.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/it/figures/mailcheck_applet.png -share/gnome/help/mailcheck/it/legal.xml -share/gnome/help/mailcheck/it/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/mailcheck/ko/figures/mailcheck-applet.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png -share/gnome/help/mailcheck/ko/legal.xml -share/gnome/help/mailcheck/ko/mailcheck.xml -share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png -share/gnome/help/mailcheck/sv/legal.xml -share/gnome/help/mailcheck/sv/mailcheck.xml -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_CN/legal.xml -share/gnome/help/mailcheck/zh_CN/mailcheck.xml -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_TW/legal.xml -share/gnome/help/mailcheck/zh_TW/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_applet.png share/gnome/help/window-list/C/legal.xml @@ -271,6 +219,8 @@ share/gnome/help/workspace-switcher/zh_TW/legal.xml share/gnome/help/workspace-switcher/zh_TW/workspace-switcher.xml share/gnome/panel2/gnome-panel-preferences.glade share/gnome/panel2/gnome-panel-screenshot.glade +share/gnome/panel2/panel-properties-dialog.glade +share/gnome/panel2/panel-run-dialog.glade 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 @@ -350,17 +300,6 @@ share/omf/gnome-panel/fish-applet-2-ko.omf share/omf/gnome-panel/fish-applet-2-sv.omf share/omf/gnome-panel/fish-applet-2-zh_CN.omf share/omf/gnome-panel/fish-applet-2-zh_TW.omf -share/omf/gnome-panel/mailcheck-C.omf -share/omf/gnome-panel/mailcheck-de.omf -share/omf/gnome-panel/mailcheck-es.omf -share/omf/gnome-panel/mailcheck-fr.omf -share/omf/gnome-panel/mailcheck-it.omf -share/omf/gnome-panel/mailcheck-ja.omf -share/omf/gnome-panel/mailcheck-ko.omf -share/omf/gnome-panel/mailcheck-sv.omf -share/omf/gnome-panel/mailcheck-zh_CN.omf -share/omf/gnome-panel/mailcheck-zh_TW.omf -share/omf/gnome-panel/notification-area-C.omf share/omf/gnome-panel/window-list-C.omf share/omf/gnome-panel/window-list-de.omf share/omf/gnome-panel/window-list-es.omf @@ -381,19 +320,29 @@ share/omf/gnome-panel/workspace-switcher-ko.omf share/omf/gnome-panel/workspace-switcher-sv.omf share/omf/gnome-panel/workspace-switcher-zh_CN.omf share/omf/gnome-panel/workspace-switcher-zh_TW.omf +share/pixmaps/cdeappmenu.png share/pixmaps/fish/fishanim.png share/pixmaps/fish/footguy.png share/pixmaps/fish/monkey.png share/pixmaps/fish/oldwanda.png +share/pixmaps/gnome-amusements.png +share/pixmaps/gnome-clock.png share/pixmaps/gnome-fish.png +share/pixmaps/gnome-gegl.png +share/pixmaps/gnome-gegl2-2.png +share/pixmaps/gnome-gegl2.png +share/pixmaps/gnome-main-menu.png +share/pixmaps/gnome-panel-type-corner.png +share/pixmaps/gnome-panel-type-edge.png +share/pixmaps/gnome-panel-type-floating.png +share/pixmaps/gnome-panel-type-menu.png +share/pixmaps/gnome-panel-type-sliding.png +share/pixmaps/gnome-panel.png +share/pixmaps/gnome-run.png +share/pixmaps/gnome-screenshot.png share/pixmaps/gnome-show-desktop.png -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 +share/pixmaps/panel-drawer.png +share/pixmaps/panel-force-quit.png @dirrm share/pixmaps/fish @dirrm share/omf/gnome-panel @comment in scrollkeeper: @dirrm share/omf @@ -441,30 +390,6 @@ share/pixmaps/mailcheck/tux-anim.png @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/zh_TW/figures -@dirrm share/gnome/help/mailcheck/zh_TW -@dirrm share/gnome/help/mailcheck/zh_CN/figures -@dirrm share/gnome/help/mailcheck/zh_CN -@dirrm share/gnome/help/mailcheck/sv/figures -@dirrm share/gnome/help/mailcheck/sv -@dirrm share/gnome/help/mailcheck/ko/figures -@dirrm share/gnome/help/mailcheck/ko -@dirrm share/gnome/help/mailcheck/ja/figures -@dirrm share/gnome/help/mailcheck/ja -@dirrm share/gnome/help/mailcheck/it/figures -@dirrm share/gnome/help/mailcheck/it -@dirrm share/gnome/help/mailcheck/fr/figures -@dirrm share/gnome/help/mailcheck/fr -@dirrm share/gnome/help/mailcheck/es/figures -@dirrm share/gnome/help/mailcheck/es -@dirrm share/gnome/help/mailcheck/de/figures -@dirrm share/gnome/help/mailcheck/de -@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/zh_TW/figures @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @@ -512,13 +437,8 @@ share/pixmaps/mailcheck/tux-anim.png @dirrm share/gnome-panel @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/examples/gnome-panel/sound/events -@dirrm share/examples/gnome-panel/sound -@dirrm share/examples/gnome-panel @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 +@comment in libbonobo: @dirrm lib/bonobo/servers @dirrm include/panel-2.0 diff --git a/x11/gnome-panel/buildlink2.mk b/x11/gnome-panel/buildlink2.mk index 88c4e375990..84002ac66d9 100644 --- a/x11/gnome-panel/buildlink2.mk +++ b/x11/gnome-panel/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.7 2003/12/13 00:45:26 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2003/12/14 23:34:16 xtraeme Exp $ # # This Makefile fragment is included by packages that use gnome-panel. # @@ -9,7 +9,7 @@ GNOME_PANEL_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= gnome-panel -BUILDLINK_DEPENDS.gnome-panel?= gnome-panel>=2.2.2.2nb4 +BUILDLINK_DEPENDS.gnome-panel?= gnome-panel>=2.4.1 BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-panel=gnome-panel @@ -23,7 +23,6 @@ BUILDLINK_FILES.gnome-panel+= lib/bonobo/servers/GNOME_NotificationAreaApplet.se 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.* -BUILDLINK_FILES.gnome-panel+= lib/pkgconfig/libpanelapplet-2.0.pc .include "../../devel/GConf2/buildlink2.mk" .include "../../devel/libwnck/buildlink2.mk" diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index 347dcebc57d..96053ec7200 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2003/07/11 19:04:09 jmmv Exp $ +$NetBSD: distinfo,v 1.8 2003/12/14 23:34:16 xtraeme Exp $ -SHA1 (gnome-panel-2.2.2.2.tar.bz2) = c556c40044a9dfe640a656a9b40c8ced0167c365 -Size (gnome-panel-2.2.2.2.tar.bz2) = 2681490 bytes +SHA1 (gnome-panel-2.4.1.tar.bz2) = 60aff60ff4240ec67db6e112bba6fcc05245f4c3 +Size (gnome-panel-2.4.1.tar.bz2) = 2642713 bytes SHA1 (patch-ac) = fcb8a31916c1752f8779c926e988a518dd2ca006 -SHA1 (patch-ae) = 0e2b0efbce597d5517b05216ed3eaaa5ae5b7351 +SHA1 (patch-ae) = 76f57ac9edee09e60f0ea1153e288f5ecc9d5d58 diff --git a/x11/gnome-panel/patches/patch-ae b/x11/gnome-panel/patches/patch-ae index de239fbe34b..9609b46209b 100644 --- a/x11/gnome-panel/patches/patch-ae +++ b/x11/gnome-panel/patches/patch-ae @@ -1,35 +1,34 @@ -$NetBSD: patch-ae,v 1.2 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 -@@ -156,7 +156,7 @@ AUTOMAKE_OPTIONS = 1.3 - - NULL = - --INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/gnome-panel -DPANEL_DEBUG -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGLADEDIR=\""$(datadir)/gnome/panel"\" $(DISABLE_DEPRECATED_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(ALLOW_CRACKPOT_MENU_CODE) $(PANEL_CFLAGS) $(PANELCONFIG_CFLAGS) $(WARN_CFLAGS) $(NULL) -+INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/gnome-panel -DPANEL_DEBUG -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGLADEDIR=\""$(datadir)/gnome/panel2"\" $(DISABLE_DEPRECATED_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(ALLOW_CRACKPOT_MENU_CODE) $(PANEL_CFLAGS) $(PANELCONFIG_CFLAGS) $(WARN_CFLAGS) $(NULL) - - - # FIXME: -@@ -172,7 +172,7 @@ DISABLE_DEPRECATED_CFLAGS = -DG_DISABL - STANDARD_PROPERTIES_CFLAGS = -DPREFIX=\""$(prefix)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" -DLIBDIR=\""$(libdir)"\" -DDATADIR=\""$(datadir)"\" $(NULL) - - --bin_PROGRAMS = gnome-panel gnome-panel-preferences gnome-panel-screenshot gnome-desktop-item-edit -+bin_PROGRAMS = gnome-panel gnome-panel-preferences gnome2-panel-screenshot gnome-desktop-item-edit - - - CORBA_SRCLIST = GNOME_Panel-stubs.c GNOME_Panel-skels.c GNOME_Panel-common.c GNOME_Panel.h $(NULL) -@@ -232,7 +232,7 @@ gnome_panel_screenshot_LDFLAGS = -export - gnome_panel_screenshot_LDADD = $(XSHAPE_LIBS) $(X_LIBS) $(PANELCONFIG_LIBS) $(PNG_LIBS) +$NetBSD: patch-ae,v 1.3 2003/12/14 23:34:16 xtraeme Exp $ +--- gnome-panel/Makefile.in.orig 2003-10-26 18:55:13.000000000 +0000 ++++ gnome-panel/Makefile.in 2003-10-26 18:58:09.000000000 +0000 +@@ -179,7 +179,7 @@ + -I$(top_builddir)/gnome-panel \ + -DPANEL_DEBUG \ + -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +- -DGLADEDIR=\""$(datadir)/gnome/panel"\" \ ++ -DGLADEDIR=\""$(datadir)/gnome/panel2"\" \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(STANDARD_PROPERTIES_CFLAGS) \ + $(ALLOW_CRACKPOT_MENU_CODE) \ +@@ -216,7 +216,7 @@ + bin_PROGRAMS = \ + gnome-panel \ + gnome-panel-preferences \ +- gnome-panel-screenshot \ ++ gnome2-panel-screenshot \ + gnome-desktop-item-edit + + +@@ -433,7 +433,7 @@ + $(PNG_LIBS) -gladedir = $(datadir)/gnome/panel +gladedir = $(datadir)/gnome/panel2 - glade_DATA = gnome-panel-preferences.glade gnome-panel-screenshot.glade - - -@@ -270,7 +270,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m + glade_DATA = \ + gnome-panel-preferences.glade \ + gnome-panel-screenshot.glade \ +@@ -499,7 +499,7 @@ CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = bin_PROGRAMS = gnome-panel$(EXEEXT) gnome-panel-preferences$(EXEEXT) \ @@ -38,7 +37,7 @@ $NetBSD: patch-ae,v 1.2 2003/02/14 21:05:28 jmmv Exp $ PROGRAMS = $(bin_PROGRAMS) -@@ -418,7 +418,7 @@ gnome-panel-preferences$(EXEEXT): $(gnom +@@ -648,7 +648,7 @@ @rm -f gnome-panel-preferences$(EXEEXT) $(LINK) $(gnome_panel_preferences_LDFLAGS) $(gnome_panel_preferences_OBJECTS) $(gnome_panel_preferences_LDADD) $(LIBS) |