sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 1.2.0.20091024

Browse source 
- Fix the crash of ibus-gconf on amd64 systems

PR:		ports/140663
Submitted by:	Henry Hu <henry.hu.sh@gmail.com> (maintainer)
This commit is contained in:
Wen Heping 2009-11-20 07:22:11 +00:00
parent 9a229d2fda
commit f95cfc5be9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=244511
5 changed files with 188 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
textproc/ibus/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= ibus
PORTVERSION= 1.1.0.20090829
PORTVERSION= 1.2.0.20091024
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
@ -24,38 +24,13 @@ USE_QT_VER= 4
USE_LDCONFIG= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
GCONF_SCHEMAS= ibus.schemas
OPTIONS= ISOCODES "Use isocodecs" on
# QTIMMODULE "Enable building of Qt4 immodule" off \
# PYGCONF "Use internal python gconf binding" on \
.include <bsd.port.pre.mk>
# With 1.1.0.20090311, QT4 IM Module is broken and would not be built
# .if defined(WITH_QTIMMODULE)
# QT_COMPONENTS= dbus xml gui corelib qmake_build
# # if no QMAKE is set, the configure script would fail to find qmake-qt4
# # however, it worked as expected when being executed in the shell...
# CONFIGURE_ENV+= QMAKE=${LOCALBASE}/bin/qmake-qt4
# PLIST_SUB+= WITH_QTIMMODULE=""
# CONFIGURE_ARGS+= --enable-qt4-immodule
# .else
# CONFIGURE_ARGS+= --disable-qt4-immodule
# PLIST_SUB+= WITH_QTIMMODULE="@comment "
# .endif
# This option does not exist now
# .if defined(WITH_PYGCONF)
# CONFIGURE_ARGS+= --enable-pygconf
# PLIST_SUB+= WITH_PYGCONF=""
# .else
# CONFIGURE_ARGS+= --disable-pygconf
# PLIST_SUB+= WITH_PYGCONF="@comment "
# depends on gnome-python ( py-gnome2 )
# USE_GNOME+= pygnome2
# .endif
.if defined(WITH_ISOCODES)
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
RUN_DEPENDS+= ${LOCALBASE}/share/xml/iso-codes/iso_639.xml:${PORTSDIR}/misc/iso-codes

6
textproc/ibus/distinfo
View file

@ -1,3 +1,3 @@
MD5 (ibus-1.1.0.20090829.tar.gz) = f00b16c29491b0a86848c2f8d5314e7a
SHA256 (ibus-1.1.0.20090829.tar.gz) = 8cd172745a08d8be814dc81ac2812693b6caa268fecdeb6c76845c250a043043
SIZE (ibus-1.1.0.20090829.tar.gz) = 1233331
MD5 (ibus-1.2.0.20091024.tar.gz) = 2133a37805abff86f6aa160f08dcd4f4
SHA256 (ibus-1.2.0.20091024.tar.gz) = 72a70c51184718cb81e2c31988538d9daac655353a9712e06f2dcbe6361fd863
SIZE (ibus-1.2.0.20091024.tar.gz) = 1444736

20
textproc/ibus/files/patch-src_ibusconfigprivate.h Normal file
View file

@ -0,0 +1,20 @@
--- src/ibusconfigprivate.h.orig 2009-11-14 11:44:58.000000000 +0800
+++ src/ibusconfigprivate.h 2009-11-14 11:45:31.000000000 +0800
@@ -28,7 +28,7 @@
g_assert (iter != NULL);
g_assert (value != NULL);
- gint type;
+ GType type;
IBusMessageIter sub_iter;
type = ibus_message_iter_get_arg_type (iter);
@@ -83,7 +83,7 @@
if (type == IBUS_TYPE_ARRAY) {
GValue v = { 0 };
IBusMessageIter sub_iter;
- gint sub_type;
+ GType sub_type;
GValueArray *array;

21
textproc/ibus/files/patch-util_IMdkit_Makefile.in Normal file
View file

@ -0,0 +1,21 @@
--- util/IMdkit/Makefile.in.orig 2009-11-10 13:51:17.000000000 +0800
+++ util/IMdkit/Makefile.in 2009-11-10 14:03:55.000000000 +0800
@@ -306,6 +306,9 @@
IMValues.c \
$(NULL)
+libIMdkit_la_CFLAGS = \
+ @X11_CFLAGS@
+
noinst_HEADERS = \
FrameMgr.h \
IMdkit.h \
@@ -396,7 +399,7 @@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(LTCOMPILE) ${libIMdkit_la_CFLAGS} -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

271
textproc/ibus/pkg-plist
View file

@ -1,43 +1,89 @@
bin/ibus-daemon
bin/ibus-setup
etc/xdg/autostart/ibus.desktop
include/ibus-1.0/ibus.h
include/ibus-1.0/ibusattribute.h
include/ibus-1.0/ibusbus.h
include/ibus-1.0/ibuscomponent.h
include/ibus-1.0/ibusconfig.h
include/ibus-1.0/ibusconfigservice.h
include/ibus-1.0/ibusconnection.h
include/ibus-1.0/ibusdebug.h
include/ibus-1.0/ibusengine.h
include/ibus-1.0/ibusenginedesc.h
include/ibus-1.0/ibusenumtypes.h
include/ibus-1.0/ibuserror.h
include/ibus-1.0/ibusfactory.h
include/ibus-1.0/ibushotkey.h
include/ibus-1.0/ibusinputcontext.h
include/ibus-1.0/ibuskeysyms.h
include/ibus-1.0/ibuslookuptable.h
include/ibus-1.0/ibusmainloop.h
include/ibus-1.0/ibusmarshalers.h
include/ibus-1.0/ibusmessage.h
include/ibus-1.0/ibusobject.h
include/ibus-1.0/ibusobservedpath.h
include/ibus-1.0/ibuspendingcall.h
include/ibus-1.0/ibusproperty.h
include/ibus-1.0/ibusproxy.h
include/ibus-1.0/ibusserializable.h
include/ibus-1.0/ibusserver.h
include/ibus-1.0/ibusservice.h
include/ibus-1.0/ibusshare.h
include/ibus-1.0/ibustext.h
include/ibus-1.0/ibustypes.h
include/ibus-1.0/ibusxml.h
lib/gtk-2.0/2.10.0/immodules/im-ibus.la
lib/gtk-2.0/2.10.0/immodules/im-ibus.so
lib/libibus.la
lib/libibus.so
lib/libibus.so.0
%%DATADIR%%/component/gconf.xml
%%DATADIR%%/component/gtkpanel.xml
%%DATADIR%%/keymaps/common
%%DATADIR%%/keymaps/jp
%%DATADIR%%/keymaps/modifiers
%%DATADIR%%/keymaps/us
%%DATADIR%%/setup/engineabout.py
%%DATADIR%%/setup/engineabout.pyc
%%DATADIR%%/setup/engineabout.pyo
%%DATADIR%%/setup/enginecombobox.py
%%DATADIR%%/setup/enginecombobox.pyc
%%DATADIR%%/setup/enginecombobox.pyo
%%DATADIR%%/setup/enginetreeview.py
%%DATADIR%%/setup/enginetreeview.pyc
%%DATADIR%%/setup/enginetreeview.pyo
%%DATADIR%%/setup/icon.py
%%DATADIR%%/setup/icon.pyc
%%DATADIR%%/setup/icon.pyo
%%DATADIR%%/setup/keyboardshortcut.py
%%DATADIR%%/setup/keyboardshortcut.pyc
%%DATADIR%%/setup/keyboardshortcut.pyo
%%DATADIR%%/setup/main.py
%%DATADIR%%/setup/main.pyc
%%DATADIR%%/setup/main.pyo
%%DATADIR%%/setup/setup.ui
%%DATADIR%%/ui/gtk/candidatepanel.py
%%DATADIR%%/ui/gtk/candidatepanel.pyc
%%DATADIR%%/ui/gtk/candidatepanel.pyo
%%DATADIR%%/ui/gtk/engineabout.py
%%DATADIR%%/ui/gtk/engineabout.pyc
%%DATADIR%%/ui/gtk/engineabout.pyo
%%DATADIR%%/ui/gtk/handle.py
%%DATADIR%%/ui/gtk/handle.pyc
%%DATADIR%%/ui/gtk/handle.pyo
%%DATADIR%%/ui/gtk/icon.py
%%DATADIR%%/ui/gtk/icon.pyc
%%DATADIR%%/ui/gtk/icon.pyo
%%DATADIR%%/ui/gtk/languagebar.py
%%DATADIR%%/ui/gtk/languagebar.pyc
%%DATADIR%%/ui/gtk/languagebar.pyo
%%DATADIR%%/ui/gtk/main.py
%%DATADIR%%/ui/gtk/main.pyc
%%DATADIR%%/ui/gtk/main.pyo
%%DATADIR%%/ui/gtk/menu.py
%%DATADIR%%/ui/gtk/menu.pyc
%%DATADIR%%/ui/gtk/menu.pyo
%%DATADIR%%/ui/gtk/notifications.py
%%DATADIR%%/ui/gtk/notifications.pyc
%%DATADIR%%/ui/gtk/notifications.pyo
%%DATADIR%%/ui/gtk/panel.py
%%DATADIR%%/ui/gtk/panel.pyc
%%DATADIR%%/ui/gtk/panel.pyo
%%DATADIR%%/ui/gtk/propitem.py
%%DATADIR%%/ui/gtk/propitem.pyc
%%DATADIR%%/ui/gtk/propitem.pyo
%%DATADIR%%/ui/gtk/toolitem.py
%%DATADIR%%/ui/gtk/toolitem.pyc
%%DATADIR%%/ui/gtk/toolitem.pyo
%%NLS%%share/locale/ar/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/as/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/bn_IN/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/ca/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/da/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/de/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/es/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/fr/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/gu/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/hi/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/hu/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/ja/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/kn/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/ko/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/ml/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/mr/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/or/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/pa/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/pl/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/ru/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/sr/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/sr@latin/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/ta/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/te/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/vi/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/ibus.mo
%%PYTHON_SITELIBDIR%%/ibus/__init__.py
%%PYTHON_SITELIBDIR%%/ibus/__init__.pyc
%%PYTHON_SITELIBDIR%%/ibus/__init__.pyo
@ -143,6 +189,48 @@ lib/libibus.so.0
%%PYTHON_SITELIBDIR%%/ibus/utility.py
%%PYTHON_SITELIBDIR%%/ibus/utility.pyc
%%PYTHON_SITELIBDIR%%/ibus/utility.pyo
bin/ibus-daemon
bin/ibus-setup
etc/xdg/autostart/ibus.desktop
include/ibus-1.0/ibus.h
include/ibus-1.0/ibusattribute.h
include/ibus-1.0/ibusbus.h
include/ibus-1.0/ibuscomponent.h
include/ibus-1.0/ibusconfig.h
include/ibus-1.0/ibusconfigservice.h
include/ibus-1.0/ibusconnection.h
include/ibus-1.0/ibusdebug.h
include/ibus-1.0/ibusengine.h
include/ibus-1.0/ibusenginedesc.h
include/ibus-1.0/ibusenumtypes.h
include/ibus-1.0/ibuserror.h
include/ibus-1.0/ibusfactory.h
include/ibus-1.0/ibushotkey.h
include/ibus-1.0/ibusinputcontext.h
include/ibus-1.0/ibuskeymap.h
include/ibus-1.0/ibuskeysyms.h
include/ibus-1.0/ibuslookuptable.h
include/ibus-1.0/ibusmainloop.h
include/ibus-1.0/ibusmarshalers.h
include/ibus-1.0/ibusmessage.h
include/ibus-1.0/ibusobject.h
include/ibus-1.0/ibusobservedpath.h
include/ibus-1.0/ibuspendingcall.h
include/ibus-1.0/ibusproperty.h
include/ibus-1.0/ibusproxy.h
include/ibus-1.0/ibusserializable.h
include/ibus-1.0/ibusserver.h
include/ibus-1.0/ibusservice.h
include/ibus-1.0/ibusshare.h
include/ibus-1.0/ibustext.h
include/ibus-1.0/ibustypes.h
include/ibus-1.0/ibusversion.h
include/ibus-1.0/ibusxml.h
lib/gtk-2.0/2.10.0/immodules/im-ibus.la
lib/gtk-2.0/2.10.0/immodules/im-ibus.so
lib/libibus.la
lib/libibus.so
lib/libibus.so.1
libdata/pkgconfig/ibus-1.0.pc
libexec/ibus-gconf
libexec/ibus-ui-gtk
@ -175,16 +263,19 @@ share/gtk-doc/html/ibus/ch03.html
share/gtk-doc/html/ibus/ch04.html
share/gtk-doc/html/ibus/ch05.html
share/gtk-doc/html/ibus/home.png
share/gtk-doc/html/ibus/ibus-IBusKeymap.html
share/gtk-doc/html/ibus/ibus-ibusdebug.html
share/gtk-doc/html/ibus/ibus-ibusenumtypes.html
share/gtk-doc/html/ibus/ibus-ibuserror.html
share/gtk-doc/html/ibus/ibus-ibusinternal.html
share/gtk-doc/html/ibus/ibus-ibuskeysyms.html
share/gtk-doc/html/ibus/ibus-ibusmainloop.html
share/gtk-doc/html/ibus/ibus-ibusmarshalers.html
share/gtk-doc/html/ibus/ibus-ibusmessage.html
share/gtk-doc/html/ibus/ibus-ibuspendingcall.html
share/gtk-doc/html/ibus/ibus-ibusshare.html
share/gtk-doc/html/ibus/ibus-ibustypes.html
share/gtk-doc/html/ibus/ibus-ibusversion.html
share/gtk-doc/html/ibus/ibus-ibusxml.html
share/gtk-doc/html/ibus/ibus-keyname-table.html
share/gtk-doc/html/ibus/ibus.devhelp
@ -195,97 +286,19 @@ share/gtk-doc/html/ibus/left.png
share/gtk-doc/html/ibus/right.png
share/gtk-doc/html/ibus/style.css
share/gtk-doc/html/ibus/up.png
%%DATADIR%%/component/gconf.xml
%%DATADIR%%/component/gtkpanel.xml
%%DATADIR%%/icons/engine-default.svg
%%DATADIR%%/icons/ibus-help.png
%%DATADIR%%/icons/ibus-keyboard.svg
%%DATADIR%%/icons/ibus-locale.svg
%%DATADIR%%/icons/ibus-zh.svg
%%DATADIR%%/icons/ibus.svg
%%DATADIR%%/setup/engineabout.py
%%DATADIR%%/setup/engineabout.pyc
%%DATADIR%%/setup/engineabout.pyo
%%DATADIR%%/setup/enginecombobox.py
%%DATADIR%%/setup/enginecombobox.pyc
%%DATADIR%%/setup/enginecombobox.pyo
%%DATADIR%%/setup/enginetreeview.py
%%DATADIR%%/setup/enginetreeview.pyc
%%DATADIR%%/setup/enginetreeview.pyo
%%DATADIR%%/setup/icon.py
%%DATADIR%%/setup/icon.pyc
%%DATADIR%%/setup/icon.pyo
%%DATADIR%%/setup/keyboardshortcut.py
%%DATADIR%%/setup/keyboardshortcut.pyc
%%DATADIR%%/setup/keyboardshortcut.pyo
%%DATADIR%%/setup/main.py
%%DATADIR%%/setup/main.pyc
%%DATADIR%%/setup/main.pyo
%%DATADIR%%/setup/setup.glade
%%DATADIR%%/ui/gtk/candidatepanel.py
%%DATADIR%%/ui/gtk/candidatepanel.pyc
%%DATADIR%%/ui/gtk/candidatepanel.pyo
%%DATADIR%%/ui/gtk/engineabout.py
%%DATADIR%%/ui/gtk/engineabout.pyc
%%DATADIR%%/ui/gtk/engineabout.pyo
%%DATADIR%%/ui/gtk/handle.py
%%DATADIR%%/ui/gtk/handle.pyc
%%DATADIR%%/ui/gtk/handle.pyo
%%DATADIR%%/ui/gtk/icon.py
%%DATADIR%%/ui/gtk/icon.pyc
%%DATADIR%%/ui/gtk/icon.pyo
%%DATADIR%%/ui/gtk/languagebar.py
%%DATADIR%%/ui/gtk/languagebar.pyc
%%DATADIR%%/ui/gtk/languagebar.pyo
%%DATADIR%%/ui/gtk/main.py
%%DATADIR%%/ui/gtk/main.pyc
%%DATADIR%%/ui/gtk/main.pyo
%%DATADIR%%/ui/gtk/menu.py
%%DATADIR%%/ui/gtk/menu.pyc
%%DATADIR%%/ui/gtk/menu.pyo
%%DATADIR%%/ui/gtk/notifications.py
%%DATADIR%%/ui/gtk/notifications.pyc
%%DATADIR%%/ui/gtk/notifications.pyo
%%DATADIR%%/ui/gtk/panel.py
%%DATADIR%%/ui/gtk/panel.pyc
%%DATADIR%%/ui/gtk/panel.pyo
%%DATADIR%%/ui/gtk/propitem.py
%%DATADIR%%/ui/gtk/propitem.pyc
%%DATADIR%%/ui/gtk/propitem.pyo
%%DATADIR%%/ui/gtk/toolitem.py
%%DATADIR%%/ui/gtk/toolitem.pyc
%%DATADIR%%/ui/gtk/toolitem.pyo
%%NLS%%share/locale/ar/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/as/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/bn_IN/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/ca/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/da/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/de/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/es/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/fr/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/gu/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/hi/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/hu/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/ja/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/kn/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/ml/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/mr/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/or/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/pa/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/pl/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/sr/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/sr@latin/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/ta/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/te/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/vi/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/ibus.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/ibus.mo
share/pixmaps/ibus-setup.svg
share/pixmaps/ibus.svg
share/icons/hicolor/16x16/apps/ibus-keyboard.png
share/icons/hicolor/22x22/apps/ibus-keyboard.png
share/icons/hicolor/24x24/apps/ibus-keyboard.png
share/icons/hicolor/32x32/apps/ibus-keyboard.png
share/icons/hicolor/48x48/apps/ibus-keyboard.png
share/icons/hicolor/scalable/apps/ibus-engine.svg
share/icons/hicolor/scalable/apps/ibus-keyboard.svg
share/icons/hicolor/scalable/apps/ibus-setup.svg
share/icons/hicolor/scalable/apps/ibus.svg
@dirrm %%DATADIR%%/ui/gtk
@dirrm %%DATADIR%%/ui
@dirrm %%DATADIR%%/icons
@dirrmtry %%DATADIR%%/icons
@dirrmtry %%DATADIR%%/keymaps
@dirrmtry %%DATADIR%%/engine
@dirrmtry %%DATADIR%%/component
@dirrm %%DATADIR%%/setup