diff --git a/x11/gnome/controlcenter/Makefile b/x11/gnome/controlcenter/Makefile index 871612e78bd..d635b7a8808 100644 --- a/x11/gnome/controlcenter/Makefile +++ b/x11/gnome/controlcenter/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.63 2012/05/14 17:46:22 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.64 2012/05/15 14:31:18 ajacoutot Exp $ # XXX Binary files patch-panels_info_hostnames-test_txt and # patch-panels_info_hostnames-test_txt.new differ @@ -9,8 +9,7 @@ SHARED_ONLY= Yes COMMENT= GNOME control center GNOME_PROJECT= gnome-control-center -GNOME_VERSION= 3.4.1 -REVISION= 0 +GNOME_VERSION= 3.4.2 CATEGORIES= x11 @@ -53,9 +52,9 @@ LIB_DEPENDS= x11/gnome/desktop \ audio/libcanberra,-gtk3 \ graphics/colord -BUILD_DEPENDS= x11/gnome/settings-daemon>=3.4.1p1 \ +BUILD_DEPENDS= x11/gnome/settings-daemon>=3.4.2 \ devel/gsettings-desktop-schemas -RUN_DEPENDS= x11/gnome/settings-daemon>=3.4.1p1 \ +RUN_DEPENDS= x11/gnome/settings-daemon>=3.4.2 \ devel/gsettings-desktop-schemas # NOTE that a11y dependencies (e.g. mousetweaks, caribou...) are not diff --git a/x11/gnome/controlcenter/distinfo b/x11/gnome/controlcenter/distinfo index ed5f78257f4..b697556ef94 100644 --- a/x11/gnome/controlcenter/distinfo +++ b/x11/gnome/controlcenter/distinfo @@ -1,5 +1,5 @@ -MD5 (gnome/gnome-control-center-3.4.1.tar.xz) = +aZVUOgtzVXKI86qWhSJ9g== -RMD160 (gnome/gnome-control-center-3.4.1.tar.xz) = CCO3WZCyhdk4Jq5x1Mqrg+NCzzU= -SHA1 (gnome/gnome-control-center-3.4.1.tar.xz) = C6ValGIR9w7LfBlc//jKc6jwHGU= -SHA256 (gnome/gnome-control-center-3.4.1.tar.xz) = xs5Oz1t0eqM6WQSwU8HE/RijndzQkIRjVY6LS0DsP9E= -SIZE (gnome/gnome-control-center-3.4.1.tar.xz) = 4416236 +MD5 (gnome/gnome-control-center-3.4.2.tar.xz) = zrsn2HvfyBdQc+67ZhCkmA== +RMD160 (gnome/gnome-control-center-3.4.2.tar.xz) = 5e8gz4DRSM0KlKnUIgasF4Bd1k0= +SHA1 (gnome/gnome-control-center-3.4.2.tar.xz) = 9SltGujq3iKtif4wz+MkIMBo8Bs= +SHA256 (gnome/gnome-control-center-3.4.2.tar.xz) = 78cr+K8HtDn18OkTXRssUjfmSeag8f888yvdcQQhBCo= +SIZE (gnome/gnome-control-center-3.4.2.tar.xz) = 4267688 diff --git a/x11/gnome/controlcenter/patches/patch-configure b/x11/gnome/controlcenter/patches/patch-configure index e65f1a9d983..60d44ad8671 100644 --- a/x11/gnome/controlcenter/patches/patch-configure +++ b/x11/gnome/controlcenter/patches/patch-configure @@ -1,11 +1,11 @@ -$OpenBSD: patch-configure,v 1.16 2012/04/17 11:02:32 jasper Exp $ +$OpenBSD: patch-configure,v 1.17 2012/05/15 14:31:18 ajacoutot Exp $ No libwacom on OpenBSD (depends on gudev; gnome-bluetooth is needed for the wacom panel). ---- configure.orig Mon Apr 16 15:25:07 2012 -+++ configure Tue Apr 17 12:52:09 2012 -@@ -15558,124 +15558,6 @@ $as_echo "yes" >&6; } +--- configure.orig Tue May 15 12:20:15 2012 ++++ configure Tue May 15 16:22:04 2012 +@@ -15671,124 +15671,6 @@ $as_echo "yes" >&6; } fi diff --git a/x11/gnome/controlcenter/patches/patch-panels_Makefile_in b/x11/gnome/controlcenter/patches/patch-panels_Makefile_in index 46ec28f6e5f..fdb3f424961 100644 --- a/x11/gnome/controlcenter/patches/patch-panels_Makefile_in +++ b/x11/gnome/controlcenter/patches/patch-panels_Makefile_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-panels_Makefile_in,v 1.5 2012/03/29 06:57:03 ajacoutot Exp $ +$OpenBSD: patch-panels_Makefile_in,v 1.6 2012/05/15 14:31:18 ajacoutot Exp $ No libwacom on OpenBSD (depends on gudev; gnome-bluetooth is needed for the wacom panel). ---- panels/Makefile.in.orig Wed Mar 28 10:34:58 2012 -+++ panels/Makefile.in Wed Mar 28 10:35:08 2012 +--- panels/Makefile.in.orig Tue May 15 12:20:15 2012 ++++ panels/Makefile.in Tue May 15 16:22:04 2012 @@ -73,7 +73,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = common background screen power color display mouse \ @@ -14,7 +14,7 @@ the wacom panel). DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ -@@ -305,7 +305,7 @@ top_builddir = @top_builddir@ +@@ -311,7 +311,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = common background screen power color display mouse \ online-accounts region info sound keyboard universal-access \ diff --git a/x11/gnome/controlcenter/patches/patch-panels_common_Makefile_in b/x11/gnome/controlcenter/patches/patch-panels_common_Makefile_in index d35f519defa..56a77082b77 100644 --- a/x11/gnome/controlcenter/patches/patch-panels_common_Makefile_in +++ b/x11/gnome/controlcenter/patches/patch-panels_common_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-panels_common_Makefile_in,v 1.4 2012/04/17 11:02:32 jasper Exp $ ---- panels/common/Makefile.in.orig Mon Apr 16 15:25:09 2012 -+++ panels/common/Makefile.in Tue Apr 17 12:52:09 2012 -@@ -338,7 +338,7 @@ AM_CPPFLAGS = \ +$OpenBSD: patch-panels_common_Makefile_in,v 1.5 2012/05/15 14:31:18 ajacoutot Exp $ +--- panels/common/Makefile.in.orig Tue May 15 12:20:17 2012 ++++ panels/common/Makefile.in Tue May 15 16:22:04 2012 +@@ -350,7 +350,7 @@ AM_CPPFLAGS = \ $(LIBLANGUAGE_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ -DUIDIR=\""$(pkgdatadir)/ui"\" \ diff --git a/x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_in b/x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_in index 0f1787b7b83..0bd5dc09d79 100644 --- a/x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_in +++ b/x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-panels_user-accounts_Makefile_in,v 1.6 2012/04/17 11:02:32 jasper Exp $ +$OpenBSD: patch-panels_user-accounts_Makefile_in,v 1.7 2012/05/15 14:31:18 ajacoutot Exp $ On OpenBSD, crypt() is part of libc. ---- panels/user-accounts/Makefile.in.orig Mon Apr 16 15:25:14 2012 -+++ panels/user-accounts/Makefile.in Tue Apr 17 12:52:09 2012 -@@ -372,7 +372,7 @@ ccpanelsdir = $(PANELS_DIR) +--- panels/user-accounts/Makefile.in.orig Tue May 15 12:20:23 2012 ++++ panels/user-accounts/Makefile.in Tue May 15 16:22:04 2012 +@@ -384,7 +384,7 @@ ccpanelsdir = $(PANELS_DIR) ccpanels_LTLIBRARIES = libuser-accounts.la AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" \ -DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \ @@ -13,7 +13,7 @@ On OpenBSD, crypt() is part of libc. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \ -I$(srcdir)/../common/ -I$(srcdir)/../../shell/ \ -@@ -408,7 +408,7 @@ libuser_accounts_la_SOURCES = \ +@@ -420,7 +420,7 @@ libuser_accounts_la_SOURCES = \ um-user-module.c libuser_accounts_la_LIBADD = $(PANEL_LIBS) $(USER_ACCOUNTS_PANEL_LIBS) \