diff --git a/net/gnome-online-accounts/Makefile b/net/gnome-online-accounts/Makefile index 80db94b87db6..0ceb9592b13a 100644 --- a/net/gnome-online-accounts/Makefile +++ b/net/gnome-online-accounts/Makefile @@ -1,26 +1,28 @@ -# $NetBSD: Makefile,v 1.36 2020/06/02 08:22:51 adam Exp $ +# $NetBSD: Makefile,v 1.37 2020/06/10 20:13:01 nia Exp $ -DISTNAME= gnome-online-accounts-3.28.0 -PKGREVISION= 14 -CATEGORIES= net devel -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-online-accounts/3.28/} +DISTNAME= gnome-online-accounts-3.36.0 +CATEGORIES= net gnome +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-online-accounts/3.36/} EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://wiki.gnome.org/Projects/GnomeOnlineAccounts COMMENT= Service that allows online accounts to be used with GNOME -LICENSE= gnu-gpl-v2 +LICENSE= gnu-lgpl-v2 -BUILD_DEPENDS+= gtk-doc>=1.3:../../textproc/gtk-doc TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake intltool pkg-config msgfmt +USE_TOOLS+= pkg-config gmake +USE_TOOLS+= msgfmt msgmerge xgettext + +CONFIGURE_ENV+= GLIB_COMPILE_SCHEMAS=glib-compile-schemas + +PKGCONFIG_OVERRIDE+= src/goabackend/goa-backend-1.0.pc.in +PKGCONFIG_OVERRIDE+= src/goa/goa-1.0.pc.in .include "../../chat/telepathy-glib/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .include "../../devel/glib2/schemas.mk" .include "../../devel/gobject-introspection/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" @@ -28,7 +30,6 @@ USE_TOOLS+= gmake intltool pkg-config msgfmt .include "../../security/libsecret/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../textproc/json-glib/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" .include "../../www/librest07/buildlink3.mk" .include "../../www/webkit-gtk/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" diff --git a/net/gnome-online-accounts/PLIST b/net/gnome-online-accounts/PLIST index 2c83024a4007..36c7aa637ffe 100644 --- a/net/gnome-online-accounts/PLIST +++ b/net/gnome-online-accounts/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2018/05/31 14:44:30 youri Exp $ +@comment $NetBSD: PLIST,v 1.3 2020/06/10 20:13:01 nia Exp $ include/goa-1.0/goa/goa-generated.h include/goa-1.0/goa/goa.h include/goa-1.0/goa/goaclient.h @@ -18,65 +18,28 @@ lib/libgoa-backend-1.0.la lib/pkgconfig/goa-1.0.pc lib/pkgconfig/goa-backend-1.0.pc libexec/goa-daemon -man/man8/goa-daemon.8 share/dbus-1/services/org.gnome.OnlineAccounts.service share/gir-1.0/Goa-1.0.gir share/glib-2.0/schemas/org.gnome.online-accounts.gschema.xml -share/icons/hicolor/16x16/apps/goa-account-facebook.png -share/icons/hicolor/16x16/apps/goa-account-flickr.png -share/icons/hicolor/16x16/apps/goa-account-foursquare.png -share/icons/hicolor/16x16/apps/goa-account-google.png -share/icons/hicolor/16x16/apps/goa-account-msn.png -share/icons/hicolor/16x16/apps/goa-account-owncloud.png -share/icons/hicolor/16x16/apps/goa-account-pocket.png -share/icons/hicolor/16x16/apps/goa-account-todoist.png -share/icons/hicolor/16x16/apps/goa-account.png -share/icons/hicolor/22x22/apps/goa-account-facebook.png -share/icons/hicolor/22x22/apps/goa-account-flickr.png -share/icons/hicolor/22x22/apps/goa-account-foursquare.png -share/icons/hicolor/22x22/apps/goa-account-google.png -share/icons/hicolor/22x22/apps/goa-account-msn.png -share/icons/hicolor/22x22/apps/goa-account-owncloud.png -share/icons/hicolor/22x22/apps/goa-account-pocket.png -share/icons/hicolor/22x22/apps/goa-account-todoist.png -share/icons/hicolor/22x22/apps/goa-account.png -share/icons/hicolor/24x24/apps/goa-account-facebook.png -share/icons/hicolor/24x24/apps/goa-account-flickr.png -share/icons/hicolor/24x24/apps/goa-account-foursquare.png -share/icons/hicolor/24x24/apps/goa-account-google.png -share/icons/hicolor/24x24/apps/goa-account-msn.png -share/icons/hicolor/24x24/apps/goa-account-owncloud.png -share/icons/hicolor/24x24/apps/goa-account-pocket.png -share/icons/hicolor/24x24/apps/goa-account-todoist.png -share/icons/hicolor/24x24/apps/goa-account.png -share/icons/hicolor/256x256/apps/goa-account.png -share/icons/hicolor/32x32/apps/goa-account-facebook.png -share/icons/hicolor/32x32/apps/goa-account-flickr.png -share/icons/hicolor/32x32/apps/goa-account-foursquare.png -share/icons/hicolor/32x32/apps/goa-account-google.png -share/icons/hicolor/32x32/apps/goa-account-msn.png -share/icons/hicolor/32x32/apps/goa-account-owncloud.png -share/icons/hicolor/32x32/apps/goa-account-pocket.png -share/icons/hicolor/32x32/apps/goa-account-todoist.png -share/icons/hicolor/32x32/apps/goa-account.png -share/icons/hicolor/48x48/apps/goa-account-facebook.png -share/icons/hicolor/48x48/apps/goa-account-flickr.png -share/icons/hicolor/48x48/apps/goa-account-foursquare.png -share/icons/hicolor/48x48/apps/goa-account-google.png -share/icons/hicolor/48x48/apps/goa-account-msn.png -share/icons/hicolor/48x48/apps/goa-account-owncloud.png -share/icons/hicolor/48x48/apps/goa-account-pocket.png -share/icons/hicolor/48x48/apps/goa-account-todoist.png -share/icons/hicolor/48x48/apps/goa-account.png -share/icons/hicolor/96x96/apps/goa-account-facebook.png -share/icons/hicolor/96x96/apps/goa-account-flickr.png -share/icons/hicolor/96x96/apps/goa-account-foursquare.png -share/icons/hicolor/96x96/apps/goa-account-google.png -share/icons/hicolor/96x96/apps/goa-account-msn.png -share/icons/hicolor/96x96/apps/goa-account-owncloud.png -share/icons/hicolor/96x96/apps/goa-account-pocket.png -share/icons/hicolor/96x96/apps/goa-account-todoist.png -share/icons/hicolor/96x96/apps/goa-account.png +share/icons/hicolor/scalable/apps/goa-account-exchange.svg +share/icons/hicolor/scalable/apps/goa-account-facebook.svg +share/icons/hicolor/scalable/apps/goa-account-fedora.svg +share/icons/hicolor/scalable/apps/goa-account-flickr.svg +share/icons/hicolor/scalable/apps/goa-account-foursquare.svg +share/icons/hicolor/scalable/apps/goa-account-google.svg +share/icons/hicolor/scalable/apps/goa-account-lastfm.svg +share/icons/hicolor/scalable/apps/goa-account-msn.svg +share/icons/hicolor/scalable/apps/goa-account-owncloud.svg +share/icons/hicolor/scalable/apps/goa-account.svg +share/icons/hicolor/symbolic/apps/goa-account-exchange-symbolic.svg +share/icons/hicolor/symbolic/apps/goa-account-facebook-symbolic.svg +share/icons/hicolor/symbolic/apps/goa-account-flickr-symbolic.svg +share/icons/hicolor/symbolic/apps/goa-account-foursquare-symbolic.svg +share/icons/hicolor/symbolic/apps/goa-account-google-symbolic.svg +share/icons/hicolor/symbolic/apps/goa-account-lastfm-symbolic.svg +share/icons/hicolor/symbolic/apps/goa-account-msn-symbolic.svg +share/icons/hicolor/symbolic/apps/goa-account-owncloud-symbolic.svg +share/icons/hicolor/symbolic/apps/goa-account-symbolic.svg share/locale/af/LC_MESSAGES/gnome-online-accounts.mo share/locale/an/LC_MESSAGES/gnome-online-accounts.mo share/locale/ar/LC_MESSAGES/gnome-online-accounts.mo @@ -88,6 +51,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-online-accounts.mo share/locale/bs/LC_MESSAGES/gnome-online-accounts.mo share/locale/ca/LC_MESSAGES/gnome-online-accounts.mo share/locale/ca@valencia/LC_MESSAGES/gnome-online-accounts.mo +share/locale/ckb/LC_MESSAGES/gnome-online-accounts.mo share/locale/cs/LC_MESSAGES/gnome-online-accounts.mo share/locale/da/LC_MESSAGES/gnome-online-accounts.mo share/locale/de/LC_MESSAGES/gnome-online-accounts.mo @@ -113,12 +77,14 @@ share/locale/id/LC_MESSAGES/gnome-online-accounts.mo share/locale/is/LC_MESSAGES/gnome-online-accounts.mo share/locale/it/LC_MESSAGES/gnome-online-accounts.mo share/locale/ja/LC_MESSAGES/gnome-online-accounts.mo +share/locale/kab/LC_MESSAGES/gnome-online-accounts.mo share/locale/kk/LC_MESSAGES/gnome-online-accounts.mo share/locale/km/LC_MESSAGES/gnome-online-accounts.mo share/locale/kn/LC_MESSAGES/gnome-online-accounts.mo share/locale/ko/LC_MESSAGES/gnome-online-accounts.mo share/locale/lt/LC_MESSAGES/gnome-online-accounts.mo share/locale/lv/LC_MESSAGES/gnome-online-accounts.mo +share/locale/mjw/LC_MESSAGES/gnome-online-accounts.mo share/locale/mk/LC_MESSAGES/gnome-online-accounts.mo share/locale/ml/LC_MESSAGES/gnome-online-accounts.mo share/locale/mr/LC_MESSAGES/gnome-online-accounts.mo diff --git a/net/gnome-online-accounts/buildlink3.mk b/net/gnome-online-accounts/buildlink3.mk index f945c149eaf2..f0fbebb194c7 100644 --- a/net/gnome-online-accounts/buildlink3.mk +++ b/net/gnome-online-accounts/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2020/06/02 08:22:51 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2020/06/10 20:13:01 nia Exp $ BUILDLINK_TREE+= gnome-online-accounts @@ -9,11 +9,7 @@ BUILDLINK_API_DEPENDS.gnome-online-accounts+= gnome-online-accounts>=3.29.1 BUILDLINK_ABI_DEPENDS.gnome-online-accounts?= gnome-online-accounts>=3.28.0nb14 BUILDLINK_PKGSRCDIR.gnome-online-accounts?= ../../net/gnome-online-accounts -.include "../../security/libgcrypt/buildlink3.mk" -.include "../../security/libsecret/buildlink3.mk" -.include "../../textproc/json-glib/buildlink3.mk" -.include "../../www/librest07/buildlink3.mk" -.include "../../www/webkit-gtk/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" .endif # GNOME_ONLINE_ACCOUNTS_BUILDLINK3_MK BUILDLINK_TREE+= -gnome-online-accounts diff --git a/net/gnome-online-accounts/distinfo b/net/gnome-online-accounts/distinfo index a1db8218bb78..0098fecd3fe7 100644 --- a/net/gnome-online-accounts/distinfo +++ b/net/gnome-online-accounts/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2018/06/01 22:00:06 youri Exp $ +$NetBSD: distinfo,v 1.6 2020/06/10 20:13:01 nia Exp $ -SHA1 (gnome-online-accounts-3.28.0.tar.xz) = 3185530d5605cda0d11ee975e2985bfe59686d74 -RMD160 (gnome-online-accounts-3.28.0.tar.xz) = 70a77e53014a96df9e645c324e0b9a57042e7bb4 -SHA512 (gnome-online-accounts-3.28.0.tar.xz) = b5f83544aca0cd24dbc778a492e0da4ca82eb6acaab375daaf7aa1482acfd31c1ba82c1afc127a8890a63e883ac8a1f277da906819573d672d2d3da7f582c02b -Size (gnome-online-accounts-3.28.0.tar.xz) = 1531200 bytes -SHA1 (patch-configure) = ae6503051574e8a918362c1ec547b5399d078206 +SHA1 (gnome-online-accounts-3.36.0.tar.xz) = e1b1f5ddd9d78e9f0822284ddb53f771fe9a96e0 +RMD160 (gnome-online-accounts-3.36.0.tar.xz) = dd5bc0427140b0eaab80687ec53efe4b8ea9f23e +SHA512 (gnome-online-accounts-3.36.0.tar.xz) = 2d04ea016c1bace9a2cb6ef7a6539c7f878cfa9b309394b18ed692ef1b9b73bf5f93a3f9edcb74170f1be4823a5c9ac6cde3b4e7245906e1b4e130d33eeb1c81 +Size (gnome-online-accounts-3.36.0.tar.xz) = 860472 bytes +SHA1 (patch-configure) = db66ef8d31189e5b92b0e8e9d9db40b88f87d72c diff --git a/net/gnome-online-accounts/patches/patch-configure b/net/gnome-online-accounts/patches/patch-configure index 7ca62dba6af4..dec1952b3334 100644 --- a/net/gnome-online-accounts/patches/patch-configure +++ b/net/gnome-online-accounts/patches/patch-configure @@ -1,10 +1,28 @@ -$NetBSD: patch-configure,v 1.1 2018/05/31 14:45:56 youri Exp $ +$NetBSD: patch-configure,v 1.2 2020/06/10 20:13:01 nia Exp $ -Portability fix. +Shell portability. ---- configure.orig 2018-04-17 15:48:19.000000000 +0000 +--- configure.orig 2020-03-10 13:08:11.000000000 +0000 +++ configure -@@ -16773,14 +16773,14 @@ fi +@@ -16991,14 +16991,14 @@ fi + + + if test "$enable_fedora" != "no"; then +- if test "$enable_fedora" == "yes" && +- test "$have_fedora" == "no" ; then ++ if test "$enable_fedora" = "yes" && ++ test "$have_fedora" = "no" ; then + as_fn_error $? "Fedora Account System support requested, but not available" "$LINENO" 5 + fi + + enable_fedora=$have_fedora + +- if test "$enable_fedora" == "yes"; then ++ if test "$enable_fedora" = "yes"; then + + $as_echo "#define GCR_API_SUBJECT_TO_CHANGE 1" >>confdefs.h + +@@ -17389,14 +17389,14 @@ fi if test "$enable_kerberos" != "no"; then