diff --git a/x11/gnome/controlcenter2/Makefile b/x11/gnome/controlcenter2/Makefile index ede8c688379..b65a5a03aa0 100644 --- a/x11/gnome/controlcenter2/Makefile +++ b/x11/gnome/controlcenter2/Makefile @@ -1,13 +1,11 @@ -# $OpenBSD: Makefile,v 1.79 2010/09/28 11:56:57 landry Exp $ +# $OpenBSD: Makefile,v 1.80 2010/09/30 07:33:38 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT= GNOME control center GNOME_PROJECT= gnome-control-center -GNOME_VERSION= 2.30.1 - -REVISION= 1 +GNOME_VERSION= 2.32.0 SHARED_LIBS += gnome-window-settings 3.0 # .1.0 @@ -33,6 +31,7 @@ WANTLIB += xcb-atom xcb-aux xcb-event xcb-render xcb-render-util WANTLIB += xkbfile xml2 z canberra canberra-gtk camel-1.2 ebook-1.2 WANTLIB += edataserver-1.2 gnomekbd gnomekbdui metacity-private WANTLIB += unique-1.0 gnome-desktop-2 gnome-menu gtop-2.0 +WANTLIB += eggdbus-1 gdata gnome-keyring nssutil3 proxy soup-gnome-2.4 MODULES= devel/gettext \ x11/gnome \ diff --git a/x11/gnome/controlcenter2/distinfo b/x11/gnome/controlcenter2/distinfo index 9c2ac2df226..76fe8499d91 100644 --- a/x11/gnome/controlcenter2/distinfo +++ b/x11/gnome/controlcenter2/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/gnome-control-center-2.30.1.tar.bz2) = lgjq5WBc/EeLo1toO/EpwQ== -RMD160 (gnome/gnome-control-center-2.30.1.tar.bz2) = cyOlnesTqAF95On27oSZ+ta216o= -SHA1 (gnome/gnome-control-center-2.30.1.tar.bz2) = 99P0huEUhx5T89fnQ9U7BB6/Lx4= -SHA256 (gnome/gnome-control-center-2.30.1.tar.bz2) = 2wUIA6S/OiKXJVuP/0gQ8hJaWwAdP9eF7h7NfyxvWTs= -SIZE (gnome/gnome-control-center-2.30.1.tar.bz2) = 2830194 +MD5 (gnome/gnome-control-center-2.32.0.tar.bz2) = 7DNxzzPhyGMCno4nibYcKw== +RMD160 (gnome/gnome-control-center-2.32.0.tar.bz2) = LO/Vx7eTI9fwgwczoZO3HqsqYfE= +SHA1 (gnome/gnome-control-center-2.32.0.tar.bz2) = dpD7d9w4HP4MIfluA0WHBP/3NjM= +SHA256 (gnome/gnome-control-center-2.32.0.tar.bz2) = 17CefgczPai0aKGyr3pkzRLhvyvVDFfiwA5MMGQvEC8= +SIZE (gnome/gnome-control-center-2.32.0.tar.bz2) = 2248711 diff --git a/x11/gnome/controlcenter2/patches/patch-capplets_keyboard_Makefile_in b/x11/gnome/controlcenter2/patches/patch-capplets_keyboard_Makefile_in index a7f29bb1844..056e7dfc753 100644 --- a/x11/gnome/controlcenter2/patches/patch-capplets_keyboard_Makefile_in +++ b/x11/gnome/controlcenter2/patches/patch-capplets_keyboard_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-capplets_keyboard_Makefile_in,v 1.7 2010/04/22 22:32:19 ajacoutot Exp $ ---- capplets/keyboard/Makefile.in.orig Mon Mar 29 16:36:41 2010 -+++ capplets/keyboard/Makefile.in Fri Apr 23 00:12:22 2010 -@@ -218,7 +218,7 @@ LIBGNOMEKBDUI_LIBS = @LIBGNOMEKBDUI_LIBS@ +$OpenBSD: patch-capplets_keyboard_Makefile_in,v 1.8 2010/09/30 07:33:38 ajacoutot Exp $ +--- capplets/keyboard/Makefile.in.orig Mon Sep 27 15:30:10 2010 ++++ capplets/keyboard/Makefile.in Wed Sep 29 13:43:56 2010 +@@ -222,7 +222,7 @@ LIBGNOMEKBDUI_LIBS = @LIBGNOMEKBDUI_LIBS@ LIBGNOMEKBD_CFLAGS = @LIBGNOMEKBD_CFLAGS@ LIBGNOMEKBD_LIBS = @LIBGNOMEKBD_LIBS@ LIBOBJS = @LIBOBJS@ diff --git a/x11/gnome/controlcenter2/patches/patch-configure b/x11/gnome/controlcenter2/patches/patch-configure index 000c4ed3427..539634bc547 100644 --- a/x11/gnome/controlcenter2/patches/patch-configure +++ b/x11/gnome/controlcenter2/patches/patch-configure @@ -1,12 +1,12 @@ -$OpenBSD: patch-configure,v 1.12 2010/04/22 22:32:19 ajacoutot Exp $ +$OpenBSD: patch-configure,v 1.13 2010/09/30 07:33:38 ajacoutot Exp $ XCURSOR_ICONDIR is set in CONFIGURE_ENV. We do not use the default ${X11BASE}/share/icons because ports (e.g. xcursor-themes) install cursor themes under ${LOCALBASE}/lib/X11/icons ---- configure.orig Mon Mar 29 16:36:39 2010 -+++ configure Fri Apr 23 00:13:01 2010 -@@ -14276,7 +14276,7 @@ if test "x$ac_cv_header_X11_extensions_xf86misc_h" = x +--- configure.orig Mon Sep 27 15:30:08 2010 ++++ configure Wed Sep 29 13:43:56 2010 +@@ -14446,7 +14446,7 @@ if test "x$ac_cv_header_X11_extensions_xf86misc_h" = x cat >>confdefs.h <<_ACEOF #define HAVE_X11_EXTENSIONS_XF86MISC_H 1 _ACEOF @@ -15,7 +15,7 @@ xcursor-themes) install cursor themes under ${LOCALBASE}/lib/X11/icons fi done -@@ -15924,23 +15924,6 @@ fi +@@ -16164,23 +16164,6 @@ fi diff --git a/x11/gnome/controlcenter2/patches/patch-libslab-directory-tile_c b/x11/gnome/controlcenter2/patches/patch-libslab-directory-tile_c deleted file mode 100644 index 5166ed1346a..00000000000 --- a/x11/gnome/controlcenter2/patches/patch-libslab-directory-tile_c +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-libslab-directory-tile_c,v 1.5 2009/10/15 15:52:37 jasper Exp $ ---- libslab/directory-tile.c.orig Mon Aug 24 13:13:11 2009 -+++ libslab/directory-tile.c Thu Oct 15 17:35:30 2009 -@@ -624,7 +624,11 @@ static void - disown_spawned_child (gpointer user_data) - { - setsid (); -+#if defined(__OpenBSD__) -+ setpgrp (0,0); -+#else - setpgrp (); -+#endif - } - - static void diff --git a/x11/gnome/controlcenter2/patches/patch-po_ml_po b/x11/gnome/controlcenter2/patches/patch-po_ml_po deleted file mode 100644 index 3b55a72c0e9..00000000000 --- a/x11/gnome/controlcenter2/patches/patch-po_ml_po +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-po_ml_po,v 1.1 2010/04/26 16:15:46 ajacoutot Exp $ ---- po/ml.po.orig Mon Apr 26 18:02:19 2010 -+++ po/ml.po Mon Apr 26 18:03:02 2010 -@@ -3162,7 +3162,7 @@ msgid "" - "applications.desktop,Add Printer;gnome-cups-manager.desktop]" - msgstr "" - "[രംഗവിതാനം മാറ്റുക;gnome-appearance-properties.desktop,മുന്‍ഗണനാ പ്രയോഗങ്ങള്‍ സജ്ജമാക്കുക;" --"gnome-default-applications.desktop,പ്രിന്റര്‍ ചേര്‍ക്കുക;system-config-printer.desktop] " -+"gnome-default-applications.desktop,പ്രിന്റര്‍ ചേര്‍ക്കുക;system-config-printer.desktop]" - - #: ../shell/control-center.schemas.in.h:14 - msgid "if true, the control-center will close when a \"Common Task\" is activated." diff --git a/x11/gnome/controlcenter2/pkg/PLIST b/x11/gnome/controlcenter2/pkg/PLIST index 74246c1273d..39fd30ce490 100644 --- a/x11/gnome/controlcenter2/pkg/PLIST +++ b/x11/gnome/controlcenter2/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.35 2010/04/22 22:32:19 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.36 2010/09/30 07:33:38 ajacoutot Exp $ @conflict control-center-1* @conflict control-center2-* @pkgpath x11/gnome/controlcenter2 @@ -31,6 +31,7 @@ lib/window-manager-settings/ lib/window-manager-settings/libmetacity.a lib/window-manager-settings/libmetacity.la lib/window-manager-settings/libmetacity.so +@bin sbin/gnome-display-properties-install-systemwide share/applications/at-properties.desktop share/applications/default-applications.desktop share/applications/display-properties.desktop @@ -71,8 +72,6 @@ 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/left-index-finger.png @@ -163,6 +162,8 @@ share/gnome/help/control-center/es/ share/gnome/help/control-center/es/control-center.xml share/gnome/help/control-center/fr/ share/gnome/help/control-center/fr/control-center.xml +share/gnome/help/control-center/id/ +share/gnome/help/control-center/id/control-center.xml share/gnome/help/control-center/it/ share/gnome/help/control-center/it/control-center.xml share/gnome/help/control-center/ja/ @@ -189,23 +190,23 @@ share/gnome/help/control-center/vi/ share/gnome/help/control-center/vi/control-center.xml share/gnome/help/control-center/zh_CN/ share/gnome/help/control-center/zh_CN/control-center.xml -share/icons/hicolor/16x16/apps/gnome-display-properties.png share/icons/hicolor/16x16/apps/gnome-network-properties.png share/icons/hicolor/16x16/apps/gnome-settings-default-applications.png -share/icons/hicolor/22x22/apps/gnome-display-properties.png +share/icons/hicolor/16x16/apps/preferences-desktop-display.png share/icons/hicolor/22x22/apps/gnome-network-properties.png share/icons/hicolor/22x22/apps/gnome-settings-default-applications.png -share/icons/hicolor/24x24/apps/gnome-display-properties.png +share/icons/hicolor/22x22/apps/preferences-desktop-display.png share/icons/hicolor/24x24/apps/gnome-network-properties.png share/icons/hicolor/24x24/apps/gnome-settings-default-applications.png -share/icons/hicolor/32x32/apps/gnome-display-properties.png +share/icons/hicolor/24x24/apps/preferences-desktop-display.png share/icons/hicolor/32x32/apps/gnome-network-properties.png share/icons/hicolor/32x32/apps/gnome-settings-default-applications.png +share/icons/hicolor/32x32/apps/preferences-desktop-display.png share/icons/hicolor/48x48/apps/gnome-network-properties.png share/icons/hicolor/48x48/apps/gnome-settings-default-applications.png share/icons/hicolor/48x48/apps/typing-monitor.png -share/icons/hicolor/scalable/apps/gnome-display-properties.svg share/icons/hicolor/scalable/apps/gnome-network-properties.svg +share/icons/hicolor/scalable/apps/preferences-desktop-display.svg share/icons/hicolor/scalable/apps/typing-monitor.svg share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo @@ -250,6 +251,7 @@ share/locale/is/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/it/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo +share/locale/kk/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/kn/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo @@ -288,6 +290,7 @@ share/locale/ta/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/th/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/tr/LC_MESSAGES/gnome-control-center-2.0.mo +share/locale/ug/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/uk/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/uz/LC_MESSAGES/gnome-control-center-2.0.mo share/locale/uz@cyrillic/LC_MESSAGES/gnome-control-center-2.0.mo @@ -309,6 +312,7 @@ share/omf/control-center/control-center-el.omf share/omf/control-center/control-center-en_GB.omf share/omf/control-center/control-center-es.omf share/omf/control-center/control-center-fr.omf +share/omf/control-center/control-center-id.omf share/omf/control-center/control-center-it.omf share/omf/control-center/control-center-ja.omf share/omf/control-center/control-center-oc.omf @@ -322,6 +326,7 @@ share/omf/control-center/control-center-th.omf share/omf/control-center/control-center-uk.omf share/omf/control-center/control-center-vi.omf share/omf/control-center/control-center-zh_CN.omf +share/polkit-1/actions/org.gnome.randr.policy @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null ${SCHEMAS_INSTDIR}/control-center.schemas ${SCHEMAS_INSTDIR}/fontilus.schemas