cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update gnome-session to 2.18.0

Browse Source 
with a patch by martynas@ to make it start like it should.

feedback and ok martynas@
This commit is contained in:
jasper 2007-05-18 14:11:32 +00:00
parent 6490700092
commit d2a051fb6f
4 changed files with 90 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
x11/gnome/session/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.21 2007/02/11 00:56:58 steven Exp $
# $OpenBSD: Makefile,v 1.22 2007/05/18 14:11:32 jasper Exp $
COMMENT= "GNOME session"
DISTNAME= gnome-session-2.10.0
PKGNAME= ${DISTNAME}p3
DISTNAME= gnome-session-2.18.0
CATEGORIES= x11 x11/gnome
HOMEPAGE= http://www.gnome.org
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-session/2.10/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-session/2.18/}
EXTRACT_SUFX= .tar.bz2
# LGPL
@ -16,38 +15,44 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xext Xrandr \
Xmu Xrender Xt art_lgpl_2 atk-1.0 audiofile bonobo-2 \
bonobo-activation bonoboui-2 c crypto esd fontconfig freetype \
gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 \
gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2 gnomevfs-2 \
gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg m \
pango-1.0 pangoft2-1.0 pangocairo-1.0 \
popt pthread ssl wrap xml2 z cairo glitz png
WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcursor Xdmcp \
Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0 \
audiofile bonobo-2 bonobo-activation bonoboui-2 c cairo \
crypto dbus-1 dbus-glib-1 esd expat fontconfig freetype \
gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 glitz gmodule-2.0 \
gnome-2 gnome-keyring gnomecanvas-2 gnomevfs-2 gobject-2.0 \
gthread-2.0 gtk-x11-2.0 jpeg m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 png popt pthread ssl startup-notification-1 \
util wrap xml2 z
MODULES= devel/gettext
MODULES= devel/gettext
BUILD_DEPENDS= :p5-XML-Parser-*:textproc/p5-XML-Parser \
:scrollkeeper-*:textproc/scrollkeeper
LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui
BUILD_DEPENDS= :p5-XML-Parser-*:textproc/p5-XML-Parser \
:scrollkeeper-*:textproc/scrollkeeper \
:control-center2-*:x11/gnome/controlcenter2
LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \
gnome-desktop-2::x11/gnome/desktop
# Here we hang all the additional ports that will make up a satisfying
# Gnome2 user experience :)
RUN_DEPENDS+= ::x11/gnome/applets2
RUN_DEPENDS+= ::x11/gnome/controlcenter2
RUN_DEPENDS+= ::x11/gnome/applets2 \
::x11/gnome/backgrounds \
::x11/gnome/controlcenter2
# Applets pulls in panel
RUN_DEPENDS+= ::x11/gnome/panel
RUN_DEPENDS+= ::x11/gnome/terminal
RUN_DEPENDS+= ::x11/gnome/themes
RUN_DEPENDS+= ::x11/gnome/yelp
RUN_DEPENDS+= ::x11/xscreensaver,no_gle
RUN_DEPENDS+= ::x11/gnome/panel \
::x11/gnome/terminal \
::x11/gnome/themes \
::x11/gnome/yelp \
::x11/xscreensaver,no_gle
# ::x11/gnome/bug-buddy
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-rebuilds
CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gnome-session
CONFIGURE_ARGS+= --disable-rebuilds \
--enable-esd \
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gnome-session
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

10
x11/gnome/session/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome-session-2.10.0.tar.bz2) = y+sttJ2sEb+AiOawJSZf/w==
RMD160 (gnome-session-2.10.0.tar.bz2) = Jjlpxq1uC6pMfLRRYFIjxi98dbE=
SHA1 (gnome-session-2.10.0.tar.bz2) = UfXCMCXmZPIvHRoHo1+vKBaJWj8=
SHA256 (gnome-session-2.10.0.tar.bz2) = YzFJLtdIqIz0dLpWROKjpC8r1dTOkztX2jUMCLrb6Xc=
SIZE (gnome-session-2.10.0.tar.bz2) = 796754
MD5 (gnome-session-2.18.0.tar.bz2) = gw26vnRHTaSQGIidJ+76rg==
RMD160 (gnome-session-2.18.0.tar.bz2) = wS6Ry0nNgxT528ppmB/pP2Xs6fs=
SHA1 (gnome-session-2.18.0.tar.bz2) = qwGoT5rXjbhQKBkmmM0dYVf9gWM=
SHA256 (gnome-session-2.18.0.tar.bz2) = ShznP+3PrpRnPu7yZVk3/2yevC9SuoF0ZmWdK1g98zA=
SIZE (gnome-session-2.18.0.tar.bz2) = 707392

