[notify] i3: new dependencies: xorg-xcb-util-xrm libxkbcommon yajl libev startup-notification

2 files changed, 15 insertions, 73 deletions

diff --git a/i3/.signature b/i3/.signature
index 492ef716d..c2cc1eade 100644
--- a/i3/.signature
+++ b/i3/.signature
@@ -1,10 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/ceXWKNasVm2KYr16gtJBMmkTH2qHFDHoH2h0fENFyQyliyGKm3cH86L/YsBtu4z9keZy9P7PnoV5UL0yMRcIwY=
-SHA256 (Pkgfile) = a984c6124c3f251dcdd86a5690be3eccb1cd2fd3380d1fc94190dede4b14dc81
+RWSE3ohX2g5d/cymWyUKLzaz6v5LZCjCheCrcvhaTdUNe2kaZYhn/7WukFsQ8ZDLwG5KmbqChJVFYvKktN60FH9cTFVOv68F1Qc=
+SHA256 (Pkgfile) = 9de2c0a51a798a4d580c4171ed8d07a41234771f1f3042a5fae44c3d106661e3
 SHA256 (.footprint) = ffddeda3d45fadfa85e007ad5f4413605d3f52ef3d4489eb7445b4fc8528afbe
 SHA256 (i3-4.19.tar.xz) = aca48b03c0c70607826a1a91333065ff44d61774c152ddc9210fbc1627355872
-SHA256 (yajl-2.1.0.tar.gz) = 3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a
-SHA256 (libev-4.33.tar.gz) = 507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea
-SHA256 (startup-notification-0.12.tar.gz) = 3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a
-SHA256 (libxkbcommon-1.0.1.tar.xz) = ab68b25341c99f2218d7cf3dad459c1827f411219901ade05bbccbdb856b6c8d
-SHA256 (xcb-util-xrm-1.3.tar.bz2) = 301cf33701207ea8782d49f4cb6404abd8f2d64e16f242017fd720be7c900c85
diff --git a/i3/Pkgfile b/i3/Pkgfile
index 340918065..62faf4883 100644
--- a/i3/Pkgfile
+++ b/i3/Pkgfile
@@ -1,77 +1,24 @@
-# Description: A tiling window manager (depends only on ports from our ISO)
+# Description: A tiling window manager
 # URL:         https://i3wm.org/
 # Maintainer:  Juergen Daubert, jue at crux dot nu
-# Depends on:  cmake pango xorg-xcb-util-cursor xorg-xcb-util-keysyms xorg-xcb-util-wm
+# Depends on:  cmake pango xorg-xcb-util-cursor xorg-xcb-util-keysyms xorg-xcb-util-wm xorg-xcb-util-xrm libxkbcommon yajl libev startup-notification
 
 name=i3
 version=4.19
-release=1
-source=(http://i3wm.org/downloads/$name-$version.tar.xz
-        https://github.com/lloyd/yajl/archive/2.1.0/yajl-2.1.0.tar.gz
-        http://dist.schmorp.de/libev/Attic/libev-4.33.tar.gz
-        http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.12.tar.gz
-        http://xkbcommon.org/download/libxkbcommon-1.0.1.tar.xz
-        https://github.com/Airblader/xcb-util-xrm/releases/download/v1.3/xcb-util-xrm-1.3.tar.bz2)
+release=2
+source=(http://i3wm.org/downloads/$name-$version.tar.xz)
 
 build() {
+	meson setup build $name-$version \
+		--prefix=/usr \
+		--sysconfdir=/usr/etc \
+		--buildtype=release
 
-    local LIBS=$SRC/$name-$version/libs
-    install -d $LIBS/{lib,include}
+	meson compile -C build -j ${JOBS:-1}
+	DESTDIR=$PKG meson install -C build
 
-    # xcb-util-xrm
-    cd $SRC/xcb-util-xrm-1.3
-    ./configure --prefix=/ --disable-shared
-    make
-    make DESTDIR=$LIBS install
+	install -d $PKG/usr/share/man/man1
+	install -m 0644 $name-$version/man/*.1 $PKG/usr/share/man/man1/
 
-    # libxkbcommon
-    cd $SRC/libxkbcommon-1.0.1
-    meson setup build . \
-        --prefix=/ \
-        --buildtype=plain \
-        --default-library=static \
-        -D enable-wayland=false \
-        -D enable-docs=false
-    meson compile  -C build -j ${JOBS:-1}
-    DESTDIR=$LIBS meson install -C build
-
-    # yajl
-    cd $SRC/yajl-2.1.0
-    cmake -S .  -B build \
-        -D CMAKE_BUILD_TYPE=Release \
-        -D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \
-        -Wno-dev
-    cmake --build build
-    cp -r build/yajl-2.1.0/include $LIBS
-    cp build/yajl-2.1.0/lib/libyajl_s.a $LIBS/lib/libyajl.a
-    cp build/yajl-2.1.0/share/pkgconfig/yajl.pc $LIBS/lib/pkgconfig
-
-    # libev
-    cd $SRC/libev-4.33
-    ./configure --prefix=/ --disable-shared
-    make
-    make DESTDIR=$LIBS install
-
-    # startup-notification
-    cd $SRC/startup-notification-0.12
-    sed -i '/^Libs: /s/$/ -lX11-xcb/' libstartup-notification-1.0.pc.in
-    ./configure --prefix=/ --disable-shared
-    make
-    make DESTDIR=$LIBS install
-    mv $LIBS/include/{startup-notification-1.0/libsn,libsn}
-
-    # i3
-    cd $SRC/$name-$version
-    export CFLAGS="$CFLAGS -I$LIBS/include"
-    export LDFLAGS="$LDFLAGS -L$LIBS/lib"
-    meson setup build . \
-        --prefix=/usr \
-        --sysconfdir=/usr/etc \
-        --buildtype=release \
-        --pkg-config-path="$LIBS/lib/pkgconfig" 
-    meson compile -C build -j ${JOBS:-1}
-    DESTDIR=$PKG meson install -C build
-    install -d $PKG/usr/share/man/man1
-    install -m 0644 man/*.1 $PKG/usr/share/man/man1/
-    rm -r $PKG/usr/share/doc
+	rm -r $PKG/usr/share/doc
 }