diff options
| author | Cyril Roelandt <tipecaml@gmail.com> | 2015-05-08 19:37:05 +0200 |
|---|---|---|
| committer | Cyril Roelandt <tipecaml@gmail.com> | 2015-05-10 02:10:07 +0200 |
| commit | 8fda1b797063af19bda898e41dcf6a8369d8aed5 (patch) | |
| tree | fa9d9df7bacc27bf89d459882b50844ec88086e1 | |
| parent | dd51caac55f052cecc61c7b8ab16654e3ace569f (diff) | |
Remove leftover patches.
* gnu/packages/patches/guix-test-networking.patch: Delete it.
* gnu/packages/patches/libtool-skip-tests.patch: Delete it.
* gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch: Delete it.
* gnu/packages/patches/udev-gir-libtool.patch: Delete it.
* gnu-system.am (dist_patch_DATA): Remove them as well.
| -rw-r--r-- | gnu-system.am | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/guix-test-networking.patch | 15 | ||||
| -rw-r--r-- | gnu/packages/patches/libtool-skip-tests.patch | 55 | ||||
| -rw-r--r-- | gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch | 15 | ||||
| -rw-r--r-- | gnu/packages/patches/udev-gir-libtool.patch | 17 |
5 files changed, 0 insertions, 106 deletions
diff --git a/gnu-system.am b/gnu-system.am index d3e91ed05b9..f5649f1a0fe 100644 --- a/gnu-system.am +++ b/gnu-system.am | |||
| @@ -448,7 +448,6 @@ dist_patch_DATA = \ | |||
| 448 | gnu/packages/patches/guile-default-utf8.patch \ | 448 | gnu/packages/patches/guile-default-utf8.patch \ |
| 449 | gnu/packages/patches/guile-linux-syscalls.patch \ | 449 | gnu/packages/patches/guile-linux-syscalls.patch \ |
| 450 | gnu/packages/patches/guile-relocatable.patch \ | 450 | gnu/packages/patches/guile-relocatable.patch \ |
| 451 | gnu/packages/patches/guix-test-networking.patch \ | ||
| 452 | gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \ | 451 | gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \ |
| 453 | gnu/packages/patches/hop-bigloo-4.0b.patch \ | 452 | gnu/packages/patches/hop-bigloo-4.0b.patch \ |
| 454 | gnu/packages/patches/hop-linker-flags.patch \ | 453 | gnu/packages/patches/hop-linker-flags.patch \ |
| @@ -466,7 +465,6 @@ dist_patch_DATA = \ | |||
| 466 | gnu/packages/patches/liboop-mips64-deplibs-fix.patch \ | 465 | gnu/packages/patches/liboop-mips64-deplibs-fix.patch \ |
| 467 | gnu/packages/patches/libmad-mips-newgcc.patch \ | 466 | gnu/packages/patches/libmad-mips-newgcc.patch \ |
| 468 | gnu/packages/patches/libtheora-config-guess.patch \ | 467 | gnu/packages/patches/libtheora-config-guess.patch \ |
| 469 | gnu/packages/patches/libtool-skip-tests.patch \ | ||
| 470 | gnu/packages/patches/libtool-skip-tests2.patch \ | 468 | gnu/packages/patches/libtool-skip-tests2.patch \ |
| 471 | gnu/packages/patches/libssh-CVE-2014-0017.patch \ | 469 | gnu/packages/patches/libssh-CVE-2014-0017.patch \ |
| 472 | gnu/packages/patches/libvpx-fix-armhf-link.patch \ | 470 | gnu/packages/patches/libvpx-fix-armhf-link.patch \ |
| @@ -524,7 +522,6 @@ dist_patch_DATA = \ | |||
| 524 | gnu/packages/patches/pyqt-configure.patch \ | 522 | gnu/packages/patches/pyqt-configure.patch \ |
| 525 | gnu/packages/patches/python-fix-tests.patch \ | 523 | gnu/packages/patches/python-fix-tests.patch \ |
| 526 | gnu/packages/patches/python-libffi-mips-n32-fix.patch \ | 524 | gnu/packages/patches/python-libffi-mips-n32-fix.patch \ |
| 527 | gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch \ | ||
| 528 | gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ | 525 | gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ |
| 529 | gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch \ | 526 | gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch \ |
| 530 | gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ | 527 | gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ |
| @@ -550,7 +547,6 @@ dist_patch_DATA = \ | |||
| 550 | gnu/packages/patches/teckit-cstdio.patch \ | 547 | gnu/packages/patches/teckit-cstdio.patch \ |
| 551 | gnu/packages/patches/texi2html-document-encoding.patch \ | 548 | gnu/packages/patches/texi2html-document-encoding.patch \ |
| 552 | gnu/packages/patches/texi2html-i18n.patch \ | 549 | gnu/packages/patches/texi2html-i18n.patch \ |
| 553 | gnu/packages/patches/udev-gir-libtool.patch \ | ||
| 554 | gnu/packages/patches/unzip-CVE-2014-8139.patch \ | 550 | gnu/packages/patches/unzip-CVE-2014-8139.patch \ |
| 555 | gnu/packages/patches/unzip-CVE-2014-8140.patch \ | 551 | gnu/packages/patches/unzip-CVE-2014-8140.patch \ |
| 556 | gnu/packages/patches/unzip-CVE-2014-8141.patch \ | 552 | gnu/packages/patches/unzip-CVE-2014-8141.patch \ |
diff --git a/gnu/packages/patches/guix-test-networking.patch b/gnu/packages/patches/guix-test-networking.patch deleted file mode 100644 index a8d1f4fd2f1..00000000000 --- a/gnu/packages/patches/guix-test-networking.patch +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | Skip that test when the network is unreachable. | ||
| 2 | |||
| 3 | diff --git a/tests/packages.scm b/tests/packages.scm | ||
| 4 | index 04e3b0b..6ac215b 100644 | ||
| 5 | --- a/tests/packages.scm | ||
| 6 | +++ b/tests/packages.scm | ||
| 7 | @@ -139,6 +139,8 @@ | ||
| 8 | (and (direct-store-path? source) | ||
| 9 | (string-suffix? "utils.scm" source)))) | ||
| 10 | |||
| 11 | +(unless (false-if-exception (getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)) | ||
| 12 | + (test-skip 1)) | ||
| 13 | (test-equal "package-source-derivation, snippet" | ||
| 14 | "OK" | ||
| 15 | (let* ((file (search-bootstrap-binary "guile-2.0.9.tar.xz" | ||
diff --git a/gnu/packages/patches/libtool-skip-tests.patch b/gnu/packages/patches/libtool-skip-tests.patch deleted file mode 100644 index 9191d404879..00000000000 --- a/gnu/packages/patches/libtool-skip-tests.patch +++ /dev/null | |||
| @@ -1,55 +0,0 @@ | |||
| 1 | Because our GCC 'lib' spec automatically adds '-rpath' for each '-L' | ||
| 2 | and a couple more '-rpath, there are two test failures: | ||
| 3 | one in demo.test, and one in destdir.at. Disable these. | ||
| 4 | |||
| 5 | Also skip the nopic test on ARM and MIPS systems. | ||
| 6 | |||
| 7 | --- libtool-2.4.6/tests/demo.at.orig 2015-01-16 13:52:04.000000000 -0500 | ||
| 8 | +++ libtool-2.4.6/tests/demo.at 2015-02-16 10:48:51.435851966 -0500 | ||
| 9 | @@ -510,7 +510,7 @@ | ||
| 10 | AT_SETUP([force non-PIC objects]) | ||
| 11 | |||
| 12 | AT_CHECK([case $host in | ||
| 13 | -hppa*|x86_64*|s390*) | ||
| 14 | +hppa*|x86_64*|s390*|arm*|mips*) | ||
| 15 | # These hosts cannot use non-PIC shared libs | ||
| 16 | exit 77 ;; | ||
| 17 | *-solaris*|*-sunos*) | ||
| 18 | --- libtool-2.4.6/tests/testsuite.orig 2015-02-15 11:15:25.000000000 -0500 | ||
| 19 | +++ libtool-2.4.6/tests/testsuite 2015-02-16 10:50:58.736483216 -0500 | ||
| 20 | @@ -8741,7 +8741,7 @@ | ||
| 21 | |||
| 22 | { set +x | ||
| 23 | $as_echo "$at_srcdir/demo.at:535: case \$host in | ||
| 24 | -hppa*|x86_64*|s390*) | ||
| 25 | +hppa*|x86_64*|s390*|arm*|mips*) | ||
| 26 | # These hosts cannot use non-PIC shared libs | ||
| 27 | exit 77 ;; | ||
| 28 | *-solaris*|*-sunos*) | ||
| 29 | @@ -8766,7 +8766,7 @@ | ||
| 30 | " | ||
| 31 | at_fn_check_prepare_notrace 'a `...` command substitution' "demo.at:535" | ||
| 32 | ( $at_check_trace; case $host in | ||
| 33 | -hppa*|x86_64*|s390*) | ||
| 34 | +hppa*|x86_64*|s390*|arm*|mips*) | ||
| 35 | # These hosts cannot use non-PIC shared libs | ||
| 36 | exit 77 ;; | ||
| 37 | *-solaris*|*-sunos*) | ||
| 38 | @@ -9298,7 +9298,7 @@ | ||
| 39 | #AT_START_34 | ||
| 40 | at_fn_group_banner 34 'demo.at:548' \ | ||
| 41 | "hardcoding library path" " " 4 | ||
| 42 | -at_xfail=no | ||
| 43 | +at_xfail=yes | ||
| 44 | test no = "$ACLOCAL" && at_xfail=yes | ||
| 45 | test no = "$AUTOHEADER" && at_xfail=yes | ||
| 46 | test no = "$AUTOMAKE" && at_xfail=yes | ||
| 47 | @@ -27243,7 +27243,7 @@ | ||
| 48 | #AT_START_98 | ||
| 49 | at_fn_group_banner 98 'destdir.at:75' \ | ||
| 50 | "DESTDIR with in-package deplibs" " " 8 | ||
| 51 | -at_xfail=no | ||
| 52 | +at_xfail=yes | ||
| 53 | eval `$LIBTOOL --config | $GREP '^fast_install='` | ||
| 54 | case $fast_install in no) :;; *) false;; esac && at_xfail=yes | ||
| 55 | ( | ||
diff --git a/gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch b/gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch deleted file mode 100644 index 2f8b159870c..00000000000 --- a/gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | From resolution of upstream python issue #20901: http://bugs.python.org/issue20901 | ||
| 2 | |||
| 3 | diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py | ||
| 4 | --- Lib/sqlite3/test/hooks.py | ||
| 5 | +++ Lib/sqlite3/test/hooks.py | ||
| 6 | @@ -162,7 +162,7 @@ class ProgressTests(unittest.TestCase): | ||
| 7 | create table bar (a, b) | ||
| 8 | """) | ||
| 9 | second_count = len(progress_calls) | ||
| 10 | - self.assertGreater(first_count, second_count) | ||
| 11 | + self.assertGreaterEqual(first_count, second_count) | ||
| 12 | |||
| 13 | def CheckCancelOperation(self): | ||
| 14 | """ | ||
| 15 | |||
diff --git a/gnu/packages/patches/udev-gir-libtool.patch b/gnu/packages/patches/udev-gir-libtool.patch deleted file mode 100644 index 7504f87eb89..00000000000 --- a/gnu/packages/patches/udev-gir-libtool.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Without this patch, 'ld' as invoked by 'g-ir-scanner' fails to find -lgudev-1.0 | ||
| 2 | This is because libtool puts it in $(top_builddir)/.libs. | ||
| 3 | |||
| 4 | This patch forces 'g-ir-scanner' to use libtool, which enables it to find | ||
| 5 | libgudev-1.0.la. | ||
| 6 | |||
| 7 | --- udev-182/Makefile.in 2014-06-22 14:55:07.000000000 +0200 | ||
| 8 | +++ udev-182/Makefile.in 2014-06-22 14:55:15.000000000 +0200 | ||
| 9 | @@ -3622,7 +3622,7 @@ test-sys-distclean: | ||
| 10 | @ENABLE_GUDEV_TRUE@@ENABLE_INTROSPECTION_TRUE@ --namespace GUdev \ | ||
| 11 | @ENABLE_GUDEV_TRUE@@ENABLE_INTROSPECTION_TRUE@ --nsversion=1.0 \ | ||
| 12 | @ENABLE_GUDEV_TRUE@@ENABLE_INTROSPECTION_TRUE@ --include=GObject-2.0 \ | ||
| 13 | -@ENABLE_GUDEV_TRUE@@ENABLE_INTROSPECTION_TRUE@ --library=gudev-1.0 \ | ||
| 14 | +@ENABLE_GUDEV_TRUE@@ENABLE_INTROSPECTION_TRUE@ --library=gudev-1.0 --libtool=$(top_builddir)/libtool \ | ||
| 15 | @ENABLE_GUDEV_TRUE@@ENABLE_INTROSPECTION_TRUE@ --library-path=$(top_builddir)/src \ | ||
| 16 | @ENABLE_GUDEV_TRUE@@ENABLE_INTROSPECTION_TRUE@ --library-path=$(top_builddir)/src/gudev \ | ||
| 17 | @ENABLE_GUDEV_TRUE@@ENABLE_INTROSPECTION_TRUE@ --output $@ \ | ||
