Browse Source

wxGTK: rebuild with new toolchain

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12279 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 3 years ago
parent
commit
bdaf1d90c9
1 changed files with 30 additions and 17 deletions
  1. 30 17
      w/wxGTK/wxGTK-vl.spec

+ 30 - 17
w/wxGTK/wxGTK-vl.spec

@@ -6,12 +6,19 @@ Summary: The GTK+ 2 port of the wxWidgets library
 Summary(ja): wxWidgets ライブラリーの GTK+ 2 ポート
 Name: %{name}
 Version: %{wx_ver}.12
-Release: 7%{?_dist_release}
+Release: 8%{?_dist_release}
 
 License: wxWindows License
 Group: System Environment/Libraries
 URL: http://www.wxwidgets.org/
+
 Source0: wxGTK-%{version}.tar.bz2
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1308243
+# backported from https://github.com/wxWidgets/wxWidgets/commit/1780a38b7bc9a9c04d33775a3176fe8516465f50
+Patch1: %{name}-%{version}-char.patch
+
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: cppunit-devel
@@ -68,6 +75,7 @@ libraries or the X Window System.
 
 %prep
 %setup -qn wxGTK-%{version}
+%patch1 -p1 -b .char
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -83,22 +91,22 @@ chmod a-x src/common/msgout.cpp
            --enable-controls \
            --enable-shared \
            --enable-unicode \
-	   --enable-sound \
-	   --enable-intl \
-	   --enable-display \
-	   --enable-geometry \
-	   --enable-graphics_ctx \
-	   --disable-rpath \
-	   --with-expat \
-	   --with-gtk \
-	   --with-libpng \
-	   --with-libjpeg \
-	   --with-libtiff \
-	   --with-libxpm \
-	   --with-opengl \
-	   --with-regex \
-	   --with-sdl \
-	   --with-zlib
+           --enable-sound \
+           --enable-intl \
+           --enable-display \
+           --enable-geometry \
+           --enable-graphics_ctx \
+           --disable-rpath \
+           --with-expat \
+           --with-gtk \
+           --with-libpng \
+           --with-libjpeg \
+           --with-libtiff \
+           --with-libxpm \
+           --with-opengl \
+           --with-regex \
+           --with-sdl \
+           --with-zlib
 
 %{__make} %{?_smp_mflags}
 
@@ -161,7 +169,12 @@ ln -sf %{_libdir}/wx/config/%{wxconfig} %{buildroot}%{_bindir}/wx-config
 %{_libdir}/libwx_baseu_net-*.so.*
 %{_libdir}/libwx_baseu_xml-*.so.*
 
+
 %changelog
+* Mon Oct 21 2019 Toshiaki Ara <ara_t@384.jp> 2.8.12-8
+- rebuilt with new toolchain.
+- add Patch1 from fedora
+
 * Fri Jul  1 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.12-7
 - rebuilt with new toolchain.