diff --git a/x11/gnome/libsecret/Makefile b/x11/gnome/libsecret/Makefile index f3e69c04da1..e26843d1883 100644 --- a/x11/gnome/libsecret/Makefile +++ b/x11/gnome/libsecret/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.26 2013/12/14 08:17:50 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.27 2014/03/09 22:22:10 ajacoutot Exp $ -COMMENT= library for storing and retrieving passwords and secrets +COMMENT= library for storing and retrieving passwords and secrets -GNOME_PROJECT= libsecret -GNOME_VERSION= 0.16 -REVISION= 2 +GNOME_PROJECT= libsecret +GNOME_VERSION= 0.18 -SHARED_LIBS += secret-1 0.1 # 0.0 +SHARED_LIBS += secret-1 1.0 # 0.0 # GPLv2 PERMIT_PACKAGE_CDROM= Yes @@ -14,31 +13,31 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += c ffi gcrypt gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 WANTLIB += gpg-error pcre pthread z -MODULES= devel/gettext \ - x11/gnome +MODULES= devel/gettext \ + x11/gnome -MODGNOME_TOOLS= gi vala +MODGNOME_TOOLS= gi vala # man pages -BUILD_DEPENDS += textproc/docbook-xsl +BUILD_DEPENDS += textproc/docbook-xsl -LIB_DEPENDS= devel/glib2 \ - security/libgcrypt +LIB_DEPENDS= devel/glib2 \ + security/libgcrypt # org.freedesktop.secrets # (XXX add "gnome-keyring-*|ksecretsservice-*" when implemented) -RUN_DEPENDS += x11/gnome/keyring +RUN_DEPENDS += x11/gnome/keyring # unable to autolaunch a dbus-daemon without a $DISPLAY for X11 TEST_IS_INTERACTIVE= X11 -TEST_DEPENDS= devel/py-gobject3 \ - x11/dbus-python +TEST_DEPENDS= devel/py-gobject3 \ + x11/dbus-python -pre-configure: - ${SUBST_CMD} ${WRKSRC}/libsecret/tests/Makefile.in \ - ${WRKSRC}/libsecret/tests/mock-service.c - -# these files call "python", libsecret/tests/{Makefile.in,mock-service.c} +# regression tests call 'python' directly +MODULES += lang/python +TEST_DEPENDS += ${MODPY_RUN_DEPENDS} +MODPY_RUNDEP= No +MODPY_BUILDDEP= No pre-test: ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python diff --git a/x11/gnome/libsecret/distinfo b/x11/gnome/libsecret/distinfo index 17f8f6dbfb8..87975567156 100644 --- a/x11/gnome/libsecret/distinfo +++ b/x11/gnome/libsecret/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/libsecret-0.16.tar.xz) = uFlAbEkKIBGzX1lAI1MEMVs0Py79VUgAKF8kuV4U8hg= -SIZE (gnome/libsecret-0.16.tar.xz) = 499888 +SHA256 (gnome/libsecret-0.18.tar.xz) = DHOqdi29Hji6ewPeNQ4jzoGMuBCweEN16V72HgBLAuM= +SIZE (gnome/libsecret-0.18.tar.xz) = 480520 diff --git a/x11/gnome/libsecret/patches/patch-libsecret_Makefile_in b/x11/gnome/libsecret/patches/patch-libsecret_Makefile_in deleted file mode 100644 index f58ca0a9b12..00000000000 --- a/x11/gnome/libsecret/patches/patch-libsecret_Makefile_in +++ /dev/null @@ -1,34 +0,0 @@ -$OpenBSD: patch-libsecret_Makefile_in,v 1.1 2013/12/14 08:17:50 ajacoutot Exp $ - -From 8d297361de86da651bf9caf809cf3f778cfad10e Mon Sep 17 00:00:00 2001 -From: Stef Walter -Date: Wed, 11 Dec 2013 08:41:27 +0000 -Subject: libsecret: Don't use non-portable sed -i shell command - ---- libsecret/Makefile.in.orig Wed Aug 14 08:14:03 2013 -+++ libsecret/Makefile.in Sat Dec 14 09:08:57 2013 -@@ -1280,13 +1280,19 @@ perform-memcheck: $(TEST_PROGS) $(TEST_SUPPRESSIONS) - @WITH_COVERAGE_TRUE@clear-coverage: - @WITH_COVERAGE_TRUE@ $(LCOV) --directory . --zerocounters - --secret-dbus-generated.c: $(DBUS_XML_DEFINITIONS) Makefile.am -+temp-dbus-generated.c: $(DBUS_XML_DEFINITIONS) Makefile.am - $(AM_V_GEN) gdbus-codegen --interface-prefix org.freedesktop.Secret. \ -- --generate-c-code secret-dbus-generated --c-namespace SecretGen \ -+ --generate-c-code temp-dbus-generated --c-namespace SecretGen \ - $(DBUS_XML_DEFINITIONS) -- $(AM_V_GEN) sed -i -e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' secret-dbus-generated.[ch] -- $(AM_V_GEN) sed -i -e '1i #define GLIB_DISABLE_DEPRECATION_WARNINGS' secret-dbus-generated.c --secret-dbus-generated.h: secret-dbus-generated.c -+secret-dbus-generated.c: temp-dbus-generated.c Makefile.am -+ $(AM_V_GEN) sed -e '1i\ -+#define GLIB_DISABLE_DEPRECATION_WARNINGS' \ -+ -e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' \ -+ -e 's/temp-dbus-generated.h/secret-dbus-generated.h/g' \ -+ temp-dbus-generated.c > secret-dbus-generated.c -+secret-dbus-generated.h: temp-dbus-generated.c Makefile.am -+ $(AM_V_GEN) sed -e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' \ -+ temp-dbus-generated.h > secret-dbus-generated.h - - secret-enum-types.h: secret-enum-types.h.template $(HEADER_FILES) - $(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > $@ diff --git a/x11/gnome/libsecret/pkg/PLIST b/x11/gnome/libsecret/pkg/PLIST index beb11a1aaa2..839f097ea27 100644 --- a/x11/gnome/libsecret/pkg/PLIST +++ b/x11/gnome/libsecret/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.9 2013/12/14 08:17:50 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.10 2014/03/09 22:22:10 ajacoutot Exp $ @bin bin/secret-tool include/libsecret-1/ include/libsecret-1/libsecret/ @@ -17,7 +17,6 @@ include/libsecret-1/libsecret/secret-value.h include/libsecret-1/libsecret/secret.h lib/girepository-1.0/ lib/girepository-1.0/Secret-1.typelib -lib/girepository-1.0/SecretUnstable-0.typelib lib/libsecret-1.a lib/libsecret-1.la @lib lib/libsecret-1.so.${LIBsecret-1_VERSION} @@ -27,10 +26,8 @@ lib/pkgconfig/libsecret-unstable.pc @man man/man1/secret-tool.1 share/gir-1.0/ share/gir-1.0/Secret-1.gir -share/gir-1.0/SecretUnstable-0.gir share/gtk-doc/html/libsecret-1/ share/gtk-doc/html/libsecret-1/SecretCollection.html -share/gtk-doc/html/libsecret-1/SecretError.html share/gtk-doc/html/libsecret-1/SecretItem.html share/gtk-doc/html/libsecret-1/SecretPrompt.html share/gtk-doc/html/libsecret-1/SecretService.html @@ -49,11 +46,13 @@ share/gtk-doc/html/libsecret-1/js-examples.html share/gtk-doc/html/libsecret-1/js-lookup-example.html share/gtk-doc/html/libsecret-1/js-remove-example.html share/gtk-doc/html/libsecret-1/js-store-example.html +share/gtk-doc/html/libsecret-1/left-insensitive.png share/gtk-doc/html/libsecret-1/left.png share/gtk-doc/html/libsecret-1/libsecret-1.devhelp2 share/gtk-doc/html/libsecret-1/libsecret-DBus-Path-Related-Functions.html share/gtk-doc/html/libsecret-1/libsecret-Password-storage.html share/gtk-doc/html/libsecret-1/libsecret-Secret-Attributes.html +share/gtk-doc/html/libsecret-1/libsecret-SecretError.html share/gtk-doc/html/libsecret-1/libsecret-SecretSchema.html share/gtk-doc/html/libsecret-1/migrating-api.html share/gtk-doc/html/libsecret-1/migrating-introduction.html @@ -71,9 +70,11 @@ share/gtk-doc/html/libsecret-1/py-examples.html share/gtk-doc/html/libsecret-1/py-lookup-example.html share/gtk-doc/html/libsecret-1/py-remove-example.html share/gtk-doc/html/libsecret-1/py-store-example.html +share/gtk-doc/html/libsecret-1/right-insensitive.png share/gtk-doc/html/libsecret-1/right.png share/gtk-doc/html/libsecret-1/simple.html share/gtk-doc/html/libsecret-1/style.css +share/gtk-doc/html/libsecret-1/up-insensitive.png share/gtk-doc/html/libsecret-1/up.png share/gtk-doc/html/libsecret-1/using-c.html share/gtk-doc/html/libsecret-1/using-js.html @@ -84,9 +85,16 @@ share/gtk-doc/html/libsecret-1/vala-examples.html share/gtk-doc/html/libsecret-1/vala-lookup-example.html share/gtk-doc/html/libsecret-1/vala-remove-example.html share/gtk-doc/html/libsecret-1/vala-store-example.html +share/locale/an/LC_MESSAGES/libsecret.mo +share/locale/as/LC_MESSAGES/libsecret.mo +share/locale/be/LC_MESSAGES/libsecret.mo +share/locale/ca/LC_MESSAGES/libsecret.mo +share/locale/ca@valencia/LC_MESSAGES/libsecret.mo share/locale/cs/LC_MESSAGES/libsecret.mo share/locale/da/LC_MESSAGES/libsecret.mo share/locale/de/LC_MESSAGES/libsecret.mo +share/locale/el/LC_MESSAGES/libsecret.mo +share/locale/eo/LC_MESSAGES/libsecret.mo share/locale/es/LC_MESSAGES/libsecret.mo share/locale/fr/LC_MESSAGES/libsecret.mo share/locale/fur/LC_MESSAGES/libsecret.mo @@ -96,20 +104,25 @@ share/locale/hu/LC_MESSAGES/libsecret.mo share/locale/id/LC_MESSAGES/libsecret.mo share/locale/it/LC_MESSAGES/libsecret.mo share/locale/ja/LC_MESSAGES/libsecret.mo +share/locale/ko/LC_MESSAGES/libsecret.mo share/locale/lt/LC_MESSAGES/libsecret.mo +share/locale/lv/LC_MESSAGES/libsecret.mo +share/locale/ml/LC_MESSAGES/libsecret.mo share/locale/nb/LC_MESSAGES/libsecret.mo +share/locale/nl/LC_MESSAGES/libsecret.mo share/locale/pa/LC_MESSAGES/libsecret.mo share/locale/pl/LC_MESSAGES/libsecret.mo +share/locale/pt/LC_MESSAGES/libsecret.mo share/locale/pt_BR/LC_MESSAGES/libsecret.mo share/locale/ru/LC_MESSAGES/libsecret.mo share/locale/sk/LC_MESSAGES/libsecret.mo share/locale/sl/LC_MESSAGES/libsecret.mo share/locale/sr/LC_MESSAGES/libsecret.mo share/locale/sr@latin/LC_MESSAGES/libsecret.mo +share/locale/tg/LC_MESSAGES/libsecret.mo +share/locale/uk/LC_MESSAGES/libsecret.mo +share/locale/zh_CN/LC_MESSAGES/libsecret.mo share/locale/zh_HK/LC_MESSAGES/libsecret.mo share/locale/zh_TW/LC_MESSAGES/libsecret.mo share/vala/vapi/libsecret-1.deps share/vala/vapi/libsecret-1.vapi -share/vala/vapi/libsecret-unstable.deps -share/vala/vapi/libsecret-unstable.vapi -share/vala/vapi/mock-service-0.vapi