diff --git a/desktop/font/noto-fonts/actions.py b/desktop/font/noto-fonts/actions.py index 88e5c63f86..fd8ddfb82c 100644 --- a/desktop/font/noto-fonts/actions.py +++ b/desktop/font/noto-fonts/actions.py @@ -9,11 +9,15 @@ from pisi.actionsapi import pisitools def install(): pisitools.insinto("/usr/share/fonts/noto", "hinted/Noto*.ttf") - pisitools.insinto("/usr/share/fonts/noto", "hinted/Noto*.ttc") + #pisitools.insinto("/usr/share/fonts/noto", "hinted/Noto*.ttc") #for noto-fonts-ttf-croscore pisitools.insinto("/usr/share/fonts/TTF", "hinted/Arimo*.ttf") pisitools.insinto("/usr/share/fonts/TTF", "hinted/Tinos*.ttf") pisitools.insinto("/usr/share/fonts/TTF", "hinted/Cousine*.ttf") + + pisitools.dosym("/etc/fonts/conf.avail/66-noto-sans.conf", "/etc/fonts/conf.d/66-noto-sans.conf") + pisitools.dosym("/etc/fonts/conf.avail/66-noto-serif.conf", "/etc/fonts/conf.d/66-noto-serif.conf") + pisitools.dosym("/etc/fonts/conf.avail/66-noto-mono.conf", "/etc/fonts/conf.d/66-noto-mono.conf") - pisitools.dodoc("LICENSE", "README.md") \ No newline at end of file + pisitools.dodoc("LICENSE", "README.md") diff --git a/desktop/font/noto-fonts/files/archlinux/66-noto-mono.conf b/desktop/font/noto-fonts/files/archlinux/66-noto-mono.conf new file mode 100644 index 0000000000..21d6c364a8 --- /dev/null +++ b/desktop/font/noto-fonts/files/archlinux/66-noto-mono.conf @@ -0,0 +1,16 @@ + + + + + monospace + + Noto Sans Mono + + + + Noto Sans Mono + + monospace + + + diff --git a/desktop/font/noto-fonts/files/archlinux/66-noto-sans.conf b/desktop/font/noto-fonts/files/archlinux/66-noto-sans.conf new file mode 100644 index 0000000000..012aebedf8 --- /dev/null +++ b/desktop/font/noto-fonts/files/archlinux/66-noto-sans.conf @@ -0,0 +1,16 @@ + + + + + sans-serif + + Noto Sans + + + + Noto Sans + + sans-serif + + + diff --git a/desktop/font/noto-fonts/files/archlinux/66-noto-serif.conf b/desktop/font/noto-fonts/files/archlinux/66-noto-serif.conf new file mode 100644 index 0000000000..036baf7764 --- /dev/null +++ b/desktop/font/noto-fonts/files/archlinux/66-noto-serif.conf @@ -0,0 +1,16 @@ + + + + + serif + + Noto Serif + + + + Noto Serif + + serif + + + diff --git a/desktop/font/noto-fonts/pspec.xml b/desktop/font/noto-fonts/pspec.xml index e034b6abb5..309fa6de02 100644 --- a/desktop/font/noto-fonts/pspec.xml +++ b/desktop/font/noto-fonts/pspec.xml @@ -12,15 +12,21 @@ data:font Google Noto TTF fonts Noto fonts are open source. All Noto fonts are published under the SIL Open Font License, Version 1.1. Language data and some sample texts are from the Unicode CLDR project. - https://github.com/googlei18n/noto-fonts/archive/v2015-09-29-license-adobe.tar.gz + https://sourceforge.net/projects/pisilinux/files/source/noto-fonts-20190623.tar.xz noto-fonts + /etc/fonts /usr/share/doc /usr/share/fonts/noto + + archlinux/66-noto-sans.conf + archlinux/66-noto-serif.conf + archlinux/66-noto-mono.conf + @@ -30,8 +36,30 @@ /usr/share/fonts/TTF + + + noto-fonts-extra + noto-fonts-ttf-croscore, Chrome OS core fonts Condensed SemiBold Medium Black Light + + /usr/share/fonts/noto/*-Condensed*.ttf + /usr/share/fonts/noto/*-SemiBold*.ttf + /usr/share/fonts/noto/*-SemiCondensed*.ttf + /usr/share/fonts/noto/*-Medium*.ttf + /usr/share/fonts/noto/*-Thin*.ttf + /usr/share/fonts/noto/*-Black*.ttf + /usr/share/fonts/noto/*-Light*.ttf + /usr/share/fonts/noto/*-Extra*.ttf + + + + 2019-11-09 + 20190623 + Rebuild for New Toolchain + Stefan Gronewold + groni@pisilinux.org + 2018-07-31 20150929 diff --git a/desktop/kde/plasma/plasma-workspace-wallpapers/actions.py b/desktop/kde/plasma/plasma-workspace-wallpapers/actions.py index 04f14d15af..6bb4cc8dec 100755 --- a/desktop/kde/plasma/plasma-workspace-wallpapers/actions.py +++ b/desktop/kde/plasma/plasma-workspace-wallpapers/actions.py @@ -9,7 +9,7 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools def setup(): - #shelltools.system("sed -i 's|5.11.0|5.10.0|g' CMakeLists.txt") + shelltools.system("tar xf ../blue.tar.gz") kde5.configure() def build(): @@ -17,5 +17,7 @@ def build(): def install(): kde5.install() + + pisitools.insinto("/usr/share/wallpapers/pisilinux-blue", "blue/*") pisitools.dodoc("COPYING", "AUTHORS") diff --git a/desktop/kde/plasma/plasma-workspace-wallpapers/pspec.xml b/desktop/kde/plasma/plasma-workspace-wallpapers/pspec.xml index 52f40ede26..9b3d206b16 100755 --- a/desktop/kde/plasma/plasma-workspace-wallpapers/pspec.xml +++ b/desktop/kde/plasma/plasma-workspace-wallpapers/pspec.xml @@ -15,6 +15,7 @@ The KDE Plasma Workspace Components The KDE Plasma Workspace Components mirrors://kde/stable/plasma/5.16.5/plasma-workspace-wallpapers-5.16.5.tar.xz + https://sourceforge.net/projects/pisilinux/files/source/blue.tar.gz qt5-base-devel extra-cmake-modules @@ -39,6 +40,13 @@ + + 2019-11-10 + 5.16.5 + Rebuild Pisilinux-blue. + Mustafa Cinasal + muscnsl@gmail.com + 2019-09-15 5.16.5