packages/wxGTK3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:8d9bf85670128a9e8407521abd0cba881cf7a9d2
Branches Tags
packages:main
...
compare: packages:98bf5d6550093cffc47e801a2e0d2042b053e64f
Branches Tags
packages:main

10 Commits
8d9bf85670 ... 98bf5d6550

Author SHA1 Message Date
openeuler-ci-bot
98bf5d6550
!24 modify wx-config to support sw_64 
From: @yangchen_guang 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo
 2023-09-26 09:24:44 +00:00
yangchenguang
690b13373c modify wx-config to support sw_64 
Signed-off-by: yangchenguang <yangchenguang@kylinsec.com.cn>
 2023-09-22 10:10:40 +08:00
openeuler-ci-bot
ca614d8c0d
!21 [sync] PR-20: Add pie compile option 
From: @openeuler-sync-bot 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
 2023-06-07 08:14:15 +00:00
cherry530
18088ba5d5 add pie compile option 
Signed-off-by: cherry530 <707078654@qq.com>
(cherry picked from commit 796c45658e5f2ea4febe227176dd8c7a73cbba05)
 2023-06-07 15:48:43 +08:00
openeuler-ci-bot
3260e86c63
!18 fix EBS compile failure caused by gcc_secure replace compiler inadequacy 
From: @wang--ge 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
 2023-04-26 08:49:40 +00:00
wang--ge
4ecb6f2bae fix EBS compile failure caused by gcc_secure replace compiler inadequacy 2023-04-26 16:06:27 +08:00
openeuler-ci-bot
da2e4f39b2
!15 fix compile error(issue I6VGJC) 
From: @zhg4554_0 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo
 2023-04-17 07:37:55 +00:00
hgzhaod
f876e664ab fix bug for compile error(https://gitee.com/src-openeuler/wxGTK3/issues/I6VGJC) 2023-04-14 15:23:17 +08:00
openeuler-ci-bot
f490c8f8ee
!14 [sync] PR-9: modify wx-config to support loongarch64 
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
 2023-01-16 12:02:58 +00:00
Jingyun Hua
a15ad6bf3b modify wx-config to support loongarch64 
Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
(cherry picked from commit 642260ec2520efafaebd2a10c667141b2d70c329)
 2023-01-16 10:14:21 +08:00
3 changed files with 35 additions and 4 deletions
Show Stats Expand all files Collapse all files

13
add-pie-compile-option.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in
index 44b7d02..dd9d4b8 100644
--- a/utils/wxrc/Makefile.in
+++ b/utils/wxrc/Makefile.in
@@ -115,7 +115,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
-@COND_USE_XRC_1@ $(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_XRC_1@ $(CXX) -fPIE -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS) -pie $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
@COND_USE_XRC_1@
@COND_USE_XRC_1@ $(__wxrc___mac_setfilecmd)

4
wx-config
View File

@ -19,10 +19,10 @@ if [ -z $arch ]; then
fi
case $arch in
i?86|ppc|s390|sparc|arm*|ia64|mips|mipsel|riscv32)
i?86|ppc|s390|sparc|arm*|ia64|mips|mipsel|riscv32|sw_64)
libdir=/usr/lib
;;
x86_64|ppc64|s390x|sparc64|aarch64|ppc64le|mips64*|riscv64)
x86_64|ppc64|s390x|sparc64|aarch64|ppc64le|mips64*|riscv64|loongarch64)
libdir=/usr/lib64
;;
*)

22
wxGTK3.spec
View File

@ -1,6 +1,6 @@
Name: wxGTK3
Version: 3.0.4
Release: 7
Release: 12
Summary: C++ Library for Cross-Platform Development
License: GPL-2.0-or-later or LGPL-2.1-only
@ -8,6 +8,7 @@ URL: https://www.wxwidgets.org/
Source0: https://github.com/wxWidgets/wxWidgets/releases/download/v%{version}/wxWidgets-%{version}.tar.bz2
Source1: wx-config
Patch0001: wxGTK3-3.0.3-abicheck.patch
Patch0002: add-pie-compile-option.patch
BuildRequires: gtk2-devel gtk3-devel webkit2gtk3-devel zlib-devel libpng-devel libjpeg-devel
BuildRequires: libtiff-devel expat-devel SDL2-devel libGLU-devel libSM-devel gstreamer1-plugins-base-devel
@ -116,7 +117,9 @@ export CPPUNIT_CONFIG="/usr/bin/pkg-config cppunit"
#package gcc_secure will add _old suffix to compile tools
gccexec=`file /usr/bin/gcc`
if [[ ${gccexec} =~ "shell script" ]]; then
gppexec=`file /usr/bin/g++`
cppexec=`file /usr/bin/c++`
if [[ ${gccexec} =~ "shell script" ]] && [[ -e /usr/bin/gcc_old ]] && [[ ${gppexec} =~ "shell script" ]] && [[ -e /usr/bin/g++_old ]] && [[ ${cppexec} =~ "shell script" ]] && [[ -e /usr/bin/c++ ]]; then
for line in `find . -name Makefile.in`;
do
sed -i 's/@CC@/@CC@_old/g' $line
@ -237,6 +240,21 @@ fi
%changelog
* Fri Sep 22 2023 yangchenguang <yangchenguang@kylinsec.com.cn> - 3.0.4-12
- modify wx-config to support sw_64
* Wed Jun 07 2023 xu_ping <707078654@qq.com> - 3.0.4-11
- Add pie compile option
* Wed Apr 26 2023 Ge Wang <wang__ge@126.com> - 3.0.4-10
- fix EBS compile failure caused by gcc_secure replace compiler inadequacy
* Fri Apr 14 2023 hgzhaod <hgzhaod@isoftstone.com> - 3.0.4-9
- fix compile bug caused by no gcc_old
* Mon Nov 28 2022 huajingyun <huajingyun@loongson.cn> - 3.0.4-8
- modify wx-config to support loongarch64
* Fri Nov 25 2022 Ge Wang <wangge20@h-partners.com> - 3.0.4-7
- Fix build failure due to gcc_secure ranamed compile tools