[arch-commits] Commit in chewing-editor/repos/community-x86_64 (6 files)

Chih-Hsuan Yen yan12125 at archlinux.org
Sat Jul 11 09:04:35 UTC 2020


    Date: Saturday, July 11, 2020 @ 09:04:35
  Author: yan12125
Revision: 663243

archrelease: copy trunk to community-x86_64

Added:
  chewing-editor/repos/community-x86_64/PKGBUILD
    (from rev 663242, chewing-editor/trunk/PKGBUILD)
  chewing-editor/repos/community-x86_64/no-rebuild-manpage.diff
    (from rev 663242, chewing-editor/trunk/no-rebuild-manpage.diff)
  chewing-editor/repos/community-x86_64/system-gtest.patch
    (from rev 663242, chewing-editor/trunk/system-gtest.patch)
Deleted:
  chewing-editor/repos/community-x86_64/PKGBUILD
  chewing-editor/repos/community-x86_64/no-rebuild-manpage.diff
  chewing-editor/repos/community-x86_64/system-gtest.patch

-------------------------+
 PKGBUILD                |  118 ++++++++++++------------
 no-rebuild-manpage.diff |   22 ++--
 system-gtest.patch      |  218 +++++++++++++++++++++++-----------------------
 3 files changed, 179 insertions(+), 179 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-11 09:02:42 UTC (rev 663242)
+++ PKGBUILD	2020-07-11 09:04:35 UTC (rev 663243)
@@ -1,59 +0,0 @@
-# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
-# Contributor: Chocobo1 <chocobo1 AT archlinux DOT net>
-
-pkgname=chewing-editor
-pkgver=0.1.1
-pkgrel=7
-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
-        no-rebuild-manpage.diff)
-sha256sums=('ad59ba32bb258d7a1ee6c105a4be54357d2de18cc324277a1429f53fbb23709b'
-            '17f115cc9352c85973f1a3f75c2f1f17c2e8cc3e52a6656914d3895478cc35fc'
-            '36a2aa702f58e90f306f3de07dee2cac74f013dff4762e277fd0048d9476c430'
-            '864a7f5a0b50a96edb21cbc76448010b375d65bb35e2f012640d41839fb13df3')
-
-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
-
-    # Building the man page requires an environment for Qt (see below). This
-    # patch avoids preparing the environment twice.
-    patch -Np1 -i ../no-rebuild-manpage.diff
-
-    rm -r gmock
-}
-
-build() {
-    cmake -S $pkgname-$pkgver -B build \
-      -DCMAKE_INSTALL_PREFIX="/usr" \
-      -DCMAKE_BUILD_TYPE=None
-
-    # Building the man page needs running `chewing-editor --version`, so
-    # preparing an environment for Qt
-    export XDG_RUNTIME_DIR="$PWD""$(mktemp -d runtimer_dir_XXXXXX)"
-    QT_QPA_PLATFORM=offscreen make -C build
-}
-
-check() {
-    cd build
-
-    make test
-}
-
-package() {
-    cd build
-
-    make DESTDIR="$pkgdir" install
-}

Copied: chewing-editor/repos/community-x86_64/PKGBUILD (from rev 663242, chewing-editor/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-11 09:04:35 UTC (rev 663243)
@@ -0,0 +1,59 @@
+# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
+# Contributor: Chocobo1 <chocobo1 AT archlinux DOT net>
+
+pkgname=chewing-editor
+pkgver=0.1.1
+pkgrel=7
+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
+        no-rebuild-manpage.diff)
+sha256sums=('ad59ba32bb258d7a1ee6c105a4be54357d2de18cc324277a1429f53fbb23709b'
+            '17f115cc9352c85973f1a3f75c2f1f17c2e8cc3e52a6656914d3895478cc35fc'
+            '36a2aa702f58e90f306f3de07dee2cac74f013dff4762e277fd0048d9476c430'
+            '864a7f5a0b50a96edb21cbc76448010b375d65bb35e2f012640d41839fb13df3')
+
+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
+
+    # Building the man page requires an environment for Qt (see below). This
+    # patch avoids preparing the environment twice.
+    patch -Np1 -i ../no-rebuild-manpage.diff
+
+    rm -r gmock
+}
+
+build() {
+    cmake -S $pkgname-$pkgver -B build \
+      -DCMAKE_INSTALL_PREFIX="/usr" \
+      -DCMAKE_BUILD_TYPE=None
+
+    # Building the man page needs running `chewing-editor --version`, so
+    # preparing an environment for Qt
+    export XDG_RUNTIME_DIR="$PWD""$(mktemp -d runtimer_dir_XXXXXX)"
+    QT_QPA_PLATFORM=offscreen make -C build
+}
+
+check() {
+    cd build
+
+    make test
+}
+
+package() {
+    cd build
+
+    make DESTDIR="$pkgdir" install
+}

Deleted: no-rebuild-manpage.diff
===================================================================
--- no-rebuild-manpage.diff	2020-07-11 09:02:42 UTC (rev 663242)
+++ no-rebuild-manpage.diff	2020-07-11 09:04:35 UTC (rev 663243)
@@ -1,11 +0,0 @@
---- chewing-editor-0.1.1/CMakeLists.txt.orig	2020-07-08 00:51:45.394618655 +0800
-+++ chewing-editor-0.1.1/CMakeLists.txt	2020-07-08 00:51:53.657721919 +0800
-@@ -248,7 +248,7 @@
-             OUTPUT
-                 ${manpage}.gz
-             COMMAND ${GZIP}
--                -n -f
-+                -n -f -k
-                 ${manpage}
-             DEPENDS
-                 ${manpage}

Copied: chewing-editor/repos/community-x86_64/no-rebuild-manpage.diff (from rev 663242, chewing-editor/trunk/no-rebuild-manpage.diff)
===================================================================
--- no-rebuild-manpage.diff	                        (rev 0)
+++ no-rebuild-manpage.diff	2020-07-11 09:04:35 UTC (rev 663243)
@@ -0,0 +1,11 @@
+--- chewing-editor-0.1.1/CMakeLists.txt.orig	2020-07-08 00:51:45.394618655 +0800
++++ chewing-editor-0.1.1/CMakeLists.txt	2020-07-08 00:51:53.657721919 +0800
+@@ -248,7 +248,7 @@
+             OUTPUT
+                 ${manpage}.gz
+             COMMAND ${GZIP}
+-                -n -f
++                -n -f -k
+                 ${manpage}
+             DEPENDS
+                 ${manpage}

Deleted: system-gtest.patch
===================================================================
--- system-gtest.patch	2020-07-11 09:02:42 UTC (rev 663242)
+++ system-gtest.patch	2020-07-11 09:04:35 UTC (rev 663243)
@@ -1,109 +0,0 @@
-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;
- 

Copied: chewing-editor/repos/community-x86_64/system-gtest.patch (from rev 663242, chewing-editor/trunk/system-gtest.patch)
===================================================================
--- system-gtest.patch	                        (rev 0)
+++ system-gtest.patch	2020-07-11 09:04:35 UTC (rev 663243)
@@ -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;
+ 


More information about the arch-commits mailing list