From b64b6c88ecbb05720b97654bc769ed75da231ebd Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Mon, 5 Aug 2019 02:12:55 +0300
Subject: [PATCH] pango/cairo: move to extra

---
 extra/cairo/build                                  | 11 +++++++++++
 extra/cairo/checksums                              |  1 +
 extra/cairo/depends                                |  7 +++++++
 extra/cairo/sources                                |  1 +
 extra/cairo/version                                |  1 +
 extra/pango/build                                  | 14 ++++++++++++++
 extra/pango/checksums                              |  1 +
 extra/pango/depends                                |  6 ++++++
 extra/pango/sources                                |  1 +
 extra/pango/version                                |  1 +
 .../rust/patches/0092-use-correct-llvm-cross.patch | 14 --------------
 11 files changed, 44 insertions(+), 14 deletions(-)
 create mode 100755 extra/cairo/build
 create mode 100644 extra/cairo/checksums
 create mode 100644 extra/cairo/depends
 create mode 100644 extra/cairo/sources
 create mode 100644 extra/cairo/version
 create mode 100755 extra/pango/build
 create mode 100644 extra/pango/checksums
 create mode 100644 extra/pango/depends
 create mode 100644 extra/pango/sources
 create mode 100644 extra/pango/version
 delete mode 100644 extra/rust/patches/0092-use-correct-llvm-cross.patch

diff --git a/extra/cairo/build b/extra/cairo/build
new file mode 100755
index 00000000..b0ef525a
--- /dev/null
+++ b/extra/cairo/build
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr \
+    --disable-static \
+    --enable-tee \
+    --enable-gl \
+    --enable-egl
+
+make
+make DESTDIR="$1" install
diff --git a/extra/cairo/checksums b/extra/cairo/checksums
new file mode 100644
index 00000000..a07be27b
--- /dev/null
+++ b/extra/cairo/checksums
@@ -0,0 +1 @@
+5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331  cairo-1.16.0.tar.xz
diff --git a/extra/cairo/depends b/extra/cairo/depends
new file mode 100644
index 00000000..ca8f5ef3
--- /dev/null
+++ b/extra/cairo/depends
@@ -0,0 +1,7 @@
+libX11
+libXext
+libffi
+libpng
+mesa
+pixman
+fontconfig
diff --git a/extra/cairo/sources b/extra/cairo/sources
new file mode 100644
index 00000000..e43c5aab
--- /dev/null
+++ b/extra/cairo/sources
@@ -0,0 +1 @@
+https://cairographics.org/releases/cairo-1.16.0.tar.xz
diff --git a/extra/cairo/version b/extra/cairo/version
new file mode 100644
index 00000000..df10ebf3
--- /dev/null
+++ b/extra/cairo/version
@@ -0,0 +1 @@
+1.16.0 1
diff --git a/extra/pango/build b/extra/pango/build
new file mode 100755
index 00000000..49b29d79
--- /dev/null
+++ b/extra/pango/build
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+
+meson \
+    --prefix=/usr \
+    -Dgir=false \
+    -Dgtk_doc=false \
+    . build
+
+ninja -C build
+DESTDIR="$1" ninja -C build install
+
+# Remove unneeded tests
+rm -rf "$1/usr/share/installed-tests"
+rm -rf "$1/usr/libexec/installed-tests"
diff --git a/extra/pango/checksums b/extra/pango/checksums
new file mode 100644
index 00000000..1aecbf98
--- /dev/null
+++ b/extra/pango/checksums
@@ -0,0 +1 @@
+1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d  pango-1.42.4.tar.xz
diff --git a/extra/pango/depends b/extra/pango/depends
new file mode 100644
index 00000000..e124feda
--- /dev/null
+++ b/extra/pango/depends
@@ -0,0 +1,6 @@
+glib
+freetype-harfbuzz
+fontconfig
+fribidi
+cairo
+meson      make
diff --git a/extra/pango/sources b/extra/pango/sources
new file mode 100644
index 00000000..1f6432f8
--- /dev/null
+++ b/extra/pango/sources
@@ -0,0 +1 @@
+https://download.gnome.org/sources/pango/1.42/pango-1.42.4.tar.xz
diff --git a/extra/pango/version b/extra/pango/version
new file mode 100644
index 00000000..c17b15a5
--- /dev/null
+++ b/extra/pango/version
@@ -0,0 +1 @@
+1.42.4 1
diff --git a/extra/rust/patches/0092-use-correct-llvm-cross.patch b/extra/rust/patches/0092-use-correct-llvm-cross.patch
deleted file mode 100644
index cce4b59e..00000000
--- a/extra/rust/patches/0092-use-correct-llvm-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Reason: rustc_codegen_llvm attempts to link against the host's llvm without this patch
---- rustc-1.36.0-src/src/librustc_llvm/build.rs
-+++ rustc-1.36.0-src/src/librustc_llvm/build.rs
-@@ -224,8 +224,8 @@ fn main() {
-             println!("cargo:rustc-link-search=native={}", &lib[9..]);
-         } else if is_crossed {
-             if lib.starts_with("-L") {
--                println!("cargo:rustc-link-search=native={}",
--                         lib[2..].replace(&host, &target));
-+                println!("cargo:rustc-link-search=native={}{}",
-+                         env::var("XBPS_CROSS_BASE").unwrap(), &lib[2..]);
-             }
-         } else if lib.starts_with("-l") {
-             println!("cargo:rustc-link-lib={}", &lib[2..]);