From 2b8993d7f202f4be1d710fe6544e88aea57a8abf Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 23 Feb 2021 16:48:04 -0600 Subject: [PATCH 1/2] blackboxwm: enable shared library --- common/shlibs | 1 + srcpkgs/blackboxwm/template | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/shlibs b/common/shlibs index c9f9bf389e8..2cf2f0d4c87 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3937,3 +3937,4 @@ libsimavr.so.1 simavr-1.6_2 libsimavrparts.so.1 simavr-1.6_2 libsword-1.8.1.so libsword-1.8.1_6 libtree-sitter.so.0 tree-sitter-0.18.2_1 +libbt.so.0 blackboxwm-0.76_1 diff --git a/srcpkgs/blackboxwm/template b/srcpkgs/blackboxwm/template index 4bf0249d064..45c7ed74b1b 100644 --- a/srcpkgs/blackboxwm/template +++ b/srcpkgs/blackboxwm/template @@ -1,9 +1,10 @@ # Template file for 'blackboxwm' pkgname=blackboxwm version=0.76 -revision=1 +revision=2 wrksrc="blackbox-${version}" build_style=gnu-configure +configure_args="--enable-shared" hostmakedepends="pkg-config" makedepends="libX11-devel libXext-devel libXft-devel libXt-devel" short_desc="Stacking window manager for X11" From e78d2e74161e9f16445008f724951fcbff30dcfe Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 23 Feb 2021 16:57:08 -0600 Subject: [PATCH 2/2] New package: bbkeys-0.9.2 --- srcpkgs/bbkeys/patches/fix-cross.patch | 39 ++++++++++++++++++++++++++ srcpkgs/bbkeys/template | 17 +++++++++++ 2 files changed, 56 insertions(+) create mode 100644 srcpkgs/bbkeys/patches/fix-cross.patch create mode 100644 srcpkgs/bbkeys/template diff --git a/srcpkgs/bbkeys/patches/fix-cross.patch b/srcpkgs/bbkeys/patches/fix-cross.patch new file mode 100644 index 00000000000..168b50d8608 --- /dev/null +++ b/srcpkgs/bbkeys/patches/fix-cross.patch @@ -0,0 +1,39 @@ +--- src/Makefile.in.orig ++++ src/Makefile.in +@@ -108,7 +108,6 @@ + Netclient.$(OBJEXT) ScreenHandler.$(OBJEXT) window.$(OBJEXT) \ + WindowlistMenu.$(OBJEXT) + bbkeys_OBJECTS = $(am_bbkeys_OBJECTS) +-bbkeys_DEPENDENCIES = /usr/lib/libbt.a + AM_V_P = $(am__v_P_@AM_V@) + am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) + am__v_P_0 = false +@@ -350,7 +349,6 @@ + WindowlistMenu.cpp \ + WindowlistMenu.h + +-bbkeys_LDADD = /usr/lib/libbt.a + AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = bbkeys + all: all-am + +@@ -444,9 +442,9 @@ + done; \ + done; rm -f c$${pid}_.???; exit $$bad + +-bbkeys$(EXEEXT): $(bbkeys_OBJECTS) $(bbkeys_DEPENDENCIES) $(EXTRA_bbkeys_DEPENDENCIES) ++bbkeys$(EXEEXT): $(bbkeys_OBJECTS) $(EXTRA_bbkeys_DEPENDENCIES) + @rm -f bbkeys$(EXEEXT) +- $(AM_V_CXXLD)$(CXXLINK) $(bbkeys_OBJECTS) $(bbkeys_LDADD) $(LIBS) ++ $(AM_V_CXXLD)$(CXXLINK) $(bbkeys_OBJECTS) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +--- src/Makefile.am.orig ++++ src/Makefile.am +@@ -31,6 +31,5 @@ + window.hh \ + WindowlistMenu.cpp \ + WindowlistMenu.h +-bbkeys_LDADD = /usr/lib/libbt.a + + AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = bbkeys diff --git a/srcpkgs/bbkeys/template b/srcpkgs/bbkeys/template new file mode 100644 index 00000000000..a9a52c11007 --- /dev/null +++ b/srcpkgs/bbkeys/template @@ -0,0 +1,17 @@ +# Template file for 'bbkeys' +pkgname=bbkeys +version=0.9.2 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config perl" +makedepends="blackboxwm-devel libX11-devel libXext-devel libXft-devel" +short_desc="Blackbox tool for setting keyboard shortcuts" +maintainer="Andrew Benson " +license="MIT" +homepage="https://github.com/bbidulock/bbkeys" +distfiles="${homepage}/releases/download/rel-${version//.}/bbkeys-${version}.tar.lz" +checksum=ece0113b2cc6367e2cad95f59cf43d7576b5a1a7eb8a9e3f10ce9814db67b95c + +post_install() { + vlicense COPYING +}