amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: firebird: Update to 3.0.10.

Browse source 
* gnu/packages/databases.scm (firebird): Update to 3.0.10.
[source]: Remove trailing #t.
[arguments]: Remove trailing #t from phases.
[inputs]: Replace icu4c-67 with icu4c.
[properties]: Remove field.
This commit is contained in:
Efraim Flashner 2022-09-24 20:35:33 +03:00
parent 8a0384b88f
commit 77c0e58e9b
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

35
gnu/packages/databases.scm
View file

@ -258,17 +258,17 @@ ElasticSearch server")
(define-public firebird (define-public firebird
(package (package
(name "firebird") (name "firebird")
(version "3.0.7") (version "3.0.10")
(source (source
(let ((revision "33374-0")) (let ((revision "33601-0"))
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/FirebirdSQL/" (uri (string-append "https://github.com/FirebirdSQL/"
"firebird/releases/download/R" "firebird/releases/download/v"
(string-replace-substring version "." "_") "/" version "/"
"Firebird-" version "." revision ".tar.bz2")) "Firebird-" version "." revision ".tar.bz2"))
(sha256 (sha256
(base32 "0xpy1bncz36c6n28y7kllm1dkrdkn4vb4gw2n43f2351mznmrf5c")) (base32 "0h033xj1kxwgvdv4ncm6kk0mqybvvn203gf88xcv3avys9hbnf4i"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin `(begin
@ -290,8 +290,7 @@ ElasticSearch server")
"doc/Firebird-3-QuickStart.pdf" "doc/Firebird-3-QuickStart.pdf"
(string-append "doc/Firebird-" ,version (string-append "doc/Firebird-" ,version
"-ReleaseNotes.pdf") "-ReleaseNotes.pdf")
"doc/README.SecureRemotePassword.html")) "doc/README.SecureRemotePassword.html")))))))
#t)))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs (list "debug" "out")) (outputs (list "debug" "out"))
(arguments (arguments
@ -329,8 +328,7 @@ ElasticSearch server")
(substitute* "src/include/firebird/Message.h" (substitute* "src/include/firebird/Message.h"
(("\"\\./impl/boost/preprocessor/seq/for_each_i\\.hpp\"") (("\"\\./impl/boost/preprocessor/seq/for_each_i\\.hpp\"")
"<boost/preprocessor/seq/for_each_i.hpp>") "<boost/preprocessor/seq/for_each_i.hpp>")
(("FB_BOOST_") "BOOST_")) (("FB_BOOST_") "BOOST_"))))
#t))
(add-after 'unpack 'patch-installation (add-after 'unpack 'patch-installation
(lambda _ (lambda _
(substitute* (substitute*
@ -358,27 +356,23 @@ ElasticSearch server")
;; These promote proprietary workflows not relevant on Guix. ;; These promote proprietary workflows not relevant on Guix.
(for-each delete-file-recursively (for-each delete-file-recursively
(find-files "doc" "README\\.(build\\.msvc|NT|Win)")) (find-files "doc" "README\\.(build\\.msvc|NT|Win)"))))
#t))
(add-after 'configure 'delete-init-scripts (add-after 'configure 'delete-init-scripts
(lambda _ (lambda _
(delete-file-recursively "gen/install/misc") (delete-file-recursively "gen/install/misc")))
#t))
(add-before 'build 'set-build-environment-variables (add-before 'build 'set-build-environment-variables
(lambda _ (lambda _
;; ‘isql’ needs to run & find libfbclient.so during the build. ;; ‘isql’ needs to run & find libfbclient.so during the build.
;; This doubles as a rudimentary test in lieu of a test suite. ;; This doubles as a rudimentary test in lieu of a test suite.
(setenv "LD_LIBRARY_PATH" (setenv "LD_LIBRARY_PATH"
(string-append (assoc-ref %build-inputs "icu4c") "/lib")) (string-append (assoc-ref %build-inputs "icu4c") "/lib"))))
#t))
(add-before 'install 'keep-embedded-debug-symbols (add-before 'install 'keep-embedded-debug-symbols
(lambda _ (lambda _
;; Let the gnu-build-system separate & deal with them later. ;; Let the gnu-build-system separate & deal with them later.
;; XXX Upstream would use ‘--strip-unneeded’, shaving a whole ;; XXX Upstream would use ‘--strip-unneeded’, shaving a whole
;; megabyte off Guix's 7.7M libEngine12.so, for example. ;; megabyte off Guix's 7.7M libEngine12.so, for example.
(substitute* "gen/Makefile.install" (substitute* "gen/Makefile.install"
(("readelf") "false")) (("readelf") "false"))))
#t))
(add-after 'install 'prune-undesirable-files (add-after 'install 'prune-undesirable-files
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
@ -389,12 +383,11 @@ ElasticSearch server")
;; Delete (now-)empty directories. ;; Delete (now-)empty directories.
(for-each rmdir (for-each rmdir
(list "include/firebird/impl" (list "include/firebird/impl"
"lib/firebird/plugins/udr")) "lib/firebird/plugins/udr")))))))))
#t)))))))
(inputs (inputs
(list boost (list boost
editline editline
icu4c-67 icu4c
libtommath libtommath
ncurses ncurses
zlib)) zlib))
@ -417,8 +410,6 @@ Firebird can also be embedded into stand-alone applications that don't want or
need a full client & server. Used in this manner, it offers richer SQL support need a full client & server. Used in this manner, it offers richer SQL support
than SQLite as well as the option to seamlessly migrate to a client/server than SQLite as well as the option to seamlessly migrate to a client/server
database later.") database later.")
(properties
`((lint-hidden-cve . ("CVE-2017-6369"))))
(license (license
;; See doc/license/README.license.usage.txt for rationale & details. ;; See doc/license/README.license.usage.txt for rationale & details.
(list license:bsd-3 ; src/common/sha2/ (list license:bsd-3 ; src/common/sha2/