Chih-Hsuan Yen pushed to branch main at Arch Linux / Packaging / Packages / gcin
Commits:
3f7c6a62 by Chih-Hsuan Yen at 2025-07-03T08:43:16+08:00
Pick a patch from OpenSUSE for building with GCC 15
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + gcin-2.9.0-gcc15.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -26,7 +26,9 @@ pkgbase = gcin
optdepends = bash: for various scripts
source = https://hyperrate.com/gcin-source/gcin-2.9.4.tar.xz
source = fix-gtk-immodules-path.patch
+ source = gcin-2.9.0-gcc15.patch
sha512sums =
8ce5783b76240d6a675679ce8861424603a3db2f5f79abb874ac5b5e7a2fba0cb3f9e4465cce63bd3f54f4f8611e3abb2029d43807e823b57f6acb98bd925db5
sha512sums =
54e90b04de45acf9f8821c92234b9708281907cbdf24ebb29f9820945615669d82a8443e49fd49d6c08be4a7b9f2857c8e763f170ef879c8fab1f232bb67e85d
+ sha512sums =
eeb12b212fadda5ae709c0153c0e0458f56d4e835958fe32563696cb165ca43ef418c643a4fd30998decb1f96df65aa0c35c4da8a00b18934cd5375b80334162
pkgname = gcin
=====================================
PKGBUILD
=====================================
@@ -22,9 +22,11 @@ optdepends=('qt5-base: support for qt5 input method'
'curl: for downloading and uploading vocabulary databases via
ts-edit'
'bash: for various scripts')
source=("https://hyperrate.com/gcin-source/${pkgname}-${pkgver}.tar.xz";
- fix-gtk-immodules-path.patch)
+ fix-gtk-immodules-path.patch
+ gcin-2.9.0-gcc15.patch)
sha512sums=('8ce5783b76240d6a675679ce8861424603a3db2f5f79abb874ac5b5e7a2fba0cb3f9e4465cce63bd3f54f4f8611e3abb2029d43807e823b57f6acb98bd925db5'
-
'54e90b04de45acf9f8821c92234b9708281907cbdf24ebb29f9820945615669d82a8443e49fd49d6c08be4a7b9f2857c8e763f170ef879c8fab1f232bb67e85d')
+
'54e90b04de45acf9f8821c92234b9708281907cbdf24ebb29f9820945615669d82a8443e49fd49d6c08be4a7b9f2857c8e763f170ef879c8fab1f232bb67e85d'
+
'eeb12b212fadda5ae709c0153c0e0458f56d4e835958fe32563696cb165ca43ef418c643a4fd30998decb1f96df65aa0c35c4da8a00b18934cd5375b80334162')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -41,6 +43,9 @@ prepare() {
sed -e 's/install -s/install/' -i Makefile
patch -Np1 -i ../fix-gtk-immodules-path.patch
+ # Patch from OpenSUSE
https://src.opensuse.org/pool/gcin/src/branch/factory/gcin-2.9.0-gcc15.patch
+ patch -Np1 -i ../gcin-2.9.0-gcc15.patch
+
# Several source files are 0600, breaking reading from sources in
gcin-debug package
find . -type f -exec chmod og+r {} \;
}
=====================================
gcin-2.9.0-gcc15.patch
=====================================
@@ -0,0 +1,58 @@
+Index: gcin-2.9.0/IMdkit/include/Xi18n.h
+===================================================================
+--- gcin-2.9.0.orig/IMdkit/include/Xi18n.h
++++ gcin-2.9.0/IMdkit/include/Xi18n.h
+@@ -68,13 +68,6 @@ IN CONNECTION WITH THE USE OR PERFORMANC
+ #define I18N_SET 1
+ #define I18N_GET 2
+
+-typedef struct
+-{
+- char *transportname;
+- int namelen;
+- Bool (*checkAddr) ();
+-} TransportSW;
+-
+ typedef struct _XIMPending
+ {
+ unsigned char *p;
+@@ -155,6 +148,13 @@ typedef struct _Xi18nClient
+
+ typedef struct _Xi18nCore *Xi18n;
+
++typedef struct _TransportSW TransportSW;
++struct _TransportSW {
++ char * transportname;
++ int namelen;
++ Bool (*checkAddr) (Xi18n, TransportSW *, char *);
++};
++
+ /*
+ * Callback Struct for XIM Protocol
+ */
+Index: gcin-2.9.0/IMdkit/lib/i18nMethod.c
+===================================================================
+--- gcin-2.9.0.orig/IMdkit/lib/i18nMethod.c
++++ gcin-2.9.0/IMdkit/lib/i18nMethod.c
+@@ -89,7 +89,7 @@ TransportSW _TransR[] =
+ #ifdef DNETCONN
+ {"decnet", 6, _Xi18nCheckTransAddress},
+ #endif
+- {(char *) NULL, 0, (Bool (*) ()) NULL}
++ {(char *) NULL, 0, (Bool (*) (Xi18n, TransportSW *, char *)) NULL}
+ };
+
+ static Bool GetInputStyles (Xi18n i18n_core, XIMStyles **p_style)
+Index: gcin-2.9.0/im-client/gcin-im-client.cpp
+===================================================================
+--- gcin-2.9.0.orig/im-client/gcin-im-client.cpp
++++ gcin-2.9.0/im-client/gcin-im-client.cpp
+@@ -39,7 +39,7 @@ static void restore_old_sigaction_single
+ if (act->sa_handler != SIG_IGN)
+ signal(signo, act->sa_handler);
+ }
+-char *get_gcin_im_srv_sock_path();
++char *get_gcin_im_srv_sock_path(char *, size_t);
+ Atom get_gcin_addr_atom(Display *dpy);
+ #endif
+
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gcin/-/commit/3f7c6a62a048875654078009e6d6f2b8ff678de1
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gcin/-/commit/3f7c6a62a048875654078009e6d6f2b8ff678de1
You're receiving this email because of your account on gitlab.archlinux.org.
