5 Commits

2 changed files with 124 additions and 24 deletions

View File

@@ -0,0 +1,36 @@
From cb41b94be34b31bc84eed0908858654632e57906 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 14 Dec 2020 15:39:22 +0100
Subject: [PATCH] python bindings: fix "TypeError: _argtypes_ must be a
sequence of types"
Fixes #125
---
bindings/python/libproxy.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bindings/python/libproxy.py b/bindings/python/libproxy.py
index a29b33a..2224a19 100644
--- a/bindings/python/libproxy.py
+++ b/bindings/python/libproxy.py
@@ -44,9 +44,9 @@ def _load(name, *versions):
# Load libproxy
_libproxy = _load("proxy", 1)
_libproxy.px_proxy_factory_new.restype = ctypes.POINTER(ctypes.c_void_p)
-_libproxy.px_proxy_factory_free.argtypes = ctypes.c_void_p,
+_libproxy.px_proxy_factory_free.argtypes = [ctypes.c_void_p]
_libproxy.px_proxy_factory_get_proxies.restype = ctypes.POINTER(ctypes.c_void_p)
-_libproxy.px_proxy_factory_free_proxies.argtypes = ctypes.POINTER(ctypes.c_void_p)
+_libproxy.px_proxy_factory_free_proxies.argtypes = [ctypes.POINTER(ctypes.c_void_p)]
class ProxyFactory(object):
"""A ProxyFactory object is used to provide potential proxies to use
@@ -141,7 +141,7 @@ def getProxies(self, url):
proxies.append(proxy_bytes.decode('utf-8', errors='replace'))
i += 1
- _libproxy.px_proxy_factory_free_proxies(proxies)
+ _libproxy.px_proxy_factory_free_proxies(array)
return proxies

View File

@@ -1,5 +1,5 @@
Name: libproxy
Version: 0.4.15
Version: 0.4.17
Release: 1mamba
Summary: A library that provides automatic proxy configuration management.
Group: System/Libraries
@@ -11,29 +11,19 @@ Source: https://github.com/libproxy/libproxy.git/%{version}/libproxy-%{ve
Patch0: libproxy-0.4.7-gcc-4.7.patch
Patch1: libproxy-0.4.7-xulrunner.patch
Patch2: libproxy-0.4.11-kde-4.10.patch
Patch3: libproxy-0.4.16-upstream-fix-python-argtypes_must_be_a_sequence.patch
License: LGPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
%if "%{stage1}" != "1"
BuildRequires: kdelibs-devel
%endif
BuildRequires: libatk-devel
BuildRequires: libcairo-devel
BuildRequires: ldconfig
BuildRequires: libdbus-devel
BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel
BuildRequires: libgcc
BuildRequires: libgdk-pixbuf-devel
BuildRequires: libglib-devel
BuildRequires: libgtk2-devel
BuildRequires: libpango-devel
BuildRequires: libpython-devel
BuildRequires: libqt4-devel
BuildRequires: libsoup-devel
BuildRequires: libnm-devel
BuildRequires: libperl
BuildRequires: libstdc++6-devel
BuildRequires: libwebkit-gtk-devel
BuildRequires: perl-devel
BuildRequires: pkg-config
BuildRequires: python3
## AUTOBUILDREQ-END
#%if "%{stage1}" != "1"
#BuildRequires: xulrunner-devel
@@ -59,12 +49,26 @@ A simple application that will use libproxy to give the results you can expect f
It can be used to debug what would happen in various cases.
%package -n python-libproxy
Summary: Pythin binding for %{name}
Summary: Python 2.7 binding for %{name}
Group: System/Libraries/Python
%description -n python-libproxy
%{summary}.
%package -n python-libproxy-py3
Summary: Python 3 binding for %{name}
Group: System/Libraries/Python
%description -n python-libproxy-py3
%{summary}.
%package -n python-libproxy-py36
Summary: Python 3.6 binding for %{name}
Group: System/Libraries/Python
%description -n python-libproxy-py36
%{summary}.
%package -n perl-Net-Libproxy
Summary: Perl binding for %{name}
Group: System/Libraries/Perl
@@ -91,6 +95,15 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
libproxy is a library that provides automatic proxy configuration management.
This package contains the plugin for NetworkManager.
%package pacrunner
Summary: Pacrunner plugin for %{name}
Group: System/Libraries
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
%description pacrunner
libproxy is a library that provides automatic proxy configuration management.
This package contains the plugin for Pacrunner.
%package kde
Summary: KDE plugin for %{name}
Group: System/Libraries
@@ -127,25 +140,47 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
libproxy is a library that provides automatic proxy configuration management.
This package contains the Webkit plugin.
%debug_package
%prep
%setup -q
#%patch0 -p1
#%patch1 -p1
#%patch2 -p1
#%patch3 -p1
%build
#export NetworkManager_CFLAGS="-I/usr/include/NetworkManager `pkg-config --cflags --libs dbus-1`"
%cmake \
%cmake -d build \
-DPERL_VENDORINSTALL=yes \
-DWITH_WEBKIT3=OFF \
-DWITH_WEBKIT=OFF \
-DLIBEXEC_INSTALL_DIR=%{_libexecdir}
-DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
-DPYTHON3_EXECUTABLE=%{__python3}
%make
cd ..
%ifnarch aarch64
%cmake -d build_py36 \
-DPERL_VENDORINSTALL=yes \
-DWITH_WEBKIT3=OFF \
-DWITH_WEBKIT=OFF \
-DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
-DPYTHON3_EXECUTABLE=%{__python36}
%make
%endif
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%makeinstall
%ifnarch aarch64
%makeinstall -C build_py36
%endif
%makeinstall -C build
%ifarch x86_64 aarch64
mv %{buildroot}%{_prefix}/lib/python3* %{buildroot}%{_libdir}
%endif
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -167,7 +202,16 @@ This package contains the Webkit plugin.
%files -n python-libproxy
%defattr(-,root,root)
%{python_sitelib}/libproxy.py
%{python3_sitelib}/libproxy.py
%files -n python-libproxy-py3
%defattr(-,root,root)
%{python3_sitearch}/libproxy.py
%ifnarch aarch64
%files -n python-libproxy-py36
%defattr(-,root,root)
%{python36_sitearch}/libproxy.py
%endif
%files -n perl-Net-Libproxy
%defattr(-,root,root)
@@ -205,7 +249,27 @@ This package contains the Webkit plugin.
%defattr(-,root,root)
%{_libdir}/libproxy/%{version}/modules/network_networkmanager.so
%files pacrunner
%defattr(-,root,root)
%{_libdir}/libproxy/%{version}/modules/config_pacrunner.so
%changelog
* Thu Jan 14 2021 Automatic Build System <autodist@mambasoft.it> 0.4.17-1mamba
- automatic version update by autodist
* Mon Dec 21 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.16-2mamba
- added a patch to fix error in python module: TypeError: _argtypes_ must be a sequence of types
* Fri Dec 18 2020 Automatic Build System <autodist@mambasoft.it> 0.4.16-1mamba
- automatic version update by autodist
* Thu Jul 23 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.15-3mamba
- added python3 package
* Sun Mar 31 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 0.4.15-2mamba
- rebuilt with python 3.6 support
* Tue Aug 08 2017 Automatic Build System <autodist@mambasoft.it> 0.4.15-1mamba
- automatic version update by autodist