Skip to content

Commit

Permalink
refresh patch
Browse files Browse the repository at this point in the history
  • Loading branch information
@ocefpaf
ocefpaf committed May 15, 2019
1 parent b66aac2 commit d1c5605
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 68 deletions.
34 changes: 17 additions & 17 deletions recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ source:
url: https://cran.r-project.org/src/base/R-3/R-{{ version }}.tar.gz
sha256: 36fcac3e452666158e62459c6fc810adc247c7109ed71c5b6c3ad5fc2bf57509
patches:
- 0001-Darwin-Remove-unicode-elipsis-character-from-grDevic.patch
- 0002-Fix-trio-config.h-include-depth-issue.patch
- 0003-Win32-Do-not-link-static-libgcc.patch
- 0004-Win32-Extend-sqrt-NA_real_-hack-to-all-GCC-versions.patch
- 0005-Win32-Prevent-conversion-of-R_ARCH-to-abs-Windows-pa.patch
- 0006-Darwin-Avoid-setting-DYLD_FALLBACK_LIBRARY_PATH.patch
- 0007-Use-AC_SEARCH_LIBS-to-search-for-ncursesw-then-ncurs.patch
- 0008-Linux-Do-not-modify-LD_LIBRARY_PATH.patch
- 0009-macOS-include-cairo.h-not-cairo-xlib.h.patch
- 0010-javareconf-Do-not-fail-on-compile-fail.patch
- 0011-Revert-part-of-9b818c6dc00143ff18775a4015a3f43b5196f.patch
- 0012-javareconf-macOS-Continue-to-allow-system-Java-lt-9-.patch
- 0013-Allow-rpath-in-tcltk-dylib-LC_LOAD_DYLIB-command.patch
- 0014-Add-luuid-to-X_PRE_LIBS.patch
- 0015-link-Xt-to-uuid.patch
- 0016-Mimic-OpenBLAS-when-making-reference-Rblas-and-Rlapa.patch
- 0017-Foribly-remove-then-forcibly-mv-in-javareconf.in.patch
- patches/0001-Darwin-Remove-unicode-elipsis-character-from-grDevic.patch
- patches/0002-Fix-trio-config.h-include-depth-issue.patch
- patches/0003-Win32-Do-not-link-static-libgcc.patch
- patches/0004-Win32-Extend-sqrt-NA_real_-hack-to-all-GCC-versions.patch
- patches/0005-Win32-Prevent-conversion-of-R_ARCH-to-abs-Windows-pa.patch
- patches/0006-Darwin-Avoid-setting-DYLD_FALLBACK_LIBRARY_PATH.patch
- patches/0007-Use-AC_SEARCH_LIBS-to-search-for-ncursesw-then-ncurs.patch
- patches/0008-Linux-Do-not-modify-LD_LIBRARY_PATH.patch
- patches/0009-macOS-include-cairo.h-not-cairo-xlib.h.patch
- patches/0010-javareconf-Do-not-fail-on-compile-fail.patch
- patches/0011-Revert-part-of-9b818c6dc00143ff18775a4015a3f43b5196f.patch
- patches/0012-javareconf-macOS-Continue-to-allow-system-Java-lt-9-.patch
- patches/0013-Allow-rpath-in-tcltk-dylib-LC_LOAD_DYLIB-command.patch
- patches/0014-Add-luuid-to-X_PRE_LIBS.patch
- patches/0015-link-Xt-to-uuid.patch
- patches/0016-Mimic-OpenBLAS-when-making-reference-Rblas-and-Rlapa.patch
- patches/0017-Foribly-remove-then-forcibly-mv-in-javareconf.in.patch

build:
merge_build_host: True # [win]
Expand Down
87 changes: 36 additions & 51 deletions recipe/patches/0009-macOS-include-cairo.h-not-cairo-xlib.h.patch
View file
Original file line number Diff line number Diff line change
@@ -1,99 +1,84 @@
From 6bd5ce080291576337567fdcc6c2bc1407961ee0 Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Tue, 2 Jan 2018 15:53:10 +0000
Subject: [PATCH 09/17] macOS: include <cairo.h> not <cairo/xlib.h>

---
configure | 11 +++++------
m4/cairo.m4 | 11 +++++------
2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index 0d441763bb..7ab3b9dafd 100755
--- a/configure
+++ b/configure
@@ -37870,8 +37870,8 @@ $as_echo "$r_cv_has_pangocairo" >&6; }
diff -Naur R-3.6.0/configure R-3.6.0.orig/configure
--- R-3.6.0/configure 2019-05-15 16:33:29.230647359 -0300
+++ R-3.6.0.orig/configure 2019-04-18 19:16:03.000000000 -0300
@@ -40686,8 +40686,8 @@
modlist="${modlist} cairo-svg"
r_cairo_svg=yes
fi
- if "${PKGCONF}" --exists cairo-xlib; then
- xmodlist="${modlist} cairo-xlib"
+ if "${PKGCONF}" --exists cairo; then
+ xmodlist="${modlist} cairo"
- if "${PKG_CONFIG}" --exists cairo; then
- xmodlist="${modlist} cairo"
+ if "${PKG_CONFIG}" --exists cairo-xlib; then
+ xmodlist="${modlist} cairo-xlib"
else
xmodlist="${modlist}"
fi
@@ -37893,7 +37893,7 @@ else
@@ -40709,7 +40709,7 @@

#include <pango/pango.h>
#include <pango/pangocairo.h>
-#include <cairo-xlib.h>
+#include <cairo.h>
-#include <cairo.h>
+#include <cairo-xlib.h>
#if CAIRO_VERSION < 10200
#error cairo version >= 1.2 required
#endif
@@ -37957,8 +37957,8 @@ $as_echo "$r_cv_has_cairo" >&6; }
@@ -40773,8 +40773,8 @@
modlist="${modlist} cairo-svg"
r_cairo_svg=yes
fi
- if "${PKGCONF}" --exists cairo-xlib; then
- xmodlist="${modlist} cairo-xlib"
+ if "${PKGCONF}" --exists cairo; then
+ xmodlist="${modlist} cairo"
- if "${PKG_CONFIG}" --exists cairo; then
- xmodlist="${modlist} cairo"
+ if "${PKG_CONFIG}" --exists cairo-xlib; then
+ xmodlist="${modlist} cairo-xlib"
else
xmodlist="${modlist}"
fi
@@ -37989,7 +37989,6 @@ else
@@ -40805,6 +40805,7 @@
/* end confdefs.h. */

#include <cairo.h>
-#include <cairo-xlib.h>
+#include <cairo-xlib.h>
#if CAIRO_VERSION < 10200
#error cairo version >= 1.2 required
#endif
diff --git a/m4/cairo.m4 b/m4/cairo.m4
index 4e7df87365..893321dd6c 100644
--- a/m4/cairo.m4
+++ b/m4/cairo.m4
@@ -52,8 +52,8 @@ else
diff -Naur R-3.6.0/m4/cairo.m4 R-3.6.0.orig/m4/cairo.m4
--- R-3.6.0/m4/cairo.m4 2019-05-15 16:34:13.051661561 -0300
+++ R-3.6.0.orig/m4/cairo.m4 2019-03-28 20:02:40.000000000 -0300
@@ -52,8 +52,8 @@
modlist="${modlist} cairo-svg"
r_cairo_svg=yes
fi
- if "${PKGCONF}" --exists cairo-xlib; then
- xmodlist="${modlist} cairo-xlib"
+ if "${PKGCONF}" --exists cairo; then
+ xmodlist="${modlist} cairo"
- if "${PKG_CONFIG}" --exists cairo; then
- xmodlist="${modlist} cairo"
+ if "${PKG_CONFIG}" --exists cairo-xlib; then
+ xmodlist="${modlist} cairo-xlib"
else
xmodlist="${modlist}"
fi
@@ -70,7 +70,7 @@ else
@@ -70,7 +70,7 @@
[AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <pango/pango.h>
#include <pango/pangocairo.h>
-#include <cairo-xlib.h>
+#include <cairo.h>
-#include <cairo.h>
+#include <cairo-xlib.h>
#if CAIRO_VERSION < 10200
#error cairo version >= 1.2 required
#endif
@@ -116,8 +116,8 @@ int main(void) {
@@ -116,8 +116,8 @@
modlist="${modlist} cairo-svg"
r_cairo_svg=yes
fi
- if "${PKGCONF}" --exists cairo-xlib; then
- xmodlist="${modlist} cairo-xlib"
+ if "${PKGCONF}" --exists cairo; then
+ xmodlist="${modlist} cairo"
- if "${PKG_CONFIG}" --exists cairo; then
- xmodlist="${modlist} cairo"
+ if "${PKG_CONFIG}" --exists cairo-xlib; then
+ xmodlist="${modlist} cairo-xlib"
else
xmodlist="${modlist}"
fi
@@ -143,7 +143,6 @@ int main(void) {
@@ -143,6 +143,7 @@
[r_cv_cairo_works],
[AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <cairo.h>
-#include <cairo-xlib.h>
+#include <cairo-xlib.h>
#if CAIRO_VERSION < 10200
#error cairo version >= 1.2 required
#endif
--
2.18.0

0 comments on commit d1c5605

Please sign in to comment.