[arch-commits] Commit in chewing-editor/repos (3 files)

[Felix Yan]

    Date: Tuesday, July 7, 2020 @ 13:01:21
  Author: felixonmars
Revision: 658322

archrelease: copy trunk to community-staging-x86_64

Added:
  chewing-editor/repos/community-staging-x86_64/
  chewing-editor/repos/community-staging-x86_64/PKGBUILD
    (from rev 658321, chewing-editor/trunk/PKGBUILD)
  chewing-editor/repos/community-staging-x86_64/system-gtest.patch
    (from rev 658321, chewing-editor/trunk/system-gtest.patch)

--------------------+
 PKGBUILD           |   54 +++++++++++++++++++++++++
 system-gtest.patch |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)

Copied: chewing-editor/repos/community-staging-x86_64/PKGBUILD (from rev 658321, chewing-editor/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-07-07 13:01:21 UTC (rev 658322)
@@ -0,0 +1,54 @@
+# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
+# Contributor: Chocobo1 <chocobo1 AT archlinux DOT net>
+
+pkgname=chewing-editor
+pkgver=0.1.1
+pkgrel=6
+pkgdesc="Cross platform chewing user phrase editor"
+arch=('x86_64')
+url="http://chewing.im"
+license=('GPL')
+depends=('glibc' 'libchewing' 'qt5-base')
+makedepends=('cmake' 'qt5-tools' 'help2man' 'gtest')
+checkdepends=('valgrind')
+source=("https://github.com/chewing/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz"
+        system-gtest.patch
+        chewing-editor-reproducibility.patch::https://github.com/chewing/chewing-editor/commit/7db328e7372f870dc741436ba2da8ceb5199f2f9.patch)
+sha256sums=('ad59ba32bb258d7a1ee6c105a4be54357d2de18cc324277a1429f53fbb23709b'
+            '17f115cc9352c85973f1a3f75c2f1f17c2e8cc3e52a6656914d3895478cc35fc'
+            '36a2aa702f58e90f306f3de07dee2cac74f013dff4762e277fd0048d9476c430')
+
+prepare() {
+    cd $pkgname-$pkgver
+
+    # based on commits from https://github.com/iblis17/chewing-editor/tree/cmake-gtest
+    patch -Np1 -i ../system-gtest.patch
+
+    patch -Np1 -i ../chewing-editor-reproducibility.patch
+
+    rm -r gmock
+
+    mkdir build
+}
+
+build() {
+    cd $pkgname-$pkgver/build
+
+    cmake \
+      -DCMAKE_INSTALL_PREFIX="/usr" \
+      ..
+
+    make
+}
+
+check() {
+    cd $pkgname-$pkgver/build
+
+    make test
+}
+
+package() {
+    cd $pkgname-$pkgver/build
+
+    make DESTDIR="$pkgdir" install
+}

Copied: chewing-editor/repos/community-staging-x86_64/system-gtest.patch (from rev 658321, chewing-editor/trunk/system-gtest.patch)
===================================================================
--- community-staging-x86_64/system-gtest.patch	                        (rev 0)
+++ community-staging-x86_64/system-gtest.patch	2020-07-07 13:01:21 UTC (rev 658322)
@@ -0,0 +1,109 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 876da06..d3cf4e1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -99,7 +99,6 @@ install(
+ 
+ include_directories(
+     ${PROJECT_BINARY_DIR}/include
+-    ${PROJECT_SOURCE_DIR}/gmock/gtest/include
+     ${PROJECT_SOURCE_DIR}/src/exporter
+     ${PROJECT_SOURCE_DIR}/src/importer
+     ${PROJECT_SOURCE_DIR}/src/model
+@@ -253,7 +253,7 @@ endif()
+ 
+ # testing
+ enable_testing()
+-add_subdirectory(gmock)
++find_package(GTest REQUIRED)
+ 
+ file(GLOB run-test_src
+     test/*.cpp
+@@ -262,7 +262,8 @@ add_executable(run-test
+     ${run-test_src}
+ )
+ target_link_libraries(run-test
+-    gmock
++    GTest::GTest
++    GTest::Main
+ 
+     exporter
+     importer
+diff --git a/test/testChewingExporter.cpp b/test/testChewingExporter.cpp
+index 911a453..b8bebf0 100644
+--- a/test/testChewingExporter.cpp
++++ b/test/testChewingExporter.cpp
+@@ -17,7 +17,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
+-#include "gtest/gtest.h"
++#include <gtest/gtest.h>
+ 
+ #include <QDebug>
+ #include <QFile>
+diff --git a/test/testChewingImporter.cpp b/test/testChewingImporter.cpp
+index 412c513..3b600d7 100644
+--- a/test/testChewingImporter.cpp
++++ b/test/testChewingImporter.cpp
+@@ -17,7 +17,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
+-#include "gtest/gtest.h"
++#include <gtest/gtest.h>
+ 
+ #include <QDebug>
+ #include <QDir>
+diff --git a/test/testHashImporter.cpp b/test/testHashImporter.cpp
+index 8f10a96..5c5be6b 100644
+--- a/test/testHashImporter.cpp
++++ b/test/testHashImporter.cpp
+@@ -17,7 +17,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
+-#include "gtest/gtest.h"
++#include <gtest/gtest.h>
+ 
+ #include <QDebug>
+ #include <QDir>
+diff --git a/test/testUserphraseImporter.cpp b/test/testUserphraseImporter.cpp
+index 17f3e27..54f2c0f 100644
+--- a/test/testUserphraseImporter.cpp
++++ b/test/testUserphraseImporter.cpp
+@@ -17,7 +17,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
+-#include "gtest/gtest.h"
++#include <gtest/gtest.h>
+ 
+ #include <QDebug>
+ 
+diff --git a/test/testUserphraseSet.cpp b/test/testUserphraseSet.cpp
+index f80d2d9..f73f33d 100644
+--- a/test/testUserphraseSet.cpp
++++ b/test/testUserphraseSet.cpp
+@@ -17,7 +17,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
+-#include "gtest/gtest.h"
++#include <gtest/gtest.h>
+ 
+ #include "UserphraseSet.h"
+ 
+diff --git a/test/testmain.cpp b/test/testmain.cpp
+index 0d58d49..e269919 100644
+--- a/test/testmain.cpp
++++ b/test/testmain.cpp
+@@ -19,7 +19,7 @@
+ #include <QApplication>
+ #include <QFileInfo>
+ 
+-#include "gtest/gtest.h"
++#include <gtest/gtest.h>
+ 
+ bool verbose = false;
+