diff options
author | wiz <wiz@pkgsrc.org> | 2014-06-01 17:55:33 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2014-06-01 17:55:33 +0000 |
commit | 5ec469063a152cee3009dfc8c031fc854391e1a8 (patch) | |
tree | 1ce475fc1640520c225631d5c06cb8ad66980f21 /lang/openjdk7/patches | |
parent | 50c0d3faac6303ac46f59e61e816d04d4b34c6d5 (diff) | |
download | pkgsrc-5ec469063a152cee3009dfc8c031fc854391e1a8.tar.gz |
Update font path references. Bump PKGREVISION.
Diffstat (limited to 'lang/openjdk7/patches')
-rw-r--r-- | lang/openjdk7/patches/patch-ap | 22 | ||||
-rw-r--r-- | lang/openjdk7/patches/patch-bn | 40 |
2 files changed, 31 insertions, 31 deletions
diff --git a/lang/openjdk7/patches/patch-ap b/lang/openjdk7/patches/patch-ap index 9507de022eb..cc339041933 100644 --- a/lang/openjdk7/patches/patch-ap +++ b/lang/openjdk7/patches/patch-ap @@ -1,10 +1,10 @@ -$NetBSD: patch-ap,v 1.5 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-ap,v 1.6 2014/06/01 17:55:33 wiz Exp $ Use pkgsrc fontconfig. ---- jdk/src/solaris/native/sun/awt/fontpath.c.orig 2013-05-29 03:57:58.000000000 +0000 +--- jdk/src/solaris/native/sun/awt/fontpath.c.orig 2014-01-01 05:53:43.000000000 +0000 +++ jdk/src/solaris/native/sun/awt/fontpath.c -@@ -72,8 +72,8 @@ extern Display *awt_display; +@@ -73,8 +73,8 @@ extern Display *awt_display; #define FONTCONFIG_DLL_VERSIONED X11_PATH "/lib/" VERSIONED_JNI_LIB_NAME("fontconfig", "1") #define FONTCONFIG_DLL X11_PATH "/lib/" JNI_LIB_NAME("fontconfig") #else @@ -15,17 +15,17 @@ Use pkgsrc fontconfig. #endif #define MAXFDIRS 512 /* Max number of directories that contain fonts */ -@@ -181,6 +181,27 @@ static char *fullLinuxFontPath[] = { +@@ -182,6 +182,27 @@ static char *fullLinuxFontPath[] = { NULL, /* terminates the list */ }; #endif +static char *pkgsrcFontPath[] = { -+ "@PREFIX@/lib/X11/fonts/100dpi", -+ "@PREFIX@/lib/X11/fonts/75dpi", -+ "@PREFIX@/lib/X11/fonts/Type1", -+ "@PREFIX@/lib/X11/fonts/cyrillic", -+ "@PREFIX@/lib/X11/fonts/misc", -+ "@PREFIX@/lib/X11/fonts/TTF", ++ "@PREFIX@/share/fonts/X11/100dpi", ++ "@PREFIX@/share/fonts/X11/75dpi", ++ "@PREFIX@/share/fonts/X11/Type1", ++ "@PREFIX@/share/fonts/X11/cyrillic", ++ "@PREFIX@/share/fonts/X11/misc", ++ "@PREFIX@/share/fonts/X11/TTF", + "/usr/X11R7/lib/X11/fonts/100dpi", + "/usr/X11R7/lib/X11/fonts/75dpi", + "/usr/X11R7/lib/X11/fonts/Type1", @@ -43,7 +43,7 @@ Use pkgsrc fontconfig. static char **getFontConfigLocations(); -@@ -545,6 +566,7 @@ static char *getPlatformFontPathChars(JN +@@ -551,6 +572,7 @@ static char *getPlatformFontPathChars(JN #else /* IF SOLARIS */ knowndirs = fullSolarisFontPath; #endif diff --git a/lang/openjdk7/patches/patch-bn b/lang/openjdk7/patches/patch-bn index b011ee6323b..b4af4cdefe1 100644 --- a/lang/openjdk7/patches/patch-bn +++ b/lang/openjdk7/patches/patch-bn @@ -1,8 +1,8 @@ -$NetBSD: patch-bn,v 1.4 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-bn,v 1.5 2014/06/01 17:55:33 wiz Exp $ Use pkgsrc fonts. ---- jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties.orig 2012-08-10 17:31:20.000000000 +0000 +--- jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties.orig 2014-01-01 05:53:43.000000000 +0000 +++ jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties @@ -166,24 +166,24 @@ sequence.fallback=chinese-big5,chinese-g @@ -12,28 +12,28 @@ Use pkgsrc fonts. -filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Bold.ttf -filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Oblique.ttf -filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf -+filename.DejaVu_LGC_Sans=@PREFIX@/lib/X11/fonts/TTF/DejaVuSans.ttf -+filename.DejaVu_LGC_Sans_Bold=@PREFIX@/lib/X11/fonts/TTF/DejaVuSans-Bold.ttf -+filename.DejaVu_LGC_Sans_Oblique=@PREFIX@/lib/X11/fonts/TTF/DejaVuSans-Oblique.ttf -+filename.DejaVu_LGC_Sans_Bold_Oblique=@PREFIX@/lib/X11/fonts/TTF/DejaVuSans-BoldOblique.ttf ++filename.DejaVu_LGC_Sans=@PREFIX@/share/fonts/X11/TTF/DejaVuSans.ttf ++filename.DejaVu_LGC_Sans_Bold=@PREFIX@/share/fonts/X11/TTF/DejaVuSans-Bold.ttf ++filename.DejaVu_LGC_Sans_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSans-Oblique.ttf ++filename.DejaVu_LGC_Sans_Bold_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSans-BoldOblique.ttf -filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono.ttf -filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf -filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf -filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf -+filename.DejaVu_LGC_Sans_Mono=@PREFIX@/lib/X11/fonts/TTF/DejaVuSansMono.ttf -+filename.DejaVu_LGC_Sans_Mono_Bold=@PREFIX@/lib/X11/fonts/TTF/DejaVuSansMono-Bold.ttf -+filename.DejaVu_LGC_Sans_Mono_Oblique=@PREFIX@/lib/X11/fonts/TTF/DejaVuSansMono-Oblique.ttf -+filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=@PREFIX@/lib/X11/fonts/TTF/DejaVuSansMono-BoldOblique.ttf ++filename.DejaVu_LGC_Sans_Mono=@PREFIX@/share/fonts/X11/TTF/DejaVuSansMono.ttf ++filename.DejaVu_LGC_Sans_Mono_Bold=@PREFIX@/share/fonts/X11/TTF/DejaVuSansMono-Bold.ttf ++filename.DejaVu_LGC_Sans_Mono_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSansMono-Oblique.ttf ++filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSansMono-BoldOblique.ttf -filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif.ttf -filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Bold.ttf -filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf -filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf -+filename.DejaVu_LGC_Serif=@PREFIX@/lib/X11/fonts/TTF/DejaVuSerif.ttf -+filename.DejaVu_LGC_Serif_Bold=@PREFIX@/lib/X11/fonts/TTF/DejaVuSerif-Bold.ttf -+filename.DejaVu_LGC_Serif_Oblique=@PREFIX@/lib/X11/fonts/TTF/DejaVuSerif-Italic.ttf -+filename.DejaVu_LGC_Serif_Bold_Oblique=@PREFIX@/lib/X11/fonts/TTF/DejaVuSerif-BoldItalic.ttf ++filename.DejaVu_LGC_Serif=@PREFIX@/share/fonts/X11/TTF/DejaVuSerif.ttf ++filename.DejaVu_LGC_Serif_Bold=@PREFIX@/share/fonts/X11/TTF/DejaVuSerif-Bold.ttf ++filename.DejaVu_LGC_Serif_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSerif-Italic.ttf ++filename.DejaVu_LGC_Serif_Bold_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSerif-BoldItalic.ttf -filename.Sazanami_Gothic=/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf -filename.Sazanami_Mincho=/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf @@ -41,9 +41,9 @@ Use pkgsrc fonts. -filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf -filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf -filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf -+filename.Sazanami_Gothic=@PREFIX@/lib/X11/fonts/TTF/sazanami-gothic.ttf -+filename.Sazanami_Mincho=@PREFIX@/lib/X11/fonts/TTF/sazanami-mincho.ttf -+filename.AR_PL_ShanHeiSun_Uni=@PREFIX@/lib/X11/fonts/TTF/uming.ttf -+filename.AR_PL_ZenKai_Uni=@PREFIX@/lib/X11/fonts/TTF/ukai.ttf -+filename.Baekmuk_Gulim=@PREFIX@/lib/X11/fonts/TTF/gulim.ttf -+filename.Baekmuk_Batang=@PREFIX@/lib/X11/fonts/TTF/batang.ttf ++filename.Sazanami_Gothic=@PREFIX@/share/fonts/X11/TTF/sazanami-gothic.ttf ++filename.Sazanami_Mincho=@PREFIX@/share/fonts/X11/TTF/sazanami-mincho.ttf ++filename.AR_PL_ShanHeiSun_Uni=@PREFIX@/share/fonts/X11/TTF/uming.ttf ++filename.AR_PL_ZenKai_Uni=@PREFIX@/share/fonts/X11/TTF/ukai.ttf ++filename.Baekmuk_Gulim=@PREFIX@/share/fonts/X11/TTF/gulim.ttf ++filename.Baekmuk_Batang=@PREFIX@/share/fonts/X11/TTF/batang.ttf |