* [PR PATCH] libsearpc: fix python3 support
@ 2021-01-20 21:42 yopito
2021-01-21 17:26 ` [PR PATCH] [Merged]: " ericonr
0 siblings, 1 reply; 2+ messages in thread
From: yopito @ 2021-01-20 21:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]
There is a new pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages seafile.issue.28041
https://github.com/void-linux/void-packages/pull/28062
libsearpc: fix python3 support
Closes: #28041
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28062.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-seafile.issue.28041-28062.patch --]
[-- Type: text/x-diff, Size: 4501 bytes --]
From 2496c8f218968c4517e0fcf77f7379c1659bc7cc Mon Sep 17 00:00:00 2001
From: Pierre Bourgin <pierre.bourgin@free.fr>
Date: Wed, 20 Jan 2021 22:35:13 +0100
Subject: [PATCH] libsearpc: fix python3 support
Closes: #28041
---
.../patches/001-python3-support.patch | 114 ++++++++++++++++++
srcpkgs/libsearpc/template | 4 +-
2 files changed, 115 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/libsearpc/patches/001-python3-support.patch
diff --git a/srcpkgs/libsearpc/patches/001-python3-support.patch b/srcpkgs/libsearpc/patches/001-python3-support.patch
new file mode 100644
index 00000000000..7b4ae20c281
--- /dev/null
+++ b/srcpkgs/libsearpc/patches/001-python3-support.patch
@@ -0,0 +1,114 @@
+upstream: yes
+
+From b0079d2a0c3ce0cb4698a162498b108244726912 Mon Sep 17 00:00:00 2001
+From: Xiangyue Cai <caixiangyue007@gmail.com>
+Date: Mon, 8 Jun 2020 15:09:06 +0800
+Subject: [PATCH] configure with python3 (#53)
+
+* configure with python3
+
+* remove future
+---
+ configure.ac | 2 +-
+ pysearpc/client.py | 1 -
+ pysearpc/named_pipe.py | 3 ---
+ pysearpc/pygencode.py | 3 ---
+ pysearpc/server.py | 2 --
+ pysearpc/test_pysearpc.py | 1 -
+ pysearpc/transport.py | 2 --
+ pysearpc/utils.py | 1 -
+ 8 files changed, 1 insertion(+), 14 deletions(-)
+
+diff --git configure.ac configure.ac
+index 53d7438..9c2159a 100644
+--- configure.ac
++++ configure.ac
+@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
+ AC_SUBST(JANSSON_CFLAGS)
+ AC_SUBST(JANSSON_LIBS)
+
+-AM_PATH_PYTHON([2.4])
++AM_PATH_PYTHON([3.5])
+ if test "$bwin32" = true; then
+ if test x$PYTHON_DIR != x; then
+ # set pyexecdir to somewhere like /c/Python26/Lib/site-packages
+diff --git pysearpc/client.py pysearpc/client.py
+index 20e5535..3650cb1 100644
+--- pysearpc/client.py
++++ pysearpc/client.py
+@@ -1,4 +1,3 @@
+-from builtins import object
+ import json
+ from .common import SearpcError
+
+diff --git pysearpc/named_pipe.py pysearpc/named_pipe.py
+index a0ca619..73df576 100644
+--- pysearpc/named_pipe.py
++++ pysearpc/named_pipe.py
+@@ -2,9 +2,6 @@
+ RPC client/server implementation based on named pipe transport.
+ """
+
+-from future import standard_library
+-standard_library.install_aliases()
+-from builtins import object
+ import json
+ import logging
+ import os
+diff --git pysearpc/pygencode.py pysearpc/pygencode.py
+index 62a635b..8c718ce 100644
+--- pysearpc/pygencode.py
++++ pysearpc/pygencode.py
+@@ -1,8 +1,5 @@
+ #!/usr/bin/python
+
+-
+-from __future__ import print_function
+-from builtins import str
+ import string
+ import sys
+
+diff --git pysearpc/server.py pysearpc/server.py
+index a7ec7be..94d9bac 100644
+--- pysearpc/server.py
++++ pysearpc/server.py
+@@ -1,5 +1,3 @@
+-from builtins import str
+-from builtins import object
+ import json
+
+ from .common import SearpcError
+diff --git pysearpc/test_pysearpc.py pysearpc/test_pysearpc.py
+index a9c6f8b..64a455d 100755
+--- pysearpc/test_pysearpc.py
++++ pysearpc/test_pysearpc.py
+@@ -1,7 +1,6 @@
+ #!/usr/bin/env python
+ #coding: UTF-8
+
+-from builtins import object
+ import json
+ import logging
+ import os
+diff --git pysearpc/transport.py pysearpc/transport.py
+index 3c6e821..3deb42c 100644
+--- pysearpc/transport.py
++++ pysearpc/transport.py
+@@ -1,5 +1,3 @@
+-
+-from builtins import object
+ class SearpcTransport(object):
+ """
+ A transport is repsonsible to send the serialized request to the
+diff --git pysearpc/utils.py pysearpc/utils.py
+index 2aeda93..451ad4e 100644
+--- pysearpc/utils.py
++++ pysearpc/utils.py
+@@ -1,4 +1,3 @@
+-from builtins import bytes
+ import os
+ import socket
+
+--
+2.30.0
+
diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template
index 625672ca4d5..02273e1ef58 100644
--- a/srcpkgs/libsearpc/template
+++ b/srcpkgs/libsearpc/template
@@ -2,9 +2,8 @@
# WARNING: upstream sometimes retag source. Wait for official announcement
pkgname=libsearpc
version=3.2.0
-revision=3
+revision=4
build_style=gnu-configure
-pycompile_module="pysearpc"
configure_args="PYTHON=python3 --disable-static --disable-compile-demo"
hostmakedepends="automake libtool pkg-config python3 glib-devel"
makedepends="libglib-devel jansson-devel"
@@ -48,7 +47,6 @@ libsearpc-codegen_package() {
libsearpc-python3_package() {
short_desc+=" - Python3 bindings"
- pycompile_module="pysearpc"
depends="python3"
pkg_install() {
vmove usr/lib/python3*
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: libsearpc: fix python3 support
2021-01-20 21:42 [PR PATCH] libsearpc: fix python3 support yopito
@ 2021-01-21 17:26 ` ericonr
0 siblings, 0 replies; 2+ messages in thread
From: ericonr @ 2021-01-21 17:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1459 bytes --]
There's a merged pull request on the void-packages repository
libsearpc: fix python3 support
https://github.com/void-linux/void-packages/pull/28062
Description:
Closes: #28041
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-21 17:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-20 21:42 [PR PATCH] libsearpc: fix python3 support yopito
2021-01-21 17:26 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).