← Back to team overview

openjdk team mailing list archive

Bug#818626: openjdk-8: patch to fix build on squeeze

 

Source: openjdk-8
Version: 8u72-b15-1~bpo8+1
Severity: wishlist
Tags: patch

Hi Doko,

you’ve always been supporting builds of src:openjdk-* on even very
old *buntu and Debian releases. I just fixed the openjdk-8 backport
to build on squeeze (with autoconf (>= 2.59) from wheezy and LCMS2
from squeeze-backports) with the attached patch.

The patch is just refreshing d/p/java-access-bridge-security.patch
and versioning the autoconf B-D, so nothing harmful.

Enjoy!

bye,
//mirabilos
-- 
tarent solutions GmbH
Rochusstraße 2-4, D-53123 Bonn • http://www.tarent.de/
Tel: +49 228 54881-393 • Fax: +49 228 54881-235
HRB 5168 (AG Bonn) • USt-ID (VAT): DE122264941
Geschäftsführer: Dr. Stefan Barth, Kai Ebenrett, Boris Esser, Alexander Steeg
diff -u openjdk-8-8u72-b15/debian/changelog openjdk-8-8u72-b15/debian/changelog
--- openjdk-8-8u72-b15/debian/changelog
+++ openjdk-8-8u72-b15/debian/changelog
@@ -1,3 +1,11 @@
+openjdk-8 (8u72-b15-1~tarent60+1) tarent; urgency=medium
+
+  * Use versioned Build-Depends on autoconf
+  * Refresh debian/patches/java-access-bridge-security.patch
+  * Build on squeeze, with previous openjdk-8 backport installed
+
+ -- Thorsten Glaser <t.glaser@xxxxxxxxx>  Fri, 18 Mar 2016 20:48:33 +0100
+
 openjdk-8 (8u72-b15-1~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
diff -u openjdk-8-8u72-b15/debian/control openjdk-8-8u72-b15/debian/control
--- openjdk-8-8u72-b15/debian/control
+++ openjdk-8-8u72-b15/debian/control
@@ -5,14 +5,14 @@
 Uploaders: Matthias Klose <doko@xxxxxxxxxx>
 Build-Depends: debhelper (>= 5), quilt, m4, lsb-release, zip, unzip,
   sharutils, gawk, cpio, pkg-config, procps, time, wdiff, fastjar (>= 2:0.96-0ubuntu2),
-  autoconf, automake, autotools-dev, ant, ant-optional,  libtool,
-  g++-4.9,
+  autoconf (>= 2.69), automake, autotools-dev, ant, ant-optional,  
+  g++-4.4 (>= 4.4.1),
   openjdk-8-jdk | openjdk-7-jdk,
   libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev,
   libffi-dev, 
-  zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev, libpulse-dev (>= 0.9.12) [!alpha], systemtap-sdt-dev [!sh4],
-  libnss3-dev (>= 2:3.17.1), tzdata,
-  mauve, jtreg, xvfb, xauth, xfonts-base, libgl1-mesa-dri [!x32], twm | metacity, twm | dbus-x11, x11-xkb-utils,
+  zlib1g-dev, libattr1-dev, libpng12-dev, libjpeg62-dev, libgif-dev, libpulse-dev (>= 0.9.12) [!alpha], 
+  libnss3-dev (>= 3.12.3), tzdata,
+  mauve,  xvfb, xauth, xfonts-base, libgl1-mesa-dri [!x32], twm | metacity, twm | dbus-x11, x11-xkb-utils,
 Standards-Version: 3.9.6
 Homepage: http://openjdk.java.net/
 Vcs-Bzr: http://bazaar.launchpad.net/~openjdk/openjdk/openjdk8
@@ -20,7 +20,6 @@
 
 Package: openjdk-8-jdk
 Architecture: alpha amd64 armel armhf arm64 i386 ia64 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64
-Multi-Arch: same
 Pre-Depends: ${dpkg:Depends}
 Depends: openjdk-8-jre (= ${binary:Version}),
   ${shlibs:Depends}, ${misc:Depends}
@@ -37,7 +36,6 @@
 
 Package: openjdk-8-jre-headless
 Architecture: alpha amd64 armel armhf arm64 i386 ia64 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64
-Multi-Arch: same
 Pre-Depends: ${dpkg:Depends}, ${multiarch:Depends}
 Depends: ${jredefault:Depends}, ${cacert:Depends},
   ${tzdata:Depends}, ${jcommon:Depends}, ${dlopenhl:Depends},
@@ -46,8 +44,8 @@
 Recommends: ${dlopenhl:Recommends}, ${jamvm:Recommends}
 Suggests: ${cacao:Recommends}, ${jamvm:Suggests},
   libnss-mdns,
-  fonts-dejavu-extra,
-  fonts-ipafont-gothic, fonts-ipafont-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, fonts-indic,
+  ttf-dejavu-extra,
+  ttf-baekmuk | ttf-unfonts | ttf-unfonts-core, ttf-sazanami-gothic | ttf-kochi-gothic, ttf-sazanami-mincho | ttf-kochi-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, ttf-indic-fonts,
 Provides: java-runtime-headless, java2-runtime-headless,
   java5-runtime-headless, java6-runtime-headless,
   java7-runtime-headless, java8-runtime-headless,
@@ -61,13 +59,12 @@
 
 Package: openjdk-8-jre
 Architecture: alpha amd64 armel armhf arm64 i386 ia64 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64
-Multi-Arch: same
 Pre-Depends: ${dpkg:Depends}
 Depends: openjdk-8-jre-headless (= ${binary:Version}),
   ${xandsound:Depends},
   ${dlopenjre:Depends}, ${dep:bridge},
   ${shlibs:Depends}, ${misc:Depends}
-Recommends: ${dlopenjre:Recommends}, fonts-dejavu-extra
+Recommends: ${dlopenjre:Recommends}, ttf-dejavu-extra
 Suggests: icedtea-8-plugin, ${pkg:pulseaudio}
 Replaces: openjdk-8-jre-headless (<< 8u20~b20-3)
 Provides: java-runtime, java2-runtime,
@@ -128,7 +125,6 @@
 
 Package: openjdk-8-dbg
 Architecture: alpha amd64 armel armhf arm64 i386 ia64 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64
-Multi-Arch: same
 Priority: extra
 Section: debug
 Pre-Depends: ${dpkg:Depends}
@@ -145,22 +141,8 @@
  The packages are built using the IcedTea build support and patches
  from the IcedTea project.
 
-Package: openjdk-8-jre-jamvm
-Architecture: amd64 armel armhf i386 powerpc kfreebsd-i386 kfreebsd-amd64 mips mipsel
-Multi-Arch: same
-Priority: extra
-Pre-Depends: ${dpkg:Depends}
-Depends: openjdk-8-jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Alternative JVM for OpenJDK, using JamVM
- The package provides an alternative runtime using the JamVM.  This is a
- somewhat faster alternative than the Zero port on architectures like armel,
- mips, mipsel, powerpc.
- .
- The VM is started with the option `-jamvm'. See the README.Debian for details.
-
 Package: openjdk-8-jre-zero
 Architecture: amd64 i386 arm64 ppc64 ppc64el kfreebsd-amd64 kfreebsd-i386 
-Multi-Arch: same
 Priority: extra
 Pre-Depends: ${dpkg:Depends}
 Depends: openjdk-8-jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
diff -u openjdk-8-8u72-b15/debian/patches/java-access-bridge-security.patch openjdk-8-8u72-b15/debian/patches/java-access-bridge-security.patch
--- openjdk-8-8u72-b15/debian/patches/java-access-bridge-security.patch
+++ openjdk-8-8u72-b15/debian/patches/java-access-bridge-security.patch
@@ -5,11 +5,11 @@
-@@ -149,7 +149,9 @@
-                com.sun.org.apache.xml.internal.security.,\
-                com.sun.org.glassfish.,\
-                org.jcp.xml.dsig.internal.,\
--               oracle.jrockit.jfr.
-+               oracle.jrockit.jfr.,\
+@@ -220,7 +220,9 @@
+                jdk.internal.,\
+                jdk.nashorn.internal.,\
+                jdk.nashorn.tools.,\
+-               com.sun.activation.registries.
++               com.sun.activation.registries.,\
 +               org.GNOME.Accessibility.,\
 +               org.GNOME.Bonobo.
+ 
  #
  # List of comma-separated packages that start with or equal this string
- # will cause a security exception to be thrown when
diff -u openjdk-8-8u72-b15/debian/rules openjdk-8-8u72-b15/debian/rules
--- openjdk-8-8u72-b15/debian/rules
+++ openjdk-8-8u72-b15/debian/rules
@@ -659,7 +659,7 @@
   bd_autotools = autoconf2.69, automake, autotools-dev,
   export AUTOCONF=autoconf2.69
 else
-  bd_autotools = autoconf, automake, autotools-dev,
+  bd_autotools = autoconf (>= 2.69), automake, autotools-dev,
 endif
 bd_bootstrap += \
 	openjdk-8-jdk | openjdk-7-jdk,