diff options
author | Hiroki Sato <hrs@FreeBSD.org> | 2008-04-13 18:27:25 +0000 |
---|---|---|
committer | Hiroki Sato <hrs@FreeBSD.org> | 2008-04-13 18:27:25 +0000 |
commit | a3081a9fbfe6bd4175ace4a939198e25b67e1df4 (patch) | |
tree | 09e21c0742f8ebe485aea167d74ebf6ff23b5ce9 /print | |
parent | linux-scim-libs is library part of Smart Common Input Method (diff) |
Update to 20080110. GTK_IM_MODULE and XMODIFIERS hack is added
and enabled by default. To disable this, you need to set
$ADOBE_DISABLEIMMODULEHACK to YES.
Discussed on: freebsd-ports@
Notes
Notes:
svn path=/head/; revision=211183
Diffstat (limited to 'print')
-rw-r--r-- | print/acroreadwrapper/Makefile | 4 | ||||
-rw-r--r-- | print/acroreadwrapper/files/acroread.in | 43 |
2 files changed, 38 insertions, 9 deletions
diff --git a/print/acroreadwrapper/Makefile b/print/acroreadwrapper/Makefile index 4fb27689a6f2..0bc1a63096ed 100644 --- a/print/acroreadwrapper/Makefile +++ b/print/acroreadwrapper/Makefile @@ -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 @@ SUB_LIST= ACROBASE7=${ACROBASE7} \ ADOBEBASE= Adobe ACROBASE7= ${ADOBEBASE}/Acrobat7.0 ACROBASE8= ${ADOBEBASE}/Reader8 -PLUGINDIR= lib/browser_linux_plugins +PLUGINDIR= lib/npapi/linux-acroread do-fetch: @${DO_NADA} diff --git a/print/acroreadwrapper/files/acroread.in b/print/acroreadwrapper/files/acroread.in index 803000d2ef71..f0dc4c6cf61f 100644 --- a/print/acroreadwrapper/files/acroread.in +++ b/print/acroreadwrapper/files/acroread.in @@ -1,4 +1,4 @@ -#!%%LINUXBASE%%/bin/sh +#!/bin/sh # $FreeBSD$ # 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,7 +71,6 @@ esac 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 @@ -94,19 +101,41 @@ case ${ADOBE_VER} in ;; esac +case ${ADOBE_DISABLEIMMODULEHACK} in +[Yy][Ee][Ss]) ;; # do nothing +*) + case ${ADOBE_VER}:${GTK_IM_MODULE} in + *:""|*:xim) + GTK_IM_MODULE=xim; export GTK_IM_MODULE + ;; + 7:scim) + GTK_IM_MODULE=xim; export GTK_IM_MODULE + XMODIFIERS="@im=SCIM"; export XMODIFIERS + ;; + 8:scim) + GTK_IM_MODULE=scim; export GTK_IM_MODULE + XMODIFIERS="@im=SCIM"; export XMODIFIERS + ;; + *) + XMODIFIERS="@im=${GTK_IM_MODULE}"; export XMODIFIERS + ;; + esac +;; +esac + case $1 in --install-plugin) echo "installing PDF plugin..." echo "%%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/Browser/intellinux/nppdf.so -> %%PREFIX%%/%%PLUGINDIR%%/nppdf.so" - mkdir -p /../%%PREFIX%%/%%PLUGINDIR%% - ln -s -f %%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/Browser/intellinux/nppdf.so \ - /../%%PREFIX%%/%%PLUGINDIR%%/nppdf.so + mkdir -p %%PREFIX%%/%%PLUGINDIR%% + ln -s -f %%PREFIX%%/${ACROBASE}/${ADOBE_LANG}/${BINPREFIX}/../Browser/intellinux/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 |