summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authormef <mef@pkgsrc.org>2016-09-20 11:40:27 +0000
committermef <mef@pkgsrc.org>2016-09-20 11:40:27 +0000
commitea7bb28b26923fc5d256f1546812ed991547ed78 (patch)
tree1b3967591ab72ddd324b96d5e7e9dadb10d49457 /fonts
parenta18e2d713d4149efd8bad4a578c77bd05500bdf8 (diff)
downloadpkgsrc-ea7bb28b26923fc5d256f1546812ed991547ed78.tar.gz
Updated fons/p5-Fonts-FreeType 0.04 to 0.07
-------------------------------------------- 0.07 2015-09-27 dmol@cpan.org - No changes since 0.07_2 0.07_2 2015-09-24 dmol@cpan.org - Try to support utf8_to_uvchr_buf for older perls 0.07_1 2015-09-24 dmol@cpan.org - Fix UTF-8 string usage on non-intel architectures (GH#17) 0.06 2015-01-27 dmol@cpan.org - No changes since 0.06_1 0.06_1 2015-01-27 dmol@cpan.org - Allow optionally fallback to missing glyph 0.05 2015-01-27 dmol@cpan.org - No changes since 0.05_02 0.05_2 2015-01-23 dmol@cpan.org - Be more tolerant in test for checking underline position (CT#9d93130c-a254-11e4-9a11-67e5227a829d) (Ivan Baidakou, basiliscos). - Get build options from freetype-config if it exists (RT#101654) (Zakariyya Mughal). 0.05_1 2015-01-21 dmol@cpan.org - Avoid clang warning (RT#101653). - Attempt to fix CT#939e0664-8c46-11e4-8147-dcee86cc0d3a. -------------------------------------------------------------------- (pkgsrc changes) - Drop patch-FreeType.xs (upstream implemented) - Modify patch-Makefile.PL Upstream implemented automatic environment config, with some testing, but testing part is redundent to pkgsrc, and yet harmfull, so remove that part. - Add buildlink to x11.buildlink3.mk to use freetype-config for automatic configuration
Diffstat (limited to 'fonts')
-rw-r--r--fonts/p5-Font-FreeType/Makefile7
-rw-r--r--fonts/p5-Font-FreeType/distinfo13
-rw-r--r--fonts/p5-Font-FreeType/patches/patch-FreeType.xs52
-rw-r--r--fonts/p5-Font-FreeType/patches/patch-Makefile.PL54
4 files changed, 49 insertions, 77 deletions
diff --git a/fonts/p5-Font-FreeType/Makefile b/fonts/p5-Font-FreeType/Makefile
index 8b758457dd2..4416ccaf348 100644
--- a/fonts/p5-Font-FreeType/Makefile
+++ b/fonts/p5-Font-FreeType/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2016/06/08 19:23:51 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2016/09/20 11:40:27 mef Exp $
#
-DISTNAME= Font-FreeType-0.03
+DISTNAME= Font-FreeType-0.07
PKGNAME= p5-${DISTNAME}
-PKGREVISION= 3
CATEGORIES= perl5 fonts graphics
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Font/}
@@ -16,4 +15,6 @@ PERL5_PACKLIST= auto/Font/FreeType/.packlist
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../lang/perl5/module.mk"
+# to find freetype-config
+.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/p5-Font-FreeType/distinfo b/fonts/p5-Font-FreeType/distinfo
index 6fa17274339..9c0f863ddf7 100644
--- a/fonts/p5-Font-FreeType/distinfo
+++ b/fonts/p5-Font-FreeType/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 20:44:38 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/09/20 11:40:27 mef Exp $
-SHA1 (Font-FreeType-0.03.tar.gz) = 7309f72ddf569b5868c49a8b407a5739b158e4d1
-RMD160 (Font-FreeType-0.03.tar.gz) = 6bd13f34505a1c04a8050eec4b72dc763e284031
-SHA512 (Font-FreeType-0.03.tar.gz) = fb10e09e7ce1a85a23e3d4e4fc6fbcf05a910b61f75117d09f464c1d68f59b624343b079d03b0787df0493f003c80a8e4bf9c72557c2763a39ed9af2deb622cd
-Size (Font-FreeType-0.03.tar.gz) = 95275 bytes
-SHA1 (patch-FreeType.xs) = 7a42e516040e26aa692b4e4fdc520711aa57b148
-SHA1 (patch-Makefile.PL) = c7737c389acb0f38b8a1367118ba62c653536c9f
+SHA1 (Font-FreeType-0.07.tar.gz) = ea1fd2d2bf0f5b422a9bc458cafae4f18ba19fe4
+RMD160 (Font-FreeType-0.07.tar.gz) = cbd5548387c3b0cd1815a2482e7d0e3cf0fabd65
+SHA512 (Font-FreeType-0.07.tar.gz) = f245f104f668eeb20fe84c8f05aa9132dd217f58f4d00c34d0318dc7de034ae9577c3f863191b27c52514fd8ef235d5018161015d246abafcc50d0eeb886c95e
+Size (Font-FreeType-0.07.tar.gz) = 234507 bytes
+SHA1 (patch-Makefile.PL) = 9f3b7b9eb26727837b82535c6a345ff125f18807
diff --git a/fonts/p5-Font-FreeType/patches/patch-FreeType.xs b/fonts/p5-Font-FreeType/patches/patch-FreeType.xs
deleted file mode 100644
index f53e3379da3..00000000000
--- a/fonts/p5-Font-FreeType/patches/patch-FreeType.xs
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-FreeType.xs,v 1.1 2014/01/27 06:07:59 obache Exp $
-
-* https://rt.cpan.org/Public/Bug/Display.html?id=32713
-
---- FreeType.xs.orig 2004-09-11 20:50:44.000000000 +0000
-+++ FreeType.xs
-@@ -226,7 +226,7 @@ ensure_outline_loaded (FT_Face face, Fon
- #define QEFFT2_CALL_TIDY FREETMPS; LEAVE;
-
- static int
--handle_move_to (FT_Vector *to, void *data)
-+handle_move_to (const FT_Vector *to, void *data)
- {
- struct QefFT2_Outline_Decompose_Extra_ *extra = data;
- double x = QEFFT2_NUM(to->x), y = QEFFT2_NUM(to->y);
-@@ -243,7 +243,7 @@ handle_move_to (FT_Vector *to, void *dat
- }
-
- static int
--handle_line_to (FT_Vector *to, void *data)
-+handle_line_to (const FT_Vector *to, void *data)
- {
- struct QefFT2_Outline_Decompose_Extra_ *extra = data;
- double x = QEFFT2_NUM(to->x), y = QEFFT2_NUM(to->y);
-@@ -260,7 +260,7 @@ handle_line_to (FT_Vector *to, void *dat
- }
-
- static int
--handle_conic_to (FT_Vector *control, FT_Vector *to, void *data)
-+handle_conic_to (const FT_Vector *control, FT_Vector *to, void *data)
- {
- struct QefFT2_Outline_Decompose_Extra_ *extra = data;
- double x = QEFFT2_NUM(to->x), y = QEFFT2_NUM(to->y);
-@@ -292,7 +292,7 @@ handle_conic_to (FT_Vector *control, FT_
- }
-
- static int
--handle_cubic_to (FT_Vector *control1, FT_Vector *control2, FT_Vector *to,
-+handle_cubic_to (const FT_Vector *control1, FT_Vector *control2, FT_Vector *to,
- void *data)
- {
- struct QefFT2_Outline_Decompose_Extra_ *extra = data;
-@@ -805,7 +805,8 @@ qefft2_glyph_char_code (Font_FreeType_Gl
- char_code = FT_Get_First_Char(face, &glyph_idx);
- while (glyph_idx) {
- if (glyph_idx == glyph->index) {
-- RETVAL = newSVuv((UV) glyph->char_code = char_code);
-+ glyph->char_code = char_code;
-+ RETVAL = newSVuv((UV) glyph->char_code);
- break;
- }
- char_code = FT_Get_Next_Char(face, char_code, &glyph_idx);
diff --git a/fonts/p5-Font-FreeType/patches/patch-Makefile.PL b/fonts/p5-Font-FreeType/patches/patch-Makefile.PL
index b06cd5d1ac7..a4ae63dc2df 100644
--- a/fonts/p5-Font-FreeType/patches/patch-Makefile.PL
+++ b/fonts/p5-Font-FreeType/patches/patch-Makefile.PL
@@ -1,17 +1,41 @@
-$NetBSD: patch-Makefile.PL,v 1.1 2014/01/27 06:07:59 obache Exp $
+$NetBSD: patch-Makefile.PL,v 1.2 2016/09/20 11:40:27 mef Exp $
-* get freetype2 configuration with "freetype-config" command.
-
---- Makefile.PL.orig 2004-09-10 00:43:29.000000000 +0000
-+++ Makefile.PL
-@@ -5,8 +5,8 @@ WriteMakefile(
- NAME => 'Font::FreeType',
- AUTHOR => 'Geoff Richards <qef@laxan.com>',
- VERSION_FROM => 'lib/Font/FreeType.pm',
-- LIBS => [ '-lfreetype' ],
-- INC => '-I/usr/include/freetype2',
-+ LIBS => `freetype-config --libs`,
-+ INC => `freetype-config --cflags`,
- NO_META => 1,
- );
+Remove unnecessary (and yet harmful) configuration check.
+In pkgsrc environment, it should always pass.
+
+--- Makefile.PL.orig 2015-09-27 20:56:20.000000000 +0900
++++ Makefile.PL 2016-09-20 20:26:33.000000000 +0900
+@@ -24,20 +24,13 @@ for my $config_name (qw(ft_config)) {
+ %{ $config->{$config_name} },
+ %header_config,
+ );
+-
+- # test the configuration
+- if( check_lib( %checklib_config ) ) {
+ $working_config_name = $config_name;
+- }
+ }
+
+ # if none of the tried configurations work, use the default
+ $working_config_name = 'default' if not defined $working_config_name;
+
+ my $working_config = $config->{$working_config_name};
+-if( !exists $working_config->{LIBS} && exists $working_config->{lib} ) {
+- $working_config->{LIBS} = "-l$working_config->{lib}";
+-}
+
+ # MakeMaker build flags
+ my %MakeMakerFlags = (
+@@ -49,12 +42,6 @@ print STDERR "Build config: $working_con
+ print STDERR "Build flag LIB: $MakeMakerFlags{LIBS}\n";
+ print STDERR "Build flag INC: $MakeMakerFlags{INC}\n";
+-# finally use check_lib_or_exit so that it gives appropriate warnings to the user
+-check_lib_or_exit(
+- %MakeMakerFlags,
+- %header_config,
+-);
+-
+ WriteMakefile(
+ NAME => 'Font::FreeType',
+ AUTHOR => 'Geoff Richards <qef@laxan.com>',