Mercurial > mxe-octave
changeset 4958:8b4d4e06075d
Add xkbcommon (required by linux qt5-5.12.X)
* src/xkbcommon-1-fixes.patch: new file
* src/xkbcommon.mk: new file
* index.html: add ref to xkbcommon
* src/qtbase.mk: add xkbcommon to dependents
author | John Donoghue |
---|---|
date | Fri, 15 Feb 2019 11:27:55 -0500 |
parents | 6a321b868d57 |
children | 506a61f959e4 |
files | index.html src/qtbase.mk src/xkbcommon-1-fixes.patch src/xkbcommon.mk |
diffstat | 4 files changed, 47 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Mon Feb 11 23:40:23 2019 +0100 +++ b/index.html Fri Feb 15 11:27:55 2019 -0500 @@ -2790,6 +2790,10 @@ <td class="website"><a href="http://xorg.freedesktop.org/">xdmcp</a></td> </tr> <tr> + <td class="package">xkbcommon</td> + <td class="website"><a href="https://github.com/xkbcommon/libxkbcommon">xkbcommon</a></td> + </tr> + <tr> <td class="package">xerces</td> <td class="website"><a href="http://xerces.apache.org/xerces-c/">Xerces-C++</a></td> </tr>
--- a/src/qtbase.mk Mon Feb 11 23:40:23 2019 +0100 +++ b/src/qtbase.mk Fri Feb 15 11:27:55 2019 -0500 @@ -35,7 +35,7 @@ $(PKG)_DEPS += icu4c $(PKG)_CONFIGURE_OPTS += -icu ifeq ($(USE_SYSTEM_X11_LIBS),no) - $(PKG)_DEPS += xdamage xdmcp xext xfixes xi xrender xt xxf86vm x11 xcb xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm + $(PKG)_DEPS += xdamage xdmcp xext xfixes xi xrender xt xxf86vm x11 xcb xcb-util xcb-util-cursor xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-wm xkbcommon endif endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/xkbcommon-1-fixes.patch Fri Feb 15 11:27:55 2019 -0500 @@ -0,0 +1,13 @@ +diff -ur libxkbcommon-xkbcommon-0.8.3.orig/autogen.sh libxkbcommon-xkbcommon-0.8.3/autogen.sh +--- libxkbcommon-xkbcommon-0.8.3.orig/autogen.sh 2019-02-15 10:00:40.949112324 -0500 ++++ libxkbcommon-xkbcommon-0.8.3/autogen.sh 2019-02-15 10:02:53.100233678 -0500 +@@ -6,7 +6,7 @@ + ORIGDIR=`pwd` + cd "$srcdir" + +-autoreconf --verbose --install --force --warnings=all ++autoreconf -I m4 --verbose --install --force --warnings=all + cd "$ORIGDIR" + + if test -z "$NOCONFIGURE"; then +Only in libxkbcommon-xkbcommon-0.8.3.orig: .autogen.sh.swp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/xkbcommon.mk Fri Feb 15 11:27:55 2019 -0500 @@ -0,0 +1,29 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := xkbcommon +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.8.3 +$(PKG)_CHECKSUM := 76c642b656f6dbd29a3ed195fffcaf8cf44634d4 +$(PKG)_SUBDIR := libxkbcommon-$(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/$(PKG)/libxkbcommon/archive/$($(PKG)_FILE) +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://github.com/$(PKG)/libxkbcommon/tags' | \ + $(SED) -n 's|.*releases/tag/$(PKG)-\([^"]*\).*|\1|p' | $(SORT) -V | \ + tail -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./autogen.sh && \ + $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ + $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ + $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ + --prefix='$(HOST_PREFIX)' \ + && $(CONFIGURE_POST_HOOK) + + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)' +endef