summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD37
-rw-r--r--no-tests.patch73
4 files changed, 102 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9bed27bc0fb1..a3810fd98ed2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,19 @@
pkgbase = ots
pkgdesc = OpenType fonts sanitiser. Supports TTF, WOFF, WOFF2 and other formats
- pkgver = 6.1.1
+ pkgver = 7.1.9
pkgrel = 1
url = https://github.com/khaledhosny/ots
arch = i686
arch = x86_64
license = custom
+ makedepends = meson
+ makedepends = ninja
depends = freetype2
conflicts = ots-git
- source = https://github.com/khaledhosny/ots/releases/download/v6.1.1/ots-6.1.1.tar.gz
- sha512sums = d7c6f77496a4b0867731e066d6c33642141b7a2ec3c4c4b323e4a350331d0360d4c58e7c8a9e996afb15dc150e62a98a5c484e25be9da2d6cbcd3b32fdd6bc9b
+ source = https://github.com/khaledhosny/ots/releases/download/v7.1.9/ots-7.1.9.tar.xz
+ source = no-tests.patch
+ sha512sums = 0defa5b9d03ab76f8d5a9403d0dd6a285b42def6151bad4c1cc2baed95e7d5feeb22c79fec313644de84a015d2fa38d8bf5eabcf9ce43a96652278aeeec5f246
+ sha512sums = 5cbbe4d68f83505892a7e04f8a8d8f541a982b43a47839dd6320912961c3c6178874ca3c488c26333d02e64bbef7235b623a59722f6cd38b4b9e6ae5a4858aba
pkgname = ots
diff --git a/.gitignore b/.gitignore
index 031407c58e92..8474eb64af22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/*.log
/*.tar
/*.tar.*
/pkg/
diff --git a/PKGBUILD b/PKGBUILD
index 71ad7d3edff4..1f74658d9dc7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,32 @@
# Maintainer: Adrián Pérez de Castro <aperez@igalia.com>
-pkgname='ots'
-pkgver='6.1.1'
-pkgrel='1'
+pkgname=ots
+pkgver=7.1.9
+pkgrel=1
pkgdesc='OpenType fonts sanitiser. Supports TTF, WOFF, WOFF2 and other formats'
-arch=('i686' 'x86_64')
-url='https://github.com/khaledhosny/ots'
-license=('custom')
-depends=('freetype2')
-conflicts=('ots-git')
-source=("${url}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('d7c6f77496a4b0867731e066d6c33642141b7a2ec3c4c4b323e4a350331d0360d4c58e7c8a9e996afb15dc150e62a98a5c484e25be9da2d6cbcd3b32fdd6bc9b')
+arch=(i686 x86_64)
+url=https://github.com/khaledhosny/ots
+license=(custom)
+depends=(freetype2)
+makedepends=(meson ninja)
+conflicts=(ots-git)
+source=("${url}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz" no-tests.patch)
+sha512sums=('0defa5b9d03ab76f8d5a9403d0dd6a285b42def6151bad4c1cc2baed95e7d5feeb22c79fec313644de84a015d2fa38d8bf5eabcf9ce43a96652278aeeec5f246'
+ '5cbbe4d68f83505892a7e04f8a8d8f541a982b43a47839dd6320912961c3c6178874ca3c488c26333d02e64bbef7235b623a59722f6cd38b4b9e6ae5a4858aba')
+
+prepare () {
+ cd "${pkgname}-${pkgver}"
+ patch -p0 < "${srcdir}/no-tests.patch"
+}
build() {
cd "${pkgname}-${pkgver}"
- ./configure --prefix=/usr --libdir=/usr/lib
- make
+ rm -rf build
+ arch-meson build -Dgraphite=true -Dvariations=true
+ ninja -C build
}
package() {
cd "${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -C build install
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- # Remove stray static libraries and headers.
- rm -rf "${pkgdir}/usr"/{lib,include}
}
diff --git a/no-tests.patch b/no-tests.patch
new file mode 100644
index 000000000000..a1b6c9b8d03f
--- /dev/null
+++ b/no-tests.patch
@@ -0,0 +1,73 @@
+--- meson.build.orig 2019-05-19 01:25:08.696623185 +0300
++++ meson.build 2019-05-19 01:26:51.054299530 +0300
+@@ -26,8 +26,7 @@
+ conf.set('HAVE_FREETYPE', 1)
+ endif
+
+-coretext = dependency('appleframeworks', modules: 'applicationservices',
+- required: false)
++coretext = disabler()
+ if coretext.found()
+ conf.set('HAVE_CORETEXT', 1)
+ endif
+@@ -242,15 +241,6 @@
+ dependencies: deps,
+ install: true,
+ )
+- test_good_fonts = find_program('tests/test_good_fonts.sh')
+- test('test_good_fonts',
+- test_good_fonts,
+- timeout: 9999,
+- env: [
+- 'top_srcdir=@0@'.format(meson.current_source_dir()),
+- 'top_builddir=@0@'.format(meson.current_build_dir()),
+- ]
+- )
+ endif
+
+
+@@ -288,44 +278,3 @@
+ install: true,
+ )
+ endif
+-
+-
+-gtest = dependency('gtest', fallback: ['gtest', 'gtest_main_dep'])
+-
+-cff_type2_charstring = executable('cff_type2_charstring',
+- 'tests/cff_type2_charstring_test.cc',
+- include_directories: include_directories(['include', 'src']),
+- link_with: libots,
+- dependencies: gtest,
+-)
+-
+-test('cff_type2_charstring', cff_type2_charstring)
+-
+-
+-layout_common_table = executable('layout_common_table',
+- 'tests/layout_common_table_test.cc',
+- include_directories: include_directories(['include', 'src']),
+- link_with: libots,
+- dependencies: gtest,
+-)
+-
+-test('layout_common_table', layout_common_table)
+-
+-
+-test('test_bad_fonts',
+- find_program('tests/test_bad_fonts.sh'),
+- env: [
+- 'top_srcdir=@0@'.format(meson.current_source_dir()),
+- 'top_builddir=@0@'.format(meson.current_build_dir()),
+- ]
+-)
+-
+-
+-test('test_fuzzed_fonts',
+- find_program('tests/test_fuzzed_fonts.sh'),
+- timeout: 9999,
+- env: [
+- 'top_srcdir=@0@'.format(meson.current_source_dir()),
+- 'top_builddir=@0@'.format(meson.current_build_dir()),
+- ]
+-)