add-pie-compile-option.patch

@@ -1,13 +0,0 @@
-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)
- 

wx-config

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

wxGTK3.spec

@@ -1,6 +1,6 @@
 Name:           wxGTK3
 Version:        3.0.4
-Release:        12
+Release:        7
 Summary:        C++ Library for Cross-Platform Development
 
 License:        GPL-2.0-or-later or LGPL-2.1-only
@@ -8,7 +8,6 @@ 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
@@ -117,9 +116,7 @@ export CPPUNIT_CONFIG="/usr/bin/pkg-config cppunit"
 
 #package gcc_secure will add _old suffix to compile tools
 gccexec=`file /usr/bin/gcc`
-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
+if [[ ${gccexec} =~ "shell script" ]]; then
   for line in `find . -name Makefile.in`;
   do 
     sed -i 's/@CC@/@CC@_old/g' $line
@@ -240,21 +237,6 @@ 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