diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-09-09 14:52:40 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-09-09 14:52:40 -0300 |
| commit | 4b0b4a36e7cb374d81e6eae73779490c3f0dc2ed (patch) | |
| tree | e1cc0796d514b816ad54993efefe86d1e70867e8 /testing | |
| parent | 3e8364b2675880d4688f65b3f2ed3bbd4244f7b2 (diff) | |
| download | aports-4b0b4a36e7cb374d81e6eae73779490c3f0dc2ed.tar.bz2 aports-4b0b4a36e7cb374d81e6eae73779490c3f0dc2ed.tar.xz | |
testing/folks: re-enable python2
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/folks/APKBUILD | 4 | ||||
| -rw-r--r-- | testing/folks/disable-py2-test.patch | 41 |
2 files changed, 1 insertions, 44 deletions
diff --git a/testing/folks/APKBUILD b/testing/folks/APKBUILD index 0e9b760e9e..a207d71019 100644 --- a/testing/folks/APKBUILD +++ b/testing/folks/APKBUILD @@ -4,7 +4,6 @@ pkgname=folks pkgver=0.12.1 pkgrel=1 pkgdesc="GObject Library to aggregate people into metacontacts" -options="!check" # one test requires python2 url="https://wiki.gnome.org/Projects/Folks" arch="all" license="LGPL-2.1-or-later" @@ -17,12 +16,11 @@ makedepends=" telepathy-glib-dev tracker-dev vala - python3 + python2 readline-dev" options="!check" # Can only be run against installed instance subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/folks/${pkgver%.*}/folks-$pkgver.tar.xz - disable-py2-test.patch " build() { diff --git a/testing/folks/disable-py2-test.patch b/testing/folks/disable-py2-test.patch deleted file mode 100644 index 681a4f362f..0000000000 --- a/testing/folks/disable-py2-test.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/tests/lib/telepathy/contactlist/meson.build b/tests/lib/telepathy/contactlist/meson.build -index 00e0266..61c0c3e 100644 ---- a/tests/lib/telepathy/contactlist/meson.build -+++ b/tests/lib/telepathy/contactlist/meson.build -@@ -30,15 +30,6 @@ telepathy_test_contactlist_sources = [ - 'util.h', - ] - --telepathy_test_contactlist_manager = custom_target('tp_test_contact_list.manager', -- output: 'param-spec-struct.h', -- input: 'manager-file.py', -- command: [ test_tools_manager_file_script, -- '@INPUT@', -- meson.current_build_dir(), -- ], --) -- - telepathy_test_contactlist_deps = [ - glib_dep, - gio_dep, -diff --git a/tests/tools/meson.build b/tests/tools/meson.build -index babbe5f..9ff3971 100644 ---- a/tests/tools/meson.build -+++ b/tests/tools/meson.build -@@ -1,2 +1 @@ - # Used for telepathy test lib (contactlist) --test_tools_manager_file_script = find_program('manager-file.py') - -diff --git a/tests/lib/telepathy/contactlist/meson.build b/tests/lib/telepathy/contactlist/meson.build -index 61c0c3e..80c845a 100644 ---- a/tests/lib/telepathy/contactlist/meson.build -+++ b/tests/lib/telepathy/contactlist/meson.build -@@ -39,7 +39,7 @@ telepathy_test_contactlist_deps = [ - ] - - telepathy_test_contactlist_lib = static_library('tp-test-contactlist', -- [ telepathy_test_contactlist_sources, telepathy_test_contactlist_manager ], -+ [ telepathy_test_contactlist_sources ], - dependencies: telepathy_test_contactlist_deps, - include_directories: config_h_dir, - ) |