View Single Post
Old 21st November 2009
jggimi's Avatar
jggimi jggimi is offline
More noise than signal
 
Join Date: May 2008
Location: USA
Posts: 7,977
Default

I recreated a -release environment, and running the patch provided, saw that it will not install as written, since there was a patch 1.84 that added in between. It adds some additional dependency libraries to the build.

I did not have your problem. I saw proper errors (hunks failed due to code mismatch).

Here is a new, -tested- patch:
Code:
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/session/Makefile,v
retrieving revision 1.83
retrieving revision 1.85
diff -u -r1.83 -r1.85
--- Makefile    16 Jun 2009 15:12:50 -0000    1.83
+++ Makefile    20 Aug 2009 09:40:13 -0000    1.85
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.83 2009/06/16 15:12:50 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.85 2009/08/20 09:40:13 ajacoutot Exp $
 
 COMMENT=        GNOME session
 
 GNOME_PROJECT=        gnome-session
 GNOME_VERSION=        2.24.3
-PKGNAME=        ${DISTNAME}p17
+PKGNAME=        ${DISTNAME}p19
 
 CATEGORIES=        x11
 
@@ -17,7 +17,7 @@
 WANTLIB=       ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
            Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \
            Xrender art_lgpl_2 atk-1.0 avahi-client avahi-common \
-           avahi-glib bonobo-2 bonobo-activation \
+           avahi-glib bonobo-2 bonobo-activation pthread-stubs xcb \
            bonoboui-2 c cairo crypto dbus-1 dbus-glib-1 expat \
            fontconfig freetype gailutil gdk-x11-2.0 gdk_pixbuf-2.0 \
            gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 \
@@ -66,6 +66,10 @@
             --disable-rebuilds
 CONFIGURE_ENV=        CPPFLAGS="-I${LOCALBASE}/include" \
             LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
+
+# XXX gconf2 MODULE changes this value but gsm-gconf.c uses this to
+# find the right path for gconftool-2
+CONFIGURE_ENV+=        GCONFTOOL=${LOCALBASE}/bin/gconftool-2
 
 MAKE_FLAGS=        XSLTPROC="${LOCALBASE}/bin/xsltproc -nonet"
And here is a session log, showing a successful test, with comments:
Code:
(These two commands give me the 4.6-release version of the port scaffolding for 
 gnome-session, in /tmp, to test the new patch against 4.6-release.)

$ cd /tmp
$ cvs get -r OPENBSD_4_6_BASE ports/x11/gnome/session
cvs checkout: Updating ports/x11/gnome/session
U ports/x11/gnome/session/Makefile
U ports/x11/gnome/session/distinfo
cvs checkout: Updating ports/x11/gnome/session/files
U ports/x11/gnome/session/files/README.OpenBSD
cvs checkout: Updating ports/x11/gnome/session/patches
U ports/x11/gnome/session/patches/patch-data_Makefile_in
U ports/x11/gnome/session/patches/patch-data_gnome-session_schemas_in
cvs checkout: Updating ports/x11/gnome/session/pkg
U ports/x11/gnome/session/pkg/DESCR
U ports/x11/gnome/session/pkg/MESSAGE
U ports/x11/gnome/session/pkg/PLIST

(These two commands apply the patch.)

$ cd ports/x11/gnome/session
$ patch < /tmp/better.gnome.session.patch
Hmm...    Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: Makefile
|===================================================================
|RCS file: /cvs/ports/x11/gnome/session/Makefile,v
|retrieving revision 1.83
|retrieving revision 1.85
|diff -u -r1.83 -r1.85
|--- Makefile    16 Jun 2009 15:12:50 -0000    1.83
|+++ Makefile    20 Aug 2009 09:40:13 -0000    1.85
--------------------------
Patching file Makefile using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 succeeded at 17.
Hunk #3 succeeded at 66.
done
$
Reply With Quote