[gentoo-commits] gentoo-x86 commit in media-libs/libcaca/files: libcaca-0.99_beta18-fix-tests.patch libcaca-0.99_beta18-latex_hacks.patch

[Samuli Suominen (ssuominen)]

ssuominen    14/08/01 19:42:47

  Modified:             libcaca-0.99_beta18-fix-tests.patch
                        libcaca-0.99_beta18-latex_hacks.patch
  Log:
  Use -latex_hacks.patch also with =dev-texlive/texlive-latex-2012* wrt #517474 by  Torsten Kaiser
  
  (Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.2                  media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch?r1=1.1&r2=1.2

Index: libcaca-0.99_beta18-fix-tests.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libcaca-0.99_beta18-fix-tests.patch	18 Apr 2014 15:52:32 -0000	1.1
+++ libcaca-0.99_beta18-fix-tests.patch	1 Aug 2014 19:42:47 -0000	1.2
@@ -1,13 +1,13 @@
---- libcaca-0.99.beta18/test/Makefile.am	2014-01-08 15:28:40.567140658 -0500
-+++ libcaca-0.99.beta18.new/test/Makefile.am	2014-01-08 15:24:51.295134240 -0500
+--- test/Makefile.am
++++ test/Makefile.am
 @@ -1,3 +1,5 @@
 +AM_TESTS_ENVIRONMENT = \
 +	top_srcdir="$(top_srcdir)"
  
  AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca
  
---- libcaca-0.99.beta18/test/check-copyright	2010-02-15 18:36:37.000000000 -0500
-+++ libcaca-0.99.beta18.new/test/check-copyright	2014-01-08 15:18:27.514123495 -0500
+--- test/check-copyright
++++ test/check-copyright
 @@ -3,10 +3,11 @@
  #
  # Check that the copyright information is valid
@@ -30,8 +30,8 @@
        echo "error: $dir/$x lacks proper copyright information"
        nfails=$(($nfails + 1))
      elif [ -d ../.git ]; then
---- libcaca-0.99.beta18/test/check-source	2012-04-06 20:46:08.000000000 +0200
-+++ libcaca-0.99.beta18-upd/test/check-source	2014-01-08 21:58:05.015389138 +0100
+--- test/check-source
++++ test/check-source
 @@ -3,6 +3,7 @@
  #
  # Check that we have no tabs or trailing spaces in the source code



1.2                  media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch?r1=1.1&r2=1.2

Index: libcaca-0.99_beta18-latex_hacks.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libcaca-0.99_beta18-latex_hacks.patch	13 Aug 2013 15:12:17 -0000	1.1
+++ libcaca-0.99_beta18-latex_hacks.patch	1 Aug 2014 19:42:47 -0000	1.2
@@ -1,10 +1,8 @@
-Hack it a bit differently so that it works with texlive 2013.
-https://bugs.gentoo.org/show_bug.cgi?id=480862
+Hack it a bit differently so that it works with texlive 2013, see http://bugs.gentoo.org/480862
+Turns out this patch is required also for texlive 2012, see http://bugs.gentoo.org/517474
 
-Index: libcaca-0.99.beta18/doc/Makefile.am
-===================================================================
---- libcaca-0.99.beta18.orig/doc/Makefile.am
-+++ libcaca-0.99.beta18/doc/Makefile.am
+--- doc/Makefile.am
++++ doc/Makefile.am
 @@ -29,7 +29,7 @@ if BUILD_DOCUMENTATION
  if USE_LATEX
  	rm -f latex/libcaca.tex latex/libcaca.pdf