From 76f86d708296fba4176c96d117b8344e46415b87 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 30 Mar 2018 07:21:36 +0000 Subject: [PATCH] Update to libsecret-0.18.6. --- x11/gnome/libsecret/Makefile | 19 ++-- x11/gnome/libsecret/distinfo | 4 +- x11/gnome/libsecret/patches/patch-Makefile_in | 21 +++++ .../libsecret/patches/patch-build_tap-driver | 40 -------- .../libsecret/patches/patch-build_tap-gtester | 91 ------------------- .../patches/patch-build_tap-unittest | 15 --- .../patches/patch-libsecret_test-py-clear_py | 20 ---- .../patches/patch-libsecret_test-py-lookup_py | 20 ---- .../patches/patch-libsecret_test-py-store_py | 20 ---- x11/gnome/libsecret/pkg/PLIST | 9 +- 10 files changed, 35 insertions(+), 224 deletions(-) create mode 100644 x11/gnome/libsecret/patches/patch-Makefile_in delete mode 100644 x11/gnome/libsecret/patches/patch-build_tap-driver delete mode 100644 x11/gnome/libsecret/patches/patch-build_tap-gtester delete mode 100644 x11/gnome/libsecret/patches/patch-build_tap-unittest delete mode 100644 x11/gnome/libsecret/patches/patch-libsecret_test-py-clear_py delete mode 100644 x11/gnome/libsecret/patches/patch-libsecret_test-py-lookup_py delete mode 100644 x11/gnome/libsecret/patches/patch-libsecret_test-py-store_py diff --git a/x11/gnome/libsecret/Makefile b/x11/gnome/libsecret/Makefile index ab013c86785..cc63ca2beb1 100644 --- a/x11/gnome/libsecret/Makefile +++ b/x11/gnome/libsecret/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.43 2017/10/28 23:36:23 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.44 2018/03/30 07:21:36 ajacoutot Exp $ COMMENT= library for storing and retrieving passwords and secrets GNOME_PROJECT= libsecret -GNOME_VERSION= 0.18.5 -REVISION= 0 +GNOME_VERSION= 0.18.6 SHARED_LIBS += secret-1 1.0 # 0.0 @@ -16,7 +15,6 @@ WANTLIB += gpg-error iconv intl pcre pthread z MODULES= x11/gnome -MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3} MODGNOME_TOOLS= docbook gobject-introspection vala LIB_DEPENDS= devel/glib2 \ @@ -31,15 +29,12 @@ CONFIGURE_STYLE= gnu # unable to autolaunch a dbus-daemon without a $DISPLAY for X11 TEST_IS_INTERACTIVE= X11 + +MODULES += lang/python +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3} +MODPY_RUNDEP= No +MODPY_BUILDDEP= No TEST_DEPENDS= devel/py-gobject3${MODPY_FLAVOR} \ x11/dbus-python${MODPY_FLAVOR} -# regression tests call 'env python3' -MODULES += lang/python -TEST_DEPENDS += ${MODPY_RUN_DEPENDS} -MODPY_RUNDEP= No -MODPY_BUILDDEP= No -pre-test: - ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python3 - .include diff --git a/x11/gnome/libsecret/distinfo b/x11/gnome/libsecret/distinfo index b9de113b0e2..02a7b05185c 100644 --- a/x11/gnome/libsecret/distinfo +++ b/x11/gnome/libsecret/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/libsecret-0.18.5.tar.xz) = nOe9jdWDHyeGyTXYJjisQo+ghQV8xngKug45N1iHzLM= -SIZE (gnome/libsecret-0.18.5.tar.xz) = 508556 +SHA256 (gnome/libsecret-0.18.6.tar.xz) = XvvIkLpBoyP/4Fmc0mD9Er2OtioEqhvRsnYlddJT1m8= +SIZE (gnome/libsecret-0.18.6.tar.xz) = 487836 diff --git a/x11/gnome/libsecret/patches/patch-Makefile_in b/x11/gnome/libsecret/patches/patch-Makefile_in new file mode 100644 index 00000000000..34ae9664a8b --- /dev/null +++ b/x11/gnome/libsecret/patches/patch-Makefile_in @@ -0,0 +1,21 @@ +$OpenBSD: patch-Makefile_in,v 1.1 2018/03/30 07:21:36 ajacoutot Exp $ + +https://bugzilla.gnome.org/show_bug.cgi?id=734630 + +Index: Makefile.in +--- Makefile.in.orig ++++ Makefile.in +@@ -2647,10 +2647,10 @@ temp-dbus-generated.c: $(DBUS_XML_DEFINITIONS) Makefil + $(AM_V_GEN) gdbus-codegen --interface-prefix org.freedesktop.Secret. \ + --generate-c-code temp-dbus-generated --c-namespace SecretGen $< + secret-dbus-generated.c: temp-dbus-generated.c Makefile.am +- $(AM_V_GEN) sed -e $$'1i\\\n#define GLIB_DISABLE_DEPRECATION_WARNINGS' \ +- -e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' \ ++ $(AM_V_GEN) { echo '#define GLIB_DISABLE_DEPRECATION_WARNINGS'; \ ++ sed -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 ++ 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 diff --git a/x11/gnome/libsecret/patches/patch-build_tap-driver b/x11/gnome/libsecret/patches/patch-build_tap-driver deleted file mode 100644 index 6a1023eabac..00000000000 --- a/x11/gnome/libsecret/patches/patch-build_tap-driver +++ /dev/null @@ -1,40 +0,0 @@ -$OpenBSD: patch-build_tap-driver,v 1.1 2016/04/16 08:18:27 ajacoutot Exp $ - -From d50dbae41ef973b0a858dbda5db91b8658787f3b Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -Date: Wed, 6 Apr 2016 10:37:38 +0200 -Subject: build: Port to Python 3 - ---- build/tap-driver.orig Tue Sep 23 09:49:21 2014 -+++ build/tap-driver Sat Apr 16 10:14:16 2016 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # Copyright (C) 2013 Red Hat, Inc. - # -@@ -102,7 +102,7 @@ class Driver: - proc = subprocess.Popen(self.argv, close_fds=True, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) -- except OSError, ex: -+ except OSError as ex: - self.report_error("Couldn't run %s: %s" % (self.argv[0], str(ex))) - return - -@@ -112,13 +112,13 @@ class Driver: - while len(rset) > 0: - ret = select.select(rset, [], [], 10) - if outf in ret[0]: -- data = os.read(outf, 1024) -+ data = os.read(outf, 1024).decode("utf-8") - if data == "": - rset.remove(outf) - self.log.write(data) - self.process(data) - if errf in ret[0]: -- data = os.read(errf, 1024) -+ data = os.read(errf, 1024).decode("utf-8") - if data == "": - rset.remove(errf) - self.log.write(data) diff --git a/x11/gnome/libsecret/patches/patch-build_tap-gtester b/x11/gnome/libsecret/patches/patch-build_tap-gtester deleted file mode 100644 index c6137745cfd..00000000000 --- a/x11/gnome/libsecret/patches/patch-build_tap-gtester +++ /dev/null @@ -1,91 +0,0 @@ -$OpenBSD: patch-build_tap-gtester,v 1.1 2016/04/16 08:18:27 ajacoutot Exp $ - -From d50dbae41ef973b0a858dbda5db91b8658787f3b Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -Date: Wed, 6 Apr 2016 10:37:38 +0200 -Subject: build: Port to Python 3 - ---- build/tap-gtester.orig Tue Sep 23 09:49:21 2014 -+++ build/tap-gtester Sat Apr 16 10:14:16 2016 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # Copyright (C) 2014 Red Hat, Inc. - # -@@ -42,7 +42,7 @@ class NullCompiler: - - def process(self, proc): - while True: -- line = proc.stdout.readline() -+ line = proc.stdout.readline().decode("utf-8") - if not line: - break - self.input(line) -@@ -75,27 +75,27 @@ class GTestCompiler(NullCompiler): - self.test_num += 1 - elif cmd == "result": - if data == "OK": -- print "ok %d %s" % (self.test_num, self.test_name) -+ print("ok %d %s" % (self.test_num, self.test_name)) - if data == "FAIL": -- print "not ok %d %s", (self.test_num, self.test_name) -+ print("not ok %d %s", (self.test_num, self.test_name)) - self.test_name = None - elif cmd == "skipping": - if "/subprocess" not in data: -- print "ok %d # skip -- %s" % (self.test_num, data) -+ print("ok %d # skip -- %s" % (self.test_num, data)) - self.test_name = None - elif data: -- print "# %s: %s" % (cmd, data) -+ print("# %s: %s" % (cmd, data)) - else: -- print "# %s" % cmd -+ print("# %s" % cmd) - elif line.startswith("(MSG: "): -- print "# %s" % line[6:-1] -+ print("# %s" % line[6:-1]) - elif line: -- print "# %s" % line -+ print("# %s" % line) - sys.stdout.flush() - - def run(self, proc, output=""): - # Complete retrieval of the list of tests -- output += proc.stdout.read() -+ output += proc.stdout.read().decode("utf-8") - proc.wait() - if proc.returncode: - sys.stderr.write("tap-gtester: listing GTest tests failed: %d\n" % proc.returncode) -@@ -105,10 +105,10 @@ class GTestCompiler(NullCompiler): - if line.startswith("/"): - self.test_remaining.append(line.strip()) - if not self.test_remaining: -- print "Bail out! No tests found in GTest: %s" % self.command[0] -+ print("Bail out! No tests found in GTest: %s" % self.command[0]) - return 0 - -- print "1..%d" % len(self.test_remaining) -+ print("1..%d" % len(self.test_remaining)) - - # First try to run all the tests in a batch - proc = subprocess.Popen(self.command + ["--verbose" ], close_fds=True, stdout=subprocess.PIPE) -@@ -120,7 +120,7 @@ class GTestCompiler(NullCompiler): - while True: - # Assume that the last test failed - if self.test_name: -- print "not ok %d %s" % (self.test_num, self.test_name) -+ print("not ok %d %s" % (self.test_num, self.test_name)) - self.test_name = None - - # Run any tests which didn't get run -@@ -156,7 +156,7 @@ def main(argv): - if format in ["auto", "gtest"]: - list_cmd = cmd + ["-l", "--verbose"] - proc = subprocess.Popen(list_cmd, close_fds=True, stdout=subprocess.PIPE) -- output = proc.stdout.readline() -+ output = proc.stdout.readline().decode("utf-8") - # Smell whether we're dealing with GTest list output from first line - if "random seed" in output or "GTest" in output or output.startswith("/"): - format = "gtest" diff --git a/x11/gnome/libsecret/patches/patch-build_tap-unittest b/x11/gnome/libsecret/patches/patch-build_tap-unittest deleted file mode 100644 index 524c5fb893d..00000000000 --- a/x11/gnome/libsecret/patches/patch-build_tap-unittest +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-build_tap-unittest,v 1.1 2016/04/16 08:18:27 ajacoutot Exp $ - -From d50dbae41ef973b0a858dbda5db91b8658787f3b Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -Date: Wed, 6 Apr 2016 10:37:38 +0200 -Subject: build: Port to Python 3 - ---- build/tap-unittest.orig Tue Sep 23 09:49:21 2014 -+++ build/tap-unittest Sat Apr 16 10:14:16 2016 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # - # This is a TAP compiler for python unittest diff --git a/x11/gnome/libsecret/patches/patch-libsecret_test-py-clear_py b/x11/gnome/libsecret/patches/patch-libsecret_test-py-clear_py deleted file mode 100644 index 4b9cf07816f..00000000000 --- a/x11/gnome/libsecret/patches/patch-libsecret_test-py-clear_py +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-libsecret_test-py-clear_py,v 1.1 2016/04/16 08:18:28 ajacoutot Exp $ - -From ae5761cd65b4f32e1b5f72f5b278fe21ab69f1c7 Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -Date: Wed, 6 Apr 2016 10:40:20 +0200 -Subject: libsecret: Get rid of PyGI warnings about unspecified versions - ---- libsecret/test-py-clear.py.orig Tue Sep 23 09:49:21 2014 -+++ libsecret/test-py-clear.py Sat Apr 16 10:13:32 2016 -@@ -14,6 +14,10 @@ - import sys - import unittest - -+import gi -+gi.require_version('MockService', '0') -+gi.require_version('Secret', '1') -+ - from gi.repository import MockService as Mock - from gi.repository import Secret, GLib - diff --git a/x11/gnome/libsecret/patches/patch-libsecret_test-py-lookup_py b/x11/gnome/libsecret/patches/patch-libsecret_test-py-lookup_py deleted file mode 100644 index 96989a7428c..00000000000 --- a/x11/gnome/libsecret/patches/patch-libsecret_test-py-lookup_py +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-libsecret_test-py-lookup_py,v 1.1 2016/04/16 08:18:28 ajacoutot Exp $ - -From ae5761cd65b4f32e1b5f72f5b278fe21ab69f1c7 Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -Date: Wed, 6 Apr 2016 10:40:20 +0200 -Subject: libsecret: Get rid of PyGI warnings about unspecified versions - ---- libsecret/test-py-lookup.py.orig Tue Sep 23 09:49:21 2014 -+++ libsecret/test-py-lookup.py Sat Apr 16 10:13:32 2016 -@@ -13,6 +13,10 @@ - - import unittest - -+import gi -+gi.require_version('MockService', '0') -+gi.require_version('Secret', '1') -+ - from gi.repository import MockService as Mock - from gi.repository import Secret, GLib - diff --git a/x11/gnome/libsecret/patches/patch-libsecret_test-py-store_py b/x11/gnome/libsecret/patches/patch-libsecret_test-py-store_py deleted file mode 100644 index 51d19551e19..00000000000 --- a/x11/gnome/libsecret/patches/patch-libsecret_test-py-store_py +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-libsecret_test-py-store_py,v 1.1 2016/04/16 08:18:28 ajacoutot Exp $ - -From ae5761cd65b4f32e1b5f72f5b278fe21ab69f1c7 Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -Date: Wed, 6 Apr 2016 10:40:20 +0200 -Subject: libsecret: Get rid of PyGI warnings about unspecified versions - ---- libsecret/test-py-store.py.orig Tue Sep 23 09:49:21 2014 -+++ libsecret/test-py-store.py Sat Apr 16 10:13:32 2016 -@@ -13,6 +13,10 @@ - - import unittest - -+import gi -+gi.require_version('MockService', '0') -+gi.require_version('Secret', '1') -+ - from gi.repository import MockService as Mock - from gi.repository import Secret, GLib - diff --git a/x11/gnome/libsecret/pkg/PLIST b/x11/gnome/libsecret/pkg/PLIST index ea06b31edae..677e74972bd 100644 --- a/x11/gnome/libsecret/pkg/PLIST +++ b/x11/gnome/libsecret/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.14 2016/04/16 08:18:28 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.15 2018/03/30 07:21:36 ajacoutot Exp $ @bin bin/secret-tool include/libsecret-1/ include/libsecret-1/libsecret/ @@ -40,7 +40,6 @@ share/gtk-doc/html/libsecret-1/complete.html share/gtk-doc/html/libsecret-1/examples.html share/gtk-doc/html/libsecret-1/home.png share/gtk-doc/html/libsecret-1/index.html -share/gtk-doc/html/libsecret-1/index.sgml 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 @@ -88,6 +87,7 @@ share/locale/an/LC_MESSAGES/libsecret.mo share/locale/ar/LC_MESSAGES/libsecret.mo share/locale/as/LC_MESSAGES/libsecret.mo share/locale/be/LC_MESSAGES/libsecret.mo +share/locale/bg/LC_MESSAGES/libsecret.mo share/locale/bs/LC_MESSAGES/libsecret.mo share/locale/ca/LC_MESSAGES/libsecret.mo share/locale/ca@valencia/LC_MESSAGES/libsecret.mo @@ -95,16 +95,16 @@ 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/en_GB/LC_MESSAGES/libsecret.mo share/locale/eo/LC_MESSAGES/libsecret.mo share/locale/es/LC_MESSAGES/libsecret.mo share/locale/eu/LC_MESSAGES/libsecret.mo share/locale/fa/LC_MESSAGES/libsecret.mo share/locale/fr/LC_MESSAGES/libsecret.mo -share/locale/fur/ -share/locale/fur/LC_MESSAGES/ share/locale/fur/LC_MESSAGES/libsecret.mo share/locale/gl/LC_MESSAGES/libsecret.mo share/locale/he/LC_MESSAGES/libsecret.mo +share/locale/hr/LC_MESSAGES/libsecret.mo share/locale/hu/LC_MESSAGES/libsecret.mo share/locale/id/LC_MESSAGES/libsecret.mo share/locale/it/LC_MESSAGES/libsecret.mo @@ -115,6 +115,7 @@ 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/ne/LC_MESSAGES/libsecret.mo share/locale/nl/LC_MESSAGES/libsecret.mo share/locale/oc/LC_MESSAGES/libsecret.mo share/locale/pa/LC_MESSAGES/libsecret.mo