mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Brought back the dbus and xmpp build flags, so build from source can be done without C libraries that may be hard to install.

Browse source
This commit is contained in:
Joey Hess 2016-02-05 18:00:20 -04:00
parent 03754a3c1c
commit 0226122842
Failed to extract signature
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -17,6 +17,8 @@ git-annex (6.20160127) UNRELEASED; urgency=medium
is linked with libmagic. is linked with libmagic.
* matchexpression: Added --largefiles option to parse an annex.largefiles * matchexpression: Added --largefiles option to parse an annex.largefiles
expression. expression.
* Brought back the dbus and xmpp build flags, so build from source can be
done without C libraries that may be hard to install.
-- Joey Hess <id@joeyh.name> Thu, 28 Jan 2016 13:53:09 -0400 -- Joey Hess <id@joeyh.name> Thu, 28 Jan 2016 13:53:09 -0400

20
git-annex.cabal
View file

@ -84,6 +84,12 @@ Flag network-uri
Flag Cryptonite Flag Cryptonite
Description: Use the cryptonite library, instead of the older cryptohash Description: Use the cryptonite library, instead of the older cryptohash
Flag Dbus
Description: Enable dbus support
Flag XMPP
Description: Enable notifications using XMPP
Executable git-annex Executable git-annex
Main-Is: git-annex.hs Main-Is: git-annex.hs
Build-Depends: Build-Depends:
@ -181,9 +187,10 @@ Executable git-annex
CPP-Options: -DWITH_KQUEUE CPP-Options: -DWITH_KQUEUE
C-Sources: Utility/libkqueue.c C-Sources: Utility/libkqueue.c
if (os(linux)) if flag(Dbus)
Build-Depends: dbus (>= 0.10.7), fdo-notify (>= 0.3) if (os(linux))
CPP-Options: -DWITH_DBUS -DWITH_DESKTOP_NOTIFY -DWITH_DBUS_NOTIFICATIONS Build-Depends: dbus (>= 0.10.7), fdo-notify (>= 0.3)
CPP-Options: -DWITH_DBUS -DWITH_DESKTOP_NOTIFY -DWITH_DBUS_NOTIFICATIONS
if flag(Android) if flag(Android)
Build-Depends: data-endian Build-Depends: data-endian
@ -213,9 +220,10 @@ Executable git-annex
Build-Depends: network-multicast, network-info Build-Depends: network-multicast, network-info
CPP-Options: -DWITH_PAIRING CPP-Options: -DWITH_PAIRING
if (! os(windows)) if flag(XMPP)
Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types if (! os(windows))
CPP-Options: -DWITH_XMPP Build-Depends: network-protocol-xmpp, gnutls (>= 0.1.4), xml-types
CPP-Options: -DWITH_XMPP
if flag(TorrentParser) if flag(TorrentParser)
Build-Depends: torrent (>= 10000.0.0) Build-Depends: torrent (>= 10000.0.0)

2
stack.yaml
View file

@ -12,8 +12,8 @@ flags:
torrentparser: true torrentparser: true
webapp: true webapp: true
magicmime: false magicmime: false
xmpp: false
dbus: false dbus: false
xmpp: false
android: false android: false
androidsplice: false androidsplice: false
ekg: false ekg: false