[gnome-continuous] Bumpd exiv2 to 0.26
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] Bumpd exiv2 to 0.26
- Date: Sun, 18 Nov 2018 12:06:46 +0000 (UTC)
commit 2f2a1f2e1c20c03eb3cf3d97df4efdc001e542f9
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sun Nov 18 12:05:18 2018 +0000
Bumpd exiv2 to 0.26
Use Git, instead of a tarball, but track the stable branch in any case.
Additionally, upstream is deprecating Autotools and moved to CMake, and
only the CMake build is automatically tested.
manifest.json | 7 ++-
patches/exiv2-cmake-buildapi.patch | 120 +++++++++++++++++++++++++++++++++++++
2 files changed, 124 insertions(+), 3 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 888238b..948a78d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1245,10 +1245,11 @@
{"src": "gnome:gnome-autoar.git",
"name": "gnome-autoar"},
- {"src": "tarball:http://www.exiv2.org/exiv2-0.25.tar.gz",
+ {"src": "git:https://github.com/Exiv2/exiv2.git",
"name": "exiv2",
- "checksum": "c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4",
- "patches": ["exiv2-no-builddir.patch"]},
+ "branch": "0.26",
+ "branch-reason": "Track the stable branch",
+ "patches": ["exiv2-cmake-buildapi.patch"]},
{"src": "gnome:gexiv2.git",
"name": "gexiv2"},
diff --git a/patches/exiv2-cmake-buildapi.patch b/patches/exiv2-cmake-buildapi.patch
new file mode 100644
index 0000000..3506b60
--- /dev/null
+++ b/patches/exiv2-cmake-buildapi.patch
@@ -0,0 +1,120 @@
+From d5e5fbf4367a0ea7f91741917f731570668709de Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Sun, 18 Nov 2018 12:02:09 +0000
+Subject: [PATCH 1/1] Add CMake wrapper script conforming to the build-api
+
+See: https://github.com/cgwalters/build-api
+---
+ configure | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 100 insertions(+)
+ create mode 100755 configure
+
+diff --git a/configure b/configure
+new file mode 100755
+index 00000000..dedf0539
+--- /dev/null
++++ b/configure
+@@ -0,0 +1,100 @@
++#!/bin/bash
++# configure script adapter for cmake
++# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
++# Copyright 2014 Debarshi Ray <debarshir gnome org>
++# Copyright 2017 Emmanuele Bassi <ebassi gnome org>
++# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
++
++prefix=/usr
++
++# Little helper function for reading args from the commandline.
++# it automatically handles -a b and -a=b variants, and returns 1 if
++# we need to shift $3.
++read_arg() {
++ # $1 = arg name
++ # $2 = arg value
++ # $3 = arg parameter
++ local rematch='^[^=]*=(.*)$'
++ if [[ $2 =~ $rematch ]]; then
++ read "$1" <<< "${BASH_REMATCH[1]}"
++ else
++ read "$1" <<< "$3"
++ # There is no way to shift our callers args, so
++ # return 1 to indicate they should do it instead.
++ return 1
++ fi
++}
++
++sanitycheck() {
++ # $1 = arg name
++ # $1 = arg command
++ # $2 = arg alternates
++ local cmd=$( which $2 2>/dev/null )
++ if [ -x "$cmd" ]; then
++ read "$1" <<< "$cmd"
++ return 0
++ fi
++ test -z $3 || {
++ for alt in $3; do
++ cmd=$( which $alt 2>/dev/null )
++ if [ -x "$cmd" ]; then
++ read "$1" <<< "$cmd"
++ return 0
++ fi
++ done
++ }
++ echo -e "\e[1;31mERROR\e[0m: Command '$2' not found"
++ exit 1
++}
++
++sanitycheck NINJA 'ninja' 'ninja-build'
++
++while (($# > 0)); do
++ case "${1%%=*}" in
++ --prefix) read_arg prefix "$@" || shift;;
++ --bindir) read_arg bindir "$@" || shift;;
++ --sbindir) read_arg sbindir "$@" || shift;;
++ --libexecdir) read_arg libexecdir "$@" || shift;;
++ --datarootdir) read_arg datarootdir "$@" || shift;;
++ --datadir) read_arg datadir "$@" || shift;;
++ --sysconfdir) read_arg sysconfdir "$@" || shift;;
++ --libdir) read_arg libdir "$@" || shift;;
++ --mandir) read_arg mandir "$@" || shift;;
++ *) echo "Ignoring unknown option '$1'";;
++ esac
++ shift
++done
++
++test -z ${prefix} && prefix=/usr
++test -z ${libdir} && libdir=${prefix}/lib
++test -z ${datarootdir} && datarootdir=${prefix}/share
++test -z ${datadir} && datadir=${datarootdir}
++test -z ${libexecdir} && libexecdir=${prefix}/libexec
++test -z ${sysconfdir} && sysconfdir=${prefix}/etc
++test -z ${mandir} && mandir=${datadir}/man
++test -z ${bindir} && bindir=${prefix}/bin
++test -z ${sbindir} && sbindir=${prefix}/sbin
++
++srcdir=$(dirname $0)
++
++cat > Makefile <<END
++# Generated by configure; do not edit
++
++all:
++ ${NINJA}
++
++install:
++ DESTDIR="\$(DESTDIR)" ${NINJA} install
++END
++
++exec cmake \
++ -DCMAKE_BUILD_TYPE=Release \
++ -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
++ -DCMAKE_INSTALL_LIBDIR:PATH=${libdir} \
++ -DCMAKE_INSTALL_BINDIR:PATH=${bindir} \
++ -DCMAKE_INSTALL_DATADIR:PATH=${datadir} \
++ -DCMAKE_INSTALL_LIBEXECDIR:PATH=${libexecdir} \
++ -DCMAKE_INSTALL_SYSCONFDIR:PATH=${sysconfdir} \
++ -DCMAKE_INSTALL_MANDIR:PATH=${mandir} \
++ -GNinja \
++ ${srcdir}
+--
+2.19.1
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]