windowmanagers/i3: fix dependencies

5 files changed, 38 insertions, 6 deletions

diff --git a/windowmanagers/i3/BUILD b/windowmanagers/i3/BUILD
index a03858250b..81fa5985a2 100755
--- a/windowmanagers/i3/BUILD
+++ b/windowmanagers/i3/BUILD
@@ -5,4 +5,13 @@ case "$HOST" in
   export LIBS="-liconv"
   ;;
 esac &&
-default_build
+
+default_build &&
+
+if is_depends_enabled $SPELL perl; then
+  cd "$SOURCE_DIRECTORY/AnyEvent-I3" &&
+  
+  default_build_perl                 &&
+  
+  cd "$SOURCE_DIRECTORY"
+fi
diff --git a/windowmanagers/i3/DEPENDS b/windowmanagers/i3/DEPENDS
index bb08fa468a..61c2846298 100755
--- a/windowmanagers/i3/DEPENDS
+++ b/windowmanagers/i3/DEPENDS
@@ -1,16 +1,28 @@
 depends  xcb-util  &&
+depends  pcre &&
+depends  libxcb &&
+depends  libxkbcommon &&
+depends  startup-notification &&
 depends  libev  &&
 depends  yajl  &&
 depends  libxcursor &&
+depends  xkeyboard-config &&
+depends  xcb-util &&
 depends  xcb-util-wm &&
 depends  xcb-util-keysyms &&
 depends  xcb-util-cursor &&
 depends  xcb-util-xrm &&
-optional_depends  asciidoc  ''  ''  'for the hacking-howto'  &&
-optional_depends  xmlto  ''  ''  'for the manpage'  &&
+depends  pango &&
+depends  cairo &&
+depends  pkgconfig &&
+
+optional_depends  asciidoc  '--enable-docs'  '--disable-docs'  'for the hacking-howto'  &&
+optional_depends  xmlto  '--enable-mans'  '--disable-mans'  'for the manpage'  &&
 optional_depends  xmessage  ''  ''  'for the welcome message'  &&
-optional_depends  perl '' '' 'for i3-dmenu-desktop (requires dmenu)' &&
-optional_depends  pango '' '' 'to use pango for rendering text (Xft fonts)' &&
+suggest_depends  perl '' '' 'for i3-dmenu-desktop (requires dmenu)' &&
+if is_depends_enabled $SPELL perl; then
+  depends perl-json-xs
+fi &&
 suggest_depends  i3lock  ''  ''  'for a screen locker'  &&
 suggest_depends  i3status '' '' 'for status bar information' &&
 suggest_depends  dmenu  ''  ''  'for an application launcher'
diff --git a/windowmanagers/i3/DETAILS b/windowmanagers/i3/DETAILS
index 0c003776e0..e196e337bd 100755
--- a/windowmanagers/i3/DETAILS
+++ b/windowmanagers/i3/DETAILS
@@ -1,5 +1,6 @@
            SPELL=i3
          VERSION=4.17.1
+     PATCH_LEVEL=1
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://${SPELL}wm.org/downloads/${SOURCE}
diff --git a/windowmanagers/i3/HISTORY b/windowmanagers/i3/HISTORY
index ead21a020b..7e601ea0a0 100644
--- a/windowmanagers/i3/HISTORY
+++ b/windowmanagers/i3/HISTORY
@@ -1,5 +1,7 @@
 2020-02-09 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DEPENDS: fix typo
+	* DEPENDS, BUILD, INSTALL: fix dependencies
+	* DETAILS: PATCH_LEVEL++
 
 2020-01-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: version 4.17.1
diff --git a/windowmanagers/i3/INSTALL b/windowmanagers/i3/INSTALL
index 02d47d7666..980d1cc2a9 100755
--- a/windowmanagers/i3/INSTALL
+++ b/windowmanagers/i3/INSTALL
@@ -1,2 +1,10 @@
 default_install &&
-cp "${SCRIPT_DIRECTORY}/starti3" "${INSTALL_ROOT}/usr/bin/"
+install -m755 -o root -g root "${SCRIPT_DIRECTORY}/starti3" "${INSTALL_ROOT}/usr/bin/" &&
+
+if is_depends_enabled $SPELL perl; then
+  cd "$SOURCE_DIRECTORY/AnyEvent-I3" &&
+
+  default_install                    &&
+
+  cd "$SOURCE_DIRECTORY"
+fi