openjdk team mailing list archive

[Tiago Stürmer Daitx <tiago.daitx@xxxxxxxxxxxxx>]

Tiago Stürmer Daitx has proposed merging ~tdaitx/ubuntu/+source/openjdk:openjdk-11-remove-libgtk-3-dev-bdep into ~openjdk/ubuntu/+source/openjdk/+git/openjdk:openjdk-11.

Requested reviews:
  Matthias Klose (doko)

For more details, see:
https://code.launchpad.net/~tdaitx/ubuntu/+source/openjdk/+git/openjdk/+merge/372017

OpenJDK does not require any external headers for libgtk-3 (or libgtk 2 for that matter) and can be build with just the runtime dependencies on those.
-- 
Your team OpenJDK is subscribed to branch ~openjdk/ubuntu/+source/openjdk/+git/openjdk:openjdk-11.

diff --git a/debian/changelog b/debian/changelog
index 61e525c..0f752a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ openjdk-11 (11.0.4+11-2) UNRELEASED; urgency=medium
 
   [ Tiago Stürmer Daitx ]
   * Properly generate Breaks: rules for bionic (fix typo).
+  * Remove libgtk-3-dev from build-deps: libgtk-3-dev is not actually
+    required, package builds fine without it; libgtk2.0-0 or libgtk-3-0
+    should be explicitly declared instead in bdeps and tests;
+    libxrandr-dev should be explicitly added as it is required and was
+    being included due to libgtk-3-dev dependency.
 
  -- Matthias Klose <doko@xxxxxxxxxx>  Wed, 17 Jul 2019 14:49:36 +0200
 
diff --git a/debian/control b/debian/control
index 302cb36..5dfd4f7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 11),
   autoconf, automake, autotools-dev, ant, ant-optional,
   g++-8 <!cross>,
   openjdk-11-jdk-headless:native | openjdk-10-jdk-headless:native,
-  libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libgtk-3-dev, libelf-dev, libfontconfig1-dev,
+  libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libxrandr-dev, libelf-dev, libfontconfig1-dev, libgtk2.0-0 | libgtk-3-0
   libffi-dev,
   zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev, 
   libnss3-dev (>= 2:3.17.1),
diff --git a/debian/rules b/debian/rules
index 0966d64..94a0c4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -582,8 +582,8 @@ bd_syslibs += \
 bd_openjdk = \
 	libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, \
 	libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), \
-	libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libgtk-3-dev, \
-	libelf-dev, libfontconfig1-dev,
+	libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libxrandr-dev, \
+	libelf-dev, libfontconfig1-dev, libgtk2.0-0 | libgtk-3-0
 
 pkg_ffidev = libffi-dev
 
diff --git a/debian/tests/control b/debian/tests/control
index b6bd332..8c8888b 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,5 +3,5 @@ Depends: @, jtreg, testng, gcc
 Restrictions: allow-stderr, skippable
 
 Tests: jdk
-Depends: @, jtreg (>= 4.2-b12-1~), testng, gcc, xfwm4, xvfb, dbus-x11
+Depends: @, jtreg (>= 4.2-b12-1~), testng, gcc, xfwm4, xvfb, dbus-x11, libgtk2.0-0 | libgtk-3-0
 Restrictions: allow-stderr, skippable