35
x11/gnome/session/patches/patch-gnome-session_gsm-dbus_c Normal file
View File

@ -0,0 +1,35 @@
$OpenBSD: patch-gnome-session_gsm-dbus_c,v 1.1 2007/05/18 14:11:32 jasper Exp $
--- gnome-session/gsm-dbus.c.orig Mon Mar 12 20:48:31 2007
+++ gnome-session/gsm-dbus.c Tue May 15 21:41:08 2007
@@ -281,6 +281,7 @@ start_parent (int address_fd, int pid_fd, pid_t child)
int exitstat;
unsigned long tmp_num;
ssize_t bytes;
+ int i;
g_assert (child > 0);
@@ -326,14 +327,17 @@ start_parent (int address_fd, int pid_fd, pid_t child)
/*
* Fetch dbus-daemon pid.
*/
- bytes = read_line (pid_fd, pid_str, sizeof (pid_str));
- if (bytes == -1 || bytes == 0)
+ for (i = 0; i < 2; i++)
{
- close (address_fd);
- close (pid_fd);
+ bytes = read_line (pid_fd, pid_str, sizeof (pid_str));
+ if (bytes == -1 || bytes == 0)
+ {
+ close (address_fd);
+ close (pid_fd);
- g_printerr ("Failed to get dbus-daemon's pid\n");
- return;
+ g_printerr ("Failed to get dbus-daemon's pid\n");
+ return;
+ }
}
close (address_fd);

25
x11/gnome/session/pkg/PLIST
View File

@ -1,19 +1,21 @@
@comment $OpenBSD: PLIST,v 1.12 2006/01/19 17:22:43 steven Exp $
@comment $OpenBSD: PLIST,v 1.13 2007/05/18 14:11:32 jasper Exp $
bin/gnome-session
bin/gnome-session-properties
bin/gnome-session-remove
bin/gnome-session-save
bin/gnome-smproxy
bin/gnome-wm
@man man/man1/gnome-session-save.1
@man man/man1/gnome-session.1
@man man/man1/gnome-smproxy.1
@man man/man1/gnome-wm.1
@man man/man1/session-properties.1
@man man/man5/default.session.5
share/applications/session-properties.desktop
share/gnome/default.session
share/gnome/default.wm
share/icons/hicolor/16x16/apps/session-properties.png
share/icons/hicolor/22x22/apps/session-properties.png
share/icons/hicolor/24x24/apps/session-properties.png
share/icons/hicolor/32x32/apps/session-properties.png
share/icons/hicolor/scalable/apps/session-properties.svg
share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
@ -21,12 +23,14 @@ share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
share/locale/da/LC_MESSAGES/gnome-session-2.0.mo
share/locale/de/LC_MESSAGES/gnome-session-2.0.mo
share/locale/dz/LC_MESSAGES/gnome-session-2.0.mo
share/locale/el/LC_MESSAGES/gnome-session-2.0.mo
share/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo
@ -44,14 +48,18 @@ share/locale/he/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hy/LC_MESSAGES/gnome-session-2.0.mo
share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
share/locale/is/LC_MESSAGES/gnome-session-2.0.mo
share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ka/LC_MESSAGES/gnome-session-2.0.mo
share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ku/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
share/locale/mg/LC_MESSAGES/gnome-session-2.0.mo
share/locale/mi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
@ -62,14 +70,15 @@ share/locale/nb/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/no/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nso/LC_MESSAGES/gnome-session-2.0.mo
share/locale/or/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo
share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
@ -78,6 +87,8 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
share/locale/tk/
share/locale/tk/LC_MESSAGES/
share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
@ -85,10 +96,14 @@ share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
share/pixmaps/splash/
share/pixmaps/splash/gnome-splash.png
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gnome-session/*.schemas > /dev/null
share/schemas/gnome-session/
share/schemas/gnome-session/gnome-session.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gnome-session/*.schemas > /dev/null
@exec %D/bin/update-desktop-database
@unexec %D/bin/update-desktop-database