diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
| commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
| tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /dev-libs/redland-bindings/files | |
| parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) | |
gentoo resync : 03.11.2019
Diffstat (limited to 'dev-libs/redland-bindings/files')
| -rw-r--r-- | dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-bool.patch | 22 | ||||
| -rw-r--r-- | dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config.patch | 34 |
2 files changed, 56 insertions, 0 deletions
diff --git a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-bool.patch b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-bool.patch new file mode 100644 index 000000000000..35594515c793 --- /dev/null +++ b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-bool.patch @@ -0,0 +1,22 @@ +From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej@sury.org> +Date: Wed, 22 Jun 2016 10:28:48 +0200 +Subject: Don't undef bool, it's needed + +--- + perl/CORE_wrap.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/perl/CORE_wrap.c b/perl/CORE_wrap.c +index 46c2a46..4eb3785 100644 +--- a/perl/CORE_wrap.c ++++ b/perl/CORE_wrap.c +@@ -1432,9 +1432,6 @@ SWIG_Perl_SetModule(swig_module_info *module) { + #ifdef eof + #undef eof + #endif +-#ifdef bool +- #undef bool +-#endif + #ifdef close + #undef close + #endif diff --git a/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config.patch b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config.patch new file mode 100644 index 000000000000..1ca8ded91e9f --- /dev/null +++ b/dev-libs/redland-bindings/files/redland-bindings-1.0.17.1-php-config.patch @@ -0,0 +1,34 @@ +diff -aurN a/configure.ac b/configure.ac +--- a/configure.ac 2014-05-10 18:38:09.000000000 -0400 ++++ b/configure.ac 2016-10-12 14:27:04.635849601 -0400 +@@ -153,13 +153,17 @@ + fi + fi + ++AC_ARG_WITH([php-config], ++ AS_HELP_STRING([--with-php-config=path], [Custom path to php-config])) ++AS_IF([test "x$with_php_config" != "x"], ++ [AC_CHECK_PROG(PHP_CONFIG, php-config, ["$with_php_config/php-config"], [], [$with_php_config])], ++ [AC_CHECK_PROG(PHP_CONFIG, php-config, php-config)]) + +-AC_CHECK_PROG(PHP_CONFIG, php-config, php-config) + if test "X$PHP_CONFIG" != X ; then + +- PHP_VERSION=`$PHP_CONFIG --version` +- PHP_INCLUDES=`$PHP_CONFIG --includes` +- PHP_EXTENSION_DIR=`$PHP_CONFIG --extension-dir` ++ PHP_VERSION=`${PHP_CONFIG} --version` ++ PHP_INCLUDES=`${PHP_CONFIG} --includes` ++ PHP_EXTENSION_DIR=`${PHP_CONFIG} --extension-dir` + + if test $PHP_VERSION '>' 5.0.0; then + PHP_SWIG="-php5" +@@ -445,7 +449,7 @@ + with_php=yes + fi + +-PHP_VERSION=`php-config --version 2>/dev/null` ++PHP_VERSION=`${PHP_CONFIG} --version 2>/dev/null` + if test "X$PHP_VERSION" != X; then + languages_available="$languages_available php($PHP_VERSION)" + if test $with_php = yes; then |