diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2010-11-01 13:54:59 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2010-11-01 13:54:59 +0100 |
| commit | f49d0b42f62e6f561c55b1662cdc311617097463 (patch) | |
| tree | 0785b5c8f0f1f7e424546860df594818e3d8675f /packages | |
| parent | 9438a4f94ab9bfc93feb66b0a6de51821dda3b56 (diff) | |
| download | embtoolkit-f49d0b42f62e6f561c55b1662cdc311617097463.tar.gz embtoolkit-f49d0b42f62e6f561c55b1662cdc311617097463.tar.bz2 embtoolkit-f49d0b42f62e6f561c55b1662cdc311617097463.tar.xz | |
Packages: X11/xkbcomp; xkbcomp-1.2.0 needs a patch
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/x11/xkbcomp/xkbcomp.kconfig | 3 | ||||
| -rw-r--r-- | packages/x11/xkbcomp/xkbcomp.mk | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/packages/x11/xkbcomp/xkbcomp.kconfig b/packages/x11/xkbcomp/xkbcomp.kconfig index 207ae14..0c5b810 100644 --- a/packages/x11/xkbcomp/xkbcomp.kconfig +++ b/packages/x11/xkbcomp/xkbcomp.kconfig @@ -40,6 +40,7 @@ choice config EMBTK_XKBCOMP_VERSION_1_2_0 bool "xkbcomp-1.2.0" + select EMBTK_XKBCOMP_NEED_PATCH config EMBTK_XKBCOMP_VERSION_1_1_1 bool "xkbcomp-1.1.1" endchoice @@ -49,3 +50,5 @@ config EMBTK_XKBCOMP_VERSION_STRING default "1.2.0" if EMBTK_XKBCOMP_VERSION_1_2_0 default "1.1.1" if EMBTK_XKBCOMP_VERSION_1_1_1 +config EMBTK_XKBCOMP_NEED_PATCH + bool diff --git a/packages/x11/xkbcomp/xkbcomp.mk b/packages/x11/xkbcomp/xkbcomp.mk index 73f77ec..02ebef7 100644 --- a/packages/x11/xkbcomp/xkbcomp.mk +++ b/packages/x11/xkbcomp/xkbcomp.mk @@ -24,7 +24,8 @@ ################################################################################ XKBCOMP_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_XKBCOMP_VERSION_STRING))) -XKBCOMP_SITE := http://xorg.freedesktop.org/archive/individual/app/ +XKBCOMP_SITE := http://xorg.freedesktop.org/archive/individual/app +XKBCOMP_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/xkbcomp/$(XKBCOMP_VERSION) XKBCOMP_PACKAGE := xkbcomp-$(XKBCOMP_VERSION).tar.bz2 XKBCOMP_BUILD_DIR := $(PACKAGES_BUILD)/xkbcomp-$(XKBCOMP_VERSION) @@ -56,10 +57,19 @@ download_xkbcomp: @test -e $(DOWNLOAD_DIR)/$(XKBCOMP_PACKAGE) || \ wget -O $(DOWNLOAD_DIR)/$(XKBCOMP_PACKAGE) \ $(XKBCOMP_SITE)/$(XKBCOMP_PACKAGE) +ifeq ($(CONFIG_EMBTK_XKBCOMP_NEED_PATCH),y) + @test -e $(DOWNLOAD_DIR)/xkbcomp-$(XKBCOMP_VERSION).patch || \ + wget -O $(DOWNLOAD_DIR)/xkbcomp-$(XKBCOMP_VERSION).patch \ + $(XKBCOMP_PATCH_SITE)/xkbcomp-$(XKBCOMP_VERSION)-*.patch +endif $(XKBCOMP_BUILD_DIR)/.decompressed: $(call EMBTK_GENERIC_MESSAGE,"Decompressing $(XKBCOMP_PACKAGE) ...") @tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(XKBCOMP_PACKAGE) +ifeq ($(CONFIG_EMBTK_XKBCOMP_NEED_PATCH),y) + @cd $(XKBCOMP_BUILD_DIR); \ + patch -p1 < $(DOWNLOAD_DIR)/xkbcomp-$(XKBCOMP_VERSION).patch +endif @touch $@ $(XKBCOMP_BUILD_DIR)/.configured: |