Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

addpkg: fcitx-mozc #1230

Merged
merged 1 commit into from
Apr 28, 2022
Merged

addpkg: fcitx-mozc #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 7 additions & 30 deletions fcitx-mozc/riscv64.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,10 @@
diff --git PKGBUILD PKGBUILD
index ffca360..10dbe4d 100644
--- PKGBUILD
+++ PKGBUILD
@@ -41,6 +41,7 @@ source=(git+https://github.com/fcitx/mozc.git#commit=${_mozc_commit}
git+https://github.com/open-source-parsers/jsoncpp.git#commit=${_jsoncpp_commit}
git+https://github.com/google/protobuf.git#commit=${_protobuf_commit}
git+https://github.com/abseil/abseil-cpp.git#commit=${_abseil_cpp_commit}
+ "add_limits_header.patch"
)
sha512sums=('SKIP'
'cadb43138597371d13d21a2766ba38f0940a73bd961a1142f3713f700d1b8e75bdb6ccc0600ea57518ad5bf1931eed329cd11faeb87b191aa460e379ed1fed93'
@@ -51,7 +52,8 @@ sha512sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'SKIP')
+ 'SKIP'
+ '5b1d503865dbfdd0158d27877e5c899439933fe7576d72ae34e80e9c50495fab975c7d1b3f67491cd47b56e06d7f0b4521c85ca3048188159cc5ae3125e0dc65')
validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9') # Weng Xuetian
@@ -99,6 +99,7 @@ build() {
# Fix compatibility with google-glog 0.3.3 (symbol conflict)
CFLAGS="${CFLAGS} -fvisibility=hidden"
CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
+ LDFLAGS="${LDFLAGS} -Wl,-plugin-opt=-target-abi=lp64d"
export _bldtype

pkgver(){
@@ -85,6 +87,10 @@ prepare() {

## use libstdc++ instead of libc++
sed "/stdlib=libc++/d;/-lc++/d" -i gyp/common.gypi
+
+ cd third_party/abseil-cpp
+ patch -Np1 -i "$srcdir/add_limits_header.patch"
+ cd -
}

build() {
cd mozc/src
0 fcitx-mozc/add_limits_header.patch → fcitx5-mozc/add_limits_header.patch
View file
Open in desktop
File renamed without changes.
31 changes: 27 additions & 4 deletions fcitx5-mozc/riscv64.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
diff --git PKGBUILD PKGBUILD
index 1aa7dac..23c281d 100644
--- PKGBUILD
+++ PKGBUILD
@@ -53,6 +53,7 @@ sha512sums=('SKIP'
@@ -41,6 +41,7 @@ source=(git+https://github.com/fcitx/mozc.git#commit=${_mozc_commit}
git+https://github.com/open-source-parsers/jsoncpp.git#commit=${_jsoncpp_commit}
git+https://github.com/google/protobuf.git#commit=${_protobuf_commit}
git+https://github.com/abseil/abseil-cpp.git#commit=${_abseil_cpp_commit}
+ "add_limits_header.patch"
)
sha512sums=('SKIP'
'cadb43138597371d13d21a2766ba38f0940a73bd961a1142f3713f700d1b8e75bdb6ccc0600ea57518ad5bf1931eed329cd11faeb87b191aa460e379ed1fed93'
@@ -51,7 +52,8 @@ sha512sums=('SKIP'
'SKIP'
'SKIP')
'SKIP'
'SKIP'
- 'SKIP')
+ 'SKIP'
+ '5b1d503865dbfdd0158d27877e5c899439933fe7576d72ae34e80e9c50495fab975c7d1b3f67491cd47b56e06d7f0b4521c85ca3048188159cc5ae3125e0dc65')
validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9') # Weng Xuetian
+options=('!lto')

pkgver(){
cd mozc
@@ -85,6 +87,10 @@ prepare() {

## use libstdc++ instead of libc++
sed "/stdlib=libc++/d;/-lc++/d" -i gyp/common.gypi
+
+ cd third_party/abseil-cpp
+ patch -Np1 -i "$srcdir/add_limits_header.patch"
+ cd -
}

build() {