Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Matsuu Takuto (matsuu)" <matsuu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-i18n/scim-bridge/files: scim-bridge-0.4.16-configure.ac.patch
Date: Wed, 24 Feb 2010 16:38:51
Message-Id: E1NkKG8-0006Y0-TW@stork.gentoo.org
1 matsuu 10/02/24 16:38:48
2
3 Added: scim-bridge-0.4.16-configure.ac.patch
4 Log:
5 fixed Qt related issue, bug #280887.
6 (Portage version: 2.1.7.17/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/scim-bridge/files/scim-bridge-0.4.16-configure.ac.patch?rev=1.1&content-type=text/plain
13
14 Index: scim-bridge-0.4.16-configure.ac.patch
15 ===================================================================
16 --- configure.ac.orig 2009-11-27 21:07:46.000000000 +0800
17 +++ configure.ac 2009-11-27 21:33:17.000000000 +0800
18 @@ -55,63 +55,6 @@
19 AM_CONDITIONAL(HAVE_DOCBOOK, test x$DOCBOOK_XSL != xno)
20 AM_CONDITIONAL(BUILD_MANUAL, test x$XSLTPROC != xno -a x$DOCBOOK_XSL != xno)
21
22 -# Check if we should build scim-bridge-gtk-immodule
23 -PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.4.0 pango >= 1.1.0 gdk-pixbuf-2.0 >= 2.4.0],
24 - [SCIM_BRIDGE_HAS_GTK2=yes],
25 - [SCIM_BRIDGE_HAS_GTK2=no])
26 -
27 -SCIM_BRIDGE_HAS_GTK2_2=no
28 -if test "$SCIM_BRIDGE_HAS_GTK2" = "yes"; then
29 - if $PKG_CONFIG --exists "gtk+-2.0 >= 2.2" ; then
30 - SCIM_BRIDGE_HAS_GTK2_2=yes
31 - GTK_VERSION=2.2.0
32 - AC_DEFINE(GDK_MULTIHEAD_SAFE,1,[Force use of GDK's multihead-safe APIs.])
33 - fi
34 - if $PKG_CONFIG --exists "gtk+-2.0 >= 2.3.5" ; then
35 - SCIM_BRIDGE_HAS_GTK2_4=yes
36 - GTK_VERSION=2.3.5
37 - AC_DEFINE(HAVE_GTK_DRAW_INSERTION_CURSOR,1,[Have gtk_draw_insertion_cursor ().])
38 - fi
39 - GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
40 - GTK_LIBDIR=`$PKG_CONFIG --variable=libdir gtk+-2.0`
41 - if test -z "$GTK_LIBDIR)"; then
42 - GTK_LIBDIR="$libdir"
43 - fi
44 - AC_SUBST(GTK_LIBDIR)
45 - AC_SUBST(GTK_VERSION)
46 - AC_SUBST(GTK_BINARY_VERSION)
47 - enable_gtk2_immodule="yes";
48 -fi
49 -
50 -# Check if we should build scim-bridge-qt-immodule
51 -PKG_CHECK_MODULES(QT3, [qt-mt >= 3.3],
52 - [SCIM_BRIDGE_HAS_QT3=yes],
53 - [SCIM_BRIDGE_HAS_QT3=no])
54 -
55 -if test "$SCIM_BRIDGE_HAS_QT3" = "yes"; then
56 - if test -z "$QT3_PREFIX"; then
57 - QT3_PREFIX=`$PKG_CONFIG --variable=prefix qt-mt`
58 - fi
59 - AC_SUBST(QT3_PREFIX)
60 - enable_qt3_immodule="yes";
61 -fi
62 -
63 -PKG_CHECK_MODULES(QT4, [QtGui >= 4.0, QtCore >= 4.0],
64 - [SCIM_BRIDGE_HAS_QT4=yes],
65 - [SCIM_BRIDGE_HAS_QT4=no])
66 -
67 -if test "$SCIM_BRIDGE_HAS_QT4" = "yes"; then
68 - if test -z "$QT4_PREFIX"; then
69 - QT4_PREFIX=`$PKG_CONFIG --variable=prefix QtCore`
70 - fi
71 - AC_SUBST(QT4_PREFIX)
72 - if test -z "$QT4_LIBDIR"; then
73 - QT4_LIBDIR=`$PKG_CONFIG --variable=libdir QtCore`
74 - fi
75 - AC_SUBST(QT4_LIBDIR)
76 - enable_qt4_immodule="yes";
77 -fi
78 -
79 ###########################################################
80 ## Definiation of compile args. ##
81 ###########################################################
82 @@ -132,13 +75,16 @@
83 enable_agent=yes)
84
85 AC_ARG_ENABLE(gtk2-immodule,
86 - [AS_HELP_STRING([--enable-gtk2-immodule], [build GTK2 IM module])], , )
87 + [AS_HELP_STRING([--enable-gtk2-immodule], [build GTK2 IM module [default=yes]])], ,
88 + enable_gtk2_immodule=yes)
89
90 AC_ARG_ENABLE(qt3-immodule,
91 - [AS_HELP_STRING([--enable-qt3-immodule], [build Qt3 IM module])], , )
92 + [AS_HELP_STRING([--enable-qt3-immodule], [build Qt3 IM module [default=yes]])], ,
93 + enable_qt3_immodule=yes)
94
95 AC_ARG_ENABLE(qt4-immodule,
96 - [AS_HELP_STRING([--enable-qt4-immodule], [build Qt4 IM module])], , )
97 + [AS_HELP_STRING([--enable-qt4-immodule], [build Qt4 IM module [default=yes]])], ,
98 + enable_qt4_immodule=yes)
99
100 if test "$enable_debug" = "yes"; then
101 AC_DEFINE(ENABLE_DEBUG,1,[Define this to enable the debug facility in libscim])
102 @@ -175,7 +121,33 @@
103 if test "$enable_gtk2_immodule" = "yes"; then
104 SCIM_BRIDGE_BUILD_GTK2_IMMODULE=1
105 SCIM_BRIDGE_BUILD_IMMODULE=1
106 - if test "$SCIM_BRIDGE_HAS_GTK2" = "no" ; then
107 +
108 + # Check if we should build scim-bridge-gtk-immodule
109 + PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.4.0 pango >= 1.1.0 gdk-pixbuf-2.0 >= 2.4.0],
110 + [SCIM_BRIDGE_HAS_GTK2=yes],
111 + [SCIM_BRIDGE_HAS_GTK2=no])
112 +
113 + SCIM_BRIDGE_HAS_GTK2_2=no
114 + if test "$SCIM_BRIDGE_HAS_GTK2" = "yes"; then
115 + if $PKG_CONFIG --exists "gtk+-2.0 >= 2.2" ; then
116 + SCIM_BRIDGE_HAS_GTK2_2=yes
117 + GTK_VERSION=2.2.0
118 + AC_DEFINE(GDK_MULTIHEAD_SAFE,1,[Force use of GDK's multihead-safe APIs.])
119 + fi
120 + if $PKG_CONFIG --exists "gtk+-2.0 >= 2.3.5" ; then
121 + SCIM_BRIDGE_HAS_GTK2_4=yes
122 + GTK_VERSION=2.3.5
123 + AC_DEFINE(HAVE_GTK_DRAW_INSERTION_CURSOR,1,[Have gtk_draw_insertion_cursor ().])
124 + fi
125 + GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
126 + GTK_LIBDIR=`$PKG_CONFIG --variable=libdir gtk+-2.0`
127 + if test -z "$GTK_LIBDIR)"; then
128 + GTK_LIBDIR="$libdir"
129 + fi
130 + AC_SUBST(GTK_LIBDIR)
131 + AC_SUBST(GTK_VERSION)
132 + AC_SUBST(GTK_BINARY_VERSION)
133 + else
134 AC_MSG_ERROR([Gtk >= 2.2 can not be found!])
135 fi
136 enable_immodule=yes
137 @@ -187,7 +159,18 @@
138 if test "$enable_qt3_immodule" = "yes"; then
139 SCIM_BRIDGE_BUILD_QT3_IMMODULE=1
140 SCIM_BRIDGE_BUILD_IMMODULE=1
141 - if test "$SCIM_BRIDGE_HAS_QT3" = "no"; then
142 +
143 + # Check if we should build scim-bridge-qt-immodule
144 + PKG_CHECK_MODULES(QT3, [qt-mt >= 3.3],
145 + [SCIM_BRIDGE_HAS_QT3=yes],
146 + [SCIM_BRIDGE_HAS_QT3=no])
147 +
148 + if test "$SCIM_BRIDGE_HAS_QT3" = "yes"; then
149 + if test -z "$QT3_PREFIX"; then
150 + QT3_PREFIX=`$PKG_CONFIG --variable=prefix qt-mt`
151 + fi
152 + AC_SUBST(QT3_PREFIX)
153 + else
154 AC_MSG_ERROR([qt >= 3.3 can not be found!])
155 fi
156 enable_immodule=yes
157 @@ -199,7 +182,21 @@
158 if test "$enable_qt4_immodule" = "yes"; then
159 SCIM_BRIDGE_BUILD_QT4_IMMODULE=1
160 SCIM_BRIDGE_BUILD_IMMODULE=1
161 - if test "$SCIM_BRIDGE_HAS_QT4" = "no"; then
162 +
163 + PKG_CHECK_MODULES(QT4, [QtGui >= 4.0, QtCore >= 4.0],
164 + [SCIM_BRIDGE_HAS_QT4=yes],
165 + [SCIM_BRIDGE_HAS_QT4=no])
166 +
167 + if test "$SCIM_BRIDGE_HAS_QT4" = "yes"; then
168 + if test -z "$QT4_PREFIX"; then
169 + QT4_PREFIX=`$PKG_CONFIG --variable=prefix QtCore`
170 + fi
171 + AC_SUBST(QT4_PREFIX)
172 + if test -z "$QT4_LIBDIR"; then
173 + QT4_LIBDIR=`$PKG_CONFIG --variable=libdir QtCore`
174 + fi
175 + AC_SUBST(QT4_LIBDIR)
176 + else
177 AC_MSG_ERROR([qt >= 4.0 can not be found!])
178 fi
179 enable_immodule=yes
Report Message
Find on MARC Find on Google Groups