Merge branch 'staging'
This commit is contained in:
commit
7d62fa206b
12
gnu/local.mk
12
gnu/local.mk
|
@ -664,6 +664,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/apr-skip-getservbyname-test.patch \
|
||||
%D%/packages/patches/aria2-CVE-2019-3500.patch \
|
||||
%D%/packages/patches/aspell-default-dict-dir.patch \
|
||||
%D%/packages/patches/at-spi2-core-meson-compat.patch \
|
||||
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
|
||||
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
|
||||
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
|
||||
|
@ -813,8 +814,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/gcc-6-source-date-epoch-1.patch \
|
||||
%D%/packages/patches/gcc-6-source-date-epoch-2.patch \
|
||||
%D%/packages/patches/gcc-8-strmov-store-file-names.patch \
|
||||
%D%/packages/patches/gcr-disable-failing-tests.patch \
|
||||
%D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch \
|
||||
%D%/packages/patches/gd-CVE-2018-5711.patch \
|
||||
%D%/packages/patches/gd-CVE-2018-1000222.patch \
|
||||
%D%/packages/patches/gd-CVE-2019-6977.patch \
|
||||
|
@ -859,7 +858,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
|
||||
%D%/packages/patches/gmp-faulty-test.patch \
|
||||
%D%/packages/patches/gnome-shell-theme.patch \
|
||||
%D%/packages/patches/gnome-todo-libical-compat.patch \
|
||||
%D%/packages/patches/gnome-tweak-tool-search-paths.patch \
|
||||
%D%/packages/patches/gnucash-fix-test-transaction-failure.patch \
|
||||
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
|
||||
|
@ -890,7 +888,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
|
||||
%D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
|
||||
%D%/packages/patches/gtk2-theme-paths.patch \
|
||||
%D%/packages/patches/gtk3-fix-deprecation-macro-use.patch \
|
||||
%D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \
|
||||
%D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
|
||||
%D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
|
||||
|
@ -1079,6 +1076,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/mozjs38-tracelogger.patch \
|
||||
%D%/packages/patches/mozjs38-version-detection.patch \
|
||||
%D%/packages/patches/mrrescue-support-love-11.patch \
|
||||
%D%/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch \
|
||||
%D%/packages/patches/mtools-mformat-uninitialized.patch \
|
||||
%D%/packages/patches/mumble-1.2.19-abs.patch \
|
||||
%D%/packages/patches/mumps-build-parallelism.patch \
|
||||
|
@ -1211,6 +1209,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \
|
||||
%D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
|
||||
%D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
|
||||
%D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \
|
||||
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \
|
||||
%D%/packages/patches/python-unittest2-python3-compat.patch \
|
||||
%D%/packages/patches/python-unittest2-remove-argparse.patch \
|
||||
|
@ -1292,9 +1291,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/teeworlds-use-latest-wavpack.patch \
|
||||
%D%/packages/patches/texinfo-perl-compat.patch \
|
||||
%D%/packages/patches/texinfo-5-perl-compat.patch \
|
||||
%D%/packages/patches/texlive-bin-CVE-2018-17407.patch \
|
||||
%D%/packages/patches/texlive-bin-luatex-poppler-compat.patch \
|
||||
%D%/packages/patches/texlive-bin-pdftex-poppler-compat.patch \
|
||||
%D%/packages/patches/texlive-bin-xetex-poppler-compat.patch \
|
||||
%D%/packages/patches/telegram-purple-adjust-test.patch \
|
||||
%D%/packages/patches/texi2html-document-encoding.patch \
|
||||
%D%/packages/patches/texi2html-i18n.patch \
|
||||
|
@ -1307,6 +1305,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/tk-find-library.patch \
|
||||
%D%/packages/patches/ttf2eot-cstddef.patch \
|
||||
%D%/packages/patches/ttfautohint-source-date-epoch.patch \
|
||||
%D%/packages/patches/totem-meson-compat.patch \
|
||||
%D%/packages/patches/totem-meson-easy-codec.patch \
|
||||
%D%/packages/patches/tuxpaint-stamps-path.patch \
|
||||
%D%/packages/patches/twinkle-include-qregexpvalidator.patch \
|
||||
|
@ -1328,7 +1327,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/upower-builddir.patch \
|
||||
%D%/packages/patches/upx-fix-CVE-2017-15056.patch \
|
||||
%D%/packages/patches/valgrind-enable-arm.patch \
|
||||
%D%/packages/patches/valgrind-glibc-compat.patch \
|
||||
%D%/packages/patches/vboot-utils-fix-format-load-address.patch \
|
||||
%D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \
|
||||
%D%/packages/patches/vboot-utils-skip-test-workbuf.patch \
|
||||
|
|
|
@ -30,14 +30,14 @@
|
|||
(define-public apr
|
||||
(package
|
||||
(name "apr")
|
||||
(version "1.6.3")
|
||||
(version "1.6.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://apache/apr/apr-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wiik6amxn6lkc55fv9yz5i3kbxnqbp36alrzabx1avsdp8hc7qk"))
|
||||
"01d1n1ql66bxsjx0wyzazmkqdqdmr0is6a7lwyy5kzy4z7yajz56"))
|
||||
(patches
|
||||
(search-patches "apr-skip-getservbyname-test.patch"))
|
||||
(patch-flags '("-p0"))))
|
||||
|
|
|
@ -1157,7 +1157,7 @@ command.")
|
|||
(define-public tzdata
|
||||
(package
|
||||
(name "tzdata")
|
||||
(version "2018i")
|
||||
(version "2019a")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1165,7 +1165,7 @@ command.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1n80ih8agibagic401smqscz3xxqvs5bm5x3lk803g539kw5xi42"))))
|
||||
"0wlpqm4asvi0waaz24xj20iq40gqfypmb4nldjhkfgm09bgnsdlh"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f
|
||||
|
@ -1215,7 +1215,7 @@ command.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1p1jxlnryaxknj0l768h3dmlk2jpqz5n5d24w9c9vyx6dj3xpb5a"))))))
|
||||
"1x9z8fpgnhzlsnps0hamb54ymaskjab7ys9m4i4gpk9hpiig2fc7"))))))
|
||||
(home-page "https://www.iana.org/time-zones")
|
||||
(synopsis "Database of current and historical time zones")
|
||||
(description "The Time Zone Database (often called tz or zoneinfo)
|
||||
|
|
|
@ -160,7 +160,7 @@ files and generates build instructions for the Ninja build system.")
|
|||
(define-public meson
|
||||
(package
|
||||
(name "meson")
|
||||
(version "0.49.0")
|
||||
(version "0.50.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/mesonbuild/meson/"
|
||||
|
@ -168,7 +168,7 @@ files and generates build instructions for the Ninja build system.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0l8m1v7cl5ybm7psfqmmdqbvmnsbb1qhb8ni3hwap3i0mk29a0zv"))))
|
||||
"07q2wz23wjfk8z66mli1cc9as0ycjp5f39fd4awny82qv8nw86ra"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH
|
||||
|
|
|
@ -76,7 +76,7 @@
|
|||
(define-public nss-certs
|
||||
(package
|
||||
(name "nss-certs")
|
||||
(version "3.41")
|
||||
(version "3.43")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((version-with-underscores
|
||||
|
@ -87,7 +87,7 @@
|
|||
"nss-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0bbif42fzz5gk451sv3yphdrl7m4p6zgk5jk0307j06xs3sihbmb"))))
|
||||
"1jp27w4w9nj5pkzrbc1zqj6pa09h2yy7vhzyx5fvg1q86fvw22zk"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"))
|
||||
(native-inputs
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
(define-public cups-filters
|
||||
(package
|
||||
(name "cups-filters")
|
||||
(version "1.21.5")
|
||||
(version "1.22.3")
|
||||
(source(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -65,7 +65,7 @@
|
|||
"cups-filters-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0azq9j7kqy18g6vgmvrbw8i4mcqdp3cbgh7q79x1b8p92w4si6rq"))
|
||||
"11vilv80l3q7hz8vyhclvjcnlgk93r7p9dvg634186iddjzls0j3"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; install backends, banners and filters to cups-filters output
|
||||
|
@ -123,6 +123,12 @@
|
|||
(("/usr/local/lib/cups/filter")
|
||||
(string-append out "/lib/cups/filter")))
|
||||
#t)))
|
||||
(add-after 'unpack 'patch-for-poppler
|
||||
(lambda _
|
||||
(substitute* "filter/pdf.cxx"
|
||||
(("GooString \\*field_name;" m)
|
||||
(string-append "const " m)))
|
||||
#t))
|
||||
(add-after 'install 'wrap-filters
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; Some filters expect to find 'gs' in $PATH. We cannot
|
||||
|
@ -180,7 +186,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.")
|
|||
(define-public cups-minimal
|
||||
(package
|
||||
(name "cups-minimal")
|
||||
(version "2.2.10")
|
||||
(version "2.2.11")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -188,7 +194,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.")
|
|||
version "/cups-" version "-source.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1fq52aw1mini3ld2czv5gg37wbbvh4n7yc7wzzxvbs3zpfrv5j3p"))))
|
||||
"0v5p10lyv8wv48s8ghkhjmdrxg6iwj8hn36v1ilkz46n7y0i107m"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
|
|
@ -484,7 +484,7 @@ Language.")
|
|||
(define-public mariadb
|
||||
(package
|
||||
(name "mariadb")
|
||||
(version "10.1.37")
|
||||
(version "10.1.38")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://downloads.mariadb.org/f/"
|
||||
|
@ -492,7 +492,7 @@ Language.")
|
|||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ijdmdn9mcciwv361zfmja6b1h6qpbdqgrnnq6kkdapplyq1dmcc"))
|
||||
"0zq77w3ff9q781fn8cv46vy1v4ggb8vjarjvk51k653x4gyg9wfa"))
|
||||
(patches (search-patches "mariadb-client-test-32bit.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
|
@ -571,7 +571,7 @@ Language.")
|
|||
"roles.acl_statistics"
|
||||
|
||||
;; This file contains a time bomb which makes it fail after
|
||||
;; 2019-01-01. See <https://bugs.gnu.org/34351> for details.
|
||||
;; 2030-12-31. See <https://bugs.gnu.org/34351> for details.
|
||||
"main.mysqldump"
|
||||
|
||||
;; XXX: Fails sporadically.
|
||||
|
@ -685,7 +685,7 @@ as a drop-in replacement of MySQL.")
|
|||
(patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-uuid=e2fs")
|
||||
`(#:configure-flags '("--with-uuid=e2fs" "--with-openssl")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-/bin/sh
|
||||
|
@ -704,6 +704,7 @@ as a drop-in replacement of MySQL.")
|
|||
(inputs
|
||||
`(("readline" ,readline)
|
||||
("libuuid" ,util-linux)
|
||||
("openssl" ,openssl)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://www.postgresql.org/")
|
||||
(synopsis "Powerful object-relational database system")
|
||||
|
|
|
@ -123,7 +123,7 @@ markup) can be customized and extended by the user.")
|
|||
(define-public doxygen
|
||||
(package
|
||||
(name "doxygen")
|
||||
(version "1.8.14")
|
||||
(version "1.8.15")
|
||||
(home-page "http://www.doxygen.nl/")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -134,7 +134,7 @@ markup) can be customized and extended by the user.")
|
|||
".src.tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0kcxymbam9jwiyjwyvwdjj0h74lbb6c467szsipzbxjyfl17wxfi"))
|
||||
"0p94b4yb6bk2dxzs5kyl82xxgq2qakgbx5yy3ssbbadncb20x75x"))
|
||||
(patches (search-patches "doxygen-test.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
|
|
|
@ -41,14 +41,14 @@
|
|||
(define-public elfutils
|
||||
(package
|
||||
(name "elfutils")
|
||||
(version "0.173")
|
||||
(version "0.176")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://sourceware.org/elfutils/ftp/"
|
||||
version "/elfutils-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1zq0l12k64hrbjmdjc4llrad96c25i427hpma1id9nk87w9qqvdp"))
|
||||
"08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb"))
|
||||
(patches (search-patches "elfutils-tests-ptrace.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
|
||||
|
|
|
@ -2600,6 +2600,31 @@ definitions, modules and classes, display method documentation and provide
|
|||
method and constant name completion.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-robot-mode
|
||||
(let ((commit "32846e7e80ae3471b7c07f9709dcaa4f9b9ed4a0")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "emacs-robot-mode")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
;; A better maintained fork of robot-mode.
|
||||
(url "https://github.com/jvalkeejarvi/robot-mode.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1i8wf7m0gml8zvvmlgppjzv78b432686p1qdbzgclc7qfcvzag0d"))))
|
||||
(build-system emacs-build-system)
|
||||
(propagated-inputs `(("emacs-s" ,emacs-s)))
|
||||
(home-page "https://github.com/jvalkeejarvi/robot-mode")
|
||||
(synopsis "Emacs mode for Robot Framework")
|
||||
(description "This major mode facilitates editing Robot Framework source
|
||||
files with features such as syntax highlighting, comments, finding keywords,
|
||||
completing keywords and smart indentation.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-rspec
|
||||
(package
|
||||
(name "emacs-rspec")
|
||||
|
|
|
@ -389,25 +389,20 @@ X11-system or any other graphical user interface.")
|
|||
(define-public teckit
|
||||
(package
|
||||
(name "teckit")
|
||||
(version "2.5.8")
|
||||
(version "2.5.9") ;signed by key 0xC9183BEA0288CDEE
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/silnrsi/teckit")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/silnrsi/teckit/releases/"
|
||||
"download/v" version "/teckit-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1jmsdmfz7bgq1n5qsqgpq1b1n77f1hll0czfw5wkxz4knzb14ndn"))))
|
||||
(base32 "0gbxyip4wdibirdg2pvzayzyy927vxyd6dfyfiflx8zg88qzn8v8"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("zlib" ,zlib)
|
||||
("expat" ,expat)))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)
|
||||
("perl" ,perl))) ; for the tests
|
||||
`(("perl" ,perl))) ;for the tests
|
||||
(synopsis "Toolkit for encoding conversions")
|
||||
(description
|
||||
"TECkit is a low-level toolkit intended to be used by other applications
|
||||
|
@ -534,7 +529,7 @@ smooth contours with constant curvature at the spline joins.")
|
|||
(define-public libuninameslist
|
||||
(package
|
||||
(name "libuninameslist")
|
||||
(version "20180701")
|
||||
(version "20190305")
|
||||
(home-page "https://github.com/fontforge/libuninameslist")
|
||||
(source
|
||||
(origin
|
||||
|
@ -543,7 +538,7 @@ smooth contours with constant curvature at the spline joins.")
|
|||
"/libuninameslist-dist-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"141wh2f5jsaw84mgw6vf2c9hd2wm957a2hpnicyqjbc7pk89gvca"))))
|
||||
"1rwd2bgcyvign9agyjsr3v2fr9j1cg2wi6g0z2wwg1az32scknwq"))))
|
||||
(build-system gnu-build-system)
|
||||
(synopsis "Unicode names and annotation list")
|
||||
(description
|
||||
|
@ -560,14 +555,14 @@ definitions.")
|
|||
(define-public fontforge
|
||||
(package
|
||||
(name "fontforge")
|
||||
(version "20170731")
|
||||
(version "20190317")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/fontforge/fontforge/releases/download/"
|
||||
version "/fontforge-dist-" version ".tar.xz"))
|
||||
version "/fontforge-" version ".tar.gz"))
|
||||
(sha256 (base32
|
||||
"08l8h3yvk4v7652jvmd3ls7nf5miybkx2fmkf1mpwwfixpxxw2l4"))))
|
||||
"1ddqbpc32cgbccdnv0lfw0qhj59hcqzb7616ph5lkvm91pnas4dp"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -614,11 +609,7 @@ definitions.")
|
|||
"pango" "cairo" "fontconfig")))
|
||||
;; Checks for potrace program at runtime
|
||||
`("PATH" ":" prefix (,potrace)))
|
||||
#t))))
|
||||
|
||||
;; Skip test 40 "FontForge .sfd file open check" to work around
|
||||
;; <https://github.com/fontforge/fontforge/issues/3246>.
|
||||
#:make-flags '("TESTSUITEFLAGS=-k '!\\.sfd'")))
|
||||
#t))))))
|
||||
(synopsis "Outline font editor")
|
||||
(description
|
||||
"FontForge allows you to create and modify postscript, truetype and
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
|
||||
;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
|
@ -152,31 +152,30 @@ freedesktop.org project.")
|
|||
(define-public libinput
|
||||
(package
|
||||
(name "libinput")
|
||||
(version "1.12.3")
|
||||
(version "1.13.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://freedesktop.org/software/libinput/"
|
||||
"libinput-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0mg2zqbjcgj0aq7d9nwawvyhx43vakilahrc83hrfyif3a3gyrpj"))))
|
||||
"0vb11fzd06xbagrnha2bbzmlfg04bbgb5w5rjrxrrz686mfwj9zb"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Ddocumentation=false")))
|
||||
(native-inputs
|
||||
`(("check" ,check)
|
||||
("pkg-config" ,pkg-config)
|
||||
("valgrind" ,valgrind)))
|
||||
(propagated-inputs
|
||||
`(;; In Requires.private of libinput.pc.
|
||||
("libevdev" ,libevdev)
|
||||
("libudev" ,eudev)
|
||||
("libwacom" ,libwacom)
|
||||
("mtdev" ,mtdev)))
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("cairo" ,cairo)
|
||||
("glib" ,glib)
|
||||
("gtk+" ,gtk+)))
|
||||
("gtk+" ,gtk+)
|
||||
("libevdev" ,libevdev)
|
||||
("libwacom" ,libwacom)
|
||||
("mtdev" ,mtdev)))
|
||||
(propagated-inputs
|
||||
`(;; libinput.h requires <libudev.h>, so propagate it.
|
||||
("udev" ,eudev)))
|
||||
(home-page "https://www.freedesktop.org/wiki/Software/libinput/")
|
||||
(synopsis "Input devices handling library")
|
||||
(description
|
||||
|
@ -187,9 +186,9 @@ other applications that need to directly deal with input devices.")
|
|||
(define-public libinput-minimal
|
||||
(package (inherit libinput)
|
||||
(name "libinput-minimal")
|
||||
(inputs '())
|
||||
(propagated-inputs
|
||||
(alist-delete "libwacom" (package-propagated-inputs libinput)))
|
||||
(inputs
|
||||
(fold alist-delete (package-inputs libinput)
|
||||
'("cairo" "glib" "gtk+" "libwacom")))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments libinput)
|
||||
((#:configure-flags flags ''())
|
||||
|
@ -547,14 +546,14 @@ Python.")
|
|||
(define-public wayland
|
||||
(package
|
||||
(name "wayland")
|
||||
(version "1.16.0")
|
||||
(version "1.17.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://wayland.freedesktop.org/releases/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf"))))
|
||||
"194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:parallel-tests? #f))
|
||||
|
|
|
@ -37,14 +37,14 @@
|
|||
(define-public gdb
|
||||
(package
|
||||
(name "gdb")
|
||||
(version "8.2")
|
||||
(version "8.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gdb/gdb-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fbw6j4z7kmvywwgavn7w3knp860i5i9qnjffc5p52bwkji43963"))))
|
||||
"00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; FIXME "make check" fails on single-processor systems.
|
||||
|
|
|
@ -101,7 +101,7 @@ topology functions.")
|
|||
(define-public gnome-maps
|
||||
(package
|
||||
(name "gnome-maps")
|
||||
(version "3.26.2")
|
||||
(version "3.28.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -109,7 +109,7 @@ topology functions.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0l40l7m9dyphvasiq1jxrn6ivavs1xwzn0bzz2x1z7x73955q783"))))
|
||||
"1yzi08a9316jplgsl2z0qzlqxhghyqcjhv0m6i94wcain4mxk1z7"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags ;; Ensure that geoclue is referred to by output.
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -221,7 +221,7 @@ also known as DXTn or DXTC) for Mesa.")
|
|||
(define-public mesa
|
||||
(package
|
||||
(name "mesa")
|
||||
(version "18.3.1")
|
||||
(version "18.3.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -233,10 +233,10 @@ also known as DXTn or DXTC) for Mesa.")
|
|||
version "/mesa-" version ".tar.xz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0qyw9dj2p9n91qzc4ylck2an7ibssjvzi2bjcpv2ajk851yq47sv"))
|
||||
"0lvrfjaic7dhay9v52f9k3q5aac8xagfq3pnzjrl0cn65jlaw9s0"))
|
||||
(patches
|
||||
(search-patches "mesa-skip-disk-cache-test.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(build-system meson-build-system)
|
||||
(propagated-inputs
|
||||
`(;; The following are in the Requires.private field of gl.pc.
|
||||
("libdrm" ,libdrm)
|
||||
|
@ -257,14 +257,17 @@ also known as DXTn or DXTC) for Mesa.")
|
|||
("libxvmc" ,libxvmc)
|
||||
,@(match (%current-system)
|
||||
((or "x86_64-linux" "i686-linux")
|
||||
`(("llvm" ,llvm-6))) ;TODO: Change to LLVM in the next rebuild cycle.
|
||||
`(("llvm" ,llvm)))
|
||||
(_
|
||||
`()))
|
||||
("makedepend" ,makedepend)
|
||||
("wayland" ,wayland)
|
||||
("wayland-protocols" ,wayland-protocols)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
`(("bison" ,bison)
|
||||
("flex" ,flex)
|
||||
("gettext" ,gettext-minimal)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python)
|
||||
("python-mako" ,python-mako)
|
||||
("which" ,(@ (gnu packages base) which))))
|
||||
|
@ -273,47 +276,48 @@ also known as DXTn or DXTC) for Mesa.")
|
|||
'(,@(match (%current-system)
|
||||
((or "armhf-linux" "aarch64-linux")
|
||||
;; TODO: Fix svga driver for aarch64 and armhf.
|
||||
'("--with-gallium-drivers=etnaviv,freedreno,imx,nouveau,pl111,r300,r600,swrast,tegra,v3d,vc4,virgl"))
|
||||
'("-Dgallium-drivers=etnaviv,freedreno,imx,nouveau,pl111,r300,r600,swrast,tegra,v3d,vc4,virgl"))
|
||||
(_
|
||||
'("--with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast,virgl")))
|
||||
'("-Dgallium-drivers=nouveau,r300,r600,radeonsi,svga,swrast,virgl")))
|
||||
;; Enable various optional features. TODO: opencl requires libclc,
|
||||
;; omx requires libomxil-bellagio
|
||||
"--with-platforms=x11,drm,surfaceless,wayland"
|
||||
"--enable-glx-tls" ;Thread Local Storage, improves performance
|
||||
;; "--enable-opencl"
|
||||
;; "--enable-omx"
|
||||
"--enable-osmesa"
|
||||
"--enable-xa"
|
||||
"-Dplatforms=x11,drm,surfaceless,wayland"
|
||||
"-Dglx=dri" ;Thread Local Storage, improves performance
|
||||
;; "-Dopencl=true"
|
||||
;; "-Domx=true"
|
||||
"-Dosmesa=gallium"
|
||||
"-Dgallium-xa=true"
|
||||
|
||||
;; features required by wayland
|
||||
"--enable-gles2"
|
||||
"--enable-gbm"
|
||||
"--enable-shared-glapi"
|
||||
"-Dgles2=true"
|
||||
"-Dgbm=true"
|
||||
"-Dshared-glapi=true"
|
||||
|
||||
;; Enable Vulkan on i686-linux and x86-64-linux.
|
||||
,@(match (%current-system)
|
||||
("x86_64-linux"
|
||||
'("--with-vulkan-drivers=intel,radeon"))
|
||||
'("-Dvulkan-drivers=intel,amd"))
|
||||
;; TODO: Fix intel driver on i686-linux.
|
||||
("i686-linux"
|
||||
'("--with-vulkan-drivers=radeon"))
|
||||
'("-Dvulkan-drivers=amd"))
|
||||
(_
|
||||
'("")))
|
||||
'("-Dvulkan-drivers=auto")))
|
||||
|
||||
;; Also enable the tests.
|
||||
"--enable-gallium-tests"
|
||||
"-Dbuild-tests=true"
|
||||
|
||||
;; on non-intel systems, drop i915 and i965
|
||||
;; from the default dri drivers
|
||||
,@(match (%current-system)
|
||||
((or "x86_64-linux" "i686-linux")
|
||||
'("--with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast"
|
||||
"--enable-llvm")) ; default is x86/x86_64 only
|
||||
'("-Ddri-drivers=i915,i965,nouveau,r200,r100"
|
||||
"-Dllvm=true")) ; default is x86/x86_64 only
|
||||
(_
|
||||
'("--with-dri-drivers=nouveau,r200,radeon,swrast"))))
|
||||
'("-Ddri-drivers=nouveau,r200,r100"))))
|
||||
#:modules ((ice-9 match)
|
||||
(srfi srfi-1)
|
||||
(guix build utils)
|
||||
(guix build gnu-build-system))
|
||||
(guix build meson-build-system))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after
|
||||
|
@ -323,7 +327,7 @@ also known as DXTn or DXTC) for Mesa.")
|
|||
(("/usr/bin/env python2") (which "python")))
|
||||
#t))
|
||||
(add-before
|
||||
'build 'fix-dlopen-libnames
|
||||
'configure 'fix-dlopen-libnames
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
;; Remain agnostic to .so.X.Y.Z versions while doing
|
||||
|
|
|
@ -509,7 +509,7 @@ has an ease of use unmatched by other C++ callback libraries.")
|
|||
(define glibmm
|
||||
(package
|
||||
(name "glibmm")
|
||||
(version "2.54.1")
|
||||
(version "2.56.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/glibmm/"
|
||||
|
@ -517,7 +517,7 @@ has an ease of use unmatched by other C++ callback libraries.")
|
|||
"/glibmm-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0jkapw18icz59cmlmsl00nwwz0wh291kb4hc9z9hxmq45drqrhkw"))))
|
||||
"1abrkqhca5p8n6ly3vp1232rny03s7lrd8f8iz2m2m141nxgqx3f"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(;; XXX: Some tests uses C++14 features. Remove this when the default
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -85,7 +85,7 @@
|
|||
(define-public atk
|
||||
(package
|
||||
(name "atk")
|
||||
(version "2.28.1")
|
||||
(version "2.32.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -93,17 +93,12 @@
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list (string-append "--with-html-dir="
|
||||
(assoc-ref %outputs "doc")
|
||||
"/share/gtk-doc/html"))))
|
||||
"1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb"))))
|
||||
(build-system meson-build-system)
|
||||
(propagated-inputs `(("glib" ,glib))) ; required by atk.pc
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("gettext" ,gettext-minimal)
|
||||
("glib" ,glib "bin") ; glib-mkenums, etc.
|
||||
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
|
||||
(synopsis "GNOME accessibility toolkit")
|
||||
|
@ -399,7 +394,7 @@ printing and other features typical of a source code editor.")
|
|||
(define-public gtksourceview
|
||||
(package
|
||||
(name "gtksourceview")
|
||||
(version "3.24.10")
|
||||
(version "4.0.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/gtksourceview/"
|
||||
|
@ -407,7 +402,7 @@ printing and other features typical of a source code editor.")
|
|||
"gtksourceview-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"16ym7jwiki4s1pilwr4incx0yg7ll94f1cajrnpndkxxs36hcm5b"))))
|
||||
"1b2z9c0skxrgw2vh08hv6qxky8jbvamc4rgww82j0kpp533rz0hm"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
@ -444,10 +439,10 @@ GTK+ text widget GtkTextView. It improves GtkTextView by implementing syntax
|
|||
highlighting and other features typical of a source code editor.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public gdk-pixbuf
|
||||
(package
|
||||
(name "gdk-pixbuf")
|
||||
(version "2.38.0")
|
||||
(define-public gtksourceview-3
|
||||
(package (inherit gtksourceview)
|
||||
(name "gtksourceview")
|
||||
(version "3.24.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -455,7 +450,20 @@ highlighting and other features typical of a source code editor.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ixfmnxjylx06mjaw116apymwi1a8rnkmkbbvqaxxg2pfwy9fl6x"))))
|
||||
"16ym7jwiki4s1pilwr4incx0yg7ll94f1cajrnpndkxxs36hcm5b"))))))
|
||||
|
||||
(define-public gdk-pixbuf
|
||||
(package
|
||||
(name "gdk-pixbuf")
|
||||
(version "2.38.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fmbjgjcyym3qg46f64qgl7icdm4ii77flyc1mhk244rp8vgi7zi"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Dinstalled_tests=false")
|
||||
|
@ -547,39 +555,64 @@ in the GNOME project.")
|
|||
(define-public at-spi2-core
|
||||
(package
|
||||
(name "at-spi2-core")
|
||||
(version "2.26.2")
|
||||
(version "2.32.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(patches (search-patches "at-spi2-core-meson-compat.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"0596ghkamkxgv08r4a1pdhm06qd5zzgcfqsv64038w9xbvghq3n8"))))
|
||||
(build-system gnu-build-system)
|
||||
"083j1v7kdjrpjsv1b9dl3d8xqj39jyp4cfn8i9gbbm7q2g93b923"))))
|
||||
(build-system meson-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
(list (string-append "--with-html-dir="
|
||||
(assoc-ref %outputs "doc")
|
||||
"/share/gtk-doc/html"))
|
||||
(list "-Ddocs=true")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
;; Run test-suite under a dbus session.
|
||||
(add-after 'unpack 'set-documentation-path
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Ensure that the cross-references point to the "doc" output.
|
||||
(substitute* "doc/libatspi/meson.build"
|
||||
(("docpath =.*")
|
||||
(string-append "docpath = '" (assoc-ref outputs "doc") "/share/gtk-doc/html'\n")))
|
||||
#t))
|
||||
(add-before 'install 'prepare-doc-directory
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(mkdir-p (string-append (assoc-ref outputs "doc") "/share"))
|
||||
#t))
|
||||
(add-after 'install 'move-documentation
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(doc (assoc-ref outputs "doc")))
|
||||
(copy-recursively
|
||||
(string-append out "/share/gtk-doc")
|
||||
(string-append doc "/share/gtk-doc"))
|
||||
(delete-file-recursively
|
||||
(string-append out "/share/gtk-doc")))
|
||||
#t))
|
||||
(add-after 'install 'check
|
||||
(lambda _
|
||||
(setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME
|
||||
;; Run test-suite under a dbus session.
|
||||
(setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service
|
||||
(string-append %output "/share"))
|
||||
;; Don't fail on missing '/etc/machine-id'.
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||
(invoke "dbus-launch" "make" "check"))))))
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0") ;
|
||||
(invoke "dbus-launch" "ninja" "test")))
|
||||
(delete 'check))))
|
||||
(propagated-inputs
|
||||
;; atspi-2.pc refers to all these.
|
||||
`(("dbus" ,dbus)
|
||||
("glib" ,glib)))
|
||||
(inputs
|
||||
`(("libxi" ,libxi)
|
||||
("glib" ,glib)
|
||||
("libxi" ,libxi)
|
||||
("libxtst" ,libxtst)))
|
||||
(native-inputs
|
||||
`(("gobject-introspection" ,gobject-introspection)
|
||||
("gtk-doc" ,gtk-doc)
|
||||
("glib" ,glib "bin")
|
||||
("intltool" ,intltool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(synopsis "Assistive Technology Service Provider Interface, core components")
|
||||
|
@ -592,7 +625,7 @@ is part of the GNOME accessibility project.")
|
|||
(define-public at-spi2-atk
|
||||
(package
|
||||
(name "at-spi2-atk")
|
||||
(version "2.26.2")
|
||||
(version "2.32.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -600,8 +633,8 @@ is part of the GNOME accessibility project.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1"))))
|
||||
(build-system gnu-build-system)
|
||||
"0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
@ -609,14 +642,16 @@ is part of the GNOME accessibility project.")
|
|||
;; Run test-suite under a dbus session.
|
||||
(lambda _
|
||||
(setenv "DBUS_FATAL_WARNINGS" "0")
|
||||
(invoke "dbus-launch" "make" "check"))))))
|
||||
(invoke "dbus-launch" "meson" "test"))))))
|
||||
(propagated-inputs
|
||||
`(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc
|
||||
(inputs
|
||||
`(("atk" ,atk)))
|
||||
(native-inputs
|
||||
`(("dbus" ,dbus) ; for testing
|
||||
("pkg-config" ,pkg-config)))
|
||||
`(("pkg-config" ,pkg-config)
|
||||
;; For tests.
|
||||
("dbus" ,dbus)
|
||||
("libxml2" ,libxml2)))
|
||||
(synopsis "Assistive Technology Service Provider Interface, ATK bindings")
|
||||
(description
|
||||
"The Assistive Technology Service Provider Interface
|
||||
|
@ -693,8 +728,7 @@ application suites.")
|
|||
(name "gtk+")
|
||||
;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in
|
||||
;; mate.scm will also need to be updated.
|
||||
(version "3.24.2")
|
||||
(replacement gtk+/fixed)
|
||||
(version "3.24.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -702,7 +736,7 @@ application suites.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"14l8mimdm44r3h5pn5hzigl1z25jna8jxvb16l88v4nc4zj0afsv"))
|
||||
"080m925dyhiidlhsxqzx040l4iha2gg38pzbfpnsnjyzl92124jj"))
|
||||
(patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
|
||||
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))
|
||||
(modules '((guix build utils)))
|
||||
|
@ -788,18 +822,6 @@ application suites.")
|
|||
(variable "GUIX_GTK3_PATH")
|
||||
(files '("lib/gtk-3.0")))))))
|
||||
|
||||
;; Fixes a bug in Gtk that causes crashes in IceCat and Emacs.
|
||||
;; See <https://bugs.gnu.org/34454>, <https://bugs.gnu.org/34658>,
|
||||
;; and <https://gitlab.gnome.org/GNOME/gtk/issues/1523>.
|
||||
(define gtk+/fixed
|
||||
(package
|
||||
(inherit gtk+)
|
||||
(source (origin
|
||||
(inherit (package-source gtk+))
|
||||
(patches
|
||||
(cons (search-patch "gtk3-fix-deprecation-macro-use.patch")
|
||||
(origin-patches (package-source gtk+))))))))
|
||||
|
||||
;;;
|
||||
;;; Guile bindings.
|
||||
;;;
|
||||
|
@ -1420,7 +1442,7 @@ information.")
|
|||
(define-public gtk-doc
|
||||
(package
|
||||
(name "gtk-doc")
|
||||
(version "1.27")
|
||||
(version "1.28")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||
|
@ -1428,7 +1450,7 @@ information.")
|
|||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vwsdl61nvnmqswlz5j9m4hg7qirhazwcikcnqf9nx0c13vx6sz2"))))
|
||||
"05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:parallel-tests? #f
|
||||
|
|
|
@ -48,14 +48,14 @@
|
|||
;; The 7 release series has an incompatible API, while the 6 series is still
|
||||
;; maintained. Don't update to 7 until we've made sure that the ImageMagick
|
||||
;; users are ready for the 7-series API.
|
||||
(version "6.9.10-16")
|
||||
(version "6.9.10-35")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://imagemagick/ImageMagick-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ylbv69r8l3d4za4i8q41cs6lq06mnhiq4qm03rvs3vp3gyp1m9x"))))
|
||||
"1mc7f1i29w27nqsc8gmlqxyid16ik4ys0razggwajzs7mhxy3g8g"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2015, 2019 Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
|
||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -92,14 +92,12 @@ conversions for values passed between the two languages.")
|
|||
(base32 "1x3lrj928dcxx1k8k9gf3s4s3jwvzv8mc3kkyg1g7c3a1sc1f3z9"))
|
||||
(patches (search-patches "python-cffi-x87-stack-clean.patch"))))
|
||||
(build-system python-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(inputs
|
||||
`(("libffi" ,libffi)))
|
||||
(propagated-inputs ; required at run-time
|
||||
`(("python-pycparser" ,python-pycparser)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("python-sphinx" ,python-sphinx)
|
||||
("python-pytest" ,python-pytest)))
|
||||
(arguments
|
||||
`(#:modules ((ice-9 ftw)
|
||||
|
@ -134,17 +132,7 @@ conversions for values passed between the two languages.")
|
|||
(lambda _
|
||||
(substitute* "testing/cffi0/test_ownlib.py"
|
||||
(("ret.left") "ownlib.left"))
|
||||
#t))
|
||||
(add-after 'install 'install-doc
|
||||
(lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
|
||||
(let* ((doc (string-append (assoc-ref outputs "doc")
|
||||
"/share/doc/" ,name "-" ,version))
|
||||
(html (string-append doc "/html")))
|
||||
(with-directory-excursion "doc"
|
||||
(apply invoke "make" "html" make-flags)
|
||||
(mkdir-p html)
|
||||
(copy-recursively "build/html" html))
|
||||
#t))))))
|
||||
#t)))))
|
||||
(home-page "https://cffi.readthedocs.org")
|
||||
(synopsis "Foreign function interface for Python")
|
||||
(description
|
||||
|
@ -154,6 +142,35 @@ conversions for values passed between the two languages.")
|
|||
(define-public python2-cffi
|
||||
(package-with-python2 python-cffi))
|
||||
|
||||
(define-public python-cffi-documentation
|
||||
(package
|
||||
(name "python-cffi-documentation")
|
||||
(version (package-version python-cffi))
|
||||
(source (package-source python-cffi))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'chdir
|
||||
(lambda _ (chdir "doc") #t))
|
||||
(delete 'configure)
|
||||
(replace 'build
|
||||
(lambda* (#:key (make-flags '()) #:allow-other-keys)
|
||||
(apply invoke "make" "html" make-flags)))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(copy-recursively "build/html" (string-append out "/html"))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("sphinx-build" ,python-sphinx)))
|
||||
(home-page (package-home-page python-cffi))
|
||||
(synopsis "Documentation for the Python CFFI interface")
|
||||
(description
|
||||
"This package contains HTML documentation for the @code{python-cffi}
|
||||
project.")
|
||||
(license (package-license python-cffi))))
|
||||
|
||||
(define-public ruby-ffi
|
||||
(package
|
||||
(name "ruby-ffi")
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016, 2018 Rene Saavedra <pacoon@protonmail.com>
|
||||
;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
|
||||
;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
|
||||
|
@ -1073,7 +1073,7 @@ intercept and print the system calls executed by the program.")
|
|||
(define-public alsa-lib
|
||||
(package
|
||||
(name "alsa-lib")
|
||||
(version "1.1.7")
|
||||
(version "1.1.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1081,7 +1081,7 @@ intercept and print the system calls executed by the program.")
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"02fw7dw202mjid49w9ki3dsfcyvid5fj488561bdzcm3haw00q4x"))))
|
||||
"1pxf0zkmps03l3zzd0fr828xhkg6a8hxljmbxzc2cyj2ls9kmp1w"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://www.alsa-project.org/")
|
||||
(synopsis "The Advanced Linux Sound Architecture libraries")
|
||||
|
@ -1093,14 +1093,14 @@ MIDI functionality to the Linux-based operating system.")
|
|||
(define-public alsa-utils
|
||||
(package
|
||||
(name "alsa-utils")
|
||||
(version "1.1.7")
|
||||
(version "1.1.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://ftp.alsa-project.org/pub/utils/"
|
||||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"02jlw6a22j2rr7inggfgk2hzx3w0fjhvhs0dn1afpzdp9aspzchx"))))
|
||||
"1kx45yhrxai3k595yyqs4wj0p2n5b0c9mf0k36ljjf1bj8lgb6zx"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; XXX: Disable man page creation until we have DocBook.
|
||||
|
@ -1113,6 +1113,13 @@ MIDI functionality to the Linux-based operating system.")
|
|||
"/lib/udev/rules.d"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'disable-broken-test
|
||||
(lambda _
|
||||
;; XXX: The 1.1.8 release tarball is missing a header that's
|
||||
;; required for this test to work. Fixed in 1.1.9.
|
||||
(substitute* "axfer/test/Makefile"
|
||||
((".*container-test.*") ""))
|
||||
#t))
|
||||
(add-before
|
||||
'install 'pre-install
|
||||
(lambda _
|
||||
|
@ -1140,14 +1147,14 @@ MIDI functionality to the Linux-based operating system.")
|
|||
(define-public alsa-plugins
|
||||
(package
|
||||
(name "alsa-plugins")
|
||||
(version "1.1.7")
|
||||
(version "1.1.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/"
|
||||
name "-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0iys4zl1davzyg3mn9lvil1n3k1ifrg3v1caj3k4dqyrnrd40jx7"))))
|
||||
"152r82i6f97gfilfgiax5prxkd4xlcipciv8ha8yrk452qbxyxvz"))))
|
||||
(build-system gnu-build-system)
|
||||
;; TODO: Split libavcodec and speex if possible. It looks like they can not
|
||||
;; be split, there are references to both in files.
|
||||
|
@ -2108,7 +2115,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.")
|
|||
(define-public kmod
|
||||
(package
|
||||
(name "kmod")
|
||||
(version "25")
|
||||
(version "26")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -2116,7 +2123,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.")
|
|||
"kmod-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kgixs4m3jvwk7fb3d18n6j77qhgi9qfv4csj35rs5ancr4ycrbi"))
|
||||
"17dvrls70nr3b3x1wm8pwbqy4r8a5c20m0dhys8mjhsnpg425fsp"))
|
||||
(patches (search-patches "kmod-module-directory.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
|
|
|
@ -324,15 +324,16 @@ enough to be used effectively as a scientific calculator.")
|
|||
(define-public double-conversion
|
||||
(package
|
||||
(name "double-conversion")
|
||||
(version "3.1.0")
|
||||
(version "3.1.4")
|
||||
(home-page "https://github.com/google/double-conversion")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page) (commit version)))
|
||||
(uri (git-reference (url home-page)
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"123rb2p4snqagrybw66vnapchqdwn2rfpr1wcq0ya9gwbyl7xccx"))))
|
||||
"13xwcqk2c0q8c1siw566clxcpvp0xrxvb72mra42wa3nvq9wlsv6"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:test-target "test"
|
||||
|
@ -2972,7 +2973,7 @@ parts of it.")
|
|||
(define-public openblas
|
||||
(package
|
||||
(name "openblas")
|
||||
(version "0.3.4")
|
||||
(version "0.3.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2981,7 +2982,7 @@ parts of it.")
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1s56lgilyyw86dzmj3jkci9zsg24n60wq4d0zri1hrxlxb6ihimj"))))
|
||||
"062kg4ny1ywz7k5grpb4pbf0hba0w6manbajwkmv4f477a31sxpl"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:test-target "test"
|
||||
|
@ -2997,6 +2998,7 @@ parts of it.")
|
|||
#:make-flags
|
||||
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
|
||||
"SHELL=bash"
|
||||
"MAKE_NB_JOBS=0" ;use jobserver for submakes
|
||||
;; Build the library for all supported CPUs. This allows
|
||||
;; switching CPU targets at runtime with the environment variable
|
||||
;; OPENBLAS_CORETYPE=<type>, where "type" is a supported CPU type.
|
||||
|
|
|
@ -1182,8 +1182,7 @@ sockets in Perl.")
|
|||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("dbus" ,dbus)
|
||||
("zlib" ,zlib)
|
||||
("network-manager" ,network-manager)))
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
(define-public ninja
|
||||
(package
|
||||
(name "ninja")
|
||||
(version "1.8.2")
|
||||
(version "1.9.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/martine/ninja/"
|
||||
|
@ -38,7 +38,7 @@
|
|||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1x66q6494ml1p1f74mxzik1giakl4zj7rxig9jsc50087l671f46"))))
|
||||
"1ffmzj5s9h98qhl94d9i23zcv057rsqbac9g1hdgvlzq51ccfzjx"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("python" ,python-2)))
|
||||
(arguments
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
(define-public nspr
|
||||
(package
|
||||
(name "nspr")
|
||||
(version "4.20")
|
||||
(version "4.21")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -42,7 +42,7 @@
|
|||
version "/src/nspr-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c"))))
|
||||
"0nkbgk0x31nfm4xl8la0a3vrnpa8gzkh7g4k65p7n880n73k5shm"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("perl" ,perl)))
|
||||
|
@ -70,7 +70,7 @@ in the Mozilla clients.")
|
|||
(define-public nss
|
||||
(package
|
||||
(name "nss")
|
||||
(version "3.41")
|
||||
(version "3.43")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((version-with-underscores
|
||||
|
@ -81,7 +81,7 @@ in the Mozilla clients.")
|
|||
"nss-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0bbif42fzz5gk451sv3yphdrl7m4p6zgk5jk0307j06xs3sihbmb"))
|
||||
"1jp27w4w9nj5pkzrbc1zqj6pa09h2yy7vhzyx5fvg1q86fvw22zk"))
|
||||
;; Create nss.pc and nss-config.
|
||||
(patches (search-patches "nss-pkgconfig.patch"
|
||||
"nss-increase-test-timeout.patch"))))
|
||||
|
@ -129,7 +129,7 @@ in the Mozilla clients.")
|
|||
;; leading to test failures:
|
||||
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
|
||||
;; work around that, set the time to roughly the release date.
|
||||
(invoke "faketime" "2018-12-01" "./nss/tests/all.sh")))
|
||||
(invoke "faketime" "2019-02-01" "./nss/tests/all.sh")))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
Fix build with Meson 0.50.0 and above.
|
||||
|
||||
Taken from upstream repository:
|
||||
https://gitlab.gnome.org/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a
|
||||
|
||||
diff --git a/atspi/meson.build b/atspi/meson.build
|
||||
index b7a9357df1c4857dffa2ec123cd3073e67a07fea..2a6915d76202dabf923b50e6a8b85cbb83cb43d0 100644
|
||||
--- a/atspi/meson.build
|
||||
+++ b/atspi/meson.build
|
||||
@@ -57,7 +57,7 @@ atspi_headers = [
|
||||
|
||||
atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi')
|
||||
|
||||
-install_headers(atspi_headers, subdir: atspi_includedir)
|
||||
+install_headers(atspi_headers, install_dir: atspi_includedir)
|
||||
|
||||
atspi_enums = gnome.mkenums('atspi-enum-types',
|
||||
sources: [ 'atspi-constants.h', 'atspi-types.h' ],
|
|
@ -5,14 +5,14 @@ test.
|
|||
diff -u -r doxygen-1.8.7.orig/testing/012/citelist.xml doxygen-1.8.7/testing/012/citelist.xml
|
||||
--- doxygen-1.8.7.orig/testing/012/citelist.xml 2014-04-24 23:43:34.000000000 +0200
|
||||
+++ doxygen-1.8.7/testing/012/citelist.xml 2014-04-24 23:49:43.000000000 +0200
|
||||
@@ -4,17 +4,6 @@
|
||||
<compoundname>citelist</compoundname>
|
||||
<title>Bibliography</title>
|
||||
@@ -6,17 +6,6 @@
|
||||
<briefdescription>
|
||||
</briefdescription>
|
||||
<detaileddescription>
|
||||
- <para>
|
||||
- <variablelist>
|
||||
- <varlistentry>
|
||||
- <term><anchor id="_1CITEREF_knuth79"/>[1]</term>
|
||||
- <term><anchor id="citelist_1CITEREF_knuth79"/>[1]</term>
|
||||
- </varlistentry>
|
||||
- <listitem>
|
||||
- <para>Donald<nonbreakablespace/>E. Knuth. <emphasis>Tex and Metafont, New Directions in Typesetting</emphasis>. American Mathematical Society and Digital Press, Stanford, 1979.</para>
|
||||
|
|
|
@ -1,126 +0,0 @@
|
|||
This patch removes a group of tests that fail because /var/lib/dbus/machine-id
|
||||
is not present in the build environment.
|
||||
|
||||
--- gcr-3.20.0.old/Makefile.in 2017-07-03 18:05:10.742595317 -0400
|
||||
+++ gcr-3.20.0/Makefile.in 2017-07-03 18:08:26.379565428 -0400
|
||||
@@ -482,8 +482,7 @@
|
||||
test-openssh$(EXEEXT) test-secure-memory$(EXEEXT) \
|
||||
test-trust$(EXEEXT) test-parser$(EXEEXT) test-record$(EXEEXT) \
|
||||
test-memory-icon$(EXEEXT) test-gnupg-key$(EXEEXT) \
|
||||
- test-gnupg-collection$(EXEEXT) test-gnupg-process$(EXEEXT) \
|
||||
- test-system-prompt$(EXEEXT)
|
||||
+ test-gnupg-collection$(EXEEXT) test-gnupg-process$(EXEEXT)
|
||||
@WITH_GTK_TRUE@am__EXEEXT_4 = frob-certificate$(EXEEXT) \
|
||||
@WITH_GTK_TRUE@ frob-combo-selector$(EXEEXT) \
|
||||
@WITH_GTK_TRUE@ frob-gnupg-selector$(EXEEXT) \
|
||||
@@ -882,14 +881,6 @@
|
||||
am_test_symkey_OBJECTS = egg/test-symkey.$(OBJEXT)
|
||||
test_symkey_OBJECTS = $(am_test_symkey_OBJECTS)
|
||||
test_symkey_DEPENDENCIES = $(am__DEPENDENCIES_4)
|
||||
-am_test_system_prompt_OBJECTS = \
|
||||
- gcr/test_system_prompt-test-system-prompt.$(OBJEXT)
|
||||
-test_system_prompt_OBJECTS = $(am_test_system_prompt_OBJECTS)
|
||||
-test_system_prompt_DEPENDENCIES = $(am__DEPENDENCIES_3)
|
||||
-test_system_prompt_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
|
||||
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
|
||||
- $(test_system_prompt_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
|
||||
- $(LDFLAGS) -o $@
|
||||
am_test_trust_OBJECTS = gcr/test_trust-test-trust.$(OBJEXT)
|
||||
test_trust_OBJECTS = $(am_test_trust_OBJECTS)
|
||||
test_trust_DEPENDENCIES = $(am__DEPENDENCIES_3)
|
||||
@@ -974,8 +965,7 @@
|
||||
$(test_secret_exchange_SOURCES) $(test_secure_memory_SOURCES) \
|
||||
$(test_simple_certificate_SOURCES) \
|
||||
$(test_subject_public_key_SOURCES) $(test_symkey_SOURCES) \
|
||||
- $(test_system_prompt_SOURCES) $(test_trust_SOURCES) \
|
||||
- $(test_util_SOURCES)
|
||||
+ $(test_trust_SOURCES) $(test_util_SOURCES)
|
||||
DIST_SOURCES = $(libegg_asn1x_la_SOURCES) $(libegg_hex_la_SOURCES) \
|
||||
$(libegg_secmem_la_SOURCES) $(libegg_test_la_SOURCES) \
|
||||
$(libegg_la_SOURCES) $(libgck_@GCK_MAJOR@_la_SOURCES) \
|
||||
@@ -1016,8 +1006,7 @@
|
||||
$(test_secret_exchange_SOURCES) $(test_secure_memory_SOURCES) \
|
||||
$(test_simple_certificate_SOURCES) \
|
||||
$(test_subject_public_key_SOURCES) $(test_symkey_SOURCES) \
|
||||
- $(test_system_prompt_SOURCES) $(test_trust_SOURCES) \
|
||||
- $(test_util_SOURCES)
|
||||
+ $(test_trust_SOURCES) $(test_util_SOURCES)
|
||||
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
|
||||
ctags-recursive dvi-recursive html-recursive info-recursive \
|
||||
install-data-recursive install-dvi-recursive \
|
||||
@@ -2117,8 +2106,7 @@
|
||||
test-memory-icon \
|
||||
test-gnupg-key \
|
||||
test-gnupg-collection \
|
||||
- test-gnupg-process \
|
||||
- test-system-prompt
|
||||
+ test-gnupg-process
|
||||
|
||||
test_certificate_SOURCES = gcr/test-certificate.c
|
||||
test_certificate_CFLAGS = $(gcr_CFLAGS)
|
||||
@@ -2171,9 +2159,6 @@
|
||||
test_subject_public_key_SOURCES = gcr/test-subject-public-key.c
|
||||
test_subject_public_key_CFLAGS = $(gcr_CFLAGS)
|
||||
test_subject_public_key_LDADD = $(gcr_LIBS)
|
||||
-test_system_prompt_SOURCES = gcr/test-system-prompt.c
|
||||
-test_system_prompt_CFLAGS = $(gcr_CFLAGS)
|
||||
-test_system_prompt_LDADD = $(gcr_LIBS)
|
||||
test_trust_SOURCES = gcr/test-trust.c
|
||||
test_trust_CFLAGS = $(gcr_CFLAGS)
|
||||
test_trust_LDADD = $(gcr_LIBS)
|
||||
@@ -3283,12 +3268,6 @@
|
||||
test-symkey$(EXEEXT): $(test_symkey_OBJECTS) $(test_symkey_DEPENDENCIES) $(EXTRA_test_symkey_DEPENDENCIES)
|
||||
@rm -f test-symkey$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(test_symkey_OBJECTS) $(test_symkey_LDADD) $(LIBS)
|
||||
-gcr/test_system_prompt-test-system-prompt.$(OBJEXT): \
|
||||
- gcr/$(am__dirstamp) gcr/$(DEPDIR)/$(am__dirstamp)
|
||||
-
|
||||
-test-system-prompt$(EXEEXT): $(test_system_prompt_OBJECTS) $(test_system_prompt_DEPENDENCIES) $(EXTRA_test_system_prompt_DEPENDENCIES)
|
||||
- @rm -f test-system-prompt$(EXEEXT)
|
||||
- $(AM_V_CCLD)$(test_system_prompt_LINK) $(test_system_prompt_OBJECTS) $(test_system_prompt_LDADD) $(LIBS)
|
||||
gcr/test_trust-test-trust.$(OBJEXT): gcr/$(am__dirstamp) \
|
||||
gcr/$(DEPDIR)/$(am__dirstamp)
|
||||
|
||||
@@ -3446,7 +3425,6 @@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@gcr/$(DEPDIR)/test_secure_memory-test-secure-memory.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@gcr/$(DEPDIR)/test_simple_certificate-test-simple-certificate.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@gcr/$(DEPDIR)/test_subject_public_key-test-subject-public-key.Po@am__quote@
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@gcr/$(DEPDIR)/test_trust-test-trust.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@gcr/$(DEPDIR)/test_util-test-util.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/frob_certificate-frob-certificate.Po@am__quote@
|
||||
@@ -4968,20 +4946,6 @@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_subject_public_key_CFLAGS) $(CFLAGS) -c -o gcr/test_subject_public_key-test-subject-public-key.obj `if test -f 'gcr/test-subject-public-key.c'; then $(CYGPATH_W) 'gcr/test-subject-public-key.c'; else $(CYGPATH_W) '$(srcdir)/gcr/test-subject-public-key.c'; fi`
|
||||
|
||||
-gcr/test_system_prompt-test-system-prompt.o: gcr/test-system-prompt.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_system_prompt_CFLAGS) $(CFLAGS) -MT gcr/test_system_prompt-test-system-prompt.o -MD -MP -MF gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Tpo -c -o gcr/test_system_prompt-test-system-prompt.o `test -f 'gcr/test-system-prompt.c' || echo '$(srcdir)/'`gcr/test-system-prompt.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Tpo gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Po
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gcr/test-system-prompt.c' object='gcr/test_system_prompt-test-system-prompt.o' libtool=no @AMDEPBACKSLASH@
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_system_prompt_CFLAGS) $(CFLAGS) -c -o gcr/test_system_prompt-test-system-prompt.o `test -f 'gcr/test-system-prompt.c' || echo '$(srcdir)/'`gcr/test-system-prompt.c
|
||||
-
|
||||
-gcr/test_system_prompt-test-system-prompt.obj: gcr/test-system-prompt.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_system_prompt_CFLAGS) $(CFLAGS) -MT gcr/test_system_prompt-test-system-prompt.obj -MD -MP -MF gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Tpo -c -o gcr/test_system_prompt-test-system-prompt.obj `if test -f 'gcr/test-system-prompt.c'; then $(CYGPATH_W) 'gcr/test-system-prompt.c'; else $(CYGPATH_W) '$(srcdir)/gcr/test-system-prompt.c'; fi`
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Tpo gcr/$(DEPDIR)/test_system_prompt-test-system-prompt.Po
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gcr/test-system-prompt.c' object='gcr/test_system_prompt-test-system-prompt.obj' libtool=no @AMDEPBACKSLASH@
|
||||
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_system_prompt_CFLAGS) $(CFLAGS) -c -o gcr/test_system_prompt-test-system-prompt.obj `if test -f 'gcr/test-system-prompt.c'; then $(CYGPATH_W) 'gcr/test-system-prompt.c'; else $(CYGPATH_W) '$(srcdir)/gcr/test-system-prompt.c'; fi`
|
||||
-
|
||||
gcr/test_trust-test-trust.o: gcr/test-trust.c
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_trust_CFLAGS) $(CFLAGS) -MT gcr/test_trust-test-trust.o -MD -MP -MF gcr/$(DEPDIR)/test_trust-test-trust.Tpo -c -o gcr/test_trust-test-trust.o `test -f 'gcr/test-trust.c' || echo '$(srcdir)/'`gcr/test-trust.c
|
||||
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) gcr/$(DEPDIR)/test_trust-test-trust.Tpo gcr/$(DEPDIR)/test_trust-test-trust.Po
|
||||
@@ -5808,13 +5772,6 @@
|
||||
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
--log-file $$b.log --trs-file $$b.trs \
|
||||
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
- "$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
-test-system-prompt.log: test-system-prompt$(EXEEXT)
|
||||
- @p='test-system-prompt$(EXEEXT)'; \
|
||||
- b='test-system-prompt'; \
|
||||
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
- --log-file $$b.log --trs-file $$b.trs \
|
||||
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
"$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
.test.log:
|
||||
@p='$<'; \
|
|
@ -1,31 +0,0 @@
|
|||
This patch comes from Debian.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=771052
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835737
|
||||
|
||||
--- gcr-3.20.0.old/gcr/test-gnupg-collection.c 2017-06-29 14:26:33.810838197 -0400
|
||||
+++ gcr-3.20.0/gcr/test-gnupg-collection.c 2017-06-30 17:25:09.149383067 -0400
|
||||
@@ -115,6 +115,14 @@
|
||||
|
||||
g_object_unref (test->collection);
|
||||
|
||||
+ /* remove potential gpg 2.1 extras, ignore any errors. */
|
||||
+ cmd = g_strdup_printf ("rm -rf %s/*.d", test->directory);
|
||||
+ system(cmd);
|
||||
+ g_free(cmd);
|
||||
+ cmd = g_strdup_printf ("rm -f %s/.gpg-v21-migrated", test->directory);
|
||||
+ system(cmd);
|
||||
+ g_free(cmd);
|
||||
+
|
||||
cmd = g_strdup_printf ("rm -f %s/*", test->directory);
|
||||
g_spawn_check_exit_status (system (cmd), &error);
|
||||
g_assert_no_error (error);
|
||||
@@ -202,7 +210,7 @@
|
||||
GcrGnupgKey *key;
|
||||
|
||||
_gcr_gnupg_collection_load_async (test->collection, NULL, on_async_ready, test);
|
||||
- egg_test_wait_until (500);
|
||||
+ egg_test_wait_until (2500);
|
||||
g_assert (test->result);
|
||||
_gcr_gnupg_collection_load_finish (test->collection, test->result, &error);
|
||||
g_assert_no_error (error);
|
|
@ -1,17 +0,0 @@
|
|||
Fix compatibility with libical 3.0.
|
||||
|
||||
Patch copied from Arch Linux:
|
||||
https://git.archlinux.org/svntogit/packages.git/tree/trunk/gnome-todo-3.26.2-libical-3.0.patch?h=packages/gnome-todo
|
||||
|
||||
diff -up gnome-todo-3.26.2/src/gtd-task.c.libical-3.0 gnome-todo-3.26.2/src/gtd-task.c
|
||||
--- gnome-todo-3.26.2/src/gtd-task.c.libical-3.0 2017-11-08 14:53:53.484294926 +0100
|
||||
+++ gnome-todo-3.26.2/src/gtd-task.c 2017-11-08 14:53:57.208294874 +0100
|
||||
@@ -778,7 +778,7 @@ gtd_task_set_complete (GtdTask *task,
|
||||
dt->minute = g_date_time_get_minute (now);
|
||||
dt->second = g_date_time_get_seconds (now);
|
||||
dt->is_date = 0;
|
||||
- dt->is_utc = 1;
|
||||
+ dt->zone = icaltimezone_get_utc_timezone ();
|
||||
|
||||
/* convert timezone
|
||||
*
|
|
@ -1,28 +0,0 @@
|
|||
Copied from <https://gitlab.gnome.org/GNOME/gtk/commit/e3a1593a>.
|
||||
Fixes upstream bugs <https://gitlab.gnome.org/GNOME/gtk/issues/1523>
|
||||
and <https://gitlab.gnome.org/GNOME/gtk/issues/1280>.
|
||||
|
||||
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
|
||||
index 97ada6d73919fba3dfe192dd66929e90bc7677bb..764e39495f7edb0c3efe41cca25b8bee4778887d 100644
|
||||
--- a/gdk/x11/gdkwindow-x11.c
|
||||
+++ b/gdk/x11/gdkwindow-x11.c
|
||||
@@ -2985,6 +2985,7 @@ gdk_window_x11_set_background (GdkWindow *window,
|
||||
double r, g, b, a;
|
||||
cairo_surface_t *surface;
|
||||
cairo_matrix_t matrix;
|
||||
+ cairo_pattern_t *parent_relative_pattern;
|
||||
|
||||
if (GDK_WINDOW_DESTROYED (window))
|
||||
return;
|
||||
@@ -2997,8 +2998,10 @@ gdk_window_x11_set_background (GdkWindow *window,
|
||||
}
|
||||
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||
- if (pattern == gdk_x11_get_parent_relative_pattern ())
|
||||
+ parent_relative_pattern = gdk_x11_get_parent_relative_pattern ();
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
+
|
||||
+ if (pattern == parent_relative_pattern)
|
||||
{
|
||||
GdkWindow *parent;
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
https://github.com/thepowersgang/mrustc/issues/109
|
||||
From: Danny Milosavljevic <dannym@scratchpost.org>
|
||||
Date: Fri, 3 Jan 2019 13:00:00 +0100
|
||||
|
||||
--- mrustc/src/expand/proc_macro.cpp.orig 2019-02-01 14:16:54.208486062 +0100
|
||||
+++ mrustc/src/expand/proc_macro.cpp 2019-02-01 14:17:14.350925705 +0100
|
||||
@@ -977,7 +977,7 @@
|
||||
for(;;)
|
||||
{
|
||||
auto b = recv_u8();
|
||||
- v |= static_cast<uint64_t>(b) << ofs;
|
||||
+ v |= static_cast<uint64_t>(b & 0x7F) << ofs;
|
||||
if( (b & 0x80) == 0 )
|
||||
break;
|
||||
ofs += 7;
|
|
@ -0,0 +1,62 @@
|
|||
From 3cc41c05fad5601c0dd1832f64a6e9efca017727 Mon Sep 17 00:00:00 2001
|
||||
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
Date: Mon, 1 Apr 2019 11:36:04 -0400
|
||||
Subject: [PATCH] robottime: Honor the SOURCE_DATE_EPOCH environment variable.
|
||||
|
||||
Honoring the SOURCE_DATE_EPOCH environment variable allows building
|
||||
the documentation using libdoc reproducibly, by setting the generated
|
||||
timestamp to a fixed value.
|
||||
|
||||
For more background on reproducible builds and the SOURCE_DATE_EPOCH
|
||||
environment variable, see:
|
||||
https://reproducible-builds.org/specs/source-date-epoch/.
|
||||
|
||||
* src/robot/utils/robottime.py: import `os'.
|
||||
(TimestampCache._get_epoch): Retrieve date from SOURCE_DATE_EPOCH if
|
||||
it is defined, otherwise from time.time().
|
||||
* utest/output/test_logger.py (TestLogger.test_write_to_one_logger):
|
||||
Check for the existance of a timestamp attribute instead of checking
|
||||
for its content as the later is easy to break when using the
|
||||
SOURCE_DATE_EPOCH environment variable.
|
||||
---
|
||||
src/robot/utils/robottime.py | 3 +++
|
||||
utest/output/test_logger.py | 2 +-
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/robot/utils/robottime.py b/src/robot/utils/robottime.py
|
||||
index 06432a4a6..91526f826 100644
|
||||
--- a/src/robot/utils/robottime.py
|
||||
+++ b/src/robot/utils/robottime.py
|
||||
@@ -14,6 +14,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
import datetime
|
||||
+import os
|
||||
import time
|
||||
import re
|
||||
|
||||
@@ -395,6 +396,8 @@ class TimestampCache(object):
|
||||
|
||||
# Seam for mocking
|
||||
def _get_epoch(self):
|
||||
+ if os.getenv('SOURCE_DATE_EPOCH'):
|
||||
+ return float(os.getenv('SOURCE_DATE_EPOCH'))
|
||||
return time.time()
|
||||
|
||||
def _use_cache(self, secs, *separators):
|
||||
diff --git a/utest/output/test_logger.py b/utest/output/test_logger.py
|
||||
index 92fe6d77d..e980227aa 100644
|
||||
--- a/utest/output/test_logger.py
|
||||
+++ b/utest/output/test_logger.py
|
||||
@@ -46,7 +46,7 @@ class TestLogger(unittest.TestCase):
|
||||
logger = LoggerMock(('Hello, world!', 'INFO'))
|
||||
self.logger.register_logger(logger)
|
||||
self.logger.write('Hello, world!', 'INFO')
|
||||
- assert_true(logger.msg.timestamp.startswith('20'))
|
||||
+ assert_true(hasattr(logger.msg, 'timestamp'))
|
||||
|
||||
def test_write_to_one_logger_with_trace_level(self):
|
||||
logger = LoggerMock(('expected message', 'TRACE'))
|
||||
--
|
||||
2.20.1
|
||||
|
|
@ -0,0 +1,249 @@
|
|||
This patch adds support for newer versions of Poppler and some upstream
|
||||
TexLive fixes, including one for CVE-2018-17407.
|
||||
|
||||
It is taken from Linux From Scratch:
|
||||
<http://www.linuxfromscratch.org/patches/blfs/svn/texlive-20180414-source-upstream_fixes-3.patch>.
|
||||
|
||||
Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
|
||||
Date: 2018-12-26
|
||||
Initial Package Version: 20180414
|
||||
Upstream Status: Applied
|
||||
Origin: Upstream
|
||||
Description: Two fixes, cherry-picked from svn plus a CVE fix.
|
||||
I have removed the partial fixes for various system versions of poppler.
|
||||
|
||||
r47469 Fix segfault in dvipdfm-x (XeTeX) on 1/2/4-bit transparent indexed PNGs.
|
||||
|
||||
r47477 Fix a ptex regression for discontinuous kinsoku table.
|
||||
|
||||
Also, via fedora (I got lost in svn) a critical fix for CVE-2018-17407
|
||||
|
||||
"A buffer overflow in the handling of Type 1 fonts allows arbitrary code
|
||||
execution when a malicious font is loaded by one of the vulnerable tools:
|
||||
pdflatex, pdftex, dvips, or luatex."
|
||||
|
||||
diff -Naur a/texk/dvipdfm-x/pngimage.c b/texk/dvipdfm-x/pngimage.c
|
||||
--- a/texk/dvipdfm-x/pngimage.c 2018-02-17 08:41:35.000000000 +0000
|
||||
+++ b/texk/dvipdfm-x/pngimage.c 2018-10-09 01:52:01.648670875 +0100
|
||||
@@ -964,12 +964,16 @@
|
||||
png_bytep trans;
|
||||
int num_trans;
|
||||
png_uint_32 i;
|
||||
+ png_byte bpc, mask, shift;
|
||||
|
||||
if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ||
|
||||
!png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, NULL)) {
|
||||
WARN("%s: PNG does not have valid tRNS chunk but tRNS is requested.", PNG_DEBUG_STR);
|
||||
return NULL;
|
||||
}
|
||||
+ bpc = png_get_bit_depth(png_ptr, info_ptr);
|
||||
+ mask = 0xff >> (8 - bpc);
|
||||
+ shift = 8 - bpc;
|
||||
|
||||
smask = pdf_new_stream(STREAM_COMPRESS);
|
||||
dict = pdf_stream_dict(smask);
|
||||
@@ -981,7 +985,8 @@
|
||||
pdf_add_dict(dict, pdf_new_name("ColorSpace"), pdf_new_name("DeviceGray"));
|
||||
pdf_add_dict(dict, pdf_new_name("BitsPerComponent"), pdf_new_number(8));
|
||||
for (i = 0; i < width*height; i++) {
|
||||
- png_byte idx = image_data_ptr[i];
|
||||
+ /* data is packed for 1/2/4 bpc formats, msb first */
|
||||
+ png_byte idx = (image_data_ptr[bpc * i / 8] >> (shift - bpc * i % 8)) & mask;
|
||||
smask_data_ptr[i] = (idx < num_trans) ? trans[idx] : 0xff;
|
||||
}
|
||||
pdf_add_stream(smask, (char *)smask_data_ptr, width*height);
|
||||
diff -Naur a/texk/dvipsk/writet1.c b/texk/dvipsk/writet1.c
|
||||
--- a/texk/dvipsk/writet1.c 2016-11-25 18:24:26.000000000 +0000
|
||||
+++ b/texk/dvipsk/writet1.c 2018-10-09 01:52:01.648670875 +0100
|
||||
@@ -1449,7 +1449,9 @@
|
||||
*(strend(t1_buf_array) - 1) = ' ';
|
||||
|
||||
t1_getline();
|
||||
+ alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE);
|
||||
strcat(t1_buf_array, t1_line_array);
|
||||
+ alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE);
|
||||
strcpy(t1_line_array, t1_buf_array);
|
||||
t1_line_ptr = eol(t1_line_array);
|
||||
}
|
||||
diff -Naur a/texk/web2c/luatexdir/font/writet1.w b/texk/web2c/luatexdir/font/writet1.w
|
||||
--- a/texk/web2c/luatexdir/font/writet1.w 2016-11-25 18:24:34.000000000 +0000
|
||||
+++ b/texk/web2c/luatexdir/font/writet1.w 2018-10-09 01:52:01.648670875 +0100
|
||||
@@ -1625,7 +1625,9 @@
|
||||
if (sscanf(p, "%i", &i) != 1) {
|
||||
strcpy(t1_buf_array, t1_line_array);
|
||||
t1_getline();
|
||||
+ alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE);
|
||||
strcat(t1_buf_array, t1_line_array);
|
||||
+ alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE);
|
||||
strcpy(t1_line_array, t1_buf_array);
|
||||
t1_line_ptr = eol(t1_line_array);
|
||||
}
|
||||
diff -Naur a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w
|
||||
--- a/texk/web2c/luatexdir/image/pdftoepdf.w 2018-01-17 18:00:12.000000000 +0000
|
||||
+++ b/texk/web2c/luatexdir/image/pdftoepdf.w 2018-10-09 01:52:01.648670875 +0100
|
||||
@@ -472,10 +472,10 @@
|
||||
break;
|
||||
*/
|
||||
case objString:
|
||||
- copyString(pdf, obj->getString());
|
||||
+ copyString(pdf, (GooString *)obj->getString());
|
||||
break;
|
||||
case objName:
|
||||
- copyName(pdf, obj->getName());
|
||||
+ copyName(pdf, (char *)obj->getName());
|
||||
break;
|
||||
case objNull:
|
||||
pdf_add_null(pdf);
|
||||
diff -Naur a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc
|
||||
--- a/texk/web2c/luatexdir/lua/lepdflib.cc 2018-02-14 14:44:38.000000000 +0000
|
||||
+++ b/texk/web2c/luatexdir/lua/lepdflib.cc 2018-10-09 01:52:01.649670868 +0100
|
||||
@@ -674,7 +674,7 @@
|
||||
uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \
|
||||
if (uin->pd != NULL && uin->pd->pc != uin->pc) \
|
||||
pdfdoc_changed_error(L); \
|
||||
- gs = ((in *) uin->d)->function(); \
|
||||
+ gs = (GooString *)((in *) uin->d)->function(); \
|
||||
if (gs != NULL) \
|
||||
lua_pushlstring(L, gs->getCString(), gs->getLength()); \
|
||||
else \
|
||||
@@ -1813,7 +1813,7 @@
|
||||
if (uin->pd != NULL && uin->pd->pc != uin->pc)
|
||||
pdfdoc_changed_error(L);
|
||||
if (((Object *) uin->d)->isString()) {
|
||||
- gs = ((Object *) uin->d)->getString();
|
||||
+ gs = (GooString *)((Object *) uin->d)->getString();
|
||||
lua_pushlstring(L, gs->getCString(), gs->getLength());
|
||||
} else
|
||||
lua_pushnil(L);
|
||||
diff -Naur a/texk/web2c/pdftexdir/writet1.c b/texk/web2c/pdftexdir/writet1.c
|
||||
--- a/texk/web2c/pdftexdir/writet1.c 2016-11-25 18:24:37.000000000 +0000
|
||||
+++ b/texk/web2c/pdftexdir/writet1.c 2018-10-09 01:52:01.649670868 +0100
|
||||
@@ -1598,7 +1598,9 @@
|
||||
*(strend(t1_buf_array) - 1) = ' ';
|
||||
|
||||
t1_getline();
|
||||
+ alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE);
|
||||
strcat(t1_buf_array, t1_line_array);
|
||||
+ alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE);
|
||||
strcpy(t1_line_array, t1_buf_array);
|
||||
t1_line_ptr = eol(t1_line_array);
|
||||
}
|
||||
diff -Naur a/texk/web2c/ptexdir/ptex_version.h b/texk/web2c/ptexdir/ptex_version.h
|
||||
--- a/texk/web2c/ptexdir/ptex_version.h 2018-01-21 03:48:06.000000000 +0000
|
||||
+++ b/texk/web2c/ptexdir/ptex_version.h 2018-10-09 01:52:01.649670868 +0100
|
||||
@@ -1 +1 @@
|
||||
-#define PTEX_VERSION "p3.8.0"
|
||||
+#define PTEX_VERSION "p3.8.1"
|
||||
diff -Naur a/texk/web2c/ptexdir/tests/free_ixsp.tex b/texk/web2c/ptexdir/tests/free_ixsp.tex
|
||||
--- a/texk/web2c/ptexdir/tests/free_ixsp.tex 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/texk/web2c/ptexdir/tests/free_ixsp.tex 2018-10-09 01:52:01.649670868 +0100
|
||||
@@ -0,0 +1,53 @@
|
||||
+%#!eptex -ini -etex
|
||||
+\let\dump\relax
|
||||
+\batchmode
|
||||
+\input plain
|
||||
+
|
||||
+\errorstopmode
|
||||
+\catcode`@=11
|
||||
+\newcount\@tempcnta
|
||||
+\newcount\@tempcntb
|
||||
+\newcount\@tempcntc
|
||||
+\mathchardef\LIM=256
|
||||
+
|
||||
+\def\MYCHAR#1{%
|
||||
+ \@tempcntc=\numexpr7*#1+"101\relax
|
||||
+ \@tempcnta=\@tempcntc\divide\@tempcnta 94
|
||||
+ \@tempcntb=\numexpr\@tempcntc-94*\@tempcnta+1\relax
|
||||
+ \ifnum\@tempcntb<0\advance\@tempcntb94 \advance\@tempcnta-1\fi
|
||||
+ \advance\@tempcnta18 % 18区以降
|
||||
+ \CNTA=\kuten\numexpr"100*\@tempcnta+\@tempcntb\relax
|
||||
+}
|
||||
+
|
||||
+\newcount\CNT\newcount\CNTA
|
||||
+\CNT=0
|
||||
+\loop
|
||||
+ \MYCHAR\CNT
|
||||
+ \message{\the\CNT.}
|
||||
+ \inhibitxspcode\CNTA=1\relax
|
||||
+ \advance\CNT1\relax
|
||||
+ \ifnum\CNT<\LIM
|
||||
+\repeat
|
||||
+
|
||||
+\newcount\CNTB
|
||||
+
|
||||
+\loop
|
||||
+ \MYCHAR\CNTB
|
||||
+ \global\inhibitxspcode\CNTA=3
|
||||
+{%
|
||||
+\CNT=0
|
||||
+\loop
|
||||
+ \MYCHAR\CNT
|
||||
+ \count@=\numexpr 1-\inhibitxspcode\CNTA\relax
|
||||
+ \ifnum\count@=0\else\ifnum\CNTB=\CNT\else
|
||||
+ \errmessage{<\the\CNTB, \the\CNT, \the\inhibitxspcode\CNTA>}\fi\fi
|
||||
+ \advance\CNT1\relax
|
||||
+ \ifnum\CNT<\LIM
|
||||
+\repeat
|
||||
+}
|
||||
+ \MYCHAR\CNTB
|
||||
+ \global\inhibitxspcode\CNTA=1\relax
|
||||
+ \advance\CNTB1\relax
|
||||
+ \ifnum\CNTB<\LIM
|
||||
+\repeat
|
||||
+\bye
|
||||
diff -Naur a/texk/web2c/ptexdir/tests/free_pena.tex b/texk/web2c/ptexdir/tests/free_pena.tex
|
||||
--- a/texk/web2c/ptexdir/tests/free_pena.tex 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/texk/web2c/ptexdir/tests/free_pena.tex 2018-10-09 01:52:01.649670868 +0100
|
||||
@@ -0,0 +1,52 @@
|
||||
+%#!eptex -ini -etex
|
||||
+\let\dump\relax
|
||||
+\batchmode
|
||||
+\input plain
|
||||
+
|
||||
+\errorstopmode
|
||||
+\catcode`@=11
|
||||
+\newcount\@tempcnta
|
||||
+\newcount\@tempcntb
|
||||
+\newcount\@tempcntc
|
||||
+\mathchardef\LIM=256
|
||||
+
|
||||
+\def\MYCHAR#1{%
|
||||
+ \@tempcntc=\numexpr7*#1+"101\relax
|
||||
+ \@tempcnta=\@tempcntc\divide\@tempcnta 94
|
||||
+ \@tempcntb=\numexpr\@tempcntc-94*\@tempcnta+1\relax
|
||||
+ \ifnum\@tempcntb<0\advance\@tempcntb94 \advance\@tempcnta-1\fi
|
||||
+ \advance\@tempcnta18 % 18区以降
|
||||
+ \CNTA=\kuten\numexpr"100*\@tempcnta+\@tempcntb\relax
|
||||
+}
|
||||
+
|
||||
+\newcount\CNT\newcount\CNTA
|
||||
+\CNT=0
|
||||
+\loop
|
||||
+ \MYCHAR\CNT
|
||||
+ \message{\the\CNT.}
|
||||
+ \prebreakpenalty\CNTA=\numexpr\CNT+1\relax
|
||||
+ \advance\CNT1\relax
|
||||
+ \ifnum\CNT<\LIM
|
||||
+\repeat
|
||||
+
|
||||
+\newcount\CNTB
|
||||
+
|
||||
+\loop
|
||||
+ \MYCHAR\CNTB
|
||||
+ \global\prebreakpenalty\CNTA=0
|
||||
+{%
|
||||
+\CNT=0
|
||||
+\loop
|
||||
+ \MYCHAR\CNT
|
||||
+ \count@=\numexpr -\CNT-1+\prebreakpenalty\CNTA\relax
|
||||
+ \ifnum\count@=0\else\ifnum\CNTB=\CNT\else\errmessage{<\the\CNTB, \the\CNT>}\fi\fi
|
||||
+ \advance\CNT1\relax
|
||||
+ \ifnum\CNT<\LIM
|
||||
+\repeat
|
||||
+}
|
||||
+ \MYCHAR\CNTB
|
||||
+ \global\prebreakpenalty\CNTA=\numexpr\CNTB+1\relax
|
||||
+ \advance\CNTB1\relax
|
||||
+ \ifnum\CNTB<\LIM
|
||||
+\repeat
|
||||
+\bye
|
|
@ -1,188 +0,0 @@
|
|||
Fix compatibility with Poppler 0.72.
|
||||
|
||||
These files are taken from the upstream "poppler0.72.0.cc" variants and
|
||||
diffed against the "newpoppler" files from the 20180414 distribution.
|
||||
|
||||
See revision 49336:
|
||||
https://tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/
|
||||
|
||||
--- a/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc 2018-12-09 21:14:58.479732695 +0100
|
||||
@@ -22,7 +22,7 @@
|
||||
https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
|
||||
by Arch Linux. A little modifications are made to avoid a crash for
|
||||
some kind of pdf images, such as figure_missing.pdf in gnuplot.
|
||||
-The poppler should be 0.59.0 or newer versions.
|
||||
+The poppler should be 0.72.0 or newer versions.
|
||||
POPPLER_VERSION should be defined.
|
||||
*/
|
||||
|
||||
@@ -120,7 +120,7 @@
|
||||
|
||||
static InObj *inObjList;
|
||||
static UsedEncoding *encodingList;
|
||||
-static GBool isInit = gFalse;
|
||||
+static bool isInit = false;
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
// Maintain list of open embedded PDF files
|
||||
@@ -317,7 +317,7 @@
|
||||
pdf_puts("<<\n");
|
||||
assert(r->type == objFont); // FontDescriptor is in fd_tree
|
||||
for (i = 0, l = obj->dictGetLength(); i < l; ++i) {
|
||||
- key = obj->dictGetKey(i);
|
||||
+ key = (char *)obj->dictGetKey(i);
|
||||
if (strncmp("FontDescriptor", key, strlen("FontDescriptor")) == 0
|
||||
|| strncmp("BaseFont", key, strlen("BaseFont")) == 0
|
||||
|| strncmp("Encoding", key, strlen("Encoding")) == 0)
|
||||
@@ -427,7 +427,7 @@
|
||||
charset = fontdesc.dictLookup("CharSet");
|
||||
if (!charset.isNull() &&
|
||||
charset.isString() && is_subsetable(fontmap))
|
||||
- epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
|
||||
+ epdf_mark_glyphs(fd, (char *)charset.getString()->c_str());
|
||||
else
|
||||
embed_whole_font(fd);
|
||||
addFontDesc(fontdescRef.getRef(), fd);
|
||||
@@ -454,7 +454,7 @@
|
||||
for (i = 0, l = obj->dictGetLength(); i < l; ++i) {
|
||||
fontRef = obj->dictGetValNF(i);
|
||||
if (fontRef.isRef())
|
||||
- copyFont(obj->dictGetKey(i), &fontRef);
|
||||
+ copyFont((char *)obj->dictGetKey(i), &fontRef);
|
||||
else if (fontRef.isDict()) { // some programs generate pdf with embedded font object
|
||||
copyName((char *)obj->dictGetKey(i));
|
||||
pdf_puts(" ");
|
||||
@@ -566,7 +566,7 @@
|
||||
pdf_printf("%s", convertNumToPDF(obj->getNum()));
|
||||
} else if (obj->isString()) {
|
||||
s = (GooString *)obj->getString();
|
||||
- p = s->getCString();
|
||||
+ p = (char *)s->c_str();
|
||||
l = s->getLength();
|
||||
if (strlen(p) == (unsigned int) l) {
|
||||
pdf_puts("(");
|
||||
@@ -664,7 +664,7 @@
|
||||
("PDF inclusion: CID fonts are not supported"
|
||||
" (try to disable font replacement to fix this)");
|
||||
}
|
||||
- if ((s = ((Gfx8BitFont *) r->font)->getCharName(i)) != 0)
|
||||
+ if ((s = (char *)((Gfx8BitFont *) r->font)->getCharName(i)) != 0)
|
||||
glyphNames[i] = s;
|
||||
else
|
||||
glyphNames[i] = notdef;
|
||||
@@ -683,7 +683,7 @@
|
||||
}
|
||||
|
||||
// get the pagebox according to the pagebox_spec
|
||||
-static PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
|
||||
+static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
|
||||
{
|
||||
if (pagebox_spec == pdfboxspecmedia)
|
||||
return page->getMediaBox();
|
||||
@@ -715,7 +715,7 @@
|
||||
{
|
||||
PdfDocument *pdf_doc;
|
||||
Page *page;
|
||||
- PDFRectangle *pagebox;
|
||||
+ const PDFRectangle *pagebox;
|
||||
#ifdef POPPLER_VERSION
|
||||
int pdf_major_version_found, pdf_minor_version_found;
|
||||
#else
|
||||
@@ -724,8 +724,8 @@
|
||||
// initialize
|
||||
if (!isInit) {
|
||||
globalParams = new GlobalParams();
|
||||
- globalParams->setErrQuiet(gFalse);
|
||||
- isInit = gTrue;
|
||||
+ globalParams->setErrQuiet(false);
|
||||
+ isInit = true;
|
||||
}
|
||||
// open PDF file
|
||||
pdf_doc = find_add_document(image_name);
|
||||
@@ -849,7 +849,7 @@
|
||||
pageObj = xref->fetch(pageRef->num, pageRef->gen);
|
||||
pageDict = pageObj.getDict();
|
||||
rotate = page->getRotate();
|
||||
- PDFRectangle *pagebox;
|
||||
+ const PDFRectangle *pagebox;
|
||||
// write the Page header
|
||||
pdf_puts("/Type /XObject\n");
|
||||
pdf_puts("/Subtype /Form\n");
|
||||
@@ -977,7 +977,7 @@
|
||||
}
|
||||
l = dic1.getLength();
|
||||
for (i = 0; i < l; i++) {
|
||||
- groupDict.dictAdd(copyString(dic1.getKey(i)),
|
||||
+ groupDict.dictAdd((const char *)copyString(dic1.getKey(i)),
|
||||
dic1.getValNF(i));
|
||||
}
|
||||
// end modification
|
||||
@@ -1001,14 +1001,14 @@
|
||||
pdf_puts("/Resources <<\n");
|
||||
for (i = 0, l = obj1->dictGetLength(); i < l; ++i) {
|
||||
obj2 = obj1->dictGetVal(i);
|
||||
- key = obj1->dictGetKey(i);
|
||||
+ key = (char *)obj1->dictGetKey(i);
|
||||
if (strcmp("Font", key) == 0)
|
||||
copyFontResources(&obj2);
|
||||
else if (strcmp("ProcSet", key) == 0)
|
||||
copyProcSet(&obj2);
|
||||
else
|
||||
- copyOtherResources(&obj2, key);
|
||||
+ copyOtherResources(&obj2, (char *)key);
|
||||
}
|
||||
pdf_puts(">>\n");
|
||||
}
|
||||
|
||||
--- a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc 2018-12-09 21:14:58.479732695 +0100
|
||||
@@ -20,7 +20,7 @@
|
||||
/*
|
||||
This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
|
||||
https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
|
||||
-by Arch Linux. The poppler should be 0.59.0 or newer versions.
|
||||
+by Arch Linux. The poppler should be 0.72.0 or newer versions.
|
||||
POPPLER_VERSION should be defined.
|
||||
*/
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
fprintf(stderr, "No SourceName found\n");
|
||||
exit(1);
|
||||
}
|
||||
- outname = (char *)srcName.getString()->getCString();
|
||||
+ outname = (char *)srcName.getString()->c_str();
|
||||
// We cannot free srcName, as objname shares its string.
|
||||
// srcName.free();
|
||||
} else if (objnum > 0) {
|
||||
@@ -118,7 +118,7 @@
|
||||
fprintf(stderr, "Not a Stream object\n");
|
||||
exit(1);
|
||||
}
|
||||
- sprintf(buf, "%s", fileName->getCString());
|
||||
+ sprintf(buf, "%s", fileName->c_str());
|
||||
if ((p = strrchr(buf, '.')) == 0)
|
||||
p = strchr(buf, 0);
|
||||
if (objgen == 0)
|
||||
@@ -128,7 +128,7 @@
|
||||
outname = buf;
|
||||
} else { // objnum < 0 means we are extracting the XRef table
|
||||
extract_xref_table = true;
|
||||
- sprintf(buf, "%s", fileName->getCString());
|
||||
+ sprintf(buf, "%s", fileName->c_str());
|
||||
if ((p = strrchr(buf, '.')) == 0)
|
||||
p = strchr(buf, 0);
|
||||
sprintf(p, ".xref");
|
||||
@@ -173,9 +173,9 @@
|
||||
|
||||
// parse the header: object numbers and offsets
|
||||
objStr.streamReset();
|
||||
- str = new EmbedStream(objStr.getStream(), Object(objNull), gTrue, first);
|
||||
+ str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
|
||||
lexer = new Lexer(xref, str);
|
||||
- parser = new Parser(xref, lexer, gFalse);
|
||||
+ parser = new Parser(xref, lexer, false);
|
||||
for (n = 0; n < nObjects; ++n) {
|
||||
obj1 = parser->getObj();
|
||||
obj2 = parser->getObj();
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
Fix compatibility with Poppler 0.72.
|
||||
|
||||
Patch taken from upstream:
|
||||
https://tug.org/svn/texlive/trunk/Build/source/texk/web2c/xetexdir/pdfimage.cpp?r1=44964&r2=48969&diff_format=u
|
||||
|
||||
--- a/texk/web2c/xetexdir/pdfimage.cpp 2017/08/06 07:12:02 44964
|
||||
+++ b/texk/web2c/xetexdir/pdfimage.cpp 2018/10/22 04:01:42 48969
|
||||
@@ -82,19 +82,19 @@
|
||||
switch (pdf_box) {
|
||||
default:
|
||||
case pdfbox_crop:
|
||||
- r = page->getCropBox();
|
||||
+ r = (PDFRectangle *)page->getCropBox();
|
||||
break;
|
||||
case pdfbox_media:
|
||||
- r = page->getMediaBox();
|
||||
+ r = (PDFRectangle *)page->getMediaBox();
|
||||
break;
|
||||
case pdfbox_bleed:
|
||||
- r = page->getBleedBox();
|
||||
+ r = (PDFRectangle *)page->getBleedBox();
|
||||
break;
|
||||
case pdfbox_trim:
|
||||
- r = page->getTrimBox();
|
||||
+ r = (PDFRectangle *)page->getTrimBox();
|
||||
break;
|
||||
case pdfbox_art:
|
||||
- r = page->getArtBox();
|
||||
+ r = (PDFRectangle *)page->getArtBox();
|
||||
break;
|
||||
}
|
|
@ -0,0 +1,14 @@
|
|||
Fix an error that occurs with Meson 0.50.0 and later:
|
||||
"ERROR: Subdir keyword must not be an absolute path".
|
||||
|
||||
--- a/src/meson.build 2019-03-15 00:10:26.882293850 +0100
|
||||
+++ b/src/meson.build 2019-03-15 00:10:54.312197229 +0100
|
||||
@@ -82,7 +82,7 @@
|
||||
|
||||
install_headers(
|
||||
headers,
|
||||
- subdir: join_paths(totem_includedir, totem_api_path)
|
||||
+ install_dir: join_paths(totem_includedir, totem_api_path)
|
||||
)
|
||||
|
||||
libtotem_player_sources = files(
|
|
@ -1,18 +0,0 @@
|
|||
Fix build failure with glibc 2.26.
|
||||
|
||||
Patch copied from upstream source repository:
|
||||
https://sourceware.org/git/?p=valgrind.git;a=commit;h=2b5eab6a8db1b0487a3ad7fc4e7eeda6d3513626
|
||||
|
||||
diff --git a/memcheck/tests/linux/stack_changes.c b/memcheck/tests/linux/stack_changes.c
|
||||
index a978fc2..7f97b90 100644
|
||||
--- a/memcheck/tests/linux/stack_changes.c
|
||||
+++ b/memcheck/tests/linux/stack_changes.c
|
||||
@@ -10,7 +10,7 @@
|
||||
// This test is checking the libc context calls (setcontext, etc.) and
|
||||
// checks that Valgrind notices their stack changes properly.
|
||||
|
||||
-typedef struct ucontext mycontext;
|
||||
+typedef ucontext_t mycontext;
|
||||
|
||||
mycontext ctx1, ctx2, oldc;
|
||||
int count;
|
|
@ -31,7 +31,7 @@
|
|||
(define-public pciutils
|
||||
(package
|
||||
(name "pciutils")
|
||||
(version "3.6.1")
|
||||
(version "3.6.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -39,7 +39,7 @@
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1q39hh8scgvqppk1clzjh7yiq5p2r0knv52g3qzmdhsir4f47h7w"))))
|
||||
"1wwkpglvvr1sdj2gxz9khq507y02c4px48njy25divzdhv4jwifv"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
|
|
@ -663,14 +663,14 @@ line tools for batch rendering @command{pdfdraw}, rewriting files
|
|||
(define-public qpdf
|
||||
(package
|
||||
(name "qpdf")
|
||||
(version "8.2.1")
|
||||
(version "8.4.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/qpdf/qpdf/" version
|
||||
"/qpdf-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1jdb0jj72fjdp6xip4m7yz31r5x13zs7h4smnxsycgw3vbmx6igl"))
|
||||
"1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Replace shebang with the bi-lingual shell/Perl trick to remove
|
||||
|
|
|
@ -1280,15 +1280,19 @@ WebSocket usage in Python programs.")
|
|||
(define-public python-requests
|
||||
(package
|
||||
(name "python-requests")
|
||||
(version "2.13.0")
|
||||
(version "2.21.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "requests" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1s0wg4any4dsv5l3hqjxqk2zgb7pdbqhy9rhc8kh3aigfq4ws8jp"))))
|
||||
;; TODO: unbundle urllib3 and chardet.
|
||||
"13jr0wkj9c2j8c0c8iaal9iivi0bpxghnsdn6lxcpnmc657q4ajh"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-certifi" ,python-certifi)
|
||||
("python-chardet" ,python-chardet)
|
||||
("python-idna" ,python-idna)
|
||||
("python-urllib3" ,python-urllib3)))
|
||||
(arguments
|
||||
;; FIXME: Some tests require network access.
|
||||
'(#:tests? #f))
|
||||
|
@ -1457,11 +1461,6 @@ authenticated session objects providing things like keep-alive.")
|
|||
"08lwd9f3hqznyf32vnzwvp87pchx062nkbgyrf67rwlkgj0jk5fy"))))
|
||||
(build-system python-build-system)
|
||||
(arguments `(#:tests? #f))
|
||||
(native-inputs
|
||||
`(;; some packages for tests
|
||||
("python-mock" ,python-mock)
|
||||
("python-pytest" ,python-pytest)
|
||||
("python-tornado" ,python-tornado)))
|
||||
(propagated-inputs
|
||||
`(;; These 5 inputs are used to build urrlib3[secure]
|
||||
("python-certifi" ,python-certifi)
|
||||
|
|
|
@ -2671,6 +2671,292 @@ and several other projects.")
|
|||
(define-public python2-guzzle-sphinx-theme
|
||||
(package-with-python2 python-guzzle-sphinx-theme))
|
||||
|
||||
(define-public python-bumpversion
|
||||
(package
|
||||
(name "python-bumpversion")
|
||||
(version "0.5.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "bumpversion" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0zn7694yfipxg35ikkfh7kvgl2fissha3dnqad2c5bvsvmrwhi37"))))
|
||||
(build-system python-build-system)
|
||||
(home-page "https://github.com/peritus/bumpversion")
|
||||
(synopsis "Tool to bump software version")
|
||||
(description "This tool provides a command-line interface (CLI) to bump a
|
||||
software version simply.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-deprecated
|
||||
(package
|
||||
(name "python-deprecated")
|
||||
(version "1.2.5")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/tantale/deprecated.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"14909glxxwwc4b9qpz2b9jdriwzi5n65ichw85xqppap5f79wcwz"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "pytest"))))))
|
||||
(propagated-inputs
|
||||
`(("python-wrapt" ,python-wrapt)))
|
||||
(native-inputs
|
||||
`(("python-bumpversion" ,python-bumpversion)
|
||||
("python-pytest" ,python-pytest)
|
||||
("python-pytest-cov" ,python-pytest-cov)
|
||||
("python-sphinx" ,python-sphinx)
|
||||
("python-tox" ,python-tox)))
|
||||
(home-page "https://github.com/tantale/deprecated")
|
||||
(synopsis "Python decorator to deprecate classes, functions or methods")
|
||||
(description "The @code{deprecated} decorator provides a convenient way to deprecate
|
||||
to deprecate classes, functions or methods.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-pygithub
|
||||
(package
|
||||
(name "python-pygithub")
|
||||
(version "1.43.7")
|
||||
(source
|
||||
;; We fetch from the Git repo because there are no tests in the PyPI
|
||||
;; archive.
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/PyGithub/PyGithub.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ww92zz0ja9w6rw83vphmn8rwmcn6abg16j4q7zxjc0rrg2cfj9i"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
;; Some tests rely on the network.
|
||||
(add-after 'unpack 'disable-failing-tests
|
||||
(lambda _
|
||||
(substitute* "tests/Issue142.py"
|
||||
(("testDecodeJson") "disabled_testDecodeJson"))
|
||||
#t))
|
||||
(add-before 'check 'prepare-for-tests
|
||||
(lambda _
|
||||
(for-each (lambda (f)
|
||||
(chmod f #o666))
|
||||
(find-files "./tests"))
|
||||
(system* "python" "-m" "lib2to3" "-w" "-n" "tests")
|
||||
(setenv "PYTHONPATH"
|
||||
(string-append "./tests:" (getenv "PYTHONPATH")))
|
||||
#t)))))
|
||||
(propagated-inputs
|
||||
`(("python-deprecated" ,python-deprecated)
|
||||
("python-pyjwt" ,python-pyjwt)
|
||||
("python-requests" ,python-requests)))
|
||||
(native-inputs `(("python-httpretty" ,python-httpretty)))
|
||||
(home-page "https://pygithub.readthedocs.io/en/latest/")
|
||||
(synopsis "Python library for the GitHub API")
|
||||
(description "This library allows managing GitHub resources such as
|
||||
repositories, user profiles, and organizations in your Python applications,
|
||||
using version 3 of the GitHub application programming interface (API).")
|
||||
(license license:lgpl3+)))
|
||||
|
||||
(define-public python-rellu
|
||||
(package
|
||||
(name "python-rellu")
|
||||
(version "0.7")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "rellu" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1w0arpj1sm7vh29nrbnca4pnp8sx42l07r17inwqcjjf9bhng66x"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-invoke" ,python-invoke)
|
||||
("python-pygithub" ,python-pygithub)))
|
||||
(home-page "https://github.com/robotframework/rellu")
|
||||
(synopsis "Utilities to create PyPI releases")
|
||||
(description "This collection of utilities contains tooling and templates
|
||||
to assist in creating releases on GitHub and publishing them on PyPI. It is
|
||||
designed to be used by Robot Framework and tools and libraries in its
|
||||
ecosystem, but can naturally be used also by other projects.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public python-robotframework
|
||||
(package
|
||||
(name "python-robotframework")
|
||||
(version "3.1.1")
|
||||
;; There are no tests in the PyPI archive.
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/robotframework/robotframework.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1aaiamc9l35m5sf7xl2qc5q9308v7sz3p1qgzcslsjxzddphyn4v"))
|
||||
(patches (search-patches
|
||||
"python-robotframework-honor-source-date-epoch.patch"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(add-before 'build 'build-and-install-doc
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((doc-output (assoc-ref outputs "doc"))
|
||||
(doc (string-append doc-output "/share/"
|
||||
,name "-" ,version "/")))
|
||||
(invoke "invoke" "library-docs" "all")
|
||||
(mkdir-p doc)
|
||||
(copy-recursively "doc/libraries"
|
||||
(string-append doc "/libraries"))
|
||||
#t)))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "python" "utest/run.py"))))))
|
||||
(native-inputs
|
||||
`(("python-invoke" ,python-invoke)
|
||||
("python-rellu" ,python-rellu)
|
||||
("python:tk" ,python "tk"))) ;used when building the HTML doc
|
||||
(outputs '("out" "doc"))
|
||||
(home-page "https://robotframework.org")
|
||||
(synopsis "Generic automation framework")
|
||||
(description "Robot Framework is a generic automation framework for
|
||||
acceptance testing, acceptance test driven development (ATDD), and robotic
|
||||
process automation (RPA).")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public python-robotframework-lint
|
||||
;; There is no properly tagged release; the commit below seems to correspond
|
||||
;; to the 0.9 stable release available from PyPI. The tests are not
|
||||
;; included in the PyPI archive, so we fetch the sources from the upstream
|
||||
;; Git repo.
|
||||
(let ((commit "e851879bab1f63e4e53b34a4dc8a67ed95102830")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "python-robotframework-lint")
|
||||
(version (git-version "0.9.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/boakley/robotframework-lint.git")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1p6fknqg5sb9qz5857ji4a877657vgfjm5v3zn45994parx6ml1m"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "python" "-m" "robot" "-A"
|
||||
"tests/conf/default.args" "tests"))))))
|
||||
(propagated-inputs
|
||||
`(("python-robotframework" ,python-robotframework)))
|
||||
(home-page "https://github.com/boakley/robotframework-lint/")
|
||||
(synopsis "Static analysis tool (linter) for Robot Framework")
|
||||
(description "This package provides the @code{rflint} command-line
|
||||
utility, a static analysis tool (linter) for Robot Framework source files.")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public python-robotframework-sshlibrary
|
||||
(package
|
||||
(name "python-robotframework-sshlibrary")
|
||||
(version "3.3.0")
|
||||
;; There are no tests in the PyPI archive.
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/robotframework/SSHLibrary.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mk6dz2jqqndbx4yji09012q6rmadnqdywi7czvj62b0s07dr3r2"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'build-and-install-doc
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((doc-output (assoc-ref outputs "doc"))
|
||||
(doc (string-append doc-output "/share/"
|
||||
,name "-" ,version "/")))
|
||||
(invoke "chmod" "-R" "+w" "docs")
|
||||
(invoke "invoke" "kw-docs" "project-docs")
|
||||
(mkdir-p doc)
|
||||
(for-each delete-file (find-files "docs" "\\.rst"))
|
||||
(copy-recursively "docs" doc)
|
||||
#t)))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
;; Some tests require an SSH server; we remove them.
|
||||
(delete-file "utest/test_client_api.py")
|
||||
(delete-file "utest/test_scp.py")
|
||||
(invoke "python" "utest/run.py"))))))
|
||||
(propagated-inputs
|
||||
`(("python-robotframework" ,python-robotframework)
|
||||
("python-paramiko" ,python-paramiko)
|
||||
("python-scp" ,python-scp)))
|
||||
(native-inputs
|
||||
`(("openssh" ,openssh)
|
||||
("which" ,which)
|
||||
;; To generate the documentation
|
||||
("python-docutils" ,python-docutils)
|
||||
("python-invoke" ,python-invoke)
|
||||
("python-pygments" ,python-pygments)
|
||||
("python-rellu" ,python-rellu)))
|
||||
(outputs '("out" "doc"))
|
||||
(home-page "https://github.com/robotframework/SSHLibrary")
|
||||
(synopsis "Robot Framework library for SSH and SFTP")
|
||||
(description "SSHLibrary is a Robot Framework library providing support
|
||||
for SSH and SFTP. It has the following main usages:
|
||||
@itemize @bullet
|
||||
@item Executing commands on the remote machine, either blocking or non-blocking.
|
||||
@item Writing and reading in an interactive shell.
|
||||
@item Transferring files and directories over SFTP.
|
||||
@item Ensuring that files and directories exist on the remote machine.
|
||||
@end itemize")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public python-scp
|
||||
(package
|
||||
(name "python-scp")
|
||||
(version "0.13.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "scp" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1crlpw9lnn58fs1c1rmh7s7s9y5gkgpgjsqlvg9qa51kq1knx7gg"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ;tests require an SSH server
|
||||
(propagated-inputs
|
||||
`(("python-paramiko" ,python-paramiko)))
|
||||
(home-page "https://github.com/jbardin/scp.py")
|
||||
(synopsis "SCP protocol module for Python and Paramiko")
|
||||
(description "The scp module extends the Paramiko library to send and
|
||||
receive files via the SCP1 protocol, as implemented by the OpenSSH
|
||||
@command{scp} program.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public python-rst.linker
|
||||
(package
|
||||
(name "python-rst.linker")
|
||||
|
@ -2977,14 +3263,14 @@ and is very extensible.")
|
|||
(define-public python-cython
|
||||
(package
|
||||
(name "python-cython")
|
||||
(version "0.29.5")
|
||||
(version "0.29.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Cython" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1wfb68g115gmf3mv23w0hh972b0ll85gpb92ci28x6h997br0llx"))))
|
||||
"1bp7cn0pp5qy63k9hbp4ka34fm01kvysh478phpkhr68npqk6pbc"))))
|
||||
(build-system python-build-system)
|
||||
;; we need the full python package and not just the python-wrapper
|
||||
;; because we need libpython3.3m.so
|
||||
|
@ -3016,9 +3302,6 @@ and is very extensible.")
|
|||
|
||||
(replace 'check
|
||||
(lambda _
|
||||
;; The "with_outer_raising" test fails with Python 3.7. See
|
||||
;; https://github.com/cython/cython/issues/2454
|
||||
(delete-file "tests/run/generators_py.py")
|
||||
(invoke "python" "runtests.py" "-vv"))))))
|
||||
(home-page "http://cython.org/")
|
||||
(synopsis "C extensions for Python")
|
||||
|
@ -3422,13 +3705,13 @@ library, libgit2 implements Git plumbing.")
|
|||
(define-public python-pyparsing
|
||||
(package
|
||||
(name "python-pyparsing")
|
||||
(version "2.2.1")
|
||||
(version "2.3.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pyparsing" version))
|
||||
(sha256
|
||||
(base32 "06dgd0iilvf8m0ssmfpcbh8l6jf0zkp8adbb84llksg17crfx4zl"))))
|
||||
(base32 "0yk6xl885b91dmlhlsap7x78hk2rdr879fln9anbq6k4ca42djb6"))))
|
||||
(build-system python-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
|
|
|
@ -144,7 +144,9 @@ Specific to rust versions before 1.32."
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i"))))
|
||||
"0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i"))
|
||||
(patches
|
||||
(search-patches "mrustc-0.8.0-fix-variable-length-integer-receiving.patch"))))
|
||||
(outputs '("out" "cargo"))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
|
|
|
@ -79,14 +79,19 @@
|
|||
;; finding the libGL from mesa at runtime.
|
||||
"LDFLAGS=-lGL")
|
||||
|
||||
#:make-flags '("V=1") ;build verbosely
|
||||
|
||||
#:tests? #f)) ; no check target
|
||||
(propagated-inputs
|
||||
;; SDL headers include X11 headers.
|
||||
`(("libx11" ,libx11)
|
||||
("libcap" ,libcap))) ; 'libSDL.la' contain `-lcap'.
|
||||
("libcap" ,libcap) ; 'libSDL.la' contain `-lcap'.
|
||||
;; TODO: Since building Mesa with Meson it is now necessary that Mesa is
|
||||
;; a propogated input. We still need to figure out why, possibly due to a
|
||||
;; change in pkg-config.
|
||||
("mesa" ,mesa)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs `(("libxrandr" ,libxrandr)
|
||||
("mesa" ,mesa)
|
||||
("glu" ,glu)
|
||||
("alsa-lib" ,alsa-lib)
|
||||
("pulseaudio" ,pulseaudio)))
|
||||
|
|
|
@ -102,21 +102,23 @@
|
|||
(base32
|
||||
"0khyi6h015r2zfqgg0a44a2j7vmr1cy42knw7jbss237yvakc07y"))
|
||||
(patches
|
||||
(list
|
||||
;; This is required for compatibility with Poppler 0.64.0 and to fix a
|
||||
;; segmentation fault in dvipdfm-x from XeTeX, and also contains a fix
|
||||
;; for CVE-2018-17407.
|
||||
(let ((arch-patch
|
||||
(lambda (name revision hash)
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.linuxfromscratch.org/patches/blfs/"
|
||||
"svn/texlive-" version "-source-upstream_fixes-2.patch"))
|
||||
(file-name "texlive-poppler-compat.patch")
|
||||
(sha256
|
||||
(base32
|
||||
"04sxy1qv9y575mxwyg3y7rx7mh540pfjqx7yni7ncb5wjbq9pq1a")))
|
||||
(search-patch "texlive-bin-luatex-poppler-compat.patch")
|
||||
(search-patch "texlive-bin-pdftex-poppler-compat.patch")
|
||||
(search-patch "texlive-bin-xetex-poppler-compat.patch")))))
|
||||
(uri (string-append "https://git.archlinux.org/svntogit/packages.git"
|
||||
"/plain/trunk/" name "?h=packages/texlive-bin"
|
||||
"&id=" revision))
|
||||
(file-name (string-append "texlive-bin-" name))
|
||||
(sha256 (base32 hash)))))
|
||||
(arch-revision "e1975bce0b9d270d7c9773c5beb7e87d61ee8f57"))
|
||||
(append (search-patches "texlive-bin-CVE-2018-17407.patch"
|
||||
"texlive-bin-luatex-poppler-compat.patch")
|
||||
(list
|
||||
(arch-patch "pdftex-poppler0.72.patch" arch-revision
|
||||
"0p46b6xxxg2s3hx67r0wpz16g3qygx65hpc581xs3jz5pvsiq3y7")
|
||||
(arch-patch "xetex-poppler-fixes.patch" arch-revision
|
||||
"1jj1p5zkjljb7id9pjv29cw0cf8mwrgrh4ackgzz9c200vaqpsvx")))))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("texlive-extra-src" ,texlive-extra-src)
|
||||
|
@ -195,9 +197,9 @@
|
|||
#t))
|
||||
(add-after 'unpack 'use-code-for-new-poppler
|
||||
(lambda _
|
||||
(copy-file "texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc"
|
||||
(copy-file "texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc"
|
||||
"texk/web2c/pdftexdir/pdftoepdf.cc")
|
||||
(copy-file "texk/web2c/pdftexdir/pdftosrc-newpoppler.cc"
|
||||
(copy-file "texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc"
|
||||
"texk/web2c/pdftexdir/pdftosrc.cc")
|
||||
#t))
|
||||
(add-after 'unpack 'disable-failing-test
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
(define-public valgrind
|
||||
(package
|
||||
(name "valgrind")
|
||||
(version "3.13.0")
|
||||
(version "3.14.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (list (string-append "http://www.valgrind.org/downloads"
|
||||
|
@ -41,9 +41,8 @@
|
|||
"/valgrind-" version ".tar.bz2")))
|
||||
(sha256
|
||||
(base32
|
||||
"0fqc3684grrbxwsic1rc5ryxzxmigzjx9p5vf3lxa37h0gpq0rnp"))
|
||||
(patches (search-patches "valgrind-enable-arm.patch"
|
||||
"valgrind-glibc-compat.patch"))))
|
||||
"19ds42jwd89zrsjb94g7gizkkzipn8xik3xykrpcqxylxyzi2z03"))
|
||||
(patches (search-patches "valgrind-enable-arm.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("doc" ;16 MB
|
||||
"out"))
|
||||
|
@ -79,11 +78,7 @@
|
|||
tools. There are Valgrind tools that can automatically detect many memory
|
||||
management and threading bugs, and profile your programs in detail. You can
|
||||
also use Valgrind to build new tools.")
|
||||
(license gpl2+)
|
||||
|
||||
;; Building VEX on mips64el-linux fails with "opcode not supported on this
|
||||
;; processor: mips3".
|
||||
(supported-systems (delete "mips64el-linux" %supported-systems))))
|
||||
(license gpl2+)))
|
||||
|
||||
(define-public valgrind-3.15
|
||||
(package
|
||||
|
|
|
@ -700,7 +700,7 @@ libebml is a C++ library to read and write EBML files.")
|
|||
(define-public libva
|
||||
(package
|
||||
(name "libva")
|
||||
(version "2.3.0")
|
||||
(version "2.4.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -712,7 +712,7 @@ libebml is a C++ library to read and write EBML files.")
|
|||
(string-append "https://www.freedesktop.org/software/vaapi/releases/"
|
||||
"libva/libva-" version "/libva-" version ".tar.bz2")))
|
||||
(sha256
|
||||
(base32 "1r6wiw4k044cpb39rfqqdw6qmzw0268whpz124hywck9v980x130"))))
|
||||
(base32 "14ckq67z3pcd7jrnrm3ckss440g6dzp2m0ff5rps54qmq9b309lr"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
@ -2272,15 +2272,16 @@ and JACK.")
|
|||
(define-public libvdpau
|
||||
(package
|
||||
(name "libvdpau")
|
||||
(version "1.1.1")
|
||||
(version "1.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://secure.freedesktop.org/~aplattner/vdpau/"
|
||||
name "-" version ".tar.bz2"))
|
||||
(uri (string-append "https://gitlab.freedesktop.org/vdpau/libvdpau"
|
||||
"/uploads/14b620084c027d546fa0b3f083b800c6/"
|
||||
"libvdpau-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dnpb0yh7v6rvckx82kxg045rd9rbsw25wjv7ad5n8h94s9h2yl5"))))
|
||||
"01ps6g6p6q7j2mjm9vn44pmzq3g75mm7mdgmnhb1qkjjdwc9njba"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
|
|
|
@ -159,16 +159,17 @@ interpretation of the specifications for these languages.")
|
|||
(define-public vulkan-headers
|
||||
(package
|
||||
(name "vulkan-headers")
|
||||
(version "1.1.99")
|
||||
(version "1.1.106")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/KhronosGroup/Vulkan-Headers")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"166z6wn5kxnqm55zgzhmqa9hg48d11bfmi3wnf1mqhsx48xw6b8z"))))
|
||||
"0idw7q715ikj575qmspvgq2gzc6c1sj581b8z3xnv6wz9qbzrmsd"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; No tests.
|
||||
|
@ -189,9 +190,10 @@ interpretation of the specifications for these languages.")
|
|||
(uri (git-reference
|
||||
(url "https://github.com/KhronosGroup/Vulkan-Loader")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"02m3sdcbl8s6qr1nsba5621vg3f4akkfaa7g9hi70cpvws4x0gg8"))))
|
||||
"1ypjd2gfxdwldnqrrqy6bnjln5mml62a9k5pfi451srcxznijjai"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;FIXME: 23/39 tests fail. Try "tests/run_all_tests.sh".
|
||||
|
@ -203,20 +205,14 @@ interpretation of the specifications for these languages.")
|
|||
(substitute* "CMakeLists.txt" ((".*spirv_tools_commit_id.h.*") ""))
|
||||
#t)))
|
||||
#:configure-flags (list
|
||||
"-DBUILD_LAYERS=OFF" ; FIXME: Fails to build.
|
||||
"-DBUILD_TESTS=OFF" ; FIXME: Needs 'googletest' submodule.
|
||||
(string-append "-DCMAKE_INSTALL_LIBDIR="
|
||||
(assoc-ref %outputs "out") "/lib"))))
|
||||
(inputs `(("glslang" ,glslang)
|
||||
("libxcb" ,libxcb)
|
||||
("libx11" ,libx11)
|
||||
("libxrandr" ,libxrandr)
|
||||
("mesa" ,mesa)
|
||||
("spirv-tools" ,spirv-tools)
|
||||
(native-inputs `(("libxrandr" ,libxrandr)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python)
|
||||
("vulkan-headers" ,vulkan-headers)
|
||||
("wayland" ,wayland)))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)
|
||||
("python" ,python)))
|
||||
(home-page
|
||||
"https://github.com/KhronosGroup/Vulkan-Loader")
|
||||
(synopsis "Khronos official ICD loader and validation layers for Vulkan")
|
||||
|
@ -238,29 +234,31 @@ and the ICD.")
|
|||
(define-public vulkan-tools
|
||||
(package
|
||||
(name "vulkan-tools")
|
||||
(version "1.1.97.0")
|
||||
(version (package-version vulkan-headers))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/KhronosGroup/Vulkan-Tools")
|
||||
(commit (string-append "sdk-" version))))
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1p70wk0x546w1dlvlghrqm4l4b6ql0x08pdybyagnwwph0gdvqy3"))))
|
||||
"0swqyk16mbkivyk79dpqbhpw05a7yrakqynywznr5zgqbc0z4gj8"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("glslang" ,glslang)
|
||||
("libxrandr" ,libxrandr)
|
||||
("mesa" ,mesa)
|
||||
("vulkan-headers" ,vulkan-headers)
|
||||
("vulkan-loader" ,vulkan-loader)
|
||||
("wayland" ,wayland)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("python" ,python)))
|
||||
("python" ,python)
|
||||
("vulkan-headers" ,vulkan-headers)))
|
||||
(arguments
|
||||
`(#:tests? #f)) ; No tests.
|
||||
`(#:tests? #f ; No tests.
|
||||
#:configure-flags (list (string-append "-DGLSLANG_INSTALL_DIR="
|
||||
(assoc-ref %build-inputs "glslang")))))
|
||||
(home-page
|
||||
"https://github.com/KhronosGroup/Vulkan-Tools")
|
||||
(synopsis "Tools and utilities for Vulkan")
|
||||
|
|
|
@ -1160,6 +1160,7 @@ modules for building a Wayland compositor.")
|
|||
("elogind" ,elogind)
|
||||
("gdk-pixbuf" ,gdk-pixbuf)
|
||||
("json-c" ,json-c)
|
||||
("libevdev" ,libevdev)
|
||||
("libinput" ,libinput)
|
||||
("libxkbcommon" ,libxkbcommon)
|
||||
("pango" ,pango)
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2015, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
|
||||
;;; Copyright © 2015 Alexander I.Grafov <grafov@gmail.com>
|
||||
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
|
||||
|
@ -219,14 +219,14 @@ avoiding password prompts when X11 forwarding has already been setup.")
|
|||
(define-public libxkbcommon
|
||||
(package
|
||||
(name "libxkbcommon")
|
||||
(version "0.8.2")
|
||||
(version "0.8.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://xkbcommon.org/download/" name "-"
|
||||
(uri (string-append "https://xkbcommon.org/download/libxkbcommon-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"136mdq11lrwg6rjmm44lmysxxgb9c35p4sq6k0cd129x82rw9f3s"))))
|
||||
"12vc91ydhphd5sddz15560r41l7k0i7mq6nma8kkbzdp6bwwzpb0"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libx11" ,libx11)
|
||||
|
@ -379,7 +379,7 @@ rasterisation.")
|
|||
(define-public libdrm
|
||||
(package
|
||||
(name "libdrm")
|
||||
(version "2.4.96")
|
||||
(version "2.4.97")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -389,23 +389,24 @@ rasterisation.")
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"14xkip83qgljjaahzq40qgl60j54q7k00la1hbf5kk5lgg7ilmhd"))
|
||||
"08yimlp6jir1rs5ajgdx74xa5qdzcqahpdzdk0rmkmhh7vdcrl3p"))
|
||||
(patches (search-patches "libdrm-symbol-check.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
'(,@(match (%current-system)
|
||||
("armhf-linux"
|
||||
'("--enable-exynos-experimental-api"
|
||||
"--enable-omap-experimental-api"
|
||||
"--enable-etnaviv-experimental-api"
|
||||
"--enable-tegra-experimental-api"
|
||||
"--enable-freedreno-kgsl"))
|
||||
("aarch64-linux"
|
||||
'("--enable-tegra-experimental-api"
|
||||
"--enable-etnaviv-experimental-api"
|
||||
"--enable-freedreno-kgsl"))
|
||||
(_ '())))))
|
||||
((or "armhf-linux" "aarch64-linux")
|
||||
'("-Dexynos=true"
|
||||
"-Domap=true"
|
||||
"-Detnaviv=true"
|
||||
"-Dtegra=true"
|
||||
"-Dfreedreno-kgsl=true"))
|
||||
(_ '())))
|
||||
|
||||
#:phases (modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "meson" "test" "--timeout-multiplier" "5"))))))
|
||||
(inputs
|
||||
`(("libpciaccess" ,libpciaccess)))
|
||||
(native-inputs
|
||||
|
|
|
@ -235,7 +235,6 @@ It currently supports:
|
|||
(define flac
|
||||
(package
|
||||
(name "flac")
|
||||
(replacement flac/fixed)
|
||||
(version "1.3.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -243,7 +242,8 @@ It currently supports:
|
|||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gymm2j3276kr9nz6vmgfwsdfrq6c449n40a0mzz8h6wc7nw7kwi"))))
|
||||
"0gymm2j3276kr9nz6vmgfwsdfrq6c449n40a0mzz8h6wc7nw7kwi"))
|
||||
(patches (search-patches "flac-CVE-2017-6888.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:parallel-tests? #f))
|
||||
|
@ -257,14 +257,6 @@ meaning that audio is compressed in FLAC without any loss in quality.")
|
|||
"See COPYING in the distribution.")) ; and LGPL and GPL
|
||||
(home-page "https://xiph.org/flac/")))
|
||||
|
||||
(define flac/fixed
|
||||
(package
|
||||
(inherit flac)
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source flac))
|
||||
(patches (search-patches "flac-CVE-2017-6888.patch"))))))
|
||||
|
||||
(define libkate
|
||||
(package
|
||||
(name "libkate")
|
||||
|
|
|
@ -1082,7 +1082,7 @@ synchronization between the X server and direct-rendering clients.")
|
|||
(define-public libfontenc
|
||||
(package
|
||||
(name "libfontenc")
|
||||
(version "1.1.3")
|
||||
(version "1.1.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1092,14 +1092,14 @@ synchronization between the X server and direct-rendering clients.")
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h"))))
|
||||
"0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("zlib" ,zlib)
|
||||
("xorgproto" ,xorgproto)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(home-page "https://www.x.org/wiki/")
|
||||
(home-page "https://gitlab.freedesktop.org/xorg/lib/libfontenc")
|
||||
(synopsis "Xorg font encoding library")
|
||||
(description "Xorg font encoding library.")
|
||||
(license license:x11)))
|
||||
|
@ -1268,7 +1268,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.")
|
|||
(define-public libxcomposite
|
||||
(package
|
||||
(name "libxcomposite")
|
||||
(version "0.4.4")
|
||||
(version "0.4.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1278,7 +1278,7 @@ with the Cygwin XWin server when running X11 in a rootless mode.")
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd"))))
|
||||
"13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
;; xcomposite.pc refers to all these.
|
||||
|
@ -1357,7 +1357,7 @@ configuration files.")
|
|||
(define-public libxkbfile
|
||||
(package
|
||||
(name "libxkbfile")
|
||||
(version "1.0.9")
|
||||
(version "1.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1367,7 +1367,7 @@ configuration files.")
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai"))))
|
||||
"1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libx11" ,libx11)))
|
||||
|
@ -1554,7 +1554,7 @@ input from UTF-8 into the locale's encoding.")
|
|||
(define-public makedepend
|
||||
(package
|
||||
(name "makedepend")
|
||||
(version "1.0.5")
|
||||
(version "1.0.6")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1564,7 +1564,7 @@ input from UTF-8 into the locale's encoding.")
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p"))))
|
||||
"072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("xorgproto" ,xorgproto)))
|
||||
|
@ -3839,7 +3839,7 @@ extension to the X11 protocol. It includes:
|
|||
(define-public xkeyboard-config
|
||||
(package
|
||||
(name "xkeyboard-config")
|
||||
(version "2.24")
|
||||
(version "2.26")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -3849,7 +3849,7 @@ extension to the X11 protocol. It includes:
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1my4786pd7iv5x392r9skj3qclmbd26nqzvh2fllwkkbyj08bcci"))))
|
||||
"13h3381pfp4pv32189zkfsj2x0alr91xj6dqii76rl0c8v3ihdrr"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
|
@ -4970,7 +4970,7 @@ new API's in libXft, or the legacy API's in libX11.")
|
|||
(define-public libxvmc
|
||||
(package
|
||||
(name "libxvmc")
|
||||
(version "1.0.10")
|
||||
(version "1.0.11")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -4980,7 +4980,7 @@ new API's in libXft, or the legacy API's in libX11.")
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5"))))
|
||||
"0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
`(("libxv" ,libxv)))
|
||||
|
@ -5132,7 +5132,7 @@ over Xlib, including:
|
|||
("xcb-util-renderutil" ,xcb-util-renderutil)
|
||||
("xcb-util-wm" ,xcb-util-wm)))
|
||||
(native-inputs
|
||||
`(("python" ,python-minimal-wrapper)
|
||||
`(("python" ,python-wrapper)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(arguments
|
||||
`(#:parallel-tests? #f
|
||||
|
@ -5205,16 +5205,7 @@ draggable titlebars and borders.")
|
|||
(define-public xorg-server-for-tests
|
||||
(hidden-package
|
||||
(package
|
||||
(inherit xorg-server)
|
||||
(version "1.20.3")
|
||||
(source (origin
|
||||
(inherit (package-source xorg-server))
|
||||
(uri (string-append
|
||||
"mirror://xorg/individual/xserver/"
|
||||
"xorg-server-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v")))))))
|
||||
(inherit xorg-server))))
|
||||
|
||||
(define-public xorg-server-xwayland
|
||||
(package
|
||||
|
@ -5275,7 +5266,7 @@ draggable titlebars and borders.")
|
|||
(define-public libxcursor
|
||||
(package
|
||||
(name "libxcursor")
|
||||
(version "1.1.15")
|
||||
(version "1.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -5285,7 +5276,7 @@ draggable titlebars and borders.")
|
|||
".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9"))))
|
||||
"10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs"))))
|
||||
(build-system gnu-build-system)
|
||||
(propagated-inputs
|
||||
`(("libx11" ,libx11)
|
||||
|
|
|
@ -86,7 +86,7 @@ operation is not deterministic, we replace it with `find`."
|
|||
"Remove the original gemspec, if present, and replace it with a new one.
|
||||
This avoids issues with upstream gemspecs requiring tools such as git to
|
||||
generate the files list."
|
||||
(when (gem-archive? source)
|
||||
(if (gem-archive? source)
|
||||
(let ((gemspec (or (false-if-exception (first-gemspec))
|
||||
;; Make new gemspec if one wasn't shipped.
|
||||
".gemspec")))
|
||||
|
@ -107,7 +107,8 @@ generate the files list."
|
|||
#t)
|
||||
(lambda ()
|
||||
(close-pipe pipe)))))
|
||||
#t))
|
||||
(display "extract-gemspec: skipping as source is not a gem archive\n"))
|
||||
#t)
|
||||
|
||||
(define* (build #:key source #:allow-other-keys)
|
||||
"Build a new gem using the gemspec from the SOURCE gem."
|
||||
|
@ -138,11 +139,15 @@ GEM-FLAGS are passed to the 'gem' invokation, if present."
|
|||
(gem-file-basename (basename gem-file))
|
||||
(gem-name (substring gem-file-basename
|
||||
0
|
||||
(- (string-length gem-file-basename) 4))))
|
||||
(- (string-length gem-file-basename) 4)))
|
||||
(gem-dir (string-append vendor-dir "/gems/" gem-name)))
|
||||
(setenv "GEM_VENDOR" vendor-dir)
|
||||
|
||||
(or (zero?
|
||||
;; 'zero? system*' allows the custom error handling to function as
|
||||
;; expected, while 'invoke' raises its own exception.
|
||||
(apply system* "gem" "install" gem-file
|
||||
"--verbose"
|
||||
"--local" "--ignore-dependencies" "--vendor"
|
||||
;; Executables should go into /bin, not
|
||||
;; /lib/ruby/gems.
|
||||
|
@ -163,7 +168,7 @@ GEM-FLAGS are passed to the 'gem' invokation, if present."
|
|||
;; For gems with native extensions, several Makefile-related files
|
||||
;; are created that contain timestamps or other elements making
|
||||
;; them not reproducible. They are unnecessary so we remove them.
|
||||
(when (file-exists? (string-append vendor-dir "/ext"))
|
||||
(when (file-exists? (string-append gem-dir "/ext"))
|
||||
(for-each (lambda (file)
|
||||
(log-file-deletion file)
|
||||
(delete-file file))
|
||||
|
@ -172,7 +177,7 @@ GEM-FLAGS are passed to the 'gem' invokation, if present."
|
|||
"page-Makefile.ri")
|
||||
(find-files (string-append vendor-dir "/extensions")
|
||||
"gem_make.out")
|
||||
(find-files (string-append vendor-dir "/ext")
|
||||
(find-files (string-append gem-dir "/ext")
|
||||
"Makefile"))))
|
||||
|
||||
#t))
|
||||
|
|
Loading…
Reference in New Issue