Date: Mon, 14 Jan 2008 02:37:13 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: nikola.lecic@anthesphoria.net Cc: FreeBSD-ports@FreeBSD.org Subject: Re: CFT: Adobe Reader 8 + SCIM/UIM Message-ID: <20080114.023713.237718911.hrs@allbsd.org> In-Reply-To: <20080108095126.2efc4557@anthesphoria.net> References: <20080108.114947.266356108.hrs@allbsd.org> <20080108.132806.27123224.hrs@allbsd.org> <20080108095126.2efc4557@anthesphoria.net>
next in thread | previous in thread | raw e-mail | index | archive | help
----Security_Multipart0(Mon_Jan_14_02_37_13_2008_695)--
Content-Type: Multipart/Mixed;
boundary="--Next_Part(Mon_Jan_14_02_37_13_2008_582)--"
Content-Transfer-Encoding: 7bit
----Next_Part(Mon_Jan_14_02_37_13_2008_582)--
Content-Type: Text/Plain; charset=utf-8
Content-Transfer-Encoding: base64
Tmlrb2xhIExlxI1pxIcgPG5pa29sYS5sZWNpY0BhbnRoZXNwaG9yaWEubmV0PiB3cm90ZQ0KICBp
biA8MjAwODAxMDgwOTUxMjYuMmVmYzQ1NTdAYW50aGVzcGhvcmlhLm5ldD46DQoNCm5pPiAzLiBO
b3cgYWNyb3JlYWQ3IGRvZXNuJ3Qgd29yayAoZm9yIG1lIGF0IGxlYXN0KSwgd2l0aCBhbGwgU0NJ
TS1yZWxhdGVkDQpuaT4gICAgZW52aXJvbm1lbnQgdmFyaWFibGVzIHNjaGVtZXMuIEl0IGp1c3Qg
cmV0dXJucyBtZSBiYWNrIHRvIHRoZSBzaGVsbA0Kbmk+ICAgIHByb21wdCB3aXRob3V0IGFueSBl
cnJvciBtZXNzYWdlOw0Kbmk+IA0Kbmk+IDQuIEhvd2V2ZXIsIGlmIEkgdXNlIHRoZSBlbnZpcm9u
bWVudCBzY2hlbWUgSSBzdWdnZXN0ZWQgaW4gbXkgcHJldmlvdXMNCm5pPiAgICBtYWlsIGFuZCBj
aGFuZ2UgR1RLX0lNX01PRFVMRS9YTU9ESUZJRVJTIGluIGFjcm9yZWFkNyBzdGFydHVwDQpuaT4g
ICAgc2NyaXB0IGFzIHByb3Bvc2VkLCBhbGwgYXBwbGljYXRpb25zIHdvcmssIGFuZCBTQ0lNIGlu
IHRoZW0uDQoNCiBGcm9tIGZ1cnRoZXIgaW52ZXN0aWdhdGlvbiwgdGhlIGNhdXNlIG9mIHRoaXMg
cHJvYmxlbSB0dXJucyBvdXQgdG8gYmUNCiBhcyBmb2xsb3dzOg0KDQogYSkgV2hlbiBHVEtfSU1f
TU9EVUxFPXhpbSBhbmQgb25lIHJ1bnMgYSBMaW51eCBiaW5hcnkgdGhhdCB1c2VzDQogICAgbGlu
dXgtZ3RrMiBsaWJyYXJ5LCB0aGUgYmluYXJ5IHVzZXMgaW0teGltLnNvIGluIGxpbnV4LWd0azIg
YW5kIGl0DQogICAgd29ya3MuDQoNCiBiKSBXaGVuIEdUS19JTV9NT0RVTEU9c2NpbSAob3Igb3Ro
ZXIgdGhhbiB4aW0pIGFuZCBvbmUgcnVucyBhIExpbnV4DQogICAgYmluYXJ5IHRoYXQgdXNlcyBs
aW51eC1ndGsyIGxpYnJhcnksIHRoZSBiaW5hcnkgdHJpZXMgdG8gbG9hZCB0aGUNCiAgICBjb3Jy
ZXNwb25kaW5nIGltbW9kdWxlIGZpbGUuICBJZiB0aGUgY29ycmVzcG9uZGluZyBmaWxlIGlzIGZv
dW5kDQogICAgaW4gL3Vzci9jb21wYXQvbGludXgvdXNyL2xpYi9ndGstMi4wIChpLmUuIExpbnV4
IGJpbmFyeSksIGl0IGlzDQogICAgbG9hZGVkIGFuZCBzaG91bGQgd29yayBmaW5lLiAgSWYgdGhl
IGNvcnJlc3BvbmRpbmcgZmlsZSBpcyBmb3VuZA0KICAgIGluIC91c3IvbG9jYWwvbGliL2d0ay0y
LjAgKGkuZS4gRnJlZUJTRCBuYXRpdmUgYmluYXJ5KSwgaXQgaXMNCiAgICBsb2FkZWQgYnV0IGRv
ZXMgbm90IHdvcmsuICBJbiB0aGUgbGF0dGVyIGNhc2UsIGlmIHRoZSBsb2FkaW5nDQogICAgZmFp
bHMgZ3JhY2VmdWxseSwgaXQgZmFsbHMgYmFjayBpbnRvIGxvYWRpbmcgaW0teGltLnNvLg0KDQog
YykgYWNyb3JlYWQ3IHdvcmtzIG9ubHkgd2l0aCBpbS14aW0uc28gYW5kIGxvYWRpbmcgRnJlZUJT
RCBiaW5hcnkNCiAgICBmYWlscyBncmFjZWZ1bGx5LiAgVGhpcyBtZWFucyBzZXR0aW5nIEdUS19J
TV9NT0RVTEU9c2NpbSBmYWxscw0KICAgIGJhY2sgaW50byBHVEtfSU1fTU9EVUxFPXhpbSBhdXRv
bWF0aWNhbGx5LiAocHJvYmFibHkgdGhpcyBpcyB0aGUNCiAgICByZWFzb24gd2h5IEdUS19JTV9N
T0RVTEU9c2NpbSArIFFUX0lNX01PRFVMRT1zY2ltICsNCiAgICBYTU9ESUZJRVJTPUBpbT1TQ0lN
IHdvcmtzLikNCg0KIGQpIGFjcm9yZWFkOCB3b3JrcyB3aXRoIGJvdGggaW0teGltLnNvIGFuZCBp
bS1zY2ltLnNvIGFzIGZhciBhcyBJIGNhbg0KICAgIGNoZWNrLCBhbmQgbG9hZGluZyBGcmVlQlNE
IGJpbmFyeSBtYWtlcyB0aGUgcHJvY2VzcyBnZXQgaG9zZWQuDQoNCiBTbywgdGhlIGluZGl2aWR1
YWwgY2FzZXMgY2FuIGJlIGNsYXNzaWZpZWQgYXMgZm9sbG93czoNCg0KIC0gYWNyb3JlYWQ3ICsg
R1RLX0lNX01PRFVMRT14aW0gKyBYTU9ESUZJRVJTPUBpbT1TQ0lNDQoNCiAgIC0+IHNob3VsZCB3
b3JrLiAgQGltPWZvbyBvdGhlciB0aGFuIFNDSU0gYWxzbyB3b3Jrcy4NCg0KIC0gYWNyb3JlYWQ3
ICsgR1RLX0lNX01PRFVMRT1zY2ltDQoNCiAgIC0+IHNob3VsZCB3b3JrLiAgRXZlbiBpZiBGcmVl
QlNEIG5hdGl2ZSBpbS1zY2ltLnNvIGV4aXN0cyBpdCBpcw0KICAgICAgYWx3YXlzIGlnbm9yZWQg
YW5kIFhJTSBpcyB1c2VkLiAgTm90ZSB0aGF0IGlmIExpbnV4IGltLXNjaW0uc28NCiAgICAgIGV4
aXN0cyBpdCBwcmV2ZW50cyB0aGUgYWNyb3JlYWQ3IGZyb20gd29ya2luZywgYnV0IHRoZXJlIGlz
IG5vDQogICAgICBwb3J0IG9mIGltLXNjaW0uc28gaW4gdGhlIFBvcnRzIENvbGxlY3Rpb24gbm93
Lg0KDQogLSBhY3JvcmVhZDggKyBHVEtfSU1fTU9EVUxFPXhpbSArIFhNT0RJRklFUlM9QGltPVND
SU0NCg0KICAgLT4gc2hvdWxkIHdvcmsuICBAaW09Zm9vIG90aGVyIHRoYW4gU0NJTSBhbHNvIHdv
cmtzLg0KDQogLSBhY3JvcmVhZDggKyBHVEtfSU1fTU9EVUxFPXNjaW0NCg0KICAgLT4gZG9lcyBu
b3Qgd29yayB1bmxlc3MgTGludXggaW0tc2NpbS5zbyBleGlzdHMuICBJZiBGcmVlQlNEIG5hdGl2
ZQ0KICAgICAgaW0tc2NpbS5zbyBleGlzdHMgdGhlIGFjcm9yZWFkOCBwcm9jZXNzIGdldHMgaG9z
ZWQgKG5vIGZhbGwtYmFjaw0KICAgICAgaGFwcGVucykuDQoNCiBTbywgdGhlIHNhZmVzdCB3YXkg
dG8gbG9hZGluZyBMaW51eCB2ZXJzaW9uIG9mIGltLXhpbS5zbyBpcyBzZXR0aW5nDQogR1RLX0lN
X01PRFVMRT14aW0gZm9yY2libHkuICBBbmQgaWYgc2V0dGluZyBYTU9ESUZJRVJTIHByb3Blcmx5
IHRoZXJlDQogc2hvdWxkIGJlIGxpdHRsZSBkaWZmZXJlbmNlIGluIGl0cyBiZWhhdmlvciBmcm9t
IHRoZSB1c2VyJ3MgcG9pbnQgb2YNCiB2aWV3Lg0KDQogSSBwb25kZXJlZCBvdmVyIGFkZGluZyBw
b3J0cyBvZiB0aGUgTGludXggaW1tb2R1bGVzIGluIG15IHByZXZpb3VzDQogcG9zdCBvciBhIGhh
Y2sgZm9yIEdUS19JTV9NT0RVTEUgdmFyaWFibGUgaW50byBwcmludC9hY3JvcmVhZHdyYXBwZXIs
DQogYnV0IEkgdGhpbmsgY2hhbmdpbmcgYWNyb3JlYWR3cmFwcGVyIGlzIGJldHRlci4gIEEgcGF0
Y2ggZm9yDQogYWNyb3JlYWR3cmFwcGVyIHRoYXQgc2V0cyBHVEtfSU1fTU9EVUxFPXhpbSBmb3Jj
aWJseSBhbmQgc2V0cw0KIFhNT0RJRklFUlM9QGltPWZvbyBhY2NvcmRpbmcgdG8gR1RLX0lNX01P
RFVMRSwgaGFzIGJlZW4gYXR0YWNoZWQuDQoNCiBIb3dldmVyLCBpbiB5b3VyIHBvc3QgeW91IHNh
aWQgd2hlbiBHVEtfSU1fTU9EVUxFPXhpbSArDQogWE1PRElGSUVSUz1AaW09U0NJTSwgdGhlIGJl
aGF2aW9yIGlzIGJhZC4gIENvdWxkIHlvdSBlbGFib3JhdGUgaXQ/ICBJDQogY291bGQgbm90IHJl
cHJvZHVjZSBpdC4NCg0KLS0gDQp8IEhpcm9raSBTQVRPDQo=
----Next_Part(Mon_Jan_14_02_37_13_2008_582)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="acroreadwrapper.diff"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/print/acroreadwrapper/Makefile,v
retrieving revision 1.9
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -r1.9 Makefile
--- Makefile 4 Jan 2008 20:20:20 -0000 1.9
+++ Makefile 11 Jan 2008 14:25:27 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= acroreadwrapper
-PORTVERSION= 0.0.20071020
+PORTVERSION= 0.0.20080110
CATEGORIES= print
MASTER_SITES= # empty
DISTFILES= # empty
@@ -29,7 +29,7 @@
ADOBEBASE= Adobe
ACROBASE7= ${ADOBEBASE}/Acrobat7.0
ACROBASE8= ${ADOBEBASE}/Reader8
-PLUGINDIR= lib/browser_linux_plugins
+PLUGINDIR= lib/npapi/linux-acroread
do-fetch:
@${DO_NADA}
Index: files/acroread.in
===================================================================
RCS file: /home/ncvs/ports/print/acroreadwrapper/files/acroread.in,v
retrieving revision 1.5
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -r1.5 acroread.in
--- files/acroread.in 4 Jan 2008 20:20:20 -0000 1.5
+++ files/acroread.in 11 Jan 2008 14:28:58 -0000
@@ -1,4 +1,4 @@
-#!%%LINUXBASE%%/bin/sh
+#!/bin/sh
# $FreeBSD: ports/print/acroreadwrapper/files/acroread.in,v 1.5 2008/01/04 20:20:20 hrs Exp $
# environment variables:
@@ -13,6 +13,14 @@
# When this script is invoked as "acroread7" and "acroread8",
# ADOBE_VER is automatically set.
#
+# ADOBE_DISABLEIMMODULEHACK:
+# This script sets GTK_IM_MODULE as "xim" by default because
+# immodules other than xim require the corresponding module files
+# in Linux binary, not FreeBSD native versions (if a FreeBSD
+# native immodule library exists and the corresponding Linux
+# library does not, Adobe Reader attempts to load the FreeBSD
+# binary and it will fail). If $ADOBE_DISABLEIMMODULEHACK is
+# defined as "YES", this behavior is disabled.
ADOBE_LANG=`echo "${ADOBE_LANG}" | tr a-z A-Z`
@@ -63,10 +71,21 @@
case ${ADOBE_LANG} in
CHS) : ${GDK_USE_XFT:=0}; export GDK_USE_XFT ;;
CHT) : ${GDK_USE_XFT:=0}; export GDK_USE_XFT ;;
-JPN) : ${GTK_IM_MODULE:=xim}; export GTK_IM_MODULE ;;
KOR) : ${GDK_USE_XFT:=0}; export GDK_USE_XFT ;;
esac
+case ${ADOBE_DISABLEIMMODULEHACK} in
+[Yy][Ee][Ss]) ;; # do nothing
+*)
+ case GTK_IM_MODULE in
+ ""|xim) ;; # do nothing
+ scim) XMODIFIERS="@im=SCIM"; export XMODIFIERS ;;
+ *) XMODIFIERS="@im=${GTK_IM_MODULE}"; export XMODIFIERS ;;
+ esac
+
+ GTK_IM_MODULE=xim; export GTK_IM_MODULE
+esac
+
case ${ADOBE_VER} in
"")
BN=${0##*/}
@@ -98,15 +117,15 @@
--install-plugin)
echo "installing PDF plugin..."
echo "%%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/Browser/intellinux/nppdf.so -> %%PREFIX%%/%%PLUGINDIR%%/nppdf.so"
- mkdir -p /../%%PREFIX%%/%%PLUGINDIR%%
+ mkdir -p %%PREFIX%%/%%PLUGINDIR%%
ln -s -f %%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/Browser/intellinux/nppdf.so \
- /../%%PREFIX%%/%%PLUGINDIR%%/nppdf.so
+ %%PREFIX%%/%%PLUGINDIR%%/nppdf.so
exit 0
;;
--deinstall-plugin)
echo "deinstalling PDF plugin..."
- rm -f /../%%PREFIX%%/%%PLUGINDIR%%/nppdf.so
- rmdir /../%%PREFIX%%/%%PLUGINDIR%% 2> /dev/null || true
+ rm -f %%PREFIX%%/%%PLUGINDIR%%/nppdf.so
+ rmdir %%PREFIX%%/%%PLUGINDIR%% > /dev/null 2>&1 || true
exit 0
;;
esac
----Next_Part(Mon_Jan_14_02_37_13_2008_582)----
----Security_Multipart0(Mon_Jan_14_02_37_13_2008_695)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
iD8DBQBHikxJTyzT2CeTzy0RAsXVAKCfVJA0/gaLbQwJda0acW/5WDd+9ACgzj54
rgQ0D+Ynvbhui/fTlM8X7tg=
=XepE
-----END PGP SIGNATURE-----
----Security_Multipart0(Mon_Jan_14_02_37_13_2008_695)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080114.023713.237718911.hrs>