diff options
| author | Juergen Daubert <jue@jue.li> | 2020-03-12 14:20:15 +0100 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2020-03-12 14:20:15 +0100 |
| commit | bd66c4b479ca970fd68785e1313d9c62220a461d (patch) | |
| tree | 71dd23dafc46743b7f03fbf04e5149fc0394eec0 | |
| parent | a3f81b92e0057bcf7b6c32ae58f5ca1cb4518462 (diff) | |
| download | contrib-bd66c4b479ca970fd68785e1313d9c62220a461d.tar.gz contrib-bd66c4b479ca970fd68785e1313d9c62220a461d.tar.xz | |
i3: fix build, remove old patch
| -rw-r--r-- | i3/.signature | 4 | ||||
| -rw-r--r-- | i3/Pkgfile | 4 | ||||
| -rw-r--r-- | i3/i3-local_libs.patch | 48 |
3 files changed, 4 insertions, 52 deletions
diff --git a/i3/.signature b/i3/.signature index d81178ae2..11f0d855c 100644 --- a/i3/.signature +++ b/i3/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30dHlevG8G8w+vZwAwCzgAlDe1/J1yDu1w8k/hkZv1T6eZtm+sjYw6ZVH4BWxK4+WY4Ozs9i3yjKQpiSPno6LgY= -SHA256 (Pkgfile) = b6f62709b7f4c334b6ac36d9b2989347170733151c62feeb6eb3d9ef70716e57 +RWSagIOpLGJF3wzYwG9xH0schx3iIiVB9icsMdG4jygMn0YK/CIn90OJYOxpsd3yOfzb1K78oIx1kgGznDHclr+H38MpLtAjEgg= +SHA256 (Pkgfile) = 51c7a052819b63506ceb5fa2f0a6614b384dd33524e521708138d63e1aa1048f SHA256 (.footprint) = ffddeda3d45fadfa85e007ad5f4413605d3f52ef3d4489eb7445b4fc8528afbe SHA256 (i3-4.18.tar.bz2) = 1fbb58d580e8f8afb7e807fe71164d6003e454d71f22eea5eb3256c73c7a6537 SHA256 (yajl-2.1.0.tar.gz) = 3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a diff --git a/i3/Pkgfile b/i3/Pkgfile index bb1c5607e..5f9e8f997 100644 --- a/i3/Pkgfile +++ b/i3/Pkgfile @@ -5,7 +5,7 @@ name=i3 version=4.18 -release=1 +release=2 source=(http://i3wm.org/downloads/$name-$version.tar.bz2 https://github.com/lloyd/yajl/archive/2.1.0/yajl-2.1.0.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.31.tar.gz @@ -26,7 +26,7 @@ build() { # libxkbcommon cd $SRC/libxkbcommon-0.10.0 - meson build --default-library=static -Denable-{wayland,docs}=false + meson build --prefix=/ --default-library=static -Denable-{wayland,docs}=false ninja -C build -j ${JOBS:-1} DESTDIR=$LIBS ninja -C build install diff --git a/i3/i3-local_libs.patch b/i3/i3-local_libs.patch deleted file mode 100644 index 33d9d29b7..000000000 --- a/i3/i3-local_libs.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nru i3-4.12.orig/common.mk i3-4.12/common.mk ---- i3-4.12.orig/common.mk 2016-04-05 21:34:20.130387548 +0200 -+++ i3-4.12/common.mk 2016-04-05 21:34:57.119059034 +0200 -@@ -49,7 +49,7 @@ - endif - - # Default LDFLAGS that users should be able to override --LDFLAGS ?= $(as_needed_LDFLAG) -+#LDFLAGS ?= $(as_needed_LDFLAG) - - # Common CFLAGS for all i3 related binaries - I3_CFLAGS = -std=c99 -@@ -57,7 +57,7 @@ - # unused-function, unused-label, unused-variable are turned on by -Wall - # We don’t want unused-parameter because of the use of many callbacks - I3_CFLAGS += -Wunused-value --I3_CFLAGS += -Iinclude -+I3_CFLAGS += -Iinclude -I$(TOPDIR)/libs/include - - I3_CPPFLAGS = -DI3_VERSION=\"${I3_VERSION}\" - I3_CPPFLAGS += -DMAJOR_VERSION=${MAJOR_VERSION} -@@ -130,7 +130,7 @@ - - #libev - LIBEV_CFLAGS := $(call cflags_for_lib, libev) --LIBEV_LIBS := $(call ldflags_for_lib, libev,ev) -+LIBEV_LIBS := $(call ldflags_for_lib, libev,ev) -lm - - # libpcre - PCRE_CFLAGS := $(call cflags_for_lib, libpcre) -@@ -141,7 +141,7 @@ - - # startup-notification - LIBSN_CFLAGS := $(call cflags_for_lib, libstartup-notification-1.0) --LIBSN_LIBS := $(call ldflags_for_lib, libstartup-notification-1.0,startup-notification-1) -+LIBSN_LIBS := $(call ldflags_for_lib, libstartup-notification-1.0,startup-notification-1) -lX11-xcb - - # Pango - PANGO_CFLAGS := $(call cflags_for_lib, cairo) -@@ -154,7 +154,7 @@ - PANGO_LIBS += $(call ldflags_for_lib, pangocairo) - - # libi3 --LIBS = -L$(TOPDIR) -li3 -lm -+LIBS = -L$(TOPDIR) -li3 -lm -L$(TOPDIR)/libs/lib -lxcb-xkb - - ## Platform-specific flags - |