aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/icecat-avoid-bundled-libraries.patch
blob: 114631517ae7f96c68d06caa3809aa827020b4b8 (about) (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35

Fixes needed when avoiding bundled libraries.

--- icecat-52.0.2/xpcom/build/moz.build.orig
+++ icecat-52.0.2/xpcom/build/moz.build
@@ -93,10 +93,5 @@
     '/docshell/base',
 ]
 
-if CONFIG['MOZ_VPX']:
-    LOCAL_INCLUDES += [
-        '/media/libvpx',
-    ]
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CXXFLAGS += CONFIG['TK_CFLAGS']
--- icecat-52.0.2/storage/moz.build.orig
+++ icecat-52.0.2/storage/moz.build
@@ -114,7 +114,6 @@
     DEFINES['MOZ_MEMORY_TEMP_STORE_PRAGMA'] = True
 
 LOCAL_INCLUDES += [
-    '/db/sqlite3/src',
     '/dom/base',
 ]
 
--- icecat-52.0.2/dom/indexedDB/moz.build.orig
+++ icecat-52.0.2/dom/indexedDB/moz.build
@@ -101,7 +101,6 @@
     CXXFLAGS += ['-Wno-error=shadow']
 
 LOCAL_INCLUDES += [
-    '/db/sqlite3/src',
     '/dom/base',
     '/dom/storage',
     '/dom/workers',
generated by cgit
t;dce-uuid str) "Parse STR as a DCE UUID (see <https://tools.ietf.org/html/rfc4122>) and return its contents as a 16-byte bytevector. Return #f if STR is not a valid UUID representation." (and=> (regexp-exec %uuid-rx str) (lambda (match) (letrec-syntax ((hex->number (syntax-rules () ((_ index) (string->number (match:substring match index) 16)))) (put! (syntax-rules () ((_ bv index (number len) rest ...) (begin (bytevector-uint-set! bv index number (endianness big) len) (put! bv (+ index len) rest ...))) ((_ bv index) bv)))) (let ((time-low (hex->number 1)) (time-mid (hex->number 2)) (time-hi (hex->number 3)) (clock-seq (hex->number 4)) (node (hex->number 5)) (uuid (make-bytevector 16))) (put! uuid 0 (time-low 4) (time-mid 2) (time-hi 2) (clock-seq 2) (node 6))))))) ;;; ;;; ISO-9660. ;;; ;; <http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-119.pdf>. (define %iso9660-uuid-rx ;; Y m d H M S ss (make-regexp "^([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2})-([[:digit:]]{2})-([[:digit:]]{2})-([[:digit:]]{2})-([[:digit:]]{2})$")) (define (string->iso9660-uuid str) "Parse STR as a ISO9660 UUID (which is really a timestamp - see /dev/disk/by-uuid). Return its contents as a 16-byte bytevector. Return #f if STR is not a valid ISO9660 UUID representation." (and=> (regexp-exec %iso9660-uuid-rx str) (lambda (match) (letrec-syntax ((match-numerals (syntax-rules () ((_ index (name rest ...) body) (let ((name (match:substring match index))) (match-numerals (+ 1 index) (rest ...) body))) ((_ index () body) body)))) (match-numerals 1 (year month day hour minute second hundredths) (string->utf8 (string-append year month day hour minute second hundredths))))))) (define (iso9660-uuid->string uuid) "Given an UUID bytevector, return its timestamp string." (define (digits->string bytes) (latin1->string bytes (lambda (c) #f))) (let* ((year (sub-bytevector uuid 0 4)) (month (sub-bytevector uuid 4 2)) (day (sub-bytevector uuid 6 2)) (hour (sub-bytevector uuid 8 2)) (minute (sub-bytevector uuid 10 2)) (second (sub-bytevector uuid 12 2)) (hundredths (sub-bytevector uuid 14 2)) (parts (list year month day hour minute second hundredths))) (string-append (string-join (map digits->string parts) "-")))) ;;; ;;; FAT32/FAT16. ;;; (define-syntax %fat-endianness ;; Endianness of FAT32/FAT16 file systems. (identifier-syntax (endianness little))) (define (fat-uuid->string uuid) "Convert FAT32/FAT16 UUID, a 4-byte bytevector, to its string representation." (let ((high (bytevector-uint-ref uuid 0 %fat-endianness 2)) (low (bytevector-uint-ref uuid 2 %fat-endianness 2))) (format #f "~:@(~4,'0x-~4,'0x~)" low high))) (define %fat-uuid-rx (make-regexp "^([[:xdigit:]]{4})-([[:xdigit:]]{4})$")) (define (string->fat-uuid str) "Parse STR, which is in FAT32/FAT16 format, and return a bytevector or #f." (match (regexp-exec %fat-uuid-rx str) (#f #f) (rx-match (uint-list->bytevector (list (string->number (match:substring rx-match 2) 16) (string->number (match:substring rx-match 1) 16)) %fat-endianness 2)))) ;;; ;;; NTFS. ;;; (define-syntax %ntfs-endianness ;; Endianness of NTFS file system. (identifier-syntax (endianness little))) (define (ntfs-uuid->string uuid) "Convert NTFS UUID, a 8-byte bytevector, to its string representation." (format #f "~{~:@(~2,'0x~)~}" (reverse (bytevector->u8-list uuid)))) (define %ntfs-uuid-rx (make-regexp "^([[:xdigit:]]{16})$")) (define (string->ntfs-uuid str) "Parse STR, which is in NTFS format, and return a bytevector or #f." (match (regexp-exec %ntfs-uuid-rx str) (#f #f) (rx-match (u8-list->bytevector (let loop ((str str) (res '())) (if (string=? str "") res (loop (string-drop str 2) (cons (string->number (string-take str 2) 16) res)))))))) ;;; ;;; Generic interface. ;;; (define string->ext2-uuid string->dce-uuid) (define string->ext3-uuid string->dce-uuid) (define string->ext4-uuid string->dce-uuid) (define string->bcachefs-uuid string->dce-uuid) (define string->btrfs-uuid string->dce-uuid) (define string->f2fs-uuid string->dce-uuid) (define string->jfs-uuid string->dce-uuid) (define string->xfs-uuid string->dce-uuid) (define-syntax vhashq (syntax-rules (=>) ((_) vlist-null) ((_ (key others ... => value) rest ...) (vhash-consq key value (vhashq (others ... => value) rest ...))) ((_ (=> value) rest ...) (vhashq rest ...)))) (define %uuid-parsers (vhashq ('dce 'ext2 'ext3 'ext4 'bcachefs 'btrfs 'f2fs 'jfs 'xfs 'luks => string->dce-uuid) ('fat32 'fat16 'fat => string->fat-uuid) ('ntfs => string->ntfs-uuid) ('iso9660 => string->iso9660-uuid))) (define %uuid-printers (vhashq ('dce 'ext2 'ext3 'ext4 'bcachefs 'btrfs 'f2fs 'jfs 'xfs 'luks => dce-uuid->string) ('iso9660 => iso9660-uuid->string) ('fat32 'fat16 'fat => fat-uuid->string) ('ntfs => ntfs-uuid->string))) (define* (string->uuid str #:optional (type 'dce)) "Parse STR as a UUID of the given TYPE. On success, return the corresponding bytevector; otherwise return #f." (match (vhash-assq type %uuid-parsers) (#f #f) ((_ . (? procedure? parse)) (parse str)))) ;; High-level UUID representation that carries its type with it. ;; ;; This is necessary to serialize bytevectors with the right printer in some ;; circumstances. For instance, GRUB "search --fs-uuid" command compares the ;; string representation of UUIDs, not the raw bytes; thus, when emitting a ;; GRUB 'search' command, we need to produce the right string representation ;; (see <https://debbugs.gnu.org/cgi/bugreport.cgi?msg=52;att=0;bug=27735>). (define-record-type <uuid> (make-uuid type bv) uuid? (type uuid-type) ;'dce | 'iso9660 | ... (bv uuid-bytevector)) (define* (bytevector->uuid bv #:optional (type 'dce)) "Return a UUID object make of BV and TYPE." (make-uuid type bv)) (define-syntax uuid (lambda (s) "Return the UUID object corresponding to the given UUID representation or #f if the string could not be parsed." (syntax-case s (quote) ((_ str (quote type)) (and (string? (syntax->datum #'str)) (identifier? #'type)) ;; A literal string: do the conversion at expansion time. (let ((bv (string->uuid (syntax->datum #'str) (syntax->datum #'type)))) (unless bv (syntax-violation 'uuid "invalid UUID" s)) #`(make-uuid 'type #,(datum->syntax s bv)))) ((_ str) (string? (syntax->datum #'str)) #'(uuid str 'dce)) ((_ str) #'(let ((bv (string->uuid str 'dce))) (and bv (make-uuid 'dce bv)))) ((_ str type) #'(let ((bv (string->uuid str type))) (and bv (make-uuid type bv))))))) (define uuid->string ;; Convert the given bytevector or UUID object, to the corresponding UUID ;; string representation. (match-lambda* (((? bytevector? bv)) (uuid->string bv 'dce)) (((? bytevector? bv) type) (match (vhash-assq type %uuid-printers) (#f #f) ((_ . (? procedure? unparse)) (unparse bv)))) (((? uuid? uuid)) (uuid->string (uuid-bytevector uuid) (uuid-type uuid))))) (define uuid=? ;; Return true if A is equal to B, comparing only the actual bits. (match-lambda* (((? bytevector? a) (? bytevector? b)) (bytevector=? a b)) (((? uuid? a) (? bytevector? b)) (bytevector=? (uuid-bytevector a) b)) (((? uuid? a) (? uuid? b)) (bytevector=? (uuid-bytevector a) (uuid-bytevector b))) (((or (? uuid? a) (? bytevector? a)) (or (? uuid? b) (? bytevector? b))) (uuid=? b a))))
generated by cgit