Merge ~openjdk/ubuntu/+source/openjdk/+git/openjdk:openjdk-11-remove-libgtk-3-dev-bdep into ~openjdk/ubuntu/+source/openjdk/+git/openjdk:openjdk-11

Proposed by Tiago Stürmer Daitx
Status: Superseded
Proposed branch: ~openjdk/ubuntu/+source/openjdk/+git/openjdk:openjdk-11-remove-libgtk-3-dev-bdep
Merge into: ~openjdk/ubuntu/+source/openjdk/+git/openjdk:openjdk-11
Diff against target: 26 lines (+2/-2)
2 files modified
debian/control (+1/-1)
debian/rules (+1/-1)
Reviewer Review Type Date Requested Status
Matthias Klose Pending
Review via email: mp+370744@code.launchpad.net

Commit message

Remove libgtk-3-dev from build-deps

libgtk-3-dev is not required, package builds fine without it.

Description of the change

OpenJDK does not require any external headers for libgtk-3 (or libgtk 2 for that matter) and can be build without any build dependencies on those.

To post a comment you must log in.

Unmerged commits

9897b87... by =?utf-8?q?Tiago_St=C3=BCrmer_Daitx?= <email address hidden>

Remove libgtk-3-dev from build-deps

libgtk-3-dev is not actually required, package builds fine without it.
libxrandr-dev should be explicitly added as it is required and was
being included due to libgtk-3.

Signed-off-by: Tiago Stürmer Daitx <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/control b/debian/control
2index 302cb36..bf896b0 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 11),
6 autoconf, automake, autotools-dev, ant, ant-optional,
7 g++-8 <!cross>,
8 openjdk-11-jdk-headless:native | openjdk-10-jdk-headless:native,
9- 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,
10+ 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,
11 libffi-dev,
12 zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev,
13 libnss3-dev (>= 2:3.17.1),
14diff --git a/debian/rules b/debian/rules
15index f02df7b..2a1d6bc 100755
16--- a/debian/rules
17+++ b/debian/rules
18@@ -582,7 +582,7 @@ bd_syslibs += \
19 bd_openjdk = \
20 libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, \
21 libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), \
22- libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libgtk-3-dev, \
23+ libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libxrandr-dev, \
24 libelf-dev, libfontconfig1-dev,
25
26 pkg_ffidev = libffi-dev

Subscribers

People subscribed via source and target branches

to all changes: