From edf8325d2602b48a8212354b2849507d5fcb8db0 Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov <apyhalov@gmail.com> Date: Tue, 17 Oct 2017 18:07:21 +0200 Subject: [PATCH] ibus: update to 1.5.13 --- components/inputmethod/ibus/Makefile | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/components/inputmethod/ibus/Makefile b/components/inputmethod/ibus/Makefile index 4a8592d..bd04a4f 100644 --- a/components/inputmethod/ibus/Makefile +++ b/components/inputmethod/ibus/Makefile @@ -10,30 +10,27 @@ # # -# Copyright 2014 Alexander Pyhalov. All rights reserved. +# Copyright 2017 Alexander Pyhalov # include ../../../make-rules/shared-macros.mk COMPONENT_NAME= ibus -COMPONENT_VERSION= 1.3.9 -COMPONENT_REVISION= 1 +COMPONENT_VERSION= 1.5.13 COMPONENT_SUMMARY= iBus - Intelligent Input Bus COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:b2784a668666efa8ae04e6f1cff5749917cd18add0a39a1d020ecc9f3df5285d + sha256:ed73d80542dfdcca190b7958431048cd6830c2ce25c467384630b6a7e957a5f1 +COMPONENT_PROJECT_URL = https://github.com/ibus/ibus COMPONENT_ARCHIVE_URL= \ - http://ibus.googlecode.com/files/$(COMPONENT_ARCHIVE) -COMPONENT_PROJECT_URL = https://code.google.com/p/ibus/ + $(COMPONENT_PROJECT_URL)/releases/download/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/configure.mk -include $(WS_TOP)/make-rules/ips.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk -gcc_OPT = -O2 - -PATH = /usr/gnu/bin:/usr/bin +PATH = $(PATH.gnu) GTK_BIN_VER := $(shell pkg-config --variable=gtk_binary_version gtk+-2.0) @@ -45,11 +42,11 @@ CONFIGURE_OPTIONS += --disable-static CONFIGURE_OPTIONS += --enable-gtk2 +CONFIGURE_OPTIONS += --enable-gtk3 CONFIGURE_OPTIONS += --enable-xim CONFIGURE_OPTIONS += --disable-gtk-doc CONFIGURE_OPTIONS += --enable-introspection -CONFIGURE_OPTIONS.32 += --sysconfdir=/etc -CONFIGURE_OPTIONS.64 += --sysconfdir=/etc/$(MACH64) +CONFIGURE_OPTIONS += --sysconfdir=/etc CONFIGURE_OPTIONS.32 += --libexecdir=/usr/lib/ibus CONFIGURE_OPTIONS.64 += --libexecdir=/usr/lib/ibus/$(MACH64) CONFIGURE_OPTIONS.64 += --with-gtk-im-module-dir=/usr/lib/$(MACH64)/gtk-2.0/$(GTK_BIN_VER)/immodules/ @@ -70,12 +67,16 @@ test: $(TEST_32_and_64) -REQUIRED_PACKAGES += SUNWcs -REQUIRED_PACKAGES += gnome/config/gconf +REQUIRED_PACKAGES += gnome/config/dconf +REQUIRED_PACKAGES += library/desktop/atk +REQUIRED_PACKAGES += library/desktop/cairo +REQUIRED_PACKAGES += library/desktop/gdk-pixbuf REQUIRED_PACKAGES += library/desktop/gtk2 +REQUIRED_PACKAGES += library/desktop/gtk3 REQUIRED_PACKAGES += library/desktop/pango REQUIRED_PACKAGES += library/glib2 -REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += library/libnotify +REQUIRED_PACKAGES += SUNWcs REQUIRED_PACKAGES += system/library -REQUIRED_PACKAGES += system/library/libdbus REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxi -- Gitblit v1.9.3