Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dbus: add manpages and missing build dependencies #6835

Closed
wants to merge 5 commits into from
Closed

dbus: add manpages and missing build dependencies #6835

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ddfa122
dbus: add manpages and missing build dependencies
Nov 11, 2016
5306718
dbus: restore skip-bootstrapping-unless-on-head behavior
Nov 12, 2016
199d47c
dbus: fix comment typo
Nov 12, 2016
aee0e5f
dbus: fix audit violations and move forward in version
Nov 12, 2016
4102da9
dbus: remove comment for docbook dir
Nov 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions Formula/dbus.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ class Dbus < Formula
url "https://dbus.freedesktop.org/releases/dbus/dbus-1.10.12.tar.gz"
mirror "https://mirrors.ocf.berkeley.edu/debian/pool/main/d/dbus/dbus_1.10.12.orig.tar.gz"
sha256 "210a79430b276eafc6406c71705e9140d25b9956d18068df98a70156dc0e475d"
head "https://anongit.freedesktop.org/git/dbus/dbus.git"

bottle do
sha256 "8848b7e368750df3a9526f4c5d47a0649359e9e89cd9d94cb45e706402bdb66c" => :sierra
Expand All @@ -19,13 +18,18 @@ class Dbus < Formula
sha256 "474de2afde8087adbd26b3fc5cbf6ec45559763c75b21981169a9a1fbac256c9"
end

depends_on "autoconf" => :build
depends_on "autoconf-archive" => :build
depends_on "automake" => :build
depends_on "libtool" => :build
head do
url "https://anongit.freedesktop.org/git/dbus/dbus.git"

depends_on "autoconf" => :build
depends_on "autoconf-archive" => :build
depends_on "automake" => :build
depends_on "libtool" => :build
end

depends_on "xmlto" => :build

# Docbook is a dependency of xmlto, but the XML_CATALOG_FILES env-set in
# doccbook is a dependency of xmlto, but the XML_CATALOG_FILES env-set in
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one c

# install() uses files created by docbook, so best to be explicit in case
# the install process for docbook ever stops creating those files.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's drop this entire comment and the explicit docbook dependency. ascii, deheader, pgbouncer, reposurgeon, and shadowsocks-libev all have the same situation and none declares a docbook dependency.

depends_on "docbook" => :build
Expand All @@ -40,10 +44,12 @@ class Dbus < Formula
def install
# Fix the TMPDIR to one D-Bus doesn't reject due to odd symbols
ENV["TMPDIR"] = "/tmp"

# Manpages won't build without a current docbook catalog. This should exist
Copy link
Contributor

@ilovezfs ilovezfs Nov 12, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is not needed. There are 29 cases just like this in core.

# if xmlto and docbook (build dependencies of this package) are installed.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is not needed. There are 29 cases just like this in core.

ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog"
system "./autogen.sh"

system "./autogen.sh", "--no-configure" if build.head?
system "./configure", "--disable-dependency-tracking",
"--prefix=#{prefix}",
"--localstatedir=#{var}",
Expand Down