diff options
| author | Bor Kraljič | 2011-10-10 09:55:54 +0200 |
|---|---|---|
| committer | Bor Kraljič | 2011-10-10 09:55:54 +0200 |
| commit | 097bc0fabc367b4cf92bd213c503e493f9e2453b (patch) | |
| tree | 90cc66cb2bf23fd16066a03ae146ec7bf74c2a25 /utils | |
| parent | 55719787f71f2820ca5f926e3660f935f2180cfa (diff) | |
avahi: removed optional dependency on qt-x11
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/avahi/DEPENDS | 4 | ||||
| -rw-r--r-- | utils/avahi/HISTORY | 4 | ||||
| -rwxr-xr-x | utils/avahi/PRE_SUB_DEPENDS | 2 | ||||
| -rwxr-xr-x | utils/avahi/SUB_DEPENDS | 3 |
4 files changed, 4 insertions, 9 deletions
diff --git a/utils/avahi/DEPENDS b/utils/avahi/DEPENDS index 853cdc26a8..7cde282f0a 100755 --- a/utils/avahi/DEPENDS +++ b/utils/avahi/DEPENDS @@ -1,8 +1,4 @@ # stuff from SUB_DEPENDS -optional_depends qt-x11 \ - "--enable-qt3" "--disable-qt3" \ - "Build Qt3 mainloop integration?" && - optional_depends qt4 \ "--enable-qt4" "--disable-qt4" \ "Build Qt4Core mainloop integration?" && diff --git a/utils/avahi/HISTORY b/utils/avahi/HISTORY index 16cee1939b..f65ccd953e 100644 --- a/utils/avahi/HISTORY +++ b/utils/avahi/HISTORY @@ -1,3 +1,7 @@ +2011-10-10 Bor Kraljič <pyrobor@ver.si> + * DEPENDS: removed optional dependency on qt-x11 + * {PRE_,}SUB_DEPENDS: removed option to request QT3 + 2011-04-30 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.6.30, SECURITY_PATCH=3 Fix CVE-2011-1002, fixing the fix for CVE-2010-2244 diff --git a/utils/avahi/PRE_SUB_DEPENDS b/utils/avahi/PRE_SUB_DEPENDS index 534017bc87..c8790c5d5a 100755 --- a/utils/avahi/PRE_SUB_DEPENDS +++ b/utils/avahi/PRE_SUB_DEPENDS @@ -1,8 +1,6 @@ case $THIS_SUB_DEPENDS in MONO) if is_depends_enabled $SPELL mono; then return 0; fi;; - QT3) - if is_depends_enabled $SPELL qt-x11; then return 0; fi;; QT4) if is_depends_enabled $SPELL qt4; then return 0; fi;; GTK2) diff --git a/utils/avahi/SUB_DEPENDS b/utils/avahi/SUB_DEPENDS index c26287a595..a7ba6fcca2 100755 --- a/utils/avahi/SUB_DEPENDS +++ b/utils/avahi/SUB_DEPENDS @@ -2,9 +2,6 @@ case $THIS_SUB_DEPENDS in MONO) echo "mono bindings requested, forcing them." && depends mono '--enable-mono' ;; -QT3) echo "qt3 bindings requested, forcing them." && - depends qt-x11 '--enable-qt3' - ;; QT4) echo "qt4 bindings requested, forcing them." && depends qt4 '--enable-qt4' ;; |