From 4bed3a4942548803f5eb6fe47eef6b790d0fe373 Mon Sep 17 00:00:00 2001 From: jasper Date: Mon, 12 May 2008 19:40:17 +0000 Subject: [PATCH] - enable gnome-about-me, but disable changing passwords via this dialog ok ajacoutot@ --- x11/gnome/controlcenter2/Makefile | 30 ++++++++++--------- ...tch-capplets_about-me_gnome-about-me_glade | 30 +++++++++++++++++++ x11/gnome/controlcenter2/pkg/PLIST | 7 ++++- 3 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 x11/gnome/controlcenter2/patches/patch-capplets_about-me_gnome-about-me_glade diff --git a/x11/gnome/controlcenter2/Makefile b/x11/gnome/controlcenter2/Makefile index 6d3b4b7a208..2ccc0a313ad 100644 --- a/x11/gnome/controlcenter2/Makefile +++ b/x11/gnome/controlcenter2/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.33 2008/04/17 08:46:48 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.34 2008/05/12 19:40:17 jasper Exp $ COMMENT= GNOME control center GNOME_PROJECT= gnome-control-center GNOME_VERSION= 2.20.3 -PKGNAME= control-center2-${VERSION}p2 +PKGNAME= control-center2-${VERSION}p3 SHARED_LIBS += gnome-window-settings 2.0 # .1.0 CATEGORIES= x11 @@ -16,21 +16,23 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ Xcursor Xdamage Xdmcp Xext Xfixes Xft Xi Xinerama Xrandr \ - Xrender Xss art_lgpl_2 atk-1.0 audiofile bonobo-2 bonobo-activation \ - bonoboui-2 bz2 c cairo crypto dbus-1 dbus-glib-1 esd \ - expat fam fontconfig freetype gailutil gconf-2 gdk-x11-2.0 \ - gdk_pixbuf-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0 \ - gnome-2 gnome-desktop-2 gnome-keyring gnome-menu gnomecanvas-2 \ - gnomeui-2 gnomevfs-2 gobject-2.0 gsf-1 gstbase-0.10 \ - gstreamer-0.10 gthread-2.0 gtk-x11-2.0 jpeg m pango-1.0 \ - pangocairo-1.0 pangoft2-1.0 pangoxft-1.0 pcre png popt \ - pthread rpcsvc ssl startup-notification-1 stdc++ util \ - xkbfile xml2 z + Xrender Xss art_lgpl_2 asn1 atk-1.0 audiofile bonobo-2 \ + bonobo-activation bonoboui-2 bz2 c cairo com_err crypto \ + db dbus-1 dbus-glib-1 esd expat fam fontconfig freetype \ + gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glade-2.0 \ + glib-2.0 glitz gmodule-2.0 gnome-2 gnome-desktop-2 \ + gnome-keyring gnome-menu gnomecanvas-2 gnomeui-2 gnomevfs-2 \ + gobject-2.0 gsf-1 gssapi gstbase-0.10 gstreamer-0.10 \ + gthread-2.0 gtk-x11-2.0 jpeg krb5 m nspr4 nss3 pango-1.0 \ + pangocairo-1.0 pangoft2-1.0 pangoxft-1.0 pcre plc4 \ + plds4 png popt pthread rpcsvc smime3 softokn3 ssl ssl3 \ + startup-notification-1 stdc++ util xkbfile xml2 z MODULES= devel/gettext \ x11/gnome -LIB_DEPENDS= gstaudio-0.10.>=0.1,gstinterfaces-0.10.>=0.1::multimedia/gstreamer-0.10/plugins-base \ +LIB_DEPENDS= camel-1.2,ebook-1.2,edataserver-1.2::databases/evolution-data-server \ + gstaudio-0.10.>=0.1,gstinterfaces-0.10.>=0.1::multimedia/gstreamer-0.10/plugins-base \ croco-0.6::www/libcroco \ gnomekbd,gnomekbdui::x11/gnome/libgnomekbd \ rsvg-2::x11/gnome/librsvg \ @@ -53,7 +55,7 @@ CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/control --disable-alsa \ --enable-esd \ --enable-gstreamer \ - --disable-aboutme # needs fixed EDS + --enable-aboutme CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome/controlcenter2/patches/patch-capplets_about-me_gnome-about-me_glade b/x11/gnome/controlcenter2/patches/patch-capplets_about-me_gnome-about-me_glade new file mode 100644 index 00000000000..73171397ceb --- /dev/null +++ b/x11/gnome/controlcenter2/patches/patch-capplets_about-me_gnome-about-me_glade @@ -0,0 +1,30 @@ +$OpenBSD: patch-capplets_about-me_gnome-about-me_glade,v 1.1 2008/05/12 19:40:17 jasper Exp $ + +XXX: +Changing the password doesn't work like it should at the moment. +Hide the button for now. + +--- capplets/about-me/gnome-about-me.glade.orig Mon May 12 12:42:33 2008 ++++ capplets/about-me/gnome-about-me.glade Mon May 12 12:43:30 2008 +@@ -214,21 +214,6 @@ + + + +- +- +- True +- True +- Change Passwo_rd... +- True +- GTK_RELIEF_NORMAL +- True +- +- +- 0 +- False +- False +- +- + + + 0 diff --git a/x11/gnome/controlcenter2/pkg/PLIST b/x11/gnome/controlcenter2/pkg/PLIST index 04e4e27d005..39512cb1bb1 100644 --- a/x11/gnome/controlcenter2/pkg/PLIST +++ b/x11/gnome/controlcenter2/pkg/PLIST @@ -1,6 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.19 2008/04/17 08:46:48 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.20 2008/05/12 19:40:17 jasper Exp $ @conflict control-center-1* %%SHARED%% +bin/gnome-about-me bin/gnome-accessibility-keyboard-properties bin/gnome-appearance-properties bin/gnome-at-mobility @@ -52,6 +53,7 @@ libexec/gnome-settings-daemon share/applications/accessibility-keyboard.desktop share/applications/at-properties.desktop share/applications/default-applications.desktop +share/applications/gnome-about-me.desktop share/applications/gnome-appearance-properties.desktop share/applications/gnome-font-viewer.desktop share/applications/gnome-network-preferences.desktop @@ -93,6 +95,7 @@ share/gnome-control-center/glade/acme.glade share/gnome-control-center/glade/appearance.glade share/gnome-control-center/glade/apply-font.glade share/gnome-control-center/glade/at-enable-dialog.glade +share/gnome-control-center/glade/gnome-about-me.glade share/gnome-control-center/glade/gnome-accessibility-keyboard-properties.glade share/gnome-control-center/glade/gnome-default-applications-properties.glade share/gnome-control-center/glade/gnome-keybinding-properties.glade @@ -122,6 +125,8 @@ share/gnome-control-center/pixmaps/bar.png share/gnome-control-center/pixmaps/double-click-maybe.png share/gnome-control-center/pixmaps/double-click-off.png share/gnome-control-center/pixmaps/double-click-on.png +share/gnome-control-center/pixmaps/gnome-about-me-lock-open.png +share/gnome-control-center/pixmaps/gnome-about-me-lock.png share/gnome-control-center/pixmaps/gtk-theme-thumbnailing.png share/gnome-control-center/pixmaps/icon-theme-thumbnailing.png share/gnome-control-center/pixmaps/keyboard-bell.png