Commit 5b244a80 authored by Luca Giambonini's avatar Luca Giambonini

lib32-cairo 1.16.0, lib32-pango-1.42.4

added new deps required for cairo and pango
[skip-ci]
parent 4e013d67
Pipeline #2545 skipped
......@@ -3,53 +3,70 @@
_pkgbasename=cairo
pkgname=lib32-$_pkgbasename
pkgver=1.14.10
pkgrel=1
pkgver=1.16.0
pkgrel=3
_ubuntu_diff_version=${pkgver}-1
pkgdesc="Cairo vector graphics library (32-bit)"
arch=('x86_64')
url="http://cairographics.org/"
license=('LGPL' 'MPL')
makedepends=('gcc-multilib' 'libtool-multilib')
depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
'lib32-pixman' 'lib32-glib2' 'lib32-mesa' 'lib32-libgl'
${_pkgbasename}=${pkgver})
provides=("${pkgname}-ubuntu")
conflicts=("${pkgname}-ubuntu")
replaces=("${pkgname}-ubuntu")
source=("http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz"
"http://archive.ubuntu.com/ubuntu/pool/main/c/cairo/cairo_${_ubuntu_diff_version}ubuntu1.debian.tar.xz")
sha1sums=('28c59d85d6b790c21b8b59ece73a6a1dda28d69a'
'89429dcce2a2efe930361b98f6d8210b885bba93')
depends=(lib32-libpng lib32-libxrender lib32-libxext lib32-fontconfig lib32-pixman lib32-glib2
"$_pkgbasename=$pkgver")
makedepends=( lib32-gtk2 lib32-librsvg gtk-doc valgrind git)
checkdepends=(ttf-dejavu gsfonts)
_commit=3ad43122b21a3299dd729dc8462d6b8f7f01142d # tags/1.16.0^0
source=("git+https://gitlab.freedesktop.org/cairo/cairo.git#commit=$_commit")
sha1sums=('SKIP')
pkgver() {
cd cairo
git describe --tags | sed 's/-/+/g'
}
prepare() {
cd cairo
# Update gtk-doc
cp /usr/share/aclocal/gtk-doc.m4 build/aclocal.gtk-doc.m4
cp /usr/share/gtk-doc/data/gtk-doc.make build/Makefile.am.gtk-doc
NOCONFIGURE=1 ./autogen.sh
}
build() {
export CC="gcc -m32"
export CXX="g++ -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
cd "${srcdir}/${_pkgbasename}-${pkgver}"
# apply ubuntu patches
for _f in $(cat "$srcdir/debian/patches/series" | grep -v '#') ; do
patch -Np1 -i "$srcdir/debian/patches/$_f"
done
autoreconf -vfi
cd cairo
./configure --prefix=/usr \
--libdir=/usr/lib32 \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static \
--enable-tee \
--enable-gl \
--enable-egl
# --disable-xlib-xcb
--libdir=/usr/lib32 \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static \
--disable-gl \
--enable-tee \
--enable-svg \
--enable-ps \
--enable-pdf \
--enable-gobject \
--disable-gtk-doc \
--enable-full-testing \
--enable-test-surfaces
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
package() {
cd "${srcdir}/${_pkgbasename}-${pkgver}"
check() {
cd cairo
# FIXME: tests don't pass
env CAIRO_TEST_TARGET=image \
CAIRO_TEST_TARGET_FORMAT=rgba \
CAIRO_TESTS='!pthread-show-text' make -k check || :
}
make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}"/usr/{include,share,bin}
package() {
cd cairo
make DESTDIR="$pkgdir" install
rm -r "$pkgdir"/usr/{include,bin}
}
_pkgbasename=fribidi
pkgname=lib32-$_pkgbasename
pkgver=1.0.5
pkgrel=1
pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm (32-bit)"
arch=('x86_64')
license=('LGPL')
url="https://github.com/fribidi/fribidi/"
depends=('lib32-glibc' "$_pkgbasename=$pkgver")
makedepends=('git' 'meson')
_commit=5b6a16e8da12ae7ff482fbfa5a17b72bd518418f # tags/v1.0.5^0
source=("git+https://github.com/fribidi/fribidi#commit=$_commit")
md5sums=('SKIP')
pkgver() {
cd fribidi
git describe --tags | sed -e 's/-/+/g' -e 's/^v//'
}
prepare() {
cd fribidi
}
build() {
export CC="gcc -m32"
export CXX="g++ -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
chakra-meson fribidi build -D docs=false --libdir=/usr/lib32
ninja -C build
}
check() {
meson test -C build
}
package() {
DESTDIR="$pkgdir" meson install -C build
rm -rf "$pkgdir"/usr/{include,share,bin}
}
_pkgbasename=libcroco
pkgname=lib32-$_pkgbasename
pkgver=0.6.12
pkgrel=1
pkgdesc='GNOME CSS2 parsing and manipulation toolkit (32-bit)'
url="https://git.gnome.org/browse/libcroco"
arch=('x86_64')
depends=('lib32-glib2' 'lib32-libxml2' "$_pkgbasename=$pkgver")
makedepends=('gcc-multilib' 'git' 'gtk-doc')
license=('LGPL')
source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/0.6/$_pkgbasename-$pkgver.tar.xz")
sha256sums=('ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860')
prepare() {
cd libcroco-$pkgver
NOCONFIGURE=1 ./autogen.sh
}
build() {
cd libcroco-$pkgver
export CC='gcc -m32'
export CXX='g++ -m32'
export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
./configure \
--prefix='/usr' \
--libdir='/usr/lib32' \
--disable-static \
--disable-gtk-doc
make
}
check() {
cd libcroco-$pkgver
make check
}
package() {
cd libcroco-$pkgver
make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}"/usr/{bin,include,share}
}
# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
# Contributor: jtts <jussaar@mbnet.fi>
# Contributor: Jan de Groot <jgc@archlinux.org>
_pkgbasename=librsvg
pkgname=lib32-$_pkgbasename
pkgver=2.44.12
pkgrel=1
pkgdesc="SVG rendering library (32-bit)"
url="https://wiki.gnome.org/Projects/LibRsvg"
arch=(x86_64)
license=(LGPL)
depends=(lib32-gdk-pixbuf2 lib32-pango lib32-libcroco "$_pkgbasename=$pkgver") #lib32-libcroco
makedepends=(intltool gobject-introspection vala python2 gtk-doc git lib32-rust)
_commit=6a0f7835bdd10e3106cd81fb6426e29ddde60eee # tags/2.44.12^0
source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit"
multilib.diff)
sha256sums=('SKIP'
'f562f9fda0c8bcad8de3f6eea9eee16014a5634261a6646724da99d9ca497bbf')
pkgver() {
cd librsvg
git describe --tags | sed 's/-/+/g'
}
prepare() {
cd librsvg
# Hack to cross-compile rust only
patch -Np1 -i ../multilib.diff
NOCONFIGURE=1 ./autogen.sh
}
build() {
export CC='gcc -m32'
export CXX='g++ -m32'
export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
export RUST_TARGET=i686-unknown-linux-gnu
cd librsvg
./configure --prefix=/usr --disable-static --enable-vala --disable-gtk-doc --libdir=/usr/lib32
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
make
}
check() {
cd librsvg
make check
}
package() {
cd librsvg
make DESTDIR="$pkgdir" install
rm -r "$pkgdir"/usr/{bin,include,share}
}
# vim: ts=2 sw=2 et:
Makefile.am | 2 --
configure.ac | 4 +---
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git c/Makefile.am i/Makefile.am
index 69bf4bc3..1a70f8de 100644
--- c/Makefile.am
+++ i/Makefile.am
@@ -128,9 +128,7 @@ else
CARGO_RELEASE_ARGS=--release
endif
-if CROSS_COMPILING
CARGO_TARGET_ARGS=--target=$(RUST_TARGET)
-endif
CARGO_VERBOSE = $(cargo_verbose_$(V))
cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY))
diff --git c/configure.ac i/configure.ac
index 6afdc9f7..e398c2c2 100644
--- c/configure.ac
+++ i/configure.ac
@@ -293,9 +293,7 @@ if test "x$RUST_TARGET" == x; then
fi
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-if test "x$cross_compiling" = "xyes" ; then
- RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR"
-fi
+RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR"
AC_SUBST([RUST_TARGET_SUBDIR])
dnl ===========================================================================
......@@ -2,24 +2,24 @@
_pkgbasename=pango
pkgname=lib32-$_pkgbasename
pkgver=1.40.14
pkgver=1.42.4
pkgrel=1
pkgdesc="A library for layout and rendering of text (32-bit)"
arch=('x86_64')
license=('LGPL')
depends=('lib32-libthai' 'lib32-libgl' 'lib32-cairo' 'lib32-libxft'
"$_pkgbasename=$pkgver")
makedepends=('gcc-multilib' 'lib32-mesa-libgl')
options=('!emptydirs')
install=pango.install
source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver:0:4}/${_pkgbasename}-${pkgver}.tar.xz)
url="http://www.pango.org/"
sha256sums=('90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3')
depends=(lib32-libthai lib32-cairo lib32-libxft lib32-harfbuzz lib32-fribidi "$_pkgbasename=$pkgver")
makedepends=(gcc-multilib gobject-introspection git meson)
_commit=a6a89818246b0b14c0fe3d00d6120929fc0a11d9 # tags/1.42.4^0
source=("git+https://gitlab.gnome.org/GNOME/pango.git#commit=$_commit")
sha256sums=('SKIP')
pkgver() {
cd pango
git describe --tags | sed 's/-/+/g'
}
prepare() {
cd "${srcdir}/${_pkgbasename}-${pkgver}"
sed -i 's#"pango.modules"#"pango.modules-32"#' pango/modules.c
cd pango
}
build() {
......@@ -27,22 +27,12 @@ build() {
export CXX="g++ -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
cd ${_pkgbasename}-${pkgver}
./configure --prefix=/usr \
--libdir=/usr/lib32 \
--sysconfdir=/etc \
--localstatedir=/var \
--with-included-modules=basic-fc \
--with-dynamic-modules=arabic-fc,arabic-lang,basic-fc,basic-win32,basic-x,basic-atsui,hangul-fc,hebrew-fc,indic-fc,indic-lang,khmer-fc,syriac-fc,tibetan-fc \
--disable-introspection
make
chakra-meson pango build --libdir=/usr/lib32
ninja -C build
}
package() {
cd ${_pkgbasename}-${pkgver}
make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}"/etc
rm -rf "${pkgdir}"/usr/{bin/pango-view,share,include}
DESTDIR="$pkgdir" meson install -C build
rm -r "$pkgdir"/usr/{bin,lib,share,include}
}
_pkgbasename=rust
pkgname=lib32-$_pkgbasename
pkgver=1.32.0
pkgrel=1
pkgdesc='32-bit libraries for rust'
url='https://www.rust-lang.org/'
arch=('x86_64')
license=('MIT' 'Apache')
makedepends=('llvm' 'libffi' 'perl' 'python2' 'curl' 'cmake')
depends=('lib32-gcc-libs' "$_pkgbasename=$pkgver")
source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
config.toml)
sha256sums=('4c594c7712a0e7e8eae6526c464bf6ea1d82f77b4f61717c3fc28fb27ba2224a'
'SKIP'
'36c22ecdacbfeca9ab955726b4a701f687f8ed358a1b8ab2d7cc988408db44cb')
validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
prepare() {
cd "rustc-$pkgver-src"
cp "$srcdir"/config.toml config.toml
}
build() {
cd "rustc-$pkgver-src"
msg2 "Run build under x.py"
python2 ./x.py build
}
package() {
cd "rustc-$pkgver-src"
target="$pkgdir"/"$(rustc --print sysroot)"/lib/rustlib
install -d "$target"
cp -r \
build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/i686-unknown-linux-gnu \
"$target"
for license in APACHE MIT; do install -Dm644 "LICENSE-$license" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE-$license"; done
}
# vim:set ts=2 sw=2 et:
[llvm]
link-shared = true
[build]
target = ["i686-unknown-linux-gnu"] # defaults to just the build triple
cargo = "/usr/bin/cargo"
rustc = "/usr/bin/rustc"
python = "python2.7"
extended = true
sanitizers = false
local-rebuild = true
[install]
prefix = "/usr"
[rust]
# 0 or the new default of 16 is faster, but can result in worse performance
# https://github.com/rust-lang/rust/issues/47745
codegen-units = 1
debuginfo = true
debuginfo-lines = true
channel = "stable"
rpath = false
[target.x86_64-unknown-linux-gnu]
llvm-config = "/usr/bin/llvm-config"
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