[mingw-webkitgtk] Use correct translation prefix
Erik van Pienbroek
epienbro at fedoraproject.org
Sat Aug 17 14:45:34 UTC 2013
commit 3b5857b371891082ec4d71b263479563f5534672
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sat Aug 17 16:44:53 2013 +0200
Use correct translation prefix
and workaround linker failure caused by invalid ar flags
mingw-webkitgtk.spec | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/mingw-webkitgtk.spec b/mingw-webkitgtk.spec
index 8922ab4..8325251 100644
--- a/mingw-webkitgtk.spec
+++ b/mingw-webkitgtk.spec
@@ -160,6 +160,12 @@ autoreconf --verbose --install -I Source/autotools
%global mingw32_cflags %(echo %{mingw32_cflags} | sed 's/-g /-g1 /')
%global mingw64_cflags %(echo %{mingw64_cflags} | sed 's/-g /-g1 /')
+# Workaround for linker failure while building the static library
+# libtool: link: (cd .libs/libjavascriptcoregtk-1.0.lax/libWTF.a && /usr/bin/i686-w64-mingw32-ar x "/builddir/build/BUILD/webkitgtk-2.0.4/build_win32/./.libs/libWTF.a")
+# /usr/bin/i686-w64-mingw32-ar: `x' cannot be used on thin archives.
+# make[1]: *** [libjavascriptcoregtk-1.0.la] Error 1
+export AR_FLAGS="cru"
+
%mingw_configure \
--with-target=win32 \
--with-gtk=2.0 \
@@ -182,7 +188,7 @@ install -m 755 build_win64/Programs/.libs/GtkLauncher.exe %{buildroot}%{mingw64_
# Drop all .la files
find $RPM_BUILD_ROOT -name "*.la" -delete
-%mingw_find_lang webkitgtk-2.0
+%mingw_find_lang WebKitGTK-2.0
## Copy over and rename the various files for %%doc inclusion.
%add_to_doc_files32 Source/WebKit/LICENSE
@@ -213,7 +219,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
# Win32
-%files -n mingw32-webkitgtk -f mingw32-webkitgtk-2.0.lang
+%files -n mingw32-webkitgtk -f mingw32-WebKitGTK-2.0.lang
%{_docdir}/mingw32-webkitgtk/
%{mingw32_bindir}/jsc-1.exe
%{mingw32_bindir}/GtkLauncher.exe
@@ -231,7 +237,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%{mingw32_libdir}/libwebkitgtk-1.0.a
# Win64
-%files -n mingw64-webkitgtk -f mingw64-webkitgtk-2.0.lang
+%files -n mingw64-webkitgtk -f mingw64-WebKitGTK-2.0.lang
%{_docdir}/mingw64-webkitgtk/
%{mingw64_bindir}/jsc-1.exe
%{mingw64_bindir}/GtkLauncher.exe
More information about the scm-commits
mailing list