diff options
| author | bjs <bjs> | 2008-04-25 04:02:23 +0000 |
|---|---|---|
| committer | bjs <bjs> | 2008-04-25 04:02:23 +0000 |
| commit | c4706bf8b596eb3acbd0a0d7e2d99be3ef686f54 (patch) | |
| tree | c0998a4912880237c30ee8cbb1940f4c831e8d05 /x11 | |
| parent | 46a5ba84eec0e4968b9660b245f73dbeff603b82 (diff) | |
| download | pkgsrc-c4706bf8b596eb3acbd0a0d7e2d99be3ef686f54.tar.gz | |
Patch data/Makefile.in not to install share/xsessions/gnome.desktop;
this conflicts with the file gdm installs. Given that gdm has always
done this and that gdm's file uses dbus, let's keep the status quo for now.
Thanks to jmcneill@ for reporting this.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-session/PLIST | 3 | ||||
| -rw-r--r-- | x11/gnome-session/distinfo | 3 | ||||
| -rw-r--r-- | x11/gnome-session/patches/patch-ac | 15 |
3 files changed, 18 insertions, 3 deletions
diff --git a/x11/gnome-session/PLIST b/x11/gnome-session/PLIST index 126b91900cc..7b89ad0864f 100644 --- a/x11/gnome-session/PLIST +++ b/x11/gnome-session/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2008/04/15 18:06:15 drochner Exp $ +@comment $NetBSD: PLIST,v 1.21 2008/04/25 04:02:23 bjs Exp $ bin/gnome-session bin/gnome-session-properties bin/gnome-session-remove @@ -105,7 +105,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo share/pixmaps/splash/gnome-splash-orig.png share/pixmaps/splash/gnome-splash.png -share/xsessions/gnome.desktop @dirrm share/pixmaps/splash @comment in xdg-dirs: @dirrm share/pixmaps @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 01f94f4250f..e57ec276a83 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2008/04/15 18:06:15 drochner Exp $ +$NetBSD: distinfo,v 1.36 2008/04/25 04:02:23 bjs Exp $ SHA1 (gnome-session-2.22.1.1.tar.bz2) = 54ba733ec8c8530a1f9c03b9f11d66bf3e666163 RMD160 (gnome-session-2.22.1.1.tar.bz2) = 0d8b26f95cee389e8aefd05251e16b7cd3703aa3 @@ -8,3 +8,4 @@ RMD160 (gnome-splash-2.16.0.png) = 28667abaaef6ac20dde9f4101554a5043b4f9c96 Size (gnome-splash-2.16.0.png) = 36601 bytes SHA1 (patch-aa) = 7cb4092f21ee08b7e7248df2cff677b678da22ec SHA1 (patch-ab) = b274bbe433151383ee0f2117dd2fb5746920be75 +SHA1 (patch-ac) = 35cc0f0982cb8ed711a4ebc45d2e9570725cbf95 diff --git a/x11/gnome-session/patches/patch-ac b/x11/gnome-session/patches/patch-ac new file mode 100644 index 00000000000..b7cc6307208 --- /dev/null +++ b/x11/gnome-session/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.11 2008/04/25 04:02:23 bjs Exp $ + +--- data/Makefile.in.orig 2008-04-10 10:34:02.000000000 -0400 ++++ data/Makefile.in +@@ -628,8 +628,8 @@ info: info-recursive + info-am: + + install-data-am: install-data-local install-defaultDATA \ +- install-pixmapDATA install-schemasDATA install-settingsDATA \ +- install-xsessionDATA ++ install-pixmapDATA install-schemasDATA install-settingsDATA ++# install-xsessionDATA + + install-dvi: install-dvi-recursive + |