Commit f6ec9a85 authored by Xuetian Weng's avatar Xuetian Weng

update glib and font libs

parent 799a685f
......@@ -3,33 +3,48 @@
#
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=elfutils
pkgver=0.161
pkgbase=elfutils
pkgname=(elfutils libelf)
pkgver=0.164
pkgrel=1
pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information."
pkgdesc="Utilities to handle ELF object files and DWARF debugging information"
arch=('x86_64')
url="https://fedorahosted.org/elfutils/"
license=('GPL2')
depends=('glibc')
source=("https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2")
md5sums=('e1b9847c9a6a1ad340de8d47a863ec52')
license=('LGPL3' 'GPL' 'GPL3')
depends=('gcc-libs' 'zlib' 'bzip2' 'xz')
options=('staticlibs')
source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig})
sha1sums=('55a951f909267db76d506f61752508a86589aa37'
'SKIP')
validpgpkeys=('47CC0331081B8BC6D0FD4DA08370665B57816A6A') # Mark J. Wielaard <mark@klomp.org>
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
# make check requires that we have dwarf information; it should be stripped away later
cd ${pkgbase}-${pkgver}
CFLAGS+=" -g" # required for test-suite success
./configure --prefix=/usr --program-prefix="eu-"
./configure --prefix=/usr --program-prefix="eu-" --enable-deterministic-archives
make
}
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
cd ${pkgbase}-${pkgver}
make check
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make install DESTDIR="${pkgdir}"
package_elfutils() {
depends=("libelf=$pkgver-$pkgrel")
cd ${pkgbase}-${pkgver}
make DESTDIR="${pkgdir}" install
mkdir "${srcdir}"/libelf
mv "${pkgdir}"/usr/{lib,include} "${srcdir}/libelf"
}
# vim:set ts=2 sw=2 et:
package_libelf() {
pkgdesc="Libraries to handle ELF object files and DWARF debugging information"
mv libelf "${pkgdir}/usr"
}
From 27f765b5f41638de36de728e9018a1400b0be615 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:40:29 +0200
Subject: [PATCH 1/4] Enable table validation modules
---
modules.cfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.cfg b/modules.cfg
index 2984e51..a5db21d 100644
--- a/modules.cfg
+++ b/modules.cfg
@@ -110,7 +110,7 @@ RASTER_MODULES += smooth
AUX_MODULES += cache
# TrueType GX/AAT table validation. Needs ftgxval.c below.
-# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid
# Support for streams compressed with gzip (files with suffix .gz).
#
@@ -129,7 +129,7 @@ AUX_MODULES += bzip2
# OpenType table validation. Needs ftotval.c below.
#
-# AUX_MODULES += otvalid
+AUX_MODULES += otvalid
# Auxiliary PostScript driver component to share common code.
#
--
2.6.0
From 27d96091b2bb0a825cbd62a332ef918f39c6126f Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:43:07 +0200
Subject: [PATCH 2/4] Enable subpixel rendering
---
include/freetype/config/ftoption.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 4970945..ab407e3 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -92,7 +92,7 @@ FT_BEGIN_HEADER
/* This is done to allow FreeType clients to run unmodified, forcing */
/* them to display normal gray-level anti-aliased glyphs. */
/* */
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
/*************************************************************************/
--
2.6.0
From f96a1d21d787b173d6293330fbf782b977194aa7 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:43:57 +0200
Subject: [PATCH 3/4] Enable subpixel hinting
---
include/freetype/config/ftoption.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index ab407e3..a2eab6a 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -602,7 +602,7 @@ FT_BEGIN_HEADER
/* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */
/* defined. */
/* */
-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
/*************************************************************************/
--
2.6.0
From bb5ece9c6773145c8342107bd32fcacbc4b212ab Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 23 Jun 2015 08:34:54 +0200
Subject: [PATCH 4/4] Mask subpixel hinting with an env var
---
src/truetype/ttobjs.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index 6060d6f..3fa98e7 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -1302,10 +1302,11 @@
TT_Driver driver = (TT_Driver)ttdriver;
#ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
- driver->interpreter_version = TT_INTERPRETER_VERSION_38;
-#else
- driver->interpreter_version = TT_INTERPRETER_VERSION_35;
+ if ( getenv( "FT2_SUBPIXEL_HINTING" ) )
+ driver->interpreter_version = TT_INTERPRETER_VERSION_38;
+ else
#endif
+ driver->interpreter_version = TT_INTERPRETER_VERSION_35;
#else /* !TT_USE_BYTECODE_INTERPRETER */
--
2.6.0
......@@ -3,36 +3,46 @@
# freetype2 and harfbuzz update
# build freetype2 with old harfbuzz -> harfbuzz with new freetype -> build freetype2 with new harfbuzz.
pkgname=freetype2
pkgver=2.5.5
_ubuntu_ver=2.5.2
pkgver=2.6.2
pkgrel=1
_ubuntu_diff_version=${_ubuntu_ver}-1ubuntu2
pkgdesc="TrueType font rendering library"
arch=('x86_64')
license=('GPL')
url="http://freetype.sourceforge.net"
# DO NOT remove harfbuzz from dependency
depends=('zlib' 'sh' 'bzip2' 'libpng' 'harfbuzz')
checkdepends=('valgrind')
source=("http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2"
"http://archive.ubuntu.com/ubuntu/pool/main/f/freetype/freetype_${_ubuntu_diff_version}.diff.gz")
md5sums=('2a7a314927011d5030903179cf183be0'
'eda9c925032709bbd7463edcded05881')
url="http://www.freetype.org/"
# adding harfbuzz for improved OpenType features auto-hinting
# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
provides=('libfreetype.so')
install=freetype2.install
source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
0001-Enable-table-validation-modules.patch
0002-Enable-subpixel-rendering.patch
0003-Enable-subpixel-hinting.patch
0004-Mask-subpixel-hinting-with-an-env-var.patch)
sha1sums=('29c22b85b77cb22cf95c13e7062e21f39fe6b17a'
'SKIP'
'1c7bc438df0428a63f881e7e4343b22c5b09ecb1'
'e2d2b8c4847ab9cfd497179c7140835e99ece711'
'ebe3d7a6fc41304a77c23cb56e94dc718146d963'
'f50c70080f3fbee45b9c4264d8ae37eb4f1ac335')
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
prepare() {
cd "${srcdir}/freetype-${pkgver}"
# apply ubuntu patches
patch -Np1 -i ../freetype_${_ubuntu_diff_version}.diff
patch -p0 -i "${srcdir}/freetype-${pkgver}/debian/patches-freetype/freetype-2.1.7-backwards.compat.patch"
patch -p1 -i "${srcdir}/freetype-${pkgver}/debian/patches-freetype/enable-subpixel-rendering.patch"
patch -p1 -i "${srcdir}/freetype-${pkgver}/debian/patches-freetype/enable-gxvalid-otvalid.patch"
patch -p1 -i "${srcdir}/freetype-${pkgver}/debian/patches-freetype/revert_scalable_fonts_metric.patch"
cd "${srcdir}/freetype-${pkgver}"
patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
# https://bugs.archlinux.org/task/35274
patch -Np1 -i "${srcdir}/0003-Enable-subpixel-hinting.patch"
# Provide a way to enable the above patch at runtime.
# Hopefully just a temporary measure until fontconfig picks up
# the necessary configurables.
patch -Np1 -i "${srcdir}/0004-Mask-subpixel-hinting-with-an-env-var.patch"
}
build() {
cd "${srcdir}/freetype-${pkgver}"
./configure --prefix=/usr
./configure --prefix=/usr --disable-static
make
}
......@@ -45,5 +55,3 @@ package() {
cd "${srcdir}/freetype-${pkgver}"
make DESTDIR="${pkgdir}" install
}
post_upgrade() {
if (( $(vercmp $2 2.5.4-3) < 0 )); then
cat <<MSG
Subpixel hinting can be enabled by adding FT2_SUBPIXEL_HINTING=1
to your environment, for example /etc/environment or ~/.pam_environment .
MSG
fi
}
......@@ -2,29 +2,28 @@
# Core Packages for Chakra, part of chakraos.org
#
pkgname=glib2
pkgver=2.42.1
pkgbase=glib2
pkgname=(glib2 glib2-docs)
pkgver=2.46.2
pkgrel=1
pkgdesc="Common C routines used by GTK+ and other libs"
url="http://www.gtk.org/"
arch=('x86_64')
license=('LGPL')
depends=('pcre' 'libffi')
makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml')
options=('!docs')
source=("http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-${pkgver}.tar.xz"
'revert-warn-glib-compile-schemas.patch')
md5sums=('89c4119e50e767d3532158605ee9121a'
'3265d1afbcf1f5f308e26c3f9f6ca899')
arch=(x86_64)
makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'libelf')
source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver:0:4}/glib-$pkgver.tar.xz
revert-warn-glib-compile-schemas.patch memleak.patch)
sha256sums=('5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db'
'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
'8337eeba4a32133d41575c8338fca32ac6a867e6e4a4e021355fcdeb606420a6')
prepare() {
cd glib-$pkgver
patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
autoreconf -fiv
patch -Np1 -i ../memleak.patch
}
build() {
cd "${srcdir}/glib-${pkgver}"
cd glib-$pkgver
PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
--sysconfdir=/etc \
--with-pcre=system \
......@@ -32,13 +31,40 @@ build() {
make
}
package() {
cd "${srcdir}/glib-${pkgver}"
make completiondir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install
check() {
cd glib-$pkgver
#make -k check || :
}
for _i in "${pkgdir}/usr/share/bash-completion/completions/"*; do
chmod -x "${_i}"
package_glib2() {
depends=('pcre' 'libffi')
optdepends=('python2: for gdbus-codegen and gtester-report'
'libelf: gresource inspection tool')
options=('!docs' '!emptydirs')
license=('LGPL')
cd glib-$pkgver
make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do
chmod -x "$_i"
done
sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
# Our gdb does not ship the required python modules, so remove it
rm -rf "$pkgdir/usr/share/gdb/"
}
package_glib2-docs() {
pkgdesc="Documentation for glib2"
conflicts=('gobject2-docs')
replaces=('gobject2-docs')
license=('custom')
options=('docs' '!emptydirs')
cd glib-$pkgver/docs
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/glib2-docs"
install -m644 reference/COPYING "${pkgdir}/usr/share/licenses/glib2-docs/"
rm -rf "${pkgdir}/usr/share/man"
}
From db641e32920ee8b553ab6f2d318aafa156e4390c Mon Sep 17 00:00:00 2001
From: Evangelos Foutras <evangelos@foutrelis.com>
Date: Wed, 25 Nov 2015 23:29:18 +0200
Subject: GDBusProxy: Fix a memory leak during initialization
https://bugzilla.gnome.org/show_bug.cgi?id=758641
---
gio/gdbusproxy.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
index 52a22fb..7b1140f 100644
--- a/gio/gdbusproxy.c
+++ b/gio/gdbusproxy.c
@@ -1720,6 +1720,7 @@ async_initable_init_second_finish (GAsyncInitable *initable,
if (result != NULL)
{
process_get_all_reply (proxy, result);
+ g_variant_unref (result);
}
proxy->priv->initialized = TRUE;
--
cgit v0.11.2
......@@ -19,7 +19,7 @@ index cf02389..27d0181 100644
@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state,
return;
}
+ if (path && (g_str_has_prefix (path, "/apps/") ||
+ g_str_has_prefix (path, "/desktop/") ||
+ g_str_has_prefix (path, "/system/")))
......@@ -28,6 +28,6 @@ index cf02389..27d0181 100644
+
state->schema_state = schema_state_new (path, gettext_domain,
extends, extends_name, list_of);
--
cgit v0.9.0.2
......@@ -2,33 +2,41 @@
# Chakra Packages for Chakra, part of chakra-project.org
#
pkgname=gobject-introspection
pkgver=1.42.0
pkgbase=gobject-introspection
pkgname=('gobject-introspection' 'gobject-introspection-runtime')
pkgver=1.46.0
pkgrel=1
pkgdesc="Introspection system for GObject-based libraries"
url="https://live.gnome.org/GObjectInstrospection"
url="https://live.gnome.org/GObjectIntrospection"
arch=('x86_64')
license=('LGPL' 'GPL')
depends=('glib2')
makedepends=('cairo' 'python2' 'python2-mako')
optdepends=('python2: gir development tools'
'python2-mako: g-ir-doc-tool')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
md5sums=('4fa52f6b67367d9c1b99b98683ced202')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz)
sha256sums=('6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233')
prepare() {
cd $pkgname-$pkgver
cd $pkgbase-$pkgver
sed -i '1s|#!/usr/bin/env python$|&2|' giscanner/*.py
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
cd $pkgbase-$pkgver
PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static --enable-doctool
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
package_gobject-introspection-runtime() {
pkgdesc="Introspection system for GObject-based libraries - runtime files"
depends=('glib2')
cd $pkgbase-$pkgver
make DESTDIR="$pkgdir" install-libLTLIBRARIES install-typelibsDATA
}
package_gobject-introspection() {
pkgdesc="Introspection system for GObject-based libraries"
depends=("gobject-introspection-runtime=$pkgver" 'python2-mako' 'python2')
options=('!emptydirs')
cd $pkgbase-$pkgver
make DESTDIR="$pkgdir" install
make DESTDIR="$pkgdir" uninstall-libLTLIBRARIES uninstall-typelibsDATA
}
# maintainer almack
pkgname=harfbuzz
pkgver=0.9.37
pkgbase=(harfbuzz)
pkgname=(harfbuzz harfbuzz-icu)
pkgver=1.1.2
pkgrel=1
pkgdesc="OpenType text shaping engine."
arch=('x86_64')
pkgdesc="OpenType text shaping engine"
arch=(x86_64)
url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
license=('MIT')
depends=('icu' 'glib2' 'freetype2' 'graphite')
makedepends=('icu' 'cairo')
optdepends=('cairo: hb-view program')
source=("http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2")
md5sums=('bfe733250e34629a188d82e3b971bc1e')
license=(MIT)
makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection)
source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2)
sha256sums=('4a2c5790bd3db7c3ca8c02e4858f2fd592df7932c1d2fa9f6b99acbce0f8461f')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
prepare() {
mkdir path
ln -s /usr/bin/python2 path/python
cd $pkgbase-$pkgver
}
build() {
cd $pkgbase-$pkgver
./configure --prefix=/usr \
--with-glib \
--with-freetype \
--with-cairo \
--with-icu \
--with-graphite2
--with-glib --with-freetype --with-cairo --with-icu --with-graphite2 \
--with-gobject
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
check() {
cd $pkgbase-$pkgver
PATH="$srcdir/path:$PATH" make -k check || :
}
package_harfbuzz() {
depends=(glib2 freetype2 graphite)
optdepends=('cairo: hb-view program')
cd $pkgbase-$pkgver
make DESTDIR="$pkgdir" install
install -Dm644 COPYING "$pkgdir/usr/share/licenses/harfbuzz/COPYING"
# Split harfbuzz-icu
mkdir -p ../hb-icu/usr/{include/harfbuzz,lib/pkgconfig}; cd ../hb-icu
mv "$pkgdir"/usr/lib/libharfbuzz-icu* ./usr/lib
mv "$pkgdir"/usr/lib/pkgconfig/harfbuzz-icu.pc ./usr/lib/pkgconfig
mv "$pkgdir"/usr/include/harfbuzz/hb-icu.h ./usr/include/harfbuzz
}
package_harfbuzz-icu(){
pkgdesc="$pkgdesc (ICU integration)"
depends=(harfbuzz icu)
mv hb-icu/* "$pkgdir"
make DESTDIR="${pkgdir}" install
install -Dm644 COPYING "${pkgdir}/usr/share/licenses/harfbuzz/COPYING"
install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/harfbuzz-icu/COPYING"
}
# Platform Packages for Chakra, part of chakra-project.org
pkgname=pango
pkgver=1.36.8
pkgver=1.38.1
pkgrel=1
pkgdesc="A library for layout and rendering of text"
arch=('x86_64')
license=('LGPL')
depends=('cairo' 'libxft' 'libthai' 'harfbuzz')
makedepends=('gobject-introspection' 'libxt' 'fontconfig')
depends=('libthai' 'cairo' 'libxft' 'harfbuzz')
makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introspection' 'help2man')
checkdepends=('ttf-dejavu')
install=pango.install
source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
url="http://www.pango.org/"
sha256sums=('18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07')
sha256sums=('1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7')
prepare() {
cd ${pkgname}-${pkgver}
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
cd ${pkgname}-${pkgver}
rm -f pango-view/pango-view.1.in
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--with-included-modules=basic-fc
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --with-included-modules=basic-fc
make
}
check() {
cd ${pkgname}-${pkgver}
make -k check || :
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/etc/pango"
cd ${pkgname}-${pkgver}
make -j1 DESTDIR="${pkgdir}" install
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment