diff options
| -rw-r--r-- | misc/fcitx-mozc/fcitx-mozc.SlackBuild | 35 | ||||
| -rw-r--r-- | misc/fcitx-mozc/fcitx-mozc.info | 6 |
2 files changed, 17 insertions, 24 deletions
diff --git a/misc/fcitx-mozc/fcitx-mozc.SlackBuild b/misc/fcitx-mozc/fcitx-mozc.SlackBuild index 8ec8a6a747..4858b3f375 100644 --- a/misc/fcitx-mozc/fcitx-mozc.SlackBuild +++ b/misc/fcitx-mozc/fcitx-mozc.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for fcitx-mozc # Issued under The MIT License (MIT) # -# Copyright 2015 Kuro_CODE25 +# Copyright 2016 Kuro_CODE25 # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ # THE SOFTWARE. PRGNAM=fcitx-mozc -VERSION=${VERSION:-2.17.2102.102.1} +VERSION=${VERSION:-2.17.2313.102.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,15 +62,12 @@ QT4I=`pkg-config QtGui --cflags-only-I` BLDTYPE=Release # source rev. and version. -ZIPCODE_REL=201504 +ZIPCODE_REL=201511 PROTOBUF_REV=172019c40bf548908ab09bfd276074c929d48415 -GYP_REV=ff251c3d43eb4263d3aafa29007d6420289525d1 -JSONCPP_REV=11086dd6a7eba04289944367ca82cea71299ed70 +GYP_REV=e2e928bacd07fead99a18cb08d64cb24e131d3e5 JAPNESE_USAGE_DICT_REV=e5b3425575734c323e1d947009dd74709437b684 -MOZC_REV=3648b9bf06d5d9b36bed2425640bfd18ae05b588 -FONTTOOLS_REV=5ba7d98a4153fad57258fca23b0bcb238717aec3 -JSR305_VER=2.0.2 -FCITX_PATCH_VER=2.17.2102.102.1 +MOZC_REV=3306d3314499a54a4064b8b80bbc1bce3f6cfac4 +FCITX_PATCH_VER=2.17.2313.102.1 rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -79,27 +76,25 @@ rm -rf $PRGNAM-$VERSION mkdir -p $PRGNAM-$VERSION cd $PRGNAM-$VERSION echo "prepare source file..." + # unzip packages unzip ${CWD}/x-ken-all-${ZIPCODE_REL}.zip unzip ${CWD}/jigyosyo-${ZIPCODE_REL}.zip -tar -xvf ${CWD}/fcitx-mozc-icon.tar.gz unzip ${CWD}/$MOZC_REV.zip -unzip ${CWD}/$JSONCPP_REV.zip unzip ${CWD}/$JAPNESE_USAGE_DICT_REV.zip unzip ${CWD}/$GYP_REV.zip unzip ${CWD}/$PROTOBUF_REV.zip -unzip ${CWD}/$FONTTOOLS_REV.zip + +# extact tar file +tar -xvf ${CWD}/fcitx-mozc-icon.tar.gz cp $CWD/fcitx-mozc-${FCITX_PATCH_VER}.patch . -cp $CWD/jsr305-$JSR305_VER.jar . # rename directory mv mozc-$MOZC_REV mozc -mv jsoncpp-$JSONCPP_REV jsoncpp mv japanese-usage-dictionary-$JAPNESE_USAGE_DICT_REV japanese_usage_dictionary -mv gyp-$GYP_REV gyp mv protobuf-$PROTOBUF_REV protobuf -mv fonttools-$FONTTOOLS_REV fonttools +mv gyp-$GYP_REV gyp chown -R root:root . find -L . \ @@ -122,13 +117,12 @@ echo "Done." # Copy third party deps echo "Copy third party deps ..." cd $BLDBASEDIR -for dep in jsoncpp gyp protobuf japanese_usage_dictionary fonttools +for dep in gyp protobuf japanese_usage_dictionary do cp -a $dep mozc/src/third_party/ done -install -D jsr305-$JSR305_VER.jar mozc/src/third_party/jsr305/jsr305-$JSR305_VER.jar - +# build package echo "build package..." CFLAGS="${CFLAGS} $QT4I -fvisibility=hidden" CXXFLAGS="${CXXFLAGS} $QT4I -fvisibility=hidden" @@ -137,7 +131,7 @@ cd $BLDBASEDIR/mozc/src _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool unix/fcitx/fcitx.gyp:fcitx-mozc" -QTDIR=$QT4DIR GYP_DEFINES="document_dir=/usr/share/licenses/$pkgname" python2 build_mozc.py gyp +QTDIR=$QT4DIR GYP_DEFINES="document_dir=/usr/share/licenses/$pkgname use_libzinnia=1" python2 build_mozc.py gyp sed -i 's|command = $cxx -MMD -MF $out.d $defines $includes $cflags $cflags_cc $cflags_pch_cc -c $in -o $out|command = $cxx -MMD -MF $out.d $defines $includes -D__STRICT_ANSI__ $cflags $cflags_cc $cflags_pch_cc -c $in -o $out|' out_linux/Release/build.ninja python2 build_mozc.py build -c $BLDTYPE $_targets @@ -145,7 +139,6 @@ python2 build_mozc.py build -c $BLDTYPE $_targets head -n 29 server/mozc_server.cc > LICENSE BLDTYPE=Release -#cd mozc/src # install mozc to /usr/lib even if 64 bit install -D -m 755 out_linux/${BLDTYPE}/mozc_server "${PKG}/usr/lib/mozc/mozc_server" diff --git a/misc/fcitx-mozc/fcitx-mozc.info b/misc/fcitx-mozc/fcitx-mozc.info index 4570d90c88..320a8faf41 100644 --- a/misc/fcitx-mozc/fcitx-mozc.info +++ b/misc/fcitx-mozc/fcitx-mozc.info @@ -1,8 +1,8 @@ PRGNAM="fcitx-mozc" -VERSION="2.17.2102.102.1" +VERSION="2.17.2313.102.1" HOMEPAGE="https://fcitx-im.org" -DOWNLOAD="http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.17.2102.102.1.patch http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz http://downloads.sourceforge.net/pnsft-aur/jigyosyo-201504.zip http://findbugs.googlecode.com/svn/repos/release-repository/com/google/code/findbugs/jsr305/2.0.2/jsr305-2.0.2.jar http://downloads.sourceforge.net/pnsft-aur/x-ken-all-201504.zip https://github.com/google/mozc/archive/3648b9bf06d5d9b36bed2425640bfd18ae05b588.zip https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.zip https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.zip https://github.com/svn2github/gyp/archive/ff251c3d43eb4263d3aafa29007d6420289525d1.zip https://github.com/google/protobuf/archive/172019c40bf548908ab09bfd276074c929d48415.zip https://github.com/googlei18n/fonttools/archive/5ba7d98a4153fad57258fca23b0bcb238717aec3.zip" -MD5SUM="d32e372c9e1fbbc028062e9f962089a7 80fe2ef127b70649df22d133822ac8a7 22e7aeec439f889b0cda4bd23126414c 144c0767e2aaf0c21a935908d0e52c68 5fa1b29d7e06a482b4eb99baf2b8597d a14580576d8401bc7f934796ff520e79 2390d646496db0bcec0ffa6bbfee2435 a6eb1da9ad7ceffcb9683003332abf7e 6e458cb1c330c772b59c80fe262a1944 828b7ffb92b4a01cce10312cdef4f532 cf0f74dd6536a35d0f6067a0de732c76" +DOWNLOAD="http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.17.2313.102.1.patch http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz http://downloads.sourceforge.net/pnsft-aur/jigyosyo-201511.zip http://downloads.sourceforge.net/pnsft-aur/x-ken-all-201511.zip https://github.com/google/mozc/archive/3306d3314499a54a4064b8b80bbc1bce3f6cfac4.zip https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.zip https://github.com/google/protobuf/archive/172019c40bf548908ab09bfd276074c929d48415.zip https://github.com/adblockplus/gyp/archive/e2e928bacd07fead99a18cb08d64cb24e131d3e5.zip" +MD5SUM="45fc59b37e21fc9d19875a9a45683688 80fe2ef127b70649df22d133822ac8a7 6a077e9aef4d8510cb4863e15ad2aed2 613677880579f1dc03f0637d42abaf0c 1b6d8aa97cb9801d214de0f47fee0242 a6eb1da9ad7ceffcb9683003332abf7e 828b7ffb92b4a01cce10312cdef4f532 fe502a9242ba799406b1141b5085a24d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="fcitx-configtool ninja zinnia" |