[packages/icedtea7] Never run the problematic 'test_gamma'
jajcus
jajcus at pld-linux.org
Fri Nov 22 13:04:55 CET 2013
commit 6f0967fe0c3d94c4ae6cc28a591588382ecca3e0
Author: Jacek Konieczny <jajcus at jajcus.net>
Date: Fri Nov 22 12:30:50 2013 +0100
Never run the problematic 'test_gamma'
It is normally disabled on some builds only.
icedtea7-never_test_gamma.patch | 29 +++++++++++++++++++++++++++++
icedtea7.spec | 2 ++
2 files changed, 31 insertions(+)
---
diff --git a/icedtea7.spec b/icedtea7.spec
index 77c633a..aa7d7b3 100644
--- a/icedtea7.spec
+++ b/icedtea7.spec
@@ -56,6 +56,7 @@ Source7: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot/arc
Source10: make-cacerts.sh
Patch0: %{name}-i486.patch
Patch1: %{name}-libpath.patch
+Patch2: %{name}-never_test_gamma.patch
URL: http://icedtea.classpath.org/wiki/Main_Page
BuildRequires: alsa-lib-devel
BuildRequires: ant
@@ -394,6 +395,7 @@ Przykłady dla OpenJDK.
%prep
%setup -qn icedtea-%{version}
%patch0 -p1
+%patch2 -p1
# patches to applied to the extracted sources
install -d pld-patches
diff --git a/icedtea7-never_test_gamma.patch b/icedtea7-never_test_gamma.patch
new file mode 100644
index 0000000..616e4e3
--- /dev/null
+++ b/icedtea7-never_test_gamma.patch
@@ -0,0 +1,29 @@
+diff -dur icedtea-2.4.3.orig/Makefile.am icedtea-2.4.3/Makefile.am
+--- icedtea-2.4.3.orig/Makefile.am 2013-10-21 10:17:55.000000000 +0200
++++ icedtea-2.4.3/Makefile.am 2013-11-22 12:07:02.553682646 +0100
+@@ -258,7 +258,8 @@
+
+ # Patch list
+
+-ICEDTEA_PATCHES =
++ICEDTEA_PATCHES = \
++ patches/test_gamma.patch
+
+ # Conditional patches
+
+@@ -299,7 +300,6 @@
+
+ if WITH_PAX
+ ICEDTEA_PATCHES += \
+- patches/test_gamma.patch \
+ patches/pax-mark-rmic-java.patch
+ endif
+
+@@ -352,7 +353,6 @@
+ endif
+
+ if !WITH_PAX
+-ICEDTEA_BOOT_PATCHES += patches/boot/test_gamma.patch
+ endif
+
+ if CP39408_JAVAH
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f2b13a0c4f8c08c1f888b2be6fe87445abe095be
More information about the pld-cvs-commit
mailing list