[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r8947: freefont fontforge libspiro mercury binutils
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r8947: freefont fontforge libspiro mercury binutils etc |
|
Date: |
Sun, 15 Jan 2023 02:01:34 -0500 (EST) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 8947
revision-id: carlhansen1234@gmail.com-20230115070124-l72zblrli4qiqjfh
parent: carlhansen1234@gmail.com-20230115005954-4yr7ub2f0q57o9m8
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Sat 2023-01-14 23:01:24 -0800
message:
freefont fontforge libspiro mercury binutils etc
removed:
pkg/gnu/freefont/files/freefont-20120503-fix-trim-version.diff
freefont20120503fixt-20160617014725-uokjfnggs70iry9h-2106
added:
pkg/gnu/freefont/files/freefont-20120503-pyfix.diff
freefont20120503pyfi-20230114072700-5527xnfvvqnd8vjo-1
pkg/other/fontforge/ fontforge-20230114062230-9cnfp6h93atasp9u-1
pkg/other/fontforge/Makefile makefile-20230114062230-9cnfp6h93atasp9u-3
pkg/other/fontforge/config.mk config.mk-20230114062230-9cnfp6h93atasp9u-2
pkg/other/fontforge/sha256sums sha256sums-20230114062230-9cnfp6h93atasp9u-4
pkg/other/libspiro/ libspiro-20230114061521-hurla5q7eilgyles-1
pkg/other/libspiro/Makefile makefile-20230114061521-hurla5q7eilgyles-3
pkg/other/libspiro/config.mk config.mk-20230114061521-hurla5q7eilgyles-2
pkg/other/libspiro/sha256sums sha256sums-20230114061521-hurla5q7eilgyles-4
pkg/other/mercury/files/ files-20230115012141-fx5cg7zcyq7jvx40-1
pkg/other/mercury/files/mercury.22.01.5.patch
mercury.22.01.5.patc-20230115012141-fx5cg7zcyq7jvx40-2
modified:
gar/gar.lib.mk gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
gar/gsrc-maint.mk gsrcmaint.mk-20220927041122-92dxd0tly081nk61-1
pkg/bio/mrbayes/sha256sums sha256sums-20160617195624-kwz1a09vkg4le6fu-131
pkg/bio/newick-utils/sha256sums sha256sums-20160617195624-kwz1a09vkg4le6fu-141
pkg/bio/perl-ensembl-compara/sha256sums
sha256sums-20160617200040-lqf8h520dfq0rtk7-62
pkg/bio/perl-ensembl-funcgen/sha256sums
sha256sums-20160617200040-lqf8h520dfq0rtk7-64
pkg/bio/perl-ensembl-variation/sha256sums
sha256sums-20160617200040-lqf8h520dfq0rtk7-66
pkg/gnome/nautilus-python/sha256sums
sha256sums-20180106063952-7rwfkmcj31w31nqw-4
pkg/gnu/ed/gpg-keyring gpgkeyring-20160617014725-uokjfnggs70iry9h-596
pkg/gnu/emacs/gpg-keyring gpgkeyring-20160617014725-uokjfnggs70iry9h-607
pkg/gnu/fontutils/sha256sums sha256sums-20160617014725-uokjfnggs70iry9h-649
pkg/gnu/freefont/Makefile makefile-20160617014725-uokjfnggs70iry9h-653
pkg/gnu/freefont/sha256sums sha256sums-20160617014725-uokjfnggs70iry9h-656
pkg/gnu/gcl/Makefile makefile-20160617014725-uokjfnggs70iry9h-686
pkg/gnu/glibc/Makefile makefile-20160617014725-uokjfnggs70iry9h-1147
pkg/gnu/gnupg/gpg-keyring gpgkeyring-20170728224302-x3bnqi8rvo3e2f6v-1
pkg/gnu/guile-gtk/sha256sums sha256sums-20160617014725-uokjfnggs70iry9h-989
pkg/gnu/unifont/Makefile makefile-20161021200207-w6apucnpk66hw5ah-3
pkg/other/imath/sha256sums sha256sums-20210518072847-dxae20zhyyvoung7-4
pkg/other/libmypaint/sha256sums sha256sums-20170901053124-9kgam4xj2ihid0jg-4
pkg/other/mercury/Makefile makefile-20181109194009-h0l0v02nsc5pw6mc-3
pkg/other/mercury/sha256sums sha256sums-20181109194009-h0l0v02nsc5pw6mc-4
pkg/other/tile-forth/sha256sums sha256sums-20191121061716-35s8rzbq86fj5emi-6
=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk 2023-01-12 08:43:40 +0000
+++ b/gar/gar.lib.mk 2023-01-15 07:01:24 +0000
@@ -739,9 +739,10 @@
.PHONY: prepare-install finish-package-install
# ?? what is this doing?
+#rm -fr $(packageDESTDIR)
+
prepare-install:
@printf "[$(OK)prepare-install$(OFF)] $(MSG)Preparing staging area
packageDESTDIR...$(OFF)\n"
- rm -fr $(packageDESTDIR)
mkdir -p $(packageDESTDIR)$(prefix)
@set -e; \
set -- $(CREATED_MERGE_DIRS); \
@@ -754,11 +755,12 @@
echo dest $$dest ; \
echo echoing .... mkdir -p $$src `dirname $$dest`; \
mkdir -p $$src `dirname $$dest`; \
- rm -rf $$dest; \
ln -sf $$src $$dest; \
shift; shift; \
done $(OUTPUT)
+#rm -rf $$dest; \
+
#$(MAKECOOKIE)
=== modified file 'gar/gsrc-maint.mk'
--- a/gar/gsrc-maint.mk 2022-09-27 18:11:29 +0000
+++ b/gar/gsrc-maint.mk 2023-01-15 07:01:24 +0000
@@ -25,7 +25,9 @@
# FIXME
keyring: fetch
id=`gpg --verify $(DOWNLOADDIR)/$(SIGFILES) 2>&1 | grep -o -E
"[0-9A-Z]{8}"` \
- && gpg -v --keyserver keys.gnupg.net --recv-keys $$id && gpg -v
--export $$id > gpg-keyring
+ && gpg -v --keyserver hkp://pgp.mit.edu:80 --recv-keys $$id &&
gpg -v --export $$id > gpg-keyring
+
+# && gpg -v --keyserver keys.gnupg.net --recv-keys $$id && gpg -v
--export $$id > gpg-keyring
# 2020 Nov 17 2020 changed back above
=== modified file 'pkg/bio/mrbayes/sha256sums'
--- a/pkg/bio/mrbayes/sha256sums 2022-11-17 09:08:07 +0000
+++ b/pkg/bio/mrbayes/sha256sums 2023-01-15 07:01:24 +0000
@@ -1,1 +0,0 @@
-3eed2e3b1d9e46f265b6067a502a89732b6f430585d258b886e008e846ecc5c6
download/v3.2.7a.tar.gz
=== modified file 'pkg/bio/newick-utils/sha256sums'
--- a/pkg/bio/newick-utils/sha256sums 2017-05-03 23:40:59 +0000
+++ b/pkg/bio/newick-utils/sha256sums 2023-01-15 07:01:24 +0000
@@ -1,2 +1,1 @@
2c142a2806f6e1598585c8be5afba6d448c572ad21c142e70d6fd61877fee798
download/newick-utils-1.6.tar.gz
-7cdd0088c0ba09e391441707ca78892c1ebdc0f0e2e0dcc778824d12f07251af
download/newick-utils-1.6-compile-w-lua-5.2.patch
=== modified file 'pkg/bio/perl-ensembl-compara/sha256sums'
--- a/pkg/bio/perl-ensembl-compara/sha256sums 2016-06-17 20:01:53 +0000
+++ b/pkg/bio/perl-ensembl-compara/sha256sums 2023-01-15 07:01:24 +0000
@@ -1,1 +1,1 @@
-a20a4917f2f2af43075dcdd5710f66f589970f73172d550d20d60d532eed0beb
download/78.zip
+63bed67308ff91918cd20f0f0fac0ba0bd8b61d0277bb1fb4a94ea7ca0da5b91
download/78.zip
=== modified file 'pkg/bio/perl-ensembl-funcgen/sha256sums'
--- a/pkg/bio/perl-ensembl-funcgen/sha256sums 2016-06-17 20:01:53 +0000
+++ b/pkg/bio/perl-ensembl-funcgen/sha256sums 2023-01-15 07:01:24 +0000
@@ -1,1 +1,1 @@
-b63d12c26eae5ae0ef6c8eeb5d8a359467bb470b3d9765e5612869aad90e28a6
download/78.zip
+1ac24e4cce49f155f4e06deb39cc0dcb0a93d701499e789975740118220ed039
download/78.zip
=== modified file 'pkg/bio/perl-ensembl-variation/sha256sums'
--- a/pkg/bio/perl-ensembl-variation/sha256sums 2016-06-17 20:01:53 +0000
+++ b/pkg/bio/perl-ensembl-variation/sha256sums 2023-01-15 07:01:24 +0000
@@ -1,1 +1,1 @@
-25674e07821a97d4978b97570dd7622ebdf1459f30c3794f0b558acc54c9eeaa
download/78.zip
+3f823922f1d1b146d370be6881302f7ad7995dc4bd9fb325169ebcdcd283c957
download/78.zip
=== modified file 'pkg/gnome/nautilus-python/sha256sums'
--- a/pkg/gnome/nautilus-python/sha256sums 2019-07-19 23:28:01 +0000
+++ b/pkg/gnome/nautilus-python/sha256sums 2023-01-15 07:01:24 +0000
@@ -1,2 +1,2 @@
-073ce0297282259937ab473d189b97a04f42b97197c9292fc3bde9d135282098
download/nautilus-python-1.2.3.tar.xz
-ddd4e4702ce855843237884c3bfd42d5b95e61bd5c1854de7d527f7179ed498d
download/nautilus-python-1.2.3.sha256sum
+17243d62eb7d7d839a9461ab8d0701688805c7161a6705e61413a58ec268281a
download/nautilus-python-4.0.tar.xz
+f780427b6ee2bfeb3ff2e11e1c5697af100fd29fcd53400c6bc314a7cf4126f4
download/nautilus-python-4.0.sha256sum
=== modified file 'pkg/gnu/ed/gpg-keyring'
Binary files a/pkg/gnu/ed/gpg-keyring 2022-02-05 17:42:26 +0000 and
b/pkg/gnu/ed/gpg-keyring 2023-01-15 07:01:24 +0000 differ
=== modified file 'pkg/gnu/emacs/gpg-keyring'
Binary files a/pkg/gnu/emacs/gpg-keyring 2021-03-25 22:08:48 +0000 and
b/pkg/gnu/emacs/gpg-keyring 2023-01-15 07:01:24 +0000 differ
=== modified file 'pkg/gnu/fontutils/sha256sums'
--- a/pkg/gnu/fontutils/sha256sums 2022-09-26 04:05:16 +0000
+++ b/pkg/gnu/fontutils/sha256sums 2023-01-15 07:01:24 +0000
@@ -1,3 +1,1 @@
75d44bdfc4002238f4ebcba857b913b57ae9e5b356416413f4776f832409939e
download/fontutils-0.7.tar.gz
-83354811f7c8b8660c40616bd34cbcf41735af9c5090140ebed5baab741da17c
download/fontutils-0.7-fix-build.diff
-eb080f0a9efba9b484b89fc48d2f24704cc3958e3356f0b5feda42228454f38a
download/fontutils-0.7-add-info-dir-entry.diff
=== modified file 'pkg/gnu/freefont/Makefile'
--- a/pkg/gnu/freefont/Makefile 2018-08-27 00:34:09 +0000
+++ b/pkg/gnu/freefont/Makefile 2023-01-15 07:01:24 +0000
@@ -1,7 +1,8 @@
# Copyright © 2013, 2014 Brandon Invergo <brandon@invergo.net>
-# Copyright © 2018 Carl Hansen <carlhansen@gnu.org>
+# Copyright © 2018, 2023 Carl Hansen <carlhansen@gnu.org>
#
-# This file is part of GSRC.
+# This file is part of GSRC, the GNU Source Release Collection.
+# http://www.gnu.org/software/gsrc
#
# GSRC is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -41,17 +42,20 @@
MASTER_SUBDIR = $(GARNAME)/
DISTFILES = $(GARNAME)-src-$(GARVERSION).tar.gz
SIGFILES = $(GARNAME)-src-$(GARVERSION).tar.gz.sig
-PATCHFILES = $(DISTNAME)-fix-trim-version.diff
+PATCHFILES = $(DISTNAME)-pyfix.diff
+WORKOBJ = $(WORKSRC)
BUILD_SCRIPTS = $(WORKSRC)/sfd/Makefile
+
+# set in config.mk: all
INSTALL_SCRIPTS = $(BUILD_TARGET)
-BUILDDEPS = #fontforge
+BUILDDEPS = fontforge
LIBDEPS =
######################################################################
+include ../../../gar/gar.mk
include config.mk
-include ../../../gar/gar.mk
build-%/Makefile:
$(BUILD_ENV) $(MAKE) -C $* $(BUILD_ARGS) $(BUILD_TARGET)
@@ -60,19 +64,17 @@
install-all: install-ttf install-otf install-woff
install-ttf:
- @mkdir -p $(packageprefix)/share/fonts/TTF
- @install -m644 -t $(packageprefix)/share/fonts/TTF \
- $(WORKOBJ)/sfd/*.ttf
+ mkdir -p $(packageprefix)/share/fonts/TTF
+ cd $(WORKOBJ) && install -m644 -t $(packageprefix)/share/fonts/TTF
./sfd/*.ttf
$(MAKECOOKIE)
install-otf:
- @mkdir -p $(packageprefix)/share/fonts/OTF
- @install -m644 -t $(packageprefix)/share/fonts/OTF \
- $(WORKOBJ)/sfd/*.otf
+ mkdir -p $(packageprefix)/share/fonts/OTF
+ cd $(WORKOBJ) && install -m644 -t $(packageprefix)/share/fonts/OTF
./sfd/*.otf
$(MAKECOOKIE)
install-woff:
- @mkdir -p $(packageprefix)/share/fonts/WOFF
- @install -m644 -t $(packageprefix)/share/fonts/WOFF \
- $(WORKOBJ)/sfd/*.woff
+ mkdir -p $(packageprefix)/share/fonts/WOFF
+ cd $(WORKOBJ) && install -m644 -t $(packageprefix)/share/fonts/WOFF
./sfd/*.woff
$(MAKECOOKIE)
+
=== removed file
'pkg/gnu/freefont/files/freefont-20120503-fix-trim-version.diff'
--- a/pkg/gnu/freefont/files/freefont-20120503-fix-trim-version.diff
2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/freefont/files/freefont-20120503-fix-trim-version.diff
1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-diff -x config.log -x config.status -ru
work/freefont-20120503/tools/generate/buildutils.py
work/freefont-20120503/tools/generate/buildutils.py
---- work/freefont-20120503/tools/generate/buildutils.py 2012-05-03
14:23:30.000000000 +0100
-+++ work/freefont-20120503/tools/generate/buildutils.py 2014-08-19
11:53:14.298469996 +0100
-@@ -33,8 +33,8 @@
- Version n.m
- Where n and m are decimal numbers.
- """
-- vstr_match = _re_vstr.match( font.version )
-- ot_stdized = ''
-+ vstr_match = _re_vstr.match( str(font.version) )
-+ otstdized = ''
- if vstr_match:
- trimmed = vstr_match.group( 1 )
- rest = vstr_match.group( 2 )
=== added file 'pkg/gnu/freefont/files/freefont-20120503-pyfix.diff'
--- a/pkg/gnu/freefont/files/freefont-20120503-pyfix.diff 1970-01-01
00:00:00 +0000
+++ b/pkg/gnu/freefont/files/freefont-20120503-pyfix.diff 2023-01-15
07:01:24 +0000
@@ -0,0 +1,225 @@
+diff -x config.log -x config.status -ru
tmp/freefont-20120503/tools/generate/MacTT
work/freefont-20120503/tools/generate/MacTT
+--- tmp/freefont-20120503/tools/generate/MacTT 2012-05-03 06:23:30.000000000
-0700
++++ work/freefont-20120503/tools/generate/MacTT 2023-01-13
23:11:02.558228673 -0800
+@@ -43,7 +43,7 @@
+ f = fontforge.open( argv[i] )
+ ttfile = f.fontname + ".mac.ttf"
+ vstr = trim_version_str( f )
+- print "Generating Mac TrueType file ", ttfile, ' ', vstr
++ print( "Generating Mac TrueType file ", ttfile, ' ', vstr)
+ f.selection.all()
+ f.autoHint()
+ f.autoInstr()
+@@ -51,4 +51,4 @@
+ #f.generate( ttfile, flags=('opentype','old-kern') )
+ f.close()
+ else:
+- print "Usage: " + scriptname + " font.sfd [font.sfd ...]"
++ print( "Usage: " + scriptname + " font.sfd [font.sfd ...]")
+diff -x config.log -x config.status -ru
tmp/freefont-20120503/tools/generate/OpenType
work/freefont-20120503/tools/generate/OpenType
+--- tmp/freefont-20120503/tools/generate/OpenType 2012-05-03
06:23:30.000000000 -0700
++++ work/freefont-20120503/tools/generate/OpenType 2023-01-13
23:11:02.559228678 -0800
+@@ -42,7 +42,7 @@
+ f = fontforge.open( argv[i] )
+ otfile = f.fontname + ".otf"
+ vstr = trim_version_str( f )
+- print "Generating OpenType file ", otfile, ' ', vstr
++ print( "Generating OpenType file ", otfile, ' ', vstr)
+ # Wanted to set to 'UniocdeBmp' if there were no high unicodes
+ # but all attemtps to determine that from Python failed.
+ f.encoding = 'UnicodeFull'
+@@ -51,4 +51,4 @@
+ f.generate( otfile, flags=('opentype','old-kern','round') )
+ f.close()
+ else:
+- print "Usage: " + scriptname + " font.sfd [font.sfd ...]"
++ print( "Usage: " + scriptname + " font.sfd [font.sfd ...]")
+diff -x config.log -x config.status -ru
tmp/freefont-20120503/tools/generate/TrueType
work/freefont-20120503/tools/generate/TrueType
+--- tmp/freefont-20120503/tools/generate/TrueType 2012-05-03
06:23:30.000000000 -0700
++++ work/freefont-20120503/tools/generate/TrueType 2023-01-13
23:11:02.559228678 -0800
+@@ -42,7 +42,7 @@
+ f = fontforge.open( sys.argv[i] )
+ ttfile = f.fontname + ".ttf"
+ vstr = trim_version_str( f )
+- print "Generating TrueType file ", ttfile, ' ', vstr
++ print( "Generating TrueType file ", ttfile, ' ', vstr)
+ # Wanted to set to 'UniocdeBmp' if there were no high unicodes
+ # but all attemtps to determine that from Python failed.
+ f.encoding = 'UnicodeFull'
+@@ -54,4 +54,4 @@
+ f.generate( ttfile, flags=('opentype','old-kern','no-hints') )
+ f.close()
+ else:
+- print "Usage: " + scriptname + " font.sfd [font.sfd ...]"
++ print( "Usage: " + scriptname + " font.sfd [font.sfd ...]")
+diff -x config.log -x config.status -ru
tmp/freefont-20120503/tools/generate/WOFF
work/freefont-20120503/tools/generate/WOFF
+--- tmp/freefont-20120503/tools/generate/WOFF 2012-05-03 06:23:30.000000000
-0700
++++ work/freefont-20120503/tools/generate/WOFF 2023-01-13 23:11:02.560228684
-0800
+@@ -153,7 +153,7 @@
+ f = fontforge.open( sys.argv[i] )
+ woff_file = f.fontname + ".woff"
+ vstr = trim_version_str( f )
+- print "Generating WOFF file ", woff_file, ' ', vstr
++ print( "Generating WOFF file ", woff_file, ' ', vstr)
+ # Wanted to set to 'UniocdeBmp' if there were no high unicodes
+ # but all attemtps to determine that from Python failed.
+ f.encoding = 'UnicodeFull'
+@@ -171,4 +171,4 @@
+ f.generate( woff_file, flags=('opentype','no-hints') )
+ f.close()
+ else:
+- print "Usage: " + scriptname + " font.sfd [font.sfd ...]"
++ print( "Usage: " + scriptname + " font.sfd [font.sfd ...]")
+diff -x config.log -x config.status -ru
tmp/freefont-20120503/tools/generate/buildutils.py
work/freefont-20120503/tools/generate/buildutils.py
+--- tmp/freefont-20120503/tools/generate/buildutils.py 2012-05-03
06:23:30.000000000 -0700
++++ work/freefont-20120503/tools/generate/buildutils.py 2023-01-13
23:11:02.544228595 -0800
+@@ -33,8 +33,8 @@
+ Version n.m
+ Where n and m are decimal numbers.
+ """
+- vstr_match = _re_vstr.match( font.version )
+- ot_stdized = ''
++ vstr_match = _re_vstr.match( str(font.version) )
++ otstdized = ''
+ if vstr_match:
+ trimmed = vstr_match.group( 1 )
+ rest = vstr_match.group( 2 )
+diff -x config.log -x config.status -ru
tmp/freefont-20120503/tools/test/checkGlyphNumbers.py
work/freefont-20120503/tools/test/checkGlyphNumbers.py
+--- tmp/freefont-20120503/tools/test/checkGlyphNumbers.py 2012-05-03
06:23:29.000000000 -0700
++++ work/freefont-20120503/tools/test/checkGlyphNumbers.py 2023-01-13
23:31:00.533844263 -0800
+@@ -53,12 +53,12 @@
+ from os import path
+ def checkGlyphNumbers( fontDir, fontFile ):
+ if isinstance( fontFile, ( list, tuple ) ):
+- print "In directory " + fontDir
++ print( "In directory " + fontDir)
+ for fontName in fontFile:
+ checkGlyphNumbers( fontDir, fontName )
+ return
+
+- print "Checking slot numbers in " + fontFile
++ print( "Checking slot numbers in " + fontFile)
+ font = fontforge.open( path.join( fontDir, fontFile ) )
+
+ g = font.selection.all()
+@@ -71,13 +71,13 @@
+ pass
+ elif inPrivateUseRange( glyph ):
+ if glyph.unicode != -1:
+- print "Glyph at slot " + str( glyph.encoding ) \
+- + " is Private Use but has Unicode"
++ print( "Glyph at slot " + str( glyph.encoding )
\
++ + " is Private Use but has Unicode")
+ problem = True
+ else:
+ if glyph.encoding != glyph.unicode:
+- print "Glyph at slot " + str( glyph.encoding ) \
+- + " has wrong Unicode"
++ print( "Glyph at slot " + str( glyph.encoding )
\
++ + " has wrong Unicode")
+ problem = True
+
+ # --------------------------------------------------------------------------
+diff -x config.log -x config.status -ru
tmp/freefont-20120503/tools/test/findBackLayers.py
work/freefont-20120503/tools/test/findBackLayers.py
+--- tmp/freefont-20120503/tools/test/findBackLayers.py 2012-05-03
06:23:29.000000000 -0700
++++ work/freefont-20120503/tools/test/findBackLayers.py 2023-01-13
23:31:34.310030837 -0800
+@@ -32,7 +32,7 @@
+ problem = False
+
+ def checkBackLayers( fontPath ):
+- print "Checking " + fontPath
++ print( "Checking " + fontPath)
+ font = fontforge.open( fontPath )
+
+ g = font.selection.all()
+@@ -42,7 +42,7 @@
+
+ for e in g:
+ if e.layer_cnt != 2:
+- print e
++ print( e )
+
+ checkBackLayers( '../sfd/FreeSerif.sfd' )
+ checkBackLayers( '../sfd/FreeSerifItalic.sfd' )
+diff -x config.log -x config.status -ru
tmp/freefont-20120503/tools/test/isMonoMono.py
work/freefont-20120503/tools/test/isMonoMono.py
+--- tmp/freefont-20120503/tools/test/isMonoMono.py 2012-05-03
06:23:29.000000000 -0700
++++ work/freefont-20120503/tools/test/isMonoMono.py 2023-01-13
23:34:10.256892300 -0800
+@@ -35,7 +35,7 @@
+ problem = False
+
+ def ismonomono( fontfilename ):
+- print "Checking character bounding boxes: " + fontfilename
++ print( "Checking character bounding boxes: " + fontfilename)
+ font = fontforge.open( fontfilename )
+
+ g = font.selection.all()
+@@ -49,16 +49,16 @@
+ nonzero = e.width
+ else:
+ if e.width > 0 and e.width != nonzero:
+- print ' ' + e.glyphname \
++ print( ' ' + e.glyphname \
+ + '(' + str( e.encoding ) \
+ + ') width is ' + str( e.width ) \
+- + ' not ' + str( nonzero )
++ + ' not ' + str( nonzero ) )
+ problem = True
+
+ ( xmin, ymin, xmax, ymax ) = e.boundingBox()
+ if ymin < -200 or ymax > 800:
+- print ' ' + e.glyphname + ' goes between heights ' \
+- + str( ymin ) + ' and ' + str( ymax )
++ print( ' ' + e.glyphname + ' goes between heights ' \
++ + str( ymin ) + ' and ' + str( ymax ) )
+ """
+ For FontForge handling of TrueType/OpenType magic characters:
+ 1) check that 0x0000 0x0001, 0x000D exist and have names
+@@ -71,15 +71,15 @@
+ if not font[0x0000] \
+ or font[0x0000].glyphname != '.notdef' \
+ or font[0x0000].width != nonzero:
+- print 'Should be full-width ".notdef" glyph at 0x0000.'
++ print( 'Should be full-width ".notdef" glyph at 0x0000.')
+ if not font[0x0001] \
+ or font[0x0001].glyphname != '.null' \
+ or font[0x0001].width != 0:
+- print 'Should be zero-width ".null" glyph at 0x0001.'
++ print( 'Should be zero-width ".null" glyph at 0x0001.')
+ if not font[0x000D] \
+ or font[0x000D].glyphname != 'nonmarkingreturn' \
+ or font[0x000D].width != nonzero:
+- print 'Should be full-width "nonmarkingreturn" glyph at 0x000D.'
++ print( 'Should be full-width "nonmarkingreturn" glyph at
0x000D.')
+
+ scriptname = sys.argv[0];
+ argc = len( sys.argv )
+diff -x config.log -x config.status -ru
tmp/freefont-20120503/tools/test/validate.py
work/freefont-20120503/tools/test/validate.py
+--- tmp/freefont-20120503/tools/test/validate.py 2012-05-03
06:23:29.000000000 -0700
++++ work/freefont-20120503/tools/test/validate.py 2023-01-13
23:37:46.309085822 -0800
+@@ -43,7 +43,7 @@
+ return p
+
+ def printProblemLine( e, msg ):
+- print "\t" + e.glyphname + msg
++ print( "\t" + e.glyphname + msg )
+
+ def dealWithValidationState( state, e ):
+ if state & 0x2:
+@@ -87,7 +87,7 @@
+ def validate( dir, fontFile ):
+ try:
+ font = fontforge.open( dir + fontFile )
+- print "Validating " + fontFile
++ print( "Validating " + fontFile)
+
+ g = font.selection.all()
+ g = font.selection.byGlyphs
+@@ -100,7 +100,7 @@
+ font.validate
+ except Exception, e:
+ problem = True
+- print >> sys.stderr, str( e )
++ print( >> sys.stderr, str( e ) )
+
+ validate( '../sfd/', 'FreeSerif.sfd' )
+ validate( '../sfd/', 'FreeSerifItalic.sfd' )
=== modified file 'pkg/gnu/freefont/sha256sums'
--- a/pkg/gnu/freefont/sha256sums 2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/freefont/sha256sums 2023-01-15 07:01:24 +0000
@@ -1,3 +1,3 @@
0d62e2e22655f841c3ac5fb8c8059a52fe2c09c695d9e8eda9903406e942657a
download/freefont-src-20120503.tar.gz
-3dd3d33ae6e4916c39b698efe1aec7f0c1c0bfff9563ac9a653a07a80ad93041
download/freefont-20120503-fix-trim-version.diff
+56b1a6c48810357cd79d4fdc96d837d2655f7af5e9f259c3e8c021601952abb6
download/freefont-20120503-pyfix.diff
ab373444d4711b8daec8ca8dbef45feec7d552ee2373efe025b9b870811f1e13
download/freefont-src-20120503.tar.gz.sig
=== modified file 'pkg/gnu/gcl/Makefile'
--- a/pkg/gnu/gcl/Makefile 2023-01-12 06:46:50 +0000
+++ b/pkg/gnu/gcl/Makefile 2023-01-15 07:01:24 +0000
@@ -1,5 +1,5 @@
# Copyright © 2013, 2014 Brandon Invergo <brandon@invergo.net>
-# Copyright ©2022 Carl Hansen <carlhansen@gnu.org>
+# Copyright ©2022, 2023 Carl Hansen <carlhansen@gnu.org>
#
# This file is part of GSRC, the GNU Source Release Collection.
# http://www.gnu.org/software/gsrc
@@ -22,7 +22,7 @@
NAME = GNU Common Lisp
GARNAME = gcl
-GARVERSION = 2.6.13
+GARVERSION = 2.6.14
HOME_URL = http://www.gnu.org/software/gcl/
DESCRIPTION = GNU Common Lisp implementation
define BLURB
=== modified file 'pkg/gnu/glibc/Makefile'
--- a/pkg/gnu/glibc/Makefile 2022-08-06 02:18:56 +0000
+++ b/pkg/gnu/glibc/Makefile 2023-01-15 07:01:24 +0000
@@ -43,11 +43,11 @@
MASTER_SUBDIR = $(UPSTREAMNAME)/
DISTFILES = $(DISTNAME).tar.xz
SIGFILES = $(DISTNAME).tar.xz.sig
-WORKOBJ = $(WORKDIR)/$(DISTNAME).build
-CONFIGURE_SCRIPTS = $(WORKSRC)/configure
-BUILD_SCRIPTS = $(WORKOBJ)/Makefile
-TEST_SCRIPTS = $(WORKOBJ)/Makefile
-INSTALL_SCRIPTS = $(WORKOBJ)/Makefile-DESTDIR
+#WORKOBJ = $(WORKDIR)/$(DISTNAME).build
+#CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+#BUILD_SCRIPTS = $(WORKOBJ)/Makefile
+#TEST_SCRIPTS = $(WORKOBJ)/Makefile
+#INSTALL_SCRIPTS = $(WORKOBJ)/Makefile-DESTDIR
INFO_FILES = libc.info
BUILDDEPS =
LIBDEPS =
@@ -73,3 +73,5 @@
# for this to be the main glibc for the system, you may remove this
# line in config.mk.
# COLLISIONS += bin/locale bin/localedef sbin/locale-gen
+#
+#
=== modified file 'pkg/gnu/gnupg/gpg-keyring'
Binary files a/pkg/gnu/gnupg/gpg-keyring 2022-09-05 04:22:02 +0000 and
b/pkg/gnu/gnupg/gpg-keyring 2023-01-15 07:01:24 +0000 differ
=== modified file 'pkg/gnu/guile-gtk/sha256sums'
--- a/pkg/gnu/guile-gtk/sha256sums 2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/guile-gtk/sha256sums 2023-01-15 07:01:24 +0000
@@ -1,3 +1,2 @@
9ad30cdfcae688837785774b2149f0ec82f464412017aeeb045b4336ef2416cc
download/guile-gtk-2.1.tar.gz
-d0fc0d628188218095442bc3cbc4e139880bedc6c16a5ec84b8e02b639757d78
download/fix-build.diff
c81d51b2110408f59fbb70260d6161362861727fc06df60b3e2687fa52c8d581
download/guile-gtk-2.1.tar.gz.sig
=== modified file 'pkg/gnu/unifont/Makefile'
--- a/pkg/gnu/unifont/Makefile 2022-09-22 00:28:31 +0000
+++ b/pkg/gnu/unifont/Makefile 2023-01-15 07:01:24 +0000
@@ -62,13 +62,20 @@
cd $(WORKSRC) && $(MAKE) docdir
cd $(WORKSRC) && $(MAKE) mandir
cd $(WORKSRC) && $(MAKE) buildfont BUILDFONT=1
+ cd $(WORKSRC)/hangul && $(MAKE)
install-myinstall:
mkdir -p $(packageprefix)/share/info
+ mkdir -p $(packageprefix)/share/fonts/X11/misc
+ mkdir -p $(packageprefix)/share/fonts/truetype
$(MAKE) -C $(WORKSRC) V=1 DESTDIR=$(packageprefix) USRDIR=""
PKGDEST="share" \
PREFIX=$(packageprefix) install
cd $(WORKSRC) && install -m0644 -p doc/unifont.info
$(packageprefix)/share/info
+ cd $(WORKSRC) && $(INSTALL_FONTS) ./font/compiled/*ttf
+ cd $(WORKSRC) && $(INSTALL_FONTS) ./font/compiled/*.pcf.gz
+ cd $(WORKSRC) && $(INSTALL_FONTS) ./hangul/*.pcf.gz
+
# Makefile test, ignore
foo:
@@ -76,8 +83,6 @@
@echo $(prefix)
@echo $(packageDESTDIR)
@echo $(DESTDIR)
- @echo
-
-
-#echo $(.VARIABLES)
+ @echo
+ echo $(.VARIABLES)
=== added directory 'pkg/other/fontforge'
=== added file 'pkg/other/fontforge/Makefile'
--- a/pkg/other/fontforge/Makefile 1970-01-01 00:00:00 +0000
+++ b/pkg/other/fontforge/Makefile 2023-01-15 07:01:24 +0000
@@ -0,0 +1,44 @@
+# Copyright © 2023 Carl Hansne
+#
+# This file is part of GSRC, the GNU Source Release Collection.
+# http://www.gnu.org/software/gsrc
+#
+# GSRC is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# GSRC is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GSRC. If not, see <http://www.gnu.org/licenses/>.
+
+NAME = fontforge
+GARNAME = fontforge
+GARVERSION = 20230101
+HOME_URL = http://fontforge.org
+DESCRIPTION = design fonts
+define BLURB
+Design outline fonts, see http://designwithfontforge.com
+endef
+LICENSE = GPL
+######################################################################
+#
https://github.com/fontforge/fontforge/releases/download/20230101/fontforge-20230101.tar.xz
+MASTER_SITES = $(MASTER_GITHUB)
+MASTER_SUBDIR = fontforge/fontforge/releases/download/$(GARVERSION)/
+#fontforge-20230101.tar.xz
+#DISTNAME = $(GARNAME)$(subst .,-,$(GARVERSION))
+DISTFILES = $(DISTNAME).tar.xz
+
+BUILDDEPS =
+LIBDEPS =
+
+######################################################################
+
+include ../../../gar/gar.lib/cmake.mk
+include config.mk
+
+
=== added file 'pkg/other/fontforge/config.mk'
--- a/pkg/other/fontforge/config.mk 1970-01-01 00:00:00 +0000
+++ b/pkg/other/fontforge/config.mk 2023-01-15 07:01:24 +0000
@@ -0,0 +1,4 @@
+## Configuration options
+
+CONFIGURE_OPTS ?=
+BUILD_OPTS ?=
=== added file 'pkg/other/fontforge/sha256sums'
--- a/pkg/other/fontforge/sha256sums 1970-01-01 00:00:00 +0000
+++ b/pkg/other/fontforge/sha256sums 2023-01-15 07:01:24 +0000
@@ -0,0 +1,1 @@
+ca82ec4c060c4dda70ace5478a41b5e7b95eb035fe1c4cf85c48f996d35c60f8
download/fontforge-20230101.tar.xz
=== modified file 'pkg/other/imath/sha256sums'
--- a/pkg/other/imath/sha256sums 2022-11-09 23:32:01 +0000
+++ b/pkg/other/imath/sha256sums 2023-01-15 07:01:24 +0000
@@ -1,1 +0,0 @@
-ea5592230f5ab917bea3ceab266cf38eb4aa4a523078d46eac0f5a89c52304db
download/v3.1.6.tar.gz
=== modified file 'pkg/other/libmypaint/sha256sums'
--- a/pkg/other/libmypaint/sha256sums 2022-06-16 01:29:22 +0000
+++ b/pkg/other/libmypaint/sha256sums 2023-01-15 07:01:24 +0000
@@ -1,1 +0,0 @@
-9d888a0f13deeba06f2d63949426f4a5e4656f451b9052e4d8f7fd372a6f274e
download/v1.6.1.tar.gz
=== added directory 'pkg/other/libspiro'
=== added file 'pkg/other/libspiro/Makefile'
--- a/pkg/other/libspiro/Makefile 1970-01-01 00:00:00 +0000
+++ b/pkg/other/libspiro/Makefile 2023-01-15 07:01:24 +0000
@@ -0,0 +1,50 @@
+# Copyright ©2023 Carl Hansen
+#
+# This file is part of GSRC, the GNU Source Release Collection.
+# http://www.gnu.org/software/gsrc
+#
+# GSRC is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# GSRC is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GSRC. If not, see <http://www.gnu.org/licenses/>.
+
+
+# Send bug reports and comments about GSRC problems to bug-gsrc@gnu.org
+
+NAME = LibSpiro
+GARNAME = libspiro
+GARVERSION = 20221101
+HOME_URL = https://libspiro.sourceforge.net/
+DESCRIPTION = constant curvature spline joins library
+define BLURB
+Using bézier splines an artist can easily draw curves with the same
+slope on either side of an on-curve point. Spiros, on the other hand,
+are based on clothoid splines which make it easy to maintain constant
+curvature as well as constant slope. Such curves will simply look nicer.
+endef
+######################################################################
+#https://github.com/fontforge/libspiro/releases/download/20221101/libspiro-dist-20221101.tar.gz
+MASTER_SITES = $(MASTER_GITHUB)
+MASTER_SUBDIR = fontforge/libspiro/releases/download/$(GARVERSION)/
+DISTNAME = $(GARNAME)-dist-$(GARVERSION)
+DISTFILES = $(DISTNAME).tar.gz
+
+BUILDDEPS =
+LIBDEPS =
+WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)
+WORKOBJ = $(WORKSRC)-build
+
+######################################################################
+
+include ../../../gar/gar.lib/autotools.mk
+include config.mk
+
+
=== added file 'pkg/other/libspiro/config.mk'
--- a/pkg/other/libspiro/config.mk 1970-01-01 00:00:00 +0000
+++ b/pkg/other/libspiro/config.mk 2023-01-15 07:01:24 +0000
@@ -0,0 +1,4 @@
+## Configuration options
+
+CONFIGURE_OPTS ?=
+BUILD_OPTS ?=
=== added file 'pkg/other/libspiro/sha256sums'
--- a/pkg/other/libspiro/sha256sums 1970-01-01 00:00:00 +0000
+++ b/pkg/other/libspiro/sha256sums 2023-01-15 07:01:24 +0000
@@ -0,0 +1,1 @@
+5984fb5af3e4e1f927f3a74850b705a711fb86284802a5e6170b09786440e8be
download/libspiro-dist-20221101.tar.gz
=== modified file 'pkg/other/mercury/Makefile'
--- a/pkg/other/mercury/Makefile 2022-11-11 07:26:19 +0000
+++ b/pkg/other/mercury/Makefile 2023-01-15 07:01:24 +0000
@@ -21,9 +21,9 @@
NAME = Mercury
GARNAME = mercury
-GARVERSION = 22.01.3
+GARVERSION = 22.01.5
HOME_URL = http://www.mercurylang.org/
-DESCRIPTION = Mercury logic programming language
+ DESCRIPTION = Mercury logic-functional programming language
define BLURB
Mercury is a pure logic programming language intended for the creation
of large, fast, reliable programs. The syntax of Mercury is based on the
@@ -44,18 +44,18 @@
BUILDDEPS =
LIBDEPS =
-#PATCHFILES = mercury.22.01.1.patch
+PATCHFILES = mercury.22.01.5.patch
#DESTDIR = $(packageprefix)
######################################################################
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include config.mk
# important
# Does "minimal install. The READMEs may help about additions.
#
-.PHONY: pre-install
+.PHONY: pre-install pre-build
pre-build:
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
=== added directory 'pkg/other/mercury/files'
=== added file 'pkg/other/mercury/files/mercury.22.01.5.patch'
--- a/pkg/other/mercury/files/mercury.22.01.5.patch 1970-01-01 00:00:00
+0000
+++ b/pkg/other/mercury/files/mercury.22.01.5.patch 2023-01-15 07:01:24
+0000
@@ -0,0 +1,56 @@
+diff -x config.log -x config.status -ru
tmp/mercury-srcdist-22.01.1/util/info_to_mdb.c
work/mercury-srcdist-22.01.1/util/info_to_mdb.c
+--- tmp/mercury-srcdist-22.01.1/util/info_to_mdb.c 2020-10-10
20:28:49.000000000 -0700
++++ work/mercury-srcdist-22.01.1/util/info_to_mdb.c 2022-04-28
17:39:38.124995557 -0700
+@@ -16,7 +16,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include "mercury_std.h"
++#include "../runtime/mercury_std.h"
+
+ #define MAXLINELEN 160
+
+diff -x config.log -x config.status -ru
tmp/mercury-srcdist-22.01.1/util/mdemangle.c
work/mercury-srcdist-22.01.1/util/mdemangle.c
+--- tmp/mercury-srcdist-22.01.1/util/mdemangle.c 2020-10-10
20:28:49.000000000 -0700
++++ work/mercury-srcdist-22.01.1/util/mdemangle.c 2022-04-28
17:38:07.751578956 -0700
+@@ -25,7 +25,7 @@
+ */
+
+ /* mercury_std.h includes mercury_regs.h, and must precede system headers */
+-#include "mercury_std.h"
++#include "../runtime/mercury_std.h"
+ #include <ctype.h>
+ #include <string.h>
+ #include <stdlib.h>
+diff -x config.log -x config.status -ru
tmp/mercury-srcdist-22.01.1/util/mkinit.c
work/mercury-srcdist-22.01.1/util/mkinit.c
+--- tmp/mercury-srcdist-22.01.1/util/mkinit.c 2022-03-27 04:56:19.000000000
-0700
++++ work/mercury-srcdist-22.01.1/util/mkinit.c 2022-04-28 17:35:21.903814431
-0700
+@@ -33,9 +33,9 @@
+ /////////////////////////////////////////////////////////////////////////////
+
+ // mercury_std.h includes mercury_regs.h, and must precede system headers.
+-#include "mercury_conf.h"
+-#include "mercury_std.h"
+-#include "mercury_array_macros.h"
++#include "../runtime/mercury_conf.h"
++#include "../runtime/mercury_std.h"
++#include "../runtime/mercury_array_macros.h"
+ #include "mkinit_common.h"
+
+ #include <stdio.h>
+diff -x config.log -x config.status -ru
tmp/mercury-srcdist-22.01.1/util/mkinit_common.c
work/mercury-srcdist-22.01.1/util/mkinit_common.c
+--- tmp/mercury-srcdist-22.01.1/util/mkinit_common.c 2020-10-27
01:57:07.000000000 -0700
++++ work/mercury-srcdist-22.01.1/util/mkinit_common.c 2022-04-28
17:37:27.390392899 -0700
+@@ -16,9 +16,9 @@
+ */
+
+ /* mercury_std.h includes mercury_regs.h, and must precede system headers */
+-#include "mercury_conf.h"
+-#include "mercury_std.h"
+-#include "mercury_array_macros.h"
++#include "../runtime/mercury_conf.h"
++#include "../runtime/mercury_std.h"
++#include "../runtime/mercury_array_macros.h"
+ #include "mkinit_common.h"
+
+ #include <stdio.h>
=== modified file 'pkg/other/mercury/sha256sums'
--- a/pkg/other/mercury/sha256sums 2022-11-11 07:26:19 +0000
+++ b/pkg/other/mercury/sha256sums 2023-01-15 07:01:24 +0000
@@ -1,2 +1,2 @@
-4b0783ee9205021e4193b0404fd654e9c6fd288bc9bb7e144b1c1f6cd45dcd2e
download/mercury-srcdist-22.01.3.tar.xz
-3a47b089068199843af502b9a997c9be1d9472e14f90ff8ef50b43899ace8d41
download/mercury.22.01.1.patch
+73c0ff72c88184779436a9f2a6169e8e918fdc48fcba8aefa550c96addb114a6
download/mercury-srcdist-22.01.5.tar.xz
+3a47b089068199843af502b9a997c9be1d9472e14f90ff8ef50b43899ace8d41
download/mercury.22.01.5.patch
=== modified file 'pkg/other/tile-forth/sha256sums'
--- a/pkg/other/tile-forth/sha256sums 2023-01-15 00:59:54 +0000
+++ b/pkg/other/tile-forth/sha256sums 2023-01-15 07:01:24 +0000
@@ -1,1 +1,2 @@
c00b3a777ca9419fbb58fbb0fdb653187f1363d3f19ee796036408f46cf564e8
download/tile-forth-2.1.tar.gz
+1b2da8da167306e850d5431a260799465d30bfb795600e4081a779b02e46f3ae
download/tile-forth.diff
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r8947: freefont fontforge libspiro mercury binutils etc,
Carl Hansen <=