diff options
-rw-r--r-- | .SRCINFO | 25 | ||||
-rw-r--r-- | PKGBUILD | 51 | ||||
-rw-r--r-- | youdao-arch.patch | 29 | ||||
-rw-r--r-- | youdao-dict.install | 13 |
4 files changed, 28 insertions, 90 deletions
@@ -1,36 +1,31 @@ -# Generated by mksrcinfo v8 -# Thu Dec 22 14:15:39 UTC 2016 pkgbase = youdao-dict pkgdesc = YouDao Dictionary - pkgver = 1.1.0 + pkgver = 6.0.0 pkgrel = 2 - url = http://cidian.youdao.com/index-linux.html - install = youdao-dict.install + url = https://cidian.youdao.com/ arch = i686 arch = x86_64 license = GPL3 - depends = desktop-file-utils depends = hicolor-icon-theme - depends = python depends = python-pyqt5 depends = python-requests depends = python-xlib + depends = python-gobject + depends = python-opengl depends = python-pillow + depends = python-pyquery + depends = python-webob + depends = python-xdg depends = tesseract-data-eng depends = tesseract-data-chi_tra depends = tesseract-data-chi_sim - depends = python-lxml - depends = python-xdg - depends = python-webob depends = qt5-webkit depends = qt5-graphicaleffects depends = qt5-quickcontrols - source = youdao-arch.patch - sha256sums = ab1e8cf2b38c459c60af5e47814a022ad485d2e2c0ae257ffae4c03174e703a6 - source_i686 = http://codown.youdao.com/cidian/linux/youdao-dict_1.1.0-0~i386.tar.gz + source_i686 = http://codown.youdao.com/cidian/linux/youdao-dict_6.0.0_i386.tar.gz sha256sums_i686 = d1ff404f1e465d6a196b566294ddfea1a1bfe4568226201b65d74236407152fc - source_x86_64 = http://codown.youdao.com/cidian/linux/youdao-dict_1.1.0-0~amd64.tar.gz - sha256sums_x86_64 = 5c3a5ed105238e2fad181704fd99815c4275bf546136f99e817614188794dc07 + source_x86_64 = http://codown.youdao.com/cidian/linux/youdao-dict-6.0.0-amd64.tar.gz + sha256sums_x86_64 = 556e2dadd0a737967b78ffd9ad5430660d190e4489854a309c85f81fdf7f084f pkgname = youdao-dict @@ -1,59 +1,44 @@ # Maintainer: yesuu zhang <yesuu79@qq.com> +# Contributor: qaz <fkxxyz@163.com> pkgname=youdao-dict -pkgver=1.1.0 +pkgver=6.0.0 pkgrel=2 pkgdesc='YouDao Dictionary' arch=('i686' 'x86_64') -url='http://cidian.youdao.com/index-linux.html' +url='https://cidian.youdao.com/' license=('GPL3') depends=( - 'desktop-file-utils' 'hicolor-icon-theme' - 'python' + 'python-pyqt5' 'python-requests' 'python-xlib' + 'python-gobject' + 'python-opengl' 'python-pillow' + 'python-pyquery' + 'python-webob' + 'python-xdg' + 'tesseract-data-eng' 'tesseract-data-chi_tra' 'tesseract-data-chi_sim' - 'python-lxml' - 'python-xdg' - 'python-webob' 'qt5-webkit' 'qt5-graphicaleffects' 'qt5-quickcontrols' ) -install=youdao-dict.install -source=('youdao-arch.patch') -source_i686=('http://codown.youdao.com/cidian/linux/youdao-dict_1.1.0-0~i386.tar.gz') -source_x86_64=('http://codown.youdao.com/cidian/linux/youdao-dict_1.1.0-0~amd64.tar.gz') -sha256sums=('ab1e8cf2b38c459c60af5e47814a022ad485d2e2c0ae257ffae4c03174e703a6') +source_i686=('http://codown.youdao.com/cidian/linux/youdao-dict_6.0.0_i386.tar.gz') +source_x86_64=('http://codown.youdao.com/cidian/linux/youdao-dict-6.0.0-amd64.tar.gz') sha256sums_i686=('d1ff404f1e465d6a196b566294ddfea1a1bfe4568226201b65d74236407152fc') -sha256sums_x86_64=('5c3a5ed105238e2fad181704fd99815c4275bf546136f99e817614188794dc07') - -prepare() { - cd "${srcdir}/src" - patch -Np2 -i "${srcdir}/youdao-arch.patch" -} +sha256sums_x86_64=('556e2dadd0a737967b78ffd9ad5430660d190e4489854a309c85f81fdf7f084f') package() { cd "${srcdir}" - mkdir -p "${pkgdir}/usr/bin" - mkdir -p "${pkgdir}/usr/share/youdao-dict" - mkdir -p "${pkgdir}/usr/share/applications" - mkdir -p "${pkgdir}/usr/share/dbus-1/services" - mkdir -p "${pkgdir}/usr/share/icons/hicolor/48x48/apps" - mkdir -p "${pkgdir}/usr/share/icons/hicolor/scalable/apps" - mkdir -p "${pkgdir}/etc/xdg/autostart" - cp -r src/* "${pkgdir}/usr/share/youdao-dict" - cp -r data/hicolor/* "${pkgdir}/usr/share/icons/hicolor/" - cp data/youdao-dict.desktop "${pkgdir}/usr/share/applications/" - cp data/youdao-dict-autostart.desktop "${pkgdir}/etc/xdg/autostart/" - cp data/com.youdao.backend.service "${pkgdir}/usr/share/dbus-1/services/" - chmod 755 "${pkgdir}/usr/share/youdao-dict/main.py" - chmod 755 "${pkgdir}/usr/share/youdao-dict/youdao-dict-backend.py" - ln -sf /usr/share/youdao-dict/main.py "${pkgdir}/usr/bin/youdao-dict" + [ ${CARCH} == x86_64 ] && cd "youdao-dict-${pkgver}-amd64" + + sed -i -e "/PREFIX=/cROOT=${pkgdir}\nPREFIX=\$ROOT/usr" -e 's/\/etc/$ROOT\/etc/g' -e 's/ln -sf $PREFIX/ln -sf \/usr/g' install.sh + sh install.sh } + diff --git a/youdao-arch.patch b/youdao-arch.patch deleted file mode 100644 index 165f76bdb93c..000000000000 --- a/youdao-arch.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/youdao-dict/app/plugins/youdao/dbus_proxy.py 2016-05-24 11:12:53.000000000 +0800 -+++ b/youdao-dict/app/plugins/youdao/dbus_proxy.py 2016-09-22 14:43:11.571453798 +0800 -@@ -52,6 +52,7 @@ - def __init__(self): - QtCore.QObject.__init__(self) - self.session_bus = QDBusConnection.sessionBus() -+ self.session_bus.registerObject('/', self) - self.session_bus.connect(self.DBUS_NAME, self.DBUS_PATH, self.DBUS_IFACE, - 'hide', self.hideSlot) - self.session_bus.connect(self.DBUS_NAME, self.DBUS_PATH, self.DBUS_IFACE, -@@ -204,6 +205,7 @@ - def __init__(self): - QtCore.QObject.__init__(self) - self.session_bus = QDBusConnection.sessionBus() -+ self.session_bus.registerObject('/indicator', self) - self.session_bus.connect(self.DBUS_NAME, self.DBUS_PATH, self.DBUS_IFACE, - 'MenuItemClicked', self.MenuItemClickedSlot) - self.session_bus.connect(self.DBUS_NAME, self.DBUS_PATH, self.DBUS_IFACE, ---- a/youdao-dict/dae/ewmh.py 2016-05-24 11:12:53.000000000 +0800 -+++ b/youdao-dict/dae/ewmh.py 2016-09-22 14:43:20.551538216 +0800 -@@ -116,7 +116,7 @@ - self.display.get_atom(property_type), - Xatom.STRING, - 8, -- property_content, -+ property_content.encode('ascii'), - ) - self.display.sync() - diff --git a/youdao-dict.install b/youdao-dict.install deleted file mode 100644 index 6a34363af250..000000000000 --- a/youdao-dict.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - |