diff options
author | Xiao Pan <xyz@flylightning.xyz> | 2025-08-18 14:18:13 +0800 |
---|---|---|
committer | Xiao Pan <xyz@flylightning.xyz> | 2025-08-18 14:18:13 +0800 |
commit | 0c24bd951ee73519fd24453b43f064d9b6de116c (patch) | |
tree | a65f2e933680e430ee8208c82bfec2dfaf2e1602 /pkgbuilds/sdcv-git | |
parent | 4466978736949253e1d7939408f41c904b014eb3 (diff) |
sdcv merged the PR, no need the patch
Diffstat (limited to 'pkgbuilds/sdcv-git')
-rw-r--r-- | pkgbuilds/sdcv-git/0001-stardict_lib.cpp-use-explicit-const_cast.patch | 29 | ||||
-rw-r--r-- | pkgbuilds/sdcv-git/PKGBUILD | 16 |
2 files changed, 4 insertions, 41 deletions
diff --git a/pkgbuilds/sdcv-git/0001-stardict_lib.cpp-use-explicit-const_cast.patch b/pkgbuilds/sdcv-git/0001-stardict_lib.cpp-use-explicit-const_cast.patch deleted file mode 100644 index bcf22ff..0000000 --- a/pkgbuilds/sdcv-git/0001-stardict_lib.cpp-use-explicit-const_cast.patch +++ /dev/null @@ -1,29 +0,0 @@ -From aec5081a8c852ef7f7330985472c564eed6c998c Mon Sep 17 00:00:00 2001 -From: Andrew Savchenko <bircoph@altlinux.org> -Date: Fri, 20 Sep 2024 16:32:47 +0300 -Subject: [PATCH] stardict_lib.cpp: use explicit const_cast - -Gcc-14 considers incompatible pointer types as an error, so use -expcilict const_cast to convert from const char* to gchar*. - -Signed-off-by: Andrew Savchenko <bircoph@altlinux.org> ---- - src/stardict_lib.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/stardict_lib.cpp b/src/stardict_lib.cpp -index 83fbc59..799a025 100644 ---- a/src/stardict_lib.cpp -+++ b/src/stardict_lib.cpp -@@ -1047,7 +1047,7 @@ bool Libs::LookupSimilarWord(const gchar *sWord, std::set<glong> &iWordIndices, - } - // Upper the first character and lower others. - if (!bFound) { -- gchar *nextchar = g_utf8_next_char(sWord); -+ gchar *nextchar = const_cast<gchar*>(g_utf8_next_char(sWord)); - gchar *firstchar = g_utf8_strup(sWord, nextchar - sWord); - nextchar = g_utf8_strdown(nextchar, -1); - casestr = g_strdup_printf("%s%s", firstchar, nextchar); --- -2.49.0 - diff --git a/pkgbuilds/sdcv-git/PKGBUILD b/pkgbuilds/sdcv-git/PKGBUILD index 0534f06..0e5de03 100644 --- a/pkgbuilds/sdcv-git/PKGBUILD +++ b/pkgbuilds/sdcv-git/PKGBUILD @@ -2,8 +2,8 @@ pkgname=sdcv-git _pkgname=sdcv -pkgver=0.5.5.r1.gbeebb0f -pkgrel=2 +pkgver=0.5.5.r16.g9c77e91 +pkgrel=1 pkgdesc="StarDict Console Version - Git version" arch=('x86_64' 'aarch64') url="https://github.com/Dushistov/sdcv" @@ -11,10 +11,8 @@ license=('GPL') depends=('glib2' 'readline' 'zlib') makedepends=('cmake' 'git') # patch from https://github.com/Dushistov/sdcv/pull/104 -source=("git+${url}.git" - '0001-stardict_lib.cpp-use-explicit-const_cast.patch') -b2sums=('SKIP' - '1f35e85d3240150e79ba234797a4535ed5a93f42f0ea93aaeecfe1d416b02b6b30f84c3686675f2f00422aa47db692ff47e9b323dd8d434e2b93d3aed414ec56') +source=("git+${url}.git") +b2sums=('SKIP') provides=('sdcv' 'stardict') conflicts=('sdcv') @@ -25,12 +23,6 @@ pkgver() { git describe --long | sed 's/^v//;s/-/.r/;s/-/./' } -prepare() { - cd "${srcdir}/${_pkgname}" - - patch -p1 -i "$srcdir/0001-stardict_lib.cpp-use-explicit-const_cast.patch" -} - build() { cd "${srcdir}/${_pkgname}" |