From b81245ccb38dc16d115519dd3166d8bb2c295bb8 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 3 Nov 2016 13:36:02 -0400 Subject: [PATCH] gnu: Add libjxr. * gnu/packages/image.scm (libjxr): New variable. * gnu/packages/patches/libjxr-fix-function-signature.patch: New file. * gnu/packages/patches/libjxr-fix-typos.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patches. --- .../patches/libjxr-fix-function-signature.patch | 16 ++++++++++++ gnu/packages/patches/libjxr-fix-typos.patch | 29 ++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 gnu/packages/patches/libjxr-fix-function-signature.patch create mode 100644 gnu/packages/patches/libjxr-fix-typos.patch (limited to 'gnu/packages/patches') diff --git a/gnu/packages/patches/libjxr-fix-function-signature.patch b/gnu/packages/patches/libjxr-fix-function-signature.patch new file mode 100644 index 0000000000..32f5f64512 --- /dev/null +++ b/gnu/packages/patches/libjxr-fix-function-signature.patch @@ -0,0 +1,16 @@ +Description: Fix function signature +Author: Mathieu Malaterre +Origin: upstream, https://jxrlib.codeplex.com/SourceControl/changeset/04cf339385b8196f98025b43a366a0790deac994 +Bug-Debian: http://bugs.debian.org/748590 + +--- jxrlib-1.1.orig/image/decode/JXRTranscode.c ++++ jxrlib-1.1/image/decode/JXRTranscode.c +@@ -47,7 +47,7 @@ EXTERN_C Void FreeCodingContextDec(CWMIm + EXTERN_C Int StrEncInit(CWMImageStrCodec *); + EXTERN_C Void StrIOEncTerm(CWMImageStrCodec *); + EXTERN_C Void FreeCodingContextEnc(CWMImageStrCodec *); +-EXTERN_C Void encodeMB(CWMImageStrCodec *, Int, Int); ++EXTERN_C Int encodeMB(CWMImageStrCodec *, Int, Int); + EXTERN_C Int writeIndexTableNull(CWMImageStrCodec *); + EXTERN_C Void writePacketHeader(BitIOInfo *, U8, U8); + diff --git a/gnu/packages/patches/libjxr-fix-typos.patch b/gnu/packages/patches/libjxr-fix-typos.patch new file mode 100644 index 0000000000..819db34900 --- /dev/null +++ b/gnu/packages/patches/libjxr-fix-typos.patch @@ -0,0 +1,29 @@ +Description: Fix typos and remove some warnings +Author: Mathieu Malaterre + +Index: jxrlib-1.1/jxrencoderdecoder/JxrEncApp.c +=================================================================== +--- jxrlib-1.1.orig/jxrencoderdecoder/JxrEncApp.c ++++ jxrlib-1.1/jxrencoderdecoder/JxrEncApp.c +@@ -578,7 +578,7 @@ main(int argc, char* argv[]) + + //================================ + Call(PKCreateCodecFactory(&pCodecFactory, WMP_SDK_VERSION)); +- Call(pCodecFactory->CreateCodec(&IID_PKImageWmpEncode, &pEncoder)); ++ Call(pCodecFactory->CreateCodec(&IID_PKImageWmpEncode, (void**)&pEncoder)); + + //---------------------------------------------------------------- + Call(PKCreateTestFactory(&pTestFactory, WMP_SDK_VERSION)); +Index: jxrlib-1.1/jxrgluelib/JXRMeta.h +=================================================================== +--- jxrlib-1.1.orig/jxrgluelib/JXRMeta.h ++++ jxrlib-1.1/jxrgluelib/JXRMeta.h +@@ -34,7 +34,7 @@ + + #ifndef UNREFERENCED_PARAMETER + #define UNREFERENCED_PARAMETER(P) { (P) = (P); } +-#endif UNREFERENCED_PARAMETER ++#endif /*UNREFERENCED_PARAMETER*/ + + //================================================================ + // Container -- cgit v1.2.3 From accd5f996e2cfda656dee3cba97de5fd3cec3ad9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 1 Nov 2016 13:20:45 +0100 Subject: gnu: python-ipython: Update to 4.0.0. * gnu/packages/python.scm (python-ipython): Update to 4.0.0. [inputs]: Keep only "readline" and "which"; move the remaining inputs to propagated-inputs, except for "python-requests" and "python-nose" which are moved to native-inputs. [propagated-inputs]: Add "python-pexpect", "python-pickleshare", "python-simplegeneric", "python-traitlets", "python-ipykernel". [native-inputs]: Add "python-testpath". [arguments]: Enable building of HTML documentation. [source]: Remove patch. * gnu/packages/patches/python-ipython-inputhook-ctype.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 2 +- .../patches/python-ipython-inputhook-ctype.patch | 41 ---------------------- gnu/packages/python.scm | 36 ++++++++++--------- 3 files changed, 21 insertions(+), 58 deletions(-) delete mode 100644 gnu/packages/patches/python-ipython-inputhook-ctype.patch (limited to 'gnu/packages/patches') diff --git a/gnu/local.mk b/gnu/local.mk index a23d536394..27848ac805 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -6,6 +6,7 @@ # Copyright © 2016 Chris Marusich # Copyright © 2016 Kei Kebreau # Copyright © 2016 Adonay "adfeno" Felipe Nogueira +# Copyright © 2016 Ricardo Wurmus # # This file is part of GNU Guix. # @@ -807,7 +808,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-dendropy-exclude-failing-tests.patch \ %D%/packages/patches/python-disable-ssl-test.patch \ %D%/packages/patches/python-fix-tests.patch \ - %D%/packages/patches/python-ipython-inputhook-ctype.patch \ %D%/packages/patches/python-rarfile-fix-tests.patch \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ %D%/packages/patches/python-statsmodels-fix-tests.patch \ diff --git a/gnu/packages/patches/python-ipython-inputhook-ctype.patch b/gnu/packages/patches/python-ipython-inputhook-ctype.patch deleted file mode 100644 index c77e310542..0000000000 --- a/gnu/packages/patches/python-ipython-inputhook-ctype.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 04c5d358c7ab74d3ddab4f7662e539393d8604c6 Mon Sep 17 00:00:00 2001 -From: Lucretiel -Date: Wed, 13 May 2015 13:12:43 -0400 -Subject: [PATCH] register now checks for missing ctypes - -If ctypes is None, then no input hooks may be registered; `InputHookManager.register` skips registration of input hook classes. Also updated `__init__` to no longer skip creating the instance attributes, to prevent AttributeError exceptions at load time. ---- - IPython/lib/inputhook.py | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/IPython/lib/inputhook.py b/IPython/lib/inputhook.py -index 4ae2cb3..6578365 100644 ---- a/IPython/lib/inputhook.py -+++ b/IPython/lib/inputhook.py -@@ -107,8 +107,8 @@ class InputHookManager(object): - def __init__(self): - if ctypes is None: - warn("IPython GUI event loop requires ctypes, %gui will not be available") -- return -- self.PYFUNC = ctypes.PYFUNCTYPE(ctypes.c_int) -+ else: -+ self.PYFUNC = ctypes.PYFUNCTYPE(ctypes.c_int) - self.guihooks = {} - self.aliases = {} - self.apps = {} -@@ -197,10 +197,11 @@ def enable(self, app=None): - ... - """ - def decorator(cls): -- inst = cls(self) -- self.guihooks[toolkitname] = inst -- for a in aliases: -- self.aliases[a] = toolkitname -+ if ctypes is not None: -+ inst = cls(self) -+ self.guihooks[toolkitname] = inst -+ for a in aliases: -+ self.aliases[a] = toolkitname - return cls - return decorator - diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 09fab7b17c..a1148b1c38 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4627,34 +4627,38 @@ (define-public python2-testpath (define-public python-ipython (package (name "python-ipython") - (version "3.2.1") + (version "4.0.0") (source (origin (method url-fetch) - (patches (search-patches "python-ipython-inputhook-ctype.patch")) - (uri (string-append "https://pypi.python.org/packages/source/i/" - "ipython/ipython-" version ".tar.gz")) + (uri (pypi-uri "ipython" version ".tar.gz")) (sha256 - (base32 "0xwin0sa9n0cabx4cq1ibf5ldsiw5dyimibla82kicz5gbpas4y9")))) + (base32 "1npl8g6bfsff9j938ypx0q5fyzy2l8lp0jl8skjjj2zv0z27dlig")))) (build-system python-build-system) (outputs '("out" "doc")) (propagated-inputs `(("python-pyzmq" ,python-pyzmq) - ("python-terminado" ,python-terminado))) - (inputs - `(("readline" ,readline) - ("which" ,which) + ("python-terminado" ,python-terminado) ("python-matplotlib" ,python-matplotlib) ("python-numpy" ,python-numpy) ("python-numpydoc" ,python-numpydoc) ("python-jinja2" ,python-jinja2) ("python-mistune" ,python-mistune) + ("python-pexpect" ,python-pexpect) + ("python-pickleshare" ,python-pickleshare) + ("python-simplegeneric" ,python-simplegeneric) ("python-jsonschema" ,python-jsonschema) - ("python-pygments" ,python-pygments) - ("python-requests" ,python-requests) ;; for tests - ("python-nose" ,python-nose))) + ("python-traitlets" ,python-traitlets) + ("python-ipykernel" ,python-ipykernel) + ("python-pygments" ,python-pygments))) + (inputs + `(("readline" ,readline) + ("which" ,which))) (native-inputs `(("pkg-config" ,pkg-config) + ("python-requests" ,python-requests) ;; for tests + ("python-testpath" ,python-testpath) + ("python-nose" ,python-nose) ("python-sphinx" ,python-sphinx) ("texlive" ,texlive) ("texinfo" ,texinfo) @@ -4673,13 +4677,13 @@ (define-public python-ipython (examples (string-append doc "/examples"))) (setenv "LANG" "en_US.utf8") (with-directory-excursion "docs" - ;; FIXME: html and pdf fail to build - ;; (system* "make" "html") - ;; (system* "make" "pdf" "PAPER=a4") + ;; FIXME: pdf fails to build + ;;(system* "make" "pdf" "PAPER=a4") + (system* "make" "html") (system* "make" "info")) (copy-recursively "docs/man" man1) (copy-recursively "examples" examples) - ;; (copy-recursively "docs/build/html" html) + (copy-recursively "docs/build/html" html) ;; (copy-file "docs/build/latex/ipython.pdf" ;; (string-append doc "/ipython.pdf")) (mkdir-p info) -- cgit v1.2.3 From 674a0f955809d40c2fe3e5092b2927c4c96e8351 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 4 Nov 2016 20:06:03 -0400 Subject: gnu: w3m: Switch to Debian's actively maintained fork of w3m. Fixes some security issues seen here: * gnu/packages/w3m.scm (w3m): Switch it. [source]: Use Debian's git tree. Remove obsolete patches. [arguments]: Remove an unneeded substitute* function. * gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch, gnu/packages/patches/w3m-disable-weak-ciphers.patch, gnu/packages/patches/w3m-force-ssl_verify_server-on.patch, gnu/packages/patches/w3m-libgc.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 4 --- .../patches/w3m-disable-sslv2-and-sslv3.patch | 24 ---------------- .../patches/w3m-disable-weak-ciphers.patch | 24 ---------------- .../patches/w3m-force-ssl_verify_server-on.patch | 24 ---------------- gnu/packages/patches/w3m-libgc.patch | 28 ------------------ gnu/packages/w3m.scm | 33 +++++++++------------- 6 files changed, 13 insertions(+), 124 deletions(-) delete mode 100644 gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch delete mode 100644 gnu/packages/patches/w3m-disable-weak-ciphers.patch delete mode 100644 gnu/packages/patches/w3m-force-ssl_verify_server-on.patch delete mode 100644 gnu/packages/patches/w3m-libgc.patch (limited to 'gnu/packages/patches') diff --git a/gnu/local.mk b/gnu/local.mk index 27848ac805..49b672111f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -891,10 +891,6 @@ dist_patch_DATA = \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ %D%/packages/patches/vtk-mesa-10.patch \ - %D%/packages/patches/w3m-libgc.patch \ - %D%/packages/patches/w3m-force-ssl_verify_server-on.patch \ - %D%/packages/patches/w3m-disable-sslv2-and-sslv3.patch \ - %D%/packages/patches/w3m-disable-weak-ciphers.patch \ %D%/packages/patches/weechat-python.patch \ %D%/packages/patches/weex-vacopy.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ diff --git a/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch b/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch deleted file mode 100644 index 5b78f2d909..0000000000 --- a/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch +++ /dev/null @@ -1,24 +0,0 @@ -Subject: Disable SSLv2 and SSLv3. - -The only remaining methods are TLSv1.* (the code never distinguishes -between TLSv1.0, TLSv1.1, and TLSv1.2). ---- - fm.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fm.h b/fm.h -index 320906c..ddcd4fc 100644 ---- a/fm.h -+++ b/fm.h -@@ -1144,7 +1144,7 @@ global int ssl_path_modified init(FALSE); - #endif /* defined(USE_SSL) && - * defined(USE_SSL_VERIFY) */ - #ifdef USE_SSL --global char *ssl_forbid_method init(NULL); -+global char *ssl_forbid_method init("2, 3"); - #endif - - global int is_redisplay init(FALSE); --- -2.6.4 - diff --git a/gnu/packages/patches/w3m-disable-weak-ciphers.patch b/gnu/packages/patches/w3m-disable-weak-ciphers.patch deleted file mode 100644 index 4780d54cb6..0000000000 --- a/gnu/packages/patches/w3m-disable-weak-ciphers.patch +++ /dev/null @@ -1,24 +0,0 @@ -Subject: Disable weak ciphers - -Disable RC4, "export ciphers", and all keys < 128 bits. - -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/w3m/+bug/1325674 ---- - url.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/url.c b/url.c -index ed6062e..e86b1f3 100644 ---- a/url.c -+++ b/url.c -@@ -326,6 +326,7 @@ openSSLHandle(int sock, char *hostname, char **p_cert) - SSL_load_error_strings(); - if (!(ssl_ctx = SSL_CTX_new(SSLv23_client_method()))) - goto eend; -+ SSL_CTX_set_cipher_list(ssl_ctx, "DEFAULT:!LOW:!RC4:!EXP"); - option = SSL_OP_ALL; - if (ssl_forbid_method) { - if (strchr(ssl_forbid_method, '2')) --- -2.6.4 - diff --git a/gnu/packages/patches/w3m-force-ssl_verify_server-on.patch b/gnu/packages/patches/w3m-force-ssl_verify_server-on.patch deleted file mode 100644 index dc9f117f9d..0000000000 --- a/gnu/packages/patches/w3m-force-ssl_verify_server-on.patch +++ /dev/null @@ -1,24 +0,0 @@ -Subject: Force ssl_verify_server on. - -By default, SSL/TLS certificates are not verified. This enables the -verification. ---- - fm.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fm.h b/fm.h -index 8378939..320906c 100644 ---- a/fm.h -+++ b/fm.h -@@ -1135,7 +1135,7 @@ global int view_unseenobject init(TRUE); - #endif - - #if defined(USE_SSL) && defined(USE_SSL_VERIFY) --global int ssl_verify_server init(FALSE); -+global int ssl_verify_server init(TRUE); - global char *ssl_cert_file init(NULL); - global char *ssl_key_file init(NULL); - global char *ssl_ca_path init(NULL); --- -2.6.4 - diff --git a/gnu/packages/patches/w3m-libgc.patch b/gnu/packages/patches/w3m-libgc.patch deleted file mode 100644 index 0dc6a4027c..0000000000 --- a/gnu/packages/patches/w3m-libgc.patch +++ /dev/null @@ -1,28 +0,0 @@ -This patch fixes w3m compilation with libgc > 7.2. - -Reported: -https://bugs.archlinux.org/task/33397 - -Patch with explanation: -http://anonscm.debian.org/cgit/collab-maint/w3m.git/commit/?id=770eec8304bdbe458 ---- - main.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/main.c b/main.c -index b421943..249eb1a 100644 ---- a/main.c -+++ b/main.c -@@ -833,7 +833,8 @@ main(int argc, char **argv, char **envp) - mySignal(SIGPIPE, SigPipe); - #endif - -- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); -+ orig_GC_warn_proc = GC_get_warn_proc(); -+ GC_set_warn_proc(wrap_GC_warn_proc); - err_msg = Strnew(); - if (load_argc == 0) { - /* no URL specified */ --- -2.6.4 - diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index e7dd583c11..54d4a119f5 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2016 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,37 +29,29 @@ (define-module (gnu packages w3m) #:use-module (gnu packages tls) #:use-module (gnu packages) #:use-module (guix packages) - #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu)) (define-public w3m (package (name "w3m") - (version "0.5.3") + (version "0.5.3+git20161031") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" name "/" - name "-" version "/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579")) - - ;; cf. https://bugs.archlinux.org/task/33397 - (patches (search-patches "w3m-libgc.patch" - "w3m-force-ssl_verify_server-on.patch" - "w3m-disable-sslv2-and-sslv3.patch" - "w3m-disable-weak-ciphers.patch")))) + (method git-fetch) + ;; Debian's fork of w3m is the only one that is still + ;; maintained. + (uri (git-reference + (url "https://anonscm.debian.org/cgit/collab-maint/w3m.git") + (commit version))) + (file-name (string-append "w3m-" version "-checkout")) + (sha256 + (base32 + "142vkkmsk76wj9w6r4y2pa1hmy1kkzmc73an9zchx0ikm2z92x6s")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target #:phases (alist-cons-before 'configure 'fix-perl (lambda _ - ;; https://launchpad.net/bugs/935540 - ;; 'struct file_handle' is used by 'glibc' - (substitute* '("istream.c" "istream.h") - (("struct[[:blank:]]+file_handle") - "struct w3m_file_handle")) (substitute* '("scripts/w3mmail.cgi.in" "scripts/dirlist.cgi.in") (("@PERL@") (which "perl")))) -- cgit v1.2.3 From 2d125a9b21306919e6123f76c0970988b14dadcf Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 5 Nov 2016 13:28:42 -0400 Subject: gnu: weex: Update to 2.8.2 [fixes CVE-2005-3150]. * gnu/packages/ftp.scm (weex): Update to 2.8.2. [source]: Use new URL. Remove obsolete 'weex-vacopy.patch'. [arguments]: Remove custom 'configure' phase and add 'bootstrap' phase. [native-inputs]: Add autoconf, automake, and gnu-gettext. * gnu/packages/patches/weex-vacopy.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/ftp.scm | 27 ++++++++++++--------------- gnu/packages/patches/weex-vacopy.patch | 13 ------------- 3 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 gnu/packages/patches/weex-vacopy.patch (limited to 'gnu/packages/patches') diff --git a/gnu/local.mk b/gnu/local.mk index 49b672111f..1ac336196d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -892,7 +892,6 @@ dist_patch_DATA = \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ %D%/packages/patches/vtk-mesa-10.patch \ %D%/packages/patches/weechat-python.patch \ - %D%/packages/patches/weex-vacopy.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index a11265532a..eb622dd17c 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -25,6 +25,8 @@ (define-module (gnu packages ftp) #:use-module (guix download) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (gnu packages autotools) + #:use-module (gnu packages gettext) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) #:use-module (gnu packages pkg-config) @@ -126,31 +128,26 @@ (define-public ncftp (define-public weex (package (name "weex") - (version "2.6.1.5") + (version "2.8.2") (source (origin (method url-fetch) (uri - (string-append "mirror://sourceforge/weex/weex/" version - "/weex-" version ".tar.gz")) + (string-append "mirror://sourceforge/weex/weex/" + "/weex_" version ".tar.gz")) (sha256 (base32 - "0f5cj5p852wkm24mzy2sxgxyahv2p9rk4wlq21j310pi7wlhgwyl")) - (patches (search-patches "weex-vacopy.patch")))) + "1ir761hjncr1bamaqcw9j7x57xi3s9jax3223bxwbq30a0vsw1pd")))) (build-system gnu-build-system) + (native-inputs + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("gettext" ,gnu-gettext))) (arguments `(#:phases (modify-phases %standard-phases - (replace 'configure - ;; configure does not work followed by both "SHELL=..." and - ;; "CONFIG_SHELL=..."; set environment variables instead - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bash (which "bash"))) - (setenv "SHELL" bash) - (setenv "CONFIG_SHELL" bash) - (zero? (system* bash "./configure" - (string-append "--prefix=" out))))))))) + (add-before 'configure 'bootstrap + (lambda _ (zero? (system* "autoreconf" "-vfi"))))))) (home-page "http://weex.sourceforge.net/") (synopsis "Non-interactive client for FTP synchronization") (description diff --git a/gnu/packages/patches/weex-vacopy.patch b/gnu/packages/patches/weex-vacopy.patch deleted file mode 100644 index f593e86c08..0000000000 --- a/gnu/packages/patches/weex-vacopy.patch +++ /dev/null @@ -1,13 +0,0 @@ -Taken from the Debian 2.8.0 package. - ---- weex-2.6.1.5/src/strlib.c 2003-08-18 11:52:38.000000000 +0200 -+++ weex-2.8.0/src/strlib.c 2007-12-04 14:22:02.000000000 +0100 -@@ -42,6 +42,8 @@ - # define G_VA_COPY(ap1, ap2) (*(ap1) = *(ap2)) - # elif defined (G_VA_COPY_AS_ARRAY) - # define G_VA_COPY(ap1, ap2) g_memmove ((ap1), (ap2), sizeof (va_list)) -+# elif defined (__x86_64__) -+# define G_VA_COPY(ap1, ap2) memmove ((ap1), (ap2), sizeof (va_list)) - # else /* va_list is a pointer */ - # define G_VA_COPY(ap1, ap2) ((ap1) = (ap2)) - # endif /* va_list is a pointer */ -- cgit v1.2.3