[gentoo-commits] gentoo-x86 commit in dev-lang/R/files: R-2.13.1-zlib_header_fix.patch R-2.12.1-ldflags.patch R-2.14.1-rmath-shared.patch R-2.14.1-tiff.patch R-2.11.1-parallel.patch

[Sebastien Fabbro (bicatali)]

bicatali    12/01/02 19:47:54

  Modified:             R-2.13.1-zlib_header_fix.patch
                        R-2.12.1-ldflags.patch R-2.11.1-parallel.patch
  Added:                R-2.14.1-rmath-shared.patch R-2.14.1-tiff.patch
  Log:
  Version bump. Fixed automagic dependencies on icu and tiff. Added required dependency on pango when cairo is set. Fixed as-needed on standalone math library. Added required use flags for graphics capabilities (bug #373649). Removed glibc hacks, applied on glibc package. Commented patches for another attempt to submit them upstream. Removed older unstable versions, fixing bugs #353545, bug #357077, bug #382687, bug #384493, bug #384723.
  
  (Portage version: 2.1.10.41/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-lang/R/files/R-2.13.1-zlib_header_fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch?r1=1.1&r2=1.2

Index: R-2.13.1-zlib_header_fix.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R-2.13.1-zlib_header_fix.patch	25 Sep 2011 06:23:59 -0000	1.1
+++ R-2.13.1-zlib_header_fix.patch	2 Jan 2012 19:47:54 -0000	1.2
@@ -1,3 +1,7 @@
+Update for zlib header changes 
+
+https://bugs.gentoo.org/show_bug.cgi?id=383431
+
 --- src/main/unzip.h.orig	2011-09-24 19:35:53.000000000 -0700
 +++ src/main/unzip.h	2011-09-24 19:37:06.000000000 -0700
 @@ -58,6 +58,10 @@



1.2                  dev-lang/R/files/R-2.12.1-ldflags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.12.1-ldflags.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.12.1-ldflags.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.12.1-ldflags.patch?r1=1.1&r2=1.2

Index: R-2.12.1-ldflags.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/R/files/R-2.12.1-ldflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R-2.12.1-ldflags.patch	22 Dec 2010 17:25:49 -0000	1.1
+++ R-2.12.1-ldflags.patch	2 Jan 2012 19:47:54 -0000	1.2
@@ -1,3 +1,7 @@
+Respect ldflags on rscript
+Patch by Sebastien Fabbro
+https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506
+
 --- src/unix/Makefile.in.orig	2010-12-22 16:58:19.000000000 +0000
 +++ src/unix/Makefile.in	2010-12-22 16:54:16.000000000 +0000
 @@ -66,7 +66,7 @@



1.2                  dev-lang/R/files/R-2.11.1-parallel.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.11.1-parallel.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.11.1-parallel.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.11.1-parallel.patch?r1=1.1&r2=1.2

Index: R-2.11.1-parallel.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/R/files/R-2.11.1-parallel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R-2.11.1-parallel.patch	16 Jun 2010 15:36:14 -0000	1.1
+++ R-2.11.1-parallel.patch	2 Jan 2012 19:47:54 -0000	1.2
@@ -1,3 +1,8 @@
+Fix ocasional failure with parallel install (bug #322965)
+Patch by Sebastien Fabbro
+
+https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505
+
 --- src/include/Makefile.in.orig	2010-06-15 18:18:54.000000000 +0000
 +++ src/include/Makefile.in	2010-06-15 18:19:48.000000000 +0000
 @@ -81,7 +81,7 @@



1.1                  dev-lang/R/files/R-2.14.1-rmath-shared.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.14.1-rmath-shared.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.14.1-rmath-shared.patch?rev=1.1&content-type=text/plain

Index: R-2.14.1-rmath-shared.patch
===================================================================
Link with libm to fix unresolved symbols when linked with as-needed
and add a soname to the standalone math library
Patch by Sebastien Fabbro
--- src/nmath/standalone/Makefile.in.orig	2010-03-17 14:43:22.000000000 +0000
+++ src/nmath/standalone/Makefile.in	2012-01-02 17:40:13.000000000 +0000
@@ -64,7 +64,8 @@
 Rexeclibdir_LTLIBRARIES = $(libRmath_la)
 libRmath_la_SOURCES = $(SOURCES)
 libRmath_la_OBJECTS = $(OBJECTS:.o=.lo)
-libRmath_la_LDFLAGS =
+libRmath_la_LDFLAGS = -Wl,-soname=libRmath.so
+libRmath_la_LIBADD = $(LIBM)
 
 CLEANFILES = Makedeps *.d *.o *.lo test $(SOURCES)
 DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES)
@@ -116,7 +117,7 @@
 	$(RANLIB) $@
 
 $(libRmath_la): $(libRmath_la_OBJECTS)
-	$(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS)
+	$(DYLIB_LINK) $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(libRmath_la_LIBADD) -o $@ 
 
 test: $(srcdir)/test.c
 	$(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \



1.1                  dev-lang/R/files/R-2.14.1-tiff.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.14.1-tiff.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/files/R-2.14.1-tiff.patch?rev=1.1&content-type=text/plain

Index: R-2.14.1-tiff.patch
===================================================================
Add a --with-tiff to avoid broken implicit dependencies
Patch by Sebastien Fabbro

--- configure.ac.orig	2012-01-02 17:01:24.000000000 +0000
+++ configure.ac	2012-01-02 17:04:21.000000000 +0000
@@ -396,6 +396,10 @@
 [AS_HELP_STRING([--with-jpeglib],[use jpeglib library (if available) @<:@yes@:>@])],
 [R_ARG_USE(jpeglib)],
 [use_jpeglib=yes])
+AC_ARG_WITH([tiff],
+[AS_HELP_STRING([--with-libtiff],[use libtiff library (if available) @<:@yes@:>@])],
+[R_ARG_USE(libtiff)],
+[use_libtiff=yes])
 AC_ARG_WITH([system-zlib],
 [AS_HELP_STRING([--with-system-zlib],[use system zlib library (if available) @<:@no@:>@])],
 [R_ARG_USE_SYSTEM(zlib)],
--- m4/R.m4.orig	2012-01-02 17:05:22.000000000 +0000
+++ m4/R.m4	2012-01-02 17:08:08.000000000 +0000
@@ -2005,16 +2005,18 @@
 	      [Define if you have the PNG headers and libraries.])
   fi
 fi
-AC_CHECK_HEADERS(tiffio.h)
-# may need to resolve jpeg routines
-AC_CHECK_LIB(tiff, TIFFOpen, [have_tiff=yes], [have_tiff=no], [${BITMAP_LIBS}])
-if test "x${ac_cv_header_tiffio_h}" = xyes ; then
-  if test "x${have_tiff}" = xyes; then
-    AC_DEFINE(HAVE_TIFF, 1, [Define this if libtiff is available.])
-    BITMAP_LIBS="-ltiff ${BITMAP_LIBS}"
-  else
-    have_tiff=no
-  fi
+if test "${use_libtiff}" = yes; then
+   AC_CHECK_HEADERS(tiffio.h)
+   # may need to resolve jpeg routines
+   AC_CHECK_LIB(tiff, TIFFOpen, [have_tiff=yes], [have_tiff=no], [${BITMAP_LIBS}])
+   if test "x${ac_cv_header_tiffio_h}" = xyes ; then
+     if test "x${have_tiff}" = xyes; then
+      AC_DEFINE(HAVE_TIFF, 1, [Define this if libtiff is available.])
+      BITMAP_LIBS="-ltiff ${BITMAP_LIBS}"
+     else
+	have_tiff=no
+     fi
+   fi
 fi
 AC_SUBST(BITMAP_LIBS)
 ])# R_BITMAPS