[haiku-commits] haiku: hrev48505 - data/system/data/fonts/ttfonts
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 16 Dec 2014 09:39:44 +0100 (CET)
hrev48505 adds 2 changesets to branch 'master'
old head: a03f66b7fb8ccebe16ae70ff4dcf5be7beea978e
new head: 7b2bc3a6d3790e097fb0509bf9b5b5156d0ac5ce
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=7b2bc3a+%5Ea03f66b
----------------------------------------------------------------------------
e7dceac: Outsource DejaVu fonts
Signed-off-by: Timothy Gu <timothygu99@xxxxxxxxx>
[ Timothy Gu <timothygu99@xxxxxxxxx> ]
7b2bc3a: Make the Haiku package depend on vl_gothic.
* Makes sure there is at least one font installed
* Fixes #11581.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
34 files changed, 13 insertions(+)
build/jam/DefaultBuildProfiles | 1 +
build/jam/repositories/HaikuPorts/arm | 1 +
build/jam/repositories/HaikuPorts/m68k | 1 +
build/jam/repositories/HaikuPorts/ppc | 1 +
build/jam/repositories/HaikuPorts/x86 | 1 +
build/jam/repositories/HaikuPorts/x86_64 | 1 +
build/jam/repositories/HaikuPorts/x86_gcc2 | 1 +
data/system/data/fonts/ttfonts/DejaVuSans-Bold.ttf | Bin 672300 -> 0 bytes
.../data/fonts/ttfonts/DejaVuSans-BoldOblique.ttf | Bin 611212 -> 0 bytes
.../data/fonts/ttfonts/DejaVuSans-ExtraLight.ttf | Bin 345208 -> 0 bytes
.../data/fonts/ttfonts/DejaVuSans-Oblique.ttf | Bin 611556 -> 0 bytes
data/system/data/fonts/ttfonts/DejaVuSans.ttf | Bin 720012 -> 0 bytes
.../fonts/ttfonts/DejaVuSansCondensed-Bold.ttf | Bin 631992 -> 0 bytes
.../ttfonts/DejaVuSansCondensed-BoldOblique.ttf | Bin 580168 -> 0 bytes
.../fonts/ttfonts/DejaVuSansCondensed-Oblique.ttf | Bin 576004 -> 0 bytes
.../data/fonts/ttfonts/DejaVuSansCondensed.ttf | Bin 643852 -> 0 bytes
.../data/fonts/ttfonts/DejaVuSansMono-Bold.ttf | Bin 313856 -> 0 bytes
.../fonts/ttfonts/DejaVuSansMono-BoldOblique.ttf | Bin 235848 -> 0 bytes
.../data/fonts/ttfonts/DejaVuSansMono-Oblique.ttf | Bin 241972 -> 0 bytes
data/system/data/fonts/ttfonts/DejaVuSansMono.ttf | Bin 333636 -> 0 bytes
.../system/data/fonts/ttfonts/DejaVuSerif-Bold.ttf | Bin 341072 -> 0 bytes
.../data/fonts/ttfonts/DejaVuSerif-BoldItalic.ttf | Bin 332036 -> 0 bytes
.../data/fonts/ttfonts/DejaVuSerif-Italic.ttf | Bin 338776 -> 0 bytes
data/system/data/fonts/ttfonts/DejaVuSerif.ttf | Bin 363200 -> 0 bytes
.../fonts/ttfonts/DejaVuSerifCondensed-Bold.ttf | Bin 316440 -> 0 bytes
.../ttfonts/DejaVuSerifCondensed-BoldItalic.ttf | Bin 331128 -> 0 bytes
.../fonts/ttfonts/DejaVuSerifCondensed-Italic.ttf | Bin 338140 -> 0 bytes
.../data/fonts/ttfonts/DejaVuSerifCondensed.ttf | Bin 330012 -> 0 bytes
src/data/package_infos/arm/haiku | 1 +
src/data/package_infos/m68k/haiku | 1 +
src/data/package_infos/ppc/haiku | 1 +
src/data/package_infos/x86/haiku | 1 +
src/data/package_infos/x86_64/haiku | 1 +
src/data/package_infos/x86_gcc2/haiku | 1 +
############################################################################
Commit: e7dceac3faecf000740bd9271ea4b11194926ff8
URL: http://cgit.haiku-os.org/haiku/commit/?id=e7dceac
Author: Timothy Gu <timothygu99@xxxxxxxxx>
Date: Mon Dec 15 21:26:12 2014 UTC
Committer: Adrien Destugues <pulkomandy@xxxxxxxxx>
Commit-Date: Tue Dec 16 08:39:02 2014 UTC
Outsource DejaVu fonts
Signed-off-by: Timothy Gu <timothygu99@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 75b879d..faaa355 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -73,6 +73,7 @@ rule DefineDefaultBuildProfiles
AddHaikuImagePackages
bepdf
cvs
+ dejavu
keymapswitcher
llvm
man
diff --git a/build/jam/repositories/HaikuPorts/arm
b/build/jam/repositories/HaikuPorts/arm
index da348b2..396ceeb 100644
--- a/build/jam/repositories/HaikuPorts/arm
+++ b/build/jam/repositories/HaikuPorts/arm
@@ -5,6 +5,7 @@ RemotePackageRepository HaikuPorts
# architecture "any" packages
be_book-2008_10_26-1
ca_root_certificates-2014_04_08-1
+ dejavu-2.34-1
texi2html-1.82-2
timgmsoundfont-2004_01_24-4
vl_gothic-20141206-1
diff --git a/build/jam/repositories/HaikuPorts/m68k
b/build/jam/repositories/HaikuPorts/m68k
index eb43d60..26406a4 100644
--- a/build/jam/repositories/HaikuPorts/m68k
+++ b/build/jam/repositories/HaikuPorts/m68k
@@ -5,6 +5,7 @@ RemotePackageRepository HaikuPorts
# architecture "any" packages
be_book-2008_10_26-1
ca_root_certificates-2014_04_08-1
+ dejavu-2.34-1
texi2html-1.82-2
timgmsoundfont-2004_01_24-4
vl_gothic-20141206-1
diff --git a/build/jam/repositories/HaikuPorts/ppc
b/build/jam/repositories/HaikuPorts/ppc
index 78ba34a..79e8db1 100644
--- a/build/jam/repositories/HaikuPorts/ppc
+++ b/build/jam/repositories/HaikuPorts/ppc
@@ -5,6 +5,7 @@ RemotePackageRepository HaikuPorts
# architecture "any" packages
be_book-2008_10_26-1
ca_root_certificates-2014_04_08-1
+ dejavu-2.34-1
texi2html-1.82-2
timgmsoundfont-2004_01_24-4
vl_gothic-20141206-1
diff --git a/build/jam/repositories/HaikuPorts/x86
b/build/jam/repositories/HaikuPorts/x86
index dff4a11..8c2548f 100644
--- a/build/jam/repositories/HaikuPorts/x86
+++ b/build/jam/repositories/HaikuPorts/x86
@@ -5,6 +5,7 @@ RemotePackageRepository HaikuPorts
# architecture "any" packages
be_book-2008_10_26-1
ca_root_certificates-2014_04_08-2
+ dejavu-2.34-1
texi2html-1.82-2
timgmsoundfont-fixed-5
vl_gothic-20141206-1
diff --git a/build/jam/repositories/HaikuPorts/x86_64
b/build/jam/repositories/HaikuPorts/x86_64
index da022e5..eb1e2fb 100644
--- a/build/jam/repositories/HaikuPorts/x86_64
+++ b/build/jam/repositories/HaikuPorts/x86_64
@@ -5,6 +5,7 @@ RemotePackageRepository HaikuPorts
# architecture "any" packages
be_book-2008_10_26-1
ca_root_certificates-2014_04_08-2
+ dejavu-2.34-1
texi2html-1.82-2
timgmsoundfont-fixed-5
vl_gothic-20141206-1
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2
b/build/jam/repositories/HaikuPorts/x86_gcc2
index 6c094b1..f9b34a4 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -5,6 +5,7 @@ RemotePackageRepository HaikuPorts
# architecture "any" packages
be_book-2008_10_26-1
ca_root_certificates-2014_04_08-2
+ dejavu-2.34-1
docbook_xml_dtd-4.5-2
docbook_xsl_stylesheets-1.78.1-1
droid-113-1
diff --git a/data/system/data/fonts/ttfonts/DejaVuSans-Bold.ttf
b/data/system/data/fonts/ttfonts/DejaVuSans-Bold.ttf
deleted file mode 100644
index 0f4d5e9..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSans-Bold.ttf and /dev/null
differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSans-BoldOblique.ttf
b/data/system/data/fonts/ttfonts/DejaVuSans-BoldOblique.ttf
deleted file mode 100644
index 48f06a8..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSans-BoldOblique.ttf and
/dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSans-ExtraLight.ttf
b/data/system/data/fonts/ttfonts/DejaVuSans-ExtraLight.ttf
deleted file mode 100644
index 01a5652..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSans-ExtraLight.ttf and
/dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSans-Oblique.ttf
b/data/system/data/fonts/ttfonts/DejaVuSans-Oblique.ttf
deleted file mode 100644
index 4485638..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSans-Oblique.ttf and
/dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSans.ttf
b/data/system/data/fonts/ttfonts/DejaVuSans.ttf
deleted file mode 100644
index 27cff47..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSans.ttf and /dev/null
differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSansCondensed-Bold.ttf
b/data/system/data/fonts/ttfonts/DejaVuSansCondensed-Bold.ttf
deleted file mode 100644
index 9edd89c..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSansCondensed-Bold.ttf and
/dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSansCondensed-BoldOblique.ttf
b/data/system/data/fonts/ttfonts/DejaVuSansCondensed-BoldOblique.ttf
deleted file mode 100644
index e2db5ce..0000000
Binary files
a/data/system/data/fonts/ttfonts/DejaVuSansCondensed-BoldOblique.ttf and
/dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSansCondensed-Oblique.ttf
b/data/system/data/fonts/ttfonts/DejaVuSansCondensed-Oblique.ttf
deleted file mode 100644
index 7cec04c..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSansCondensed-Oblique.ttf
and /dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSansCondensed.ttf
b/data/system/data/fonts/ttfonts/DejaVuSansCondensed.ttf
deleted file mode 100644
index 826e619..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSansCondensed.ttf and
/dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSansMono-Bold.ttf
b/data/system/data/fonts/ttfonts/DejaVuSansMono-Bold.ttf
deleted file mode 100644
index 09d4279..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSansMono-Bold.ttf and
/dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSansMono-BoldOblique.ttf
b/data/system/data/fonts/ttfonts/DejaVuSansMono-BoldOblique.ttf
deleted file mode 100644
index 0344c22..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSansMono-BoldOblique.ttf
and /dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSansMono-Oblique.ttf
b/data/system/data/fonts/ttfonts/DejaVuSansMono-Oblique.ttf
deleted file mode 100644
index bc16d51..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSansMono-Oblique.ttf and
/dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSansMono.ttf
b/data/system/data/fonts/ttfonts/DejaVuSansMono.ttf
deleted file mode 100644
index 7260bd6..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSansMono.ttf and /dev/null
differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSerif-Bold.ttf
b/data/system/data/fonts/ttfonts/DejaVuSerif-Bold.ttf
deleted file mode 100644
index afa2d5e..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSerif-Bold.ttf and
/dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSerif-BoldItalic.ttf
b/data/system/data/fonts/ttfonts/DejaVuSerif-BoldItalic.ttf
deleted file mode 100644
index ce9443e..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSerif-BoldItalic.ttf and
/dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSerif-Italic.ttf
b/data/system/data/fonts/ttfonts/DejaVuSerif-Italic.ttf
deleted file mode 100644
index c1864a3..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSerif-Italic.ttf and
/dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSerif.ttf
b/data/system/data/fonts/ttfonts/DejaVuSerif.ttf
deleted file mode 100644
index ed53a29..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSerif.ttf and /dev/null
differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSerifCondensed-Bold.ttf
b/data/system/data/fonts/ttfonts/DejaVuSerifCondensed-Bold.ttf
deleted file mode 100644
index 55adca4..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSerifCondensed-Bold.ttf and
/dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSerifCondensed-BoldItalic.ttf
b/data/system/data/fonts/ttfonts/DejaVuSerifCondensed-BoldItalic.ttf
deleted file mode 100644
index e211957..0000000
Binary files
a/data/system/data/fonts/ttfonts/DejaVuSerifCondensed-BoldItalic.ttf and
/dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSerifCondensed-Italic.ttf
b/data/system/data/fonts/ttfonts/DejaVuSerifCondensed-Italic.ttf
deleted file mode 100644
index 275b26d..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSerifCondensed-Italic.ttf
and /dev/null differ
diff --git a/data/system/data/fonts/ttfonts/DejaVuSerifCondensed.ttf
b/data/system/data/fonts/ttfonts/DejaVuSerifCondensed.ttf
deleted file mode 100644
index 83120cd..0000000
Binary files a/data/system/data/fonts/ttfonts/DejaVuSerifCondensed.ttf and
/dev/null differ
############################################################################
Revision: hrev48505
Commit: 7b2bc3a6d3790e097fb0509bf9b5b5156d0ac5ce
URL: http://cgit.haiku-os.org/haiku/commit/?id=7b2bc3a
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Tue Dec 16 08:35:06 2014 UTC
Ticket: https://dev.haiku-os.org/ticket/11581
Make the Haiku package depend on vl_gothic.
* Makes sure there is at least one font installed
* Fixes #11581.
----------------------------------------------------------------------------
diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku
index 290ba33..85ef84c 100644
--- a/src/data/package_infos/arm/haiku
+++ b/src/data/package_infos/arm/haiku
@@ -188,4 +188,5 @@ requires {
lib:libstdc++
lib:libsupc++
lib:libz
+ vl_gothic
}
diff --git a/src/data/package_infos/m68k/haiku
b/src/data/package_infos/m68k/haiku
index d2b6ef1..1587871 100644
--- a/src/data/package_infos/m68k/haiku
+++ b/src/data/package_infos/m68k/haiku
@@ -180,4 +180,5 @@ requires {
lib:libstdc++
lib:libsupc++
lib:libz
+ vl_gothic
}
diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku
index b6633a5..364cecb 100644
--- a/src/data/package_infos/ppc/haiku
+++ b/src/data/package_infos/ppc/haiku
@@ -188,4 +188,5 @@ requires {
lib:libstdc++
lib:libsupc++
lib:libz
+ vl_gothic
}
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index 372ab1b..b149152 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -195,4 +195,5 @@ requires {
lib:libstdc++
lib:libsupc++
lib:libz
+ vl_gothic
}
diff --git a/src/data/package_infos/x86_64/haiku
b/src/data/package_infos/x86_64/haiku
index fdd3b3c..5db9211 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -194,4 +194,5 @@ requires {
lib:libstdc++
lib:libsupc++
lib:libz
+ vl_gothic
}
diff --git a/src/data/package_infos/x86_gcc2/haiku
b/src/data/package_infos/x86_gcc2/haiku
index 54cb4a4..6dca4e1 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -193,4 +193,5 @@ requires {
lib:libsolv
lib:libsolvext
lib:libz
+ vl_gothic
}
Other related posts:
