cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to libsecret-0.18.6.

Browse Source
This commit is contained in:
ajacoutot 2018-03-30 07:21:36 +00:00
parent 16909b93b8
commit 76f86d7082
10 changed files with 35 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
x11/gnome/libsecret/Makefile
View File

@ -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 <bsd.port.mk>

4
x11/gnome/libsecret/distinfo
View File

@ -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

21
x11/gnome/libsecret/patches/patch-Makefile_in Normal file
View File

@ -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

40
x11/gnome/libsecret/patches/patch-build_tap-driver
View File

@ -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 <mitya57@gmail.com>
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)

91
x11/gnome/libsecret/patches/patch-build_tap-gtester
View File

@ -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 <mitya57@gmail.com>
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"

15
x11/gnome/libsecret/patches/patch-build_tap-unittest
View File

@ -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 <mitya57@gmail.com>
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

20
x11/gnome/libsecret/patches/patch-libsecret_test-py-clear_py
View File

@ -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 <mitya57@gmail.com>
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

20
x11/gnome/libsecret/patches/patch-libsecret_test-py-lookup_py
View File

@ -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 <mitya57@gmail.com>
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

20
x11/gnome/libsecret/patches/patch-libsecret_test-py-store_py
View File

@ -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 <mitya57@gmail.com>
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

9
x11/gnome/libsecret/pkg/PLIST
View File

@ -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