Merge branch 'master' of github.com:pisilinux/main

This commit is contained in:
Ertuğrul Erata
2017-02-02 23:03:29 +03:00
24 changed files with 198 additions and 33 deletions
@@ -0,0 +1,41 @@
From 165f0f012f8d4bebb12d188c1c2a369d233d586e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 10 Jan 2017 10:01:54 +0100
Subject: [PATCH 1/1] fix test with freetype2 2.7.1
Upstream freetype2 applied a patch from openSuSE [0]:
[pcf] Enrich family name with foundry name and glyph width info.
3576487add2f0e9691e8c43f8b0cd8e61aebf14f
This prepends the foundry name plus a space to the family name. We needs
change the font name in expexted test output.
[0] http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3576487add2f0e9691e8c43f8b0cd8e61aebf14f
Signed-off-by: Christian Hesse <mail@eworm.de>
---
test/out.expected | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/out.expected b/test/out.expected
index 39634c5..f3a8856 100644
--- a/test/out.expected
+++ b/test/out.expected
@@ -1,8 +1,8 @@
-Fixed:pixelsize=16
-Fixed:pixelsize=6
+Misc Fixed:pixelsize=6
+Sony Fixed:pixelsize=16
=
-Fixed:pixelsize=16
-Fixed:pixelsize=6
+Misc Fixed:pixelsize=6
+Sony Fixed:pixelsize=16
=
-Fixed:pixelsize=16
-Fixed:pixelsize=6
+Misc Fixed:pixelsize=6
+Sony Fixed:pixelsize=16
--
2.11.0
+10 -2
View File
@@ -12,17 +12,18 @@
<IsA>library</IsA>
<Summary>A library for configuring and customizing font access</Summary>
<Description>Fontconfig is a library designed to provide system-wide font configuration, customization and application access.</Description>
<Archive sha1sum="08565feea5a4e6375f9d8a7435dac04e52620ff2" type="tarbz2">http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.11.1.tar.bz2</Archive>
<Archive sha1sum="30d832b754fb10a3b70ebac750a38a0275438ad8" type="tarbz2">https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.1.tar.bz2</Archive>
<BuildDependencies>
<Dependency>freetype-devel</Dependency>
<Dependency>expat-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- prefer dejavu over bitstream -->
<Patch level="1">0001-fix-test-with-freetype2-2.7.1.patch</Patch>
<Patch level="1">prefer_dejavu.patch</Patch>
<Patch level="1">anymetrics_urw.patch</Patch>
<Patch level="1">use_legacy_lcdfilter_on_small_monospace.patch</Patch>
<Patch level="1">add_hinting_and_antialiasing_to_proper_fonts.patch</Patch>
<!-- <Patch level="1">add_hinting_and_antialiasing_to_proper_fonts.patch</Patch> -->
<!-- Sleep less in fc-cache -->
<Patch level="1">fontconfig-2.8.0-sleep-less.patch</Patch>
<!-- remove deprecated user conf dir -->
@@ -87,6 +88,13 @@
</Package>
<History>
<Update release="4">
<Date>2016-06-09</Date>
<Version>2.12.1</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-06-09</Date>
<Version>2.11.1</Version>
+2 -2
View File
@@ -9,11 +9,11 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def build():
autotools.make("CC=%s CFLAGS='%s'" % (get.CC(), get.CFLAGS()))
autotools.make("-j1 CC=%s CFLAGS='%s'" % (get.CC(), get.CFLAGS()))
def check():
autotools.make("-j1 test")
def install():
pisitools.insinto("/usr/include/", "libjbig/jbig*.h")
pisitools.insinto("/usr/lib/", "libjbig/libjbig*.so")
+7 -7
View File
@@ -63,14 +63,14 @@ def setup():
cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \
%s \
-DLLVM_ENABLE_FFI=ON \
-DLLVM_BUILD_DOCS=OFF \
-DBUILD_SHARED_LIBS=ON \
-DLLVM_ENABLE_RTTI=ON \
-DLLVM_INCLUDEDIR=/usr/include \
-DLLVM_ENABLE_ASSERTIONS=OFF \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLLVM_ENABLE_FFI=ON \
-DCMAKE_BUILD_TYPE=Release \
-DLLVM_BUILD_LLVM_DYLIB=ON \
-DLLDB_DISABLE_LIBEDIT=1 \
-DLLVM_INCLUDEDIR=/usr/include \
-DFFI_INCLUDE_DIR=/usr/lib/libffi-3.2.1/include \
-DENABLE_SHARED=ON" % options, sourceDir=".." )
-DLLVM_TARGETS_TO_BUILD='host;AMDGPU'" % options, sourceDir=".." )
def build():
shelltools.makedirs("build")
+12 -5
View File
@@ -11,11 +11,11 @@
<License>NCSA</License>
<Summary>The Low Level Virtual Machine</Summary>
<Description>The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. Despite its name, LLVM has little to do with traditional virtual machines, though it does provide helpful libraries that can be used to build them.</Description>
<Archive sha1sum="723ac918979255706434a05f5af34b71c49c9971" type="tarxz">http://llvm.org/releases/3.8.0/llvm-3.8.0.src.tar.xz</Archive>
<Archive sha1sum="2230ef962f2df3c13ec93f5b04b0e3cdff94b2ce" type="binary">http://llvm.org/releases/3.8.0/cfe-3.8.0.src.tar.xz</Archive>
<Archive sha1sum="a99d8b6fc5e593c4671424b327779318a1856acf" type="binary">http://llvm.org/releases/3.8.0/clang-tools-extra-3.8.0.src.tar.xz</Archive>
<Archive sha1sum="6d503cea94c131b6bfcf5254e62d32fcce1ebcc8" type="binary">http://llvm.org/releases/3.8.0/lldb-3.8.0.src.tar.xz</Archive>
<Archive sha1sum="480ea09e369dac6de1f3759b27fa19417b26b69e" type="binary">http://llvm.org/releases/3.8.0/compiler-rt-3.8.0.src.tar.xz</Archive>
<Archive sha1sum="ce801cf456b8dacd565ce8df8288b4d90e7317ff" type="tarxz">http://releases.llvm.org/3.9.1/llvm-3.9.1.src.tar.xz</Archive>
<Archive sha1sum="95e4be54b70f32cf98a8de36821ea5495b84add8" type="binary">http://releases.llvm.org/3.9.1/cfe-3.9.1.src.tar.xz</Archive>
<Archive sha1sum="f24e5ceb226a72e781cefde4e30f2d7be09ea305" type="binary">http://releases.llvm.org/3.9.1/clang-tools-extra-3.9.1.src.tar.xz</Archive>
<Archive sha1sum="f6da59c9ed570c4c7091c25f0abe59aba0e29de3" type="binary">http://releases.llvm.org/3.9.1/lldb-3.9.1.src.tar.xz</Archive>
<Archive sha1sum="938921d076e28943f5d5b653514f2ce36a88a55e" type="binary">http://releases.llvm.org/3.9.1/compiler-rt-3.9.1.src.tar.xz</Archive>
<BuildDependencies>
<Dependency>zlib-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
@@ -200,6 +200,13 @@
</Package>
<History>
<Update release="4">
<Date>2017-02-02</Date>
<Version>3.9.1</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-06-09</Date>
<Version>3.8.0</Version>
@@ -11,7 +11,7 @@ from pisi.actionsapi import get
def setup():
pisitools.dosed("configure", "-Werror=format", "#-Werror=format")
shelltools.export("PYTHON", "/usr/bin/python3.4")
shelltools.export("PYTHON", "/usr/bin/python3.6")
shelltools.system("./configure --prefix=/usr \
--localstatedir=/var \
--disable-static")
@@ -35,8 +35,8 @@
<Files>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share/pygobject</Path>
<Path fileType="library">/usr/lib/python3.4</Path>
<Path fileType="library">/usr/lib/libpyglib-gi-2.0-python3.4.so*</Path>
<Path fileType="library">/usr/lib/python3*</Path>
<Path fileType="library">/usr/lib/libpyglib-gi-2.0-python3*.so*</Path>
</Files>
</Package>
+7
View File
@@ -69,6 +69,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>1.2.2</Version>
<Comment>Rebuild.</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.2.2</Version>
+8 -1
View File
@@ -15,7 +15,7 @@
<Archive sha1sum="75fd0b996e56e12db1d84e9b63549c5c3f2631ca" type="tarbz2">mirrors://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libX11-devel</Dependency>
<Dependency>libXfixes-devel</Dependency>
<Dependency>libXfixes-devel</Dependency>
<Dependency>util-macros</Dependency>
</BuildDependencies>
</Source>
@@ -66,6 +66,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>0.4.4</Version>
<Comment>Rebuild</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>0.4.4</Version>
+7 -1
View File
@@ -65,7 +65,6 @@
</BuildDependencies>
<RuntimeDependencies>
<Dependency release="current">libXcursor</Dependency>
<Dependency>libX11-32bit</Dependency>
<Dependency>libXfixes-32bit</Dependency>
<Dependency>libXrender-32bit</Dependency>
@@ -76,6 +75,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>1.1.14</Version>
<Comment>Rebuild.</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.1.14</Version>
+10 -4
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>X.Org Xfont library</Summary>
<Description>libXfont is the Xorg library that allows using various types of fonts.</Description>
<Archive sha1sum="e63a354de5dc2d8cba08d50add1519471412a618" type="tarbz2">mirrors://xorg/individual/lib/libXfont-1.5.1.tar.bz2</Archive>
<Archive sha1sum="a9470774f271622c1b425826d1c8836ed96e4a96" type="tarbz2">mirrors://xorg/individual/lib/libXfont-1.5.2.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libfontenc-devel</Dependency>
<Dependency>util-macros</Dependency>
@@ -20,7 +20,6 @@
<Dependency>xorg-proto</Dependency>
<Dependency>xtrans</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>freetype-devel</Dependency>
</BuildDependencies>
</Source>
@@ -28,8 +27,8 @@
<Name>libXfont</Name>
<RuntimeDependencies>
<Dependency>libfontenc</Dependency>
<Dependency>zlib</Dependency>
<Dependency>freetype</Dependency>
<Dependency>zlib</Dependency>
<Dependency>freetype</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
@@ -52,6 +51,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>1.5.2</Version>
<Comment>Version bump</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.5.1</Version>
+2 -2
View File
@@ -83,9 +83,9 @@
<History>
<Update release="3">
<Date>2017-01-31</Date>
<Date>2017-02-02</Date>
<Version>2.3.2</Version>
<Comment>Release bump</Comment>
<Comment>Rebuild</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
+7
View File
@@ -69,6 +69,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>1.1.3</Version>
<Comment>Rebuild</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.1.3</Version>
+8 -1
View File
@@ -26,7 +26,7 @@
<Name>libXmu</Name>
<RuntimeDependencies>
<Dependency>libXt</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libXext</Dependency>
</RuntimeDependencies>
<Files>
@@ -73,6 +73,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>1.1.2</Version>
<Comment>Rebuild</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.1.2</Version>
+7
View File
@@ -73,6 +73,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>1.0.3</Version>
<Comment>Rebuild</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.0.3</Version>
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>X.Org Xpm library</Summary>
<Description>LibXpm is the X pixmap library.</Description>
<Archive sha1sum="77b95dd1c8cd9bc00b3b834b53d824409202acbb" type="tarbz2">mirrors://xorg/individual/lib/libXpm-3.5.11.tar.bz2</Archive>
<Archive sha1sum="4e22fefe61714209539b08051b5287bcd9ecfd04" type="tarbz2">mirrors://xorg/individual/lib/libXpm-3.5.12.tar.bz2</Archive>
<BuildDependencies>
<Dependency>util-macros</Dependency>
<Dependency>libXext-devel</Dependency>
@@ -72,6 +72,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>3.5.12</Version>
<Comment>Version bump</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>3.5.11</Version>
+7
View File
@@ -76,6 +76,13 @@
</Package>
<History>
<Update release="4">
<Date>2017-02-02</Date>
<Version>1.5.1</Version>
<Comment>Rebuild.</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-11-02</Date>
<Version>1.5.1</Version>
+7 -1
View File
@@ -53,7 +53,6 @@
<Summary>32-bit shared libraries for libXrender</Summary>
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>libX11-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
@@ -67,6 +66,13 @@
</Package>
<History>
<Update release="4">
<Date>2017-02-02</Date>
<Version>0.9.10</Version>
<Comment>Rebuild.</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-11-02</Date>
<Version>0.9.10</Version>
+7
View File
@@ -47,6 +47,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>1.0.7</Version>
<Comment>Rebuild.</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.0.7</Version>
+8 -1
View File
@@ -18,7 +18,7 @@
<Dependency>libSM-devel</Dependency>
<Dependency>xorg-proto</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>util-macros</Dependency>
<Dependency>util-macros</Dependency>
</BuildDependencies>
</Source>
@@ -78,6 +78,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>1.1.5</Version>
<Comment>Rebuild</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.1.5</Version>
+7
View File
@@ -74,6 +74,13 @@
</Package>
<History>
<Update release="4">
<Date>2017-02-02</Date>
<Version>1.0.10</Version>
<Comment>Rebuild</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-11-03</Date>
<Version>1.0.10</Version>
+7
View File
@@ -65,6 +65,13 @@
</Files>
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>1.1.4</Version>
<Comment>Rebuild.</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.1.4</Version>
+9 -2
View File
@@ -13,10 +13,10 @@
<IsA>library</IsA>
<Summary>Library to convert evdev keycodes to keysyms</Summary>
<Description>Library to convert evdev keycodes to keysyms</Description>
<Archive sha1sum="0575ab35bba913d739267fbc1ed963fe7f8e386e" type="targz">https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-0.6.1.tar.gz</Archive>
<Archive sha1sum="293f3b2355c4bbf1da23474233b3bc54cb7b4fd3" type="targz">https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-0.7.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>util-macros</Dependency>
<Dependency>libxcb-devel</Dependency>
<Dependency>libxcb-devel</Dependency>
</BuildDependencies>
</Source>
@@ -62,6 +62,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>0.7.1</Version>
<Comment>Version bump.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-27</Date>
<Version>0.6.1</Version>
+7
View File
@@ -45,6 +45,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-02-02</Date>
<Version>1.0.9</Version>
<Comment>Rebuild</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.0.9</Version>