[arch-commits] Commit in fcitx-qt5/repos/community-x86_64 (3 files)

[Felix Yan]

    Date: Saturday, May 26, 2018 @ 07:53:09
  Author: felixonmars
Revision: 330011

archrelease: copy trunk to community-x86_64

Added:
  fcitx-qt5/repos/community-x86_64/PKGBUILD
    (from rev 330010, fcitx-qt5/trunk/PKGBUILD)
Deleted:
  fcitx-qt5/repos/community-x86_64/PKGBUILD
  fcitx-qt5/repos/community-x86_64/fcitx-qt5.11.patch

--------------------+
 PKGBUILD           |   65 ++++++++++++++++++++++-----------------------------
 fcitx-qt5.11.patch |   10 -------
 2 files changed, 29 insertions(+), 46 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-26 07:52:44 UTC (rev 330010)
+++ PKGBUILD	2018-05-26 07:53:09 UTC (rev 330011)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=fcitx-qt5
-pkgver=1.2.2
-pkgrel=3
-pkgdesc="Qt5 IM Module for Fcitx"
-arch=('x86_64')
-url="https://github.com/fcitx/fcitx-qt5"
-license=('GPL')
-groups=('fcitx-im')
-depends=('fcitx' 'libxkbcommon' 'qt5-base')
-makedepends=('extra-cmake-modules')
-source=("https://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
-        fcitx-qt5.11.patch)
-sha512sums=('902180ff8336c688d5d548a1628dc481f1ce0ea6cc79719ab53337ebfbb745232bfc58cf6e739a60c562d30c3d996eb5e07bd8ef932eade72a79fb35e096e1c3'
-            'SKIP'
-            '1931de220c5ba10c794148155a6aa7d6503f080b9ca82e9d7a7db09bb326235816ecec1c76725780901fa7652a99d8e2d1e1e810b2db7f04930c74114198b320')
-validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9') # Weng Xuetian <wengxt at gmail.com>
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../fcitx-qt5.11.patch # Fix build with Qt 5.11
-}
-
-build() {
-  cd $pkgname-$pkgver
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_LIBDIR=lib .
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make install DESTDIR="$pkgdir"
-}

Copied: fcitx-qt5/repos/community-x86_64/PKGBUILD (from rev 330010, fcitx-qt5/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-05-26 07:53:09 UTC (rev 330011)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=fcitx-qt5
+pkgver=1.2.3
+pkgrel=1
+pkgdesc="Qt5 IM Module for Fcitx"
+arch=('x86_64')
+url="https://github.com/fcitx/fcitx-qt5"
+license=('GPL')
+groups=('fcitx-im')
+depends=('fcitx' 'libxkbcommon' 'qt5-base')
+makedepends=('extra-cmake-modules')
+source=("https://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+sha512sums=('e3e9a76419caca4eeebf3c149a72ee939a25f463d03dd8461caf44cace310278b08e83d460112f240cd54ed05dba3c5e9732198f0c3d0b9d81c3a444c33ab8d3'
+            'SKIP')
+validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9') # Weng Xuetian <wengxt at gmail.com>
+
+build() {
+  cd $pkgname-$pkgver
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_LIBDIR=lib .
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make install DESTDIR="$pkgdir"
+}

Deleted: fcitx-qt5.11.patch
===================================================================
--- fcitx-qt5.11.patch	2018-05-26 07:52:44 UTC (rev 330010)
+++ fcitx-qt5.11.patch	2018-05-26 07:53:09 UTC (rev 330011)
@@ -1,10 +0,0 @@
---- fcitx-qt5-1.2.2/quickphrase-editor/batchdialog.cpp.orig	2018-05-22 11:50:22.925424854 +0000
-+++ fcitx-qt5-1.2.2/quickphrase-editor/batchdialog.cpp	2018-05-22 11:51:02.385547104 +0000
-@@ -20,6 +20,7 @@
- #include "batchdialog.h"
- #include "common.h"
- #include "ui_batchdialog.h"
-+#include <QIcon>
- 
- namespace fcitx {
- BatchDialog::BatchDialog(QWidget *parent)