[arch-commits] Commit in libutf8proc/trunk (PKGBUILD libutf8proc.pc)

[Alexander Rødseth]

    Date: Saturday, April 30, 2016 @ 14:05:10
  Author: arodseth
Revision: 173129

upgpkg: libutf8proc 1.3.1_2-1

Modified:
  libutf8proc/trunk/PKGBUILD
  libutf8proc/trunk/libutf8proc.pc

----------------+
 PKGBUILD       |   23 ++++++++++++++++-------
 libutf8proc.pc |    2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-30 12:00:12 UTC (rev 173128)
+++ PKGBUILD	2016-04-30 12:05:10 UTC (rev 173129)
@@ -2,8 +2,8 @@
 # Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
 
 pkgname=libutf8proc
-pkgver=1.3.1
-pkgrel=3
+pkgver=1.3.1_2
+pkgrel=1
 pkgdesc='C library for processing UTF-8 encoded Unicode strings'
 arch=('x86_64' 'i686')
 url='http://git.netsurf-browser.org/libutf8proc.git/'
@@ -11,13 +11,20 @@
 replaces=('utf8proc')
 depends=('glibc')
 makedepends=('git' 'ninja' 'cmake')
-source=("git://git.netsurf-browser.org/libutf8proc.git#tag=v$pkgver"
-        'libutf8proc.pc')
-sha256sums=('SKIP'
-            '6c6c05ff6c91777987d76f935c24c7a3f67eba12e420a437f03ee1545f404d31')
+source=("git://git.netsurf-browser.org/libutf8proc.git#tag=release/${pkgver/_/-}")
+sha256sums=('SKIP')
 
+prepare() {
+  cd "$pkgname"
+
+  rm Makefile
+  find . -iwholename '*cmake*' -not -name CMakeLists.txt -not -name utils.cmake -delete
+  cp -r src/* include/$pkgname/* .
+}
+
 build() {
   cd "$pkgname"
+
   mkdir -p build
   cd build
   cmake .. \
@@ -30,9 +37,11 @@
 package() {
   cd "$pkgname"
 
+  # The CMake/install configuration does not work for libutf8proc
+  # DESTDIR="$pkgdir" ninja -C "$pkgname-$pkgver/build" install
+
   install -Dm644 utf8proc.h "$pkgdir/usr/include/utf8proc.h"
   install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
-  install -Dm644 ../libutf8proc.pc "$pkgdir/usr/lib/pkgconfig/libutf8proc.pc"
   install -Dm644 build/libutf8proc.so.1.3.1 "$pkgdir/usr/lib/libutf8proc.so.1.3.1"
   ln -s /usr/lib/libutf8proc.so.1.3.1 "$pkgdir/usr/lib/libutf8proc.so.1"
   ln -s /usr/lib/libutf8proc.so.1.3.1 "$pkgdir/usr/lib/libutf8proc.so"

Modified: libutf8proc.pc
===================================================================
--- libutf8proc.pc	2016-04-30 12:00:12 UTC (rev 173128)
+++ libutf8proc.pc	2016-04-30 12:05:10 UTC (rev 173129)
@@ -7,4 +7,4 @@
 Description: UTF8 processing
 Version: 1.3.1
 Libs: -L${libdir} -lutf8proc
-Cflags: -I${includedir}
+Cflags: -I${includedir} -DUTF8PROC_EXPORTS