[mingw-webkitgtk: 14/36] Rebuilt with mingw32-libjpeg-turbo, dropped jpeg_boolean patch (#604702)
Kalev Lember
kalev at fedoraproject.org
Tue Mar 6 21:10:35 UTC 2012
commit 16ee477a4786dda50581aef19d2e520f3df80b98
Author: Kalev Lember <kalev at smartlink.ee>
Date: Sat Jun 4 00:00:44 2011 +0300
Rebuilt with mingw32-libjpeg-turbo, dropped jpeg_boolean patch (#604702)
mingw32-webkitgtk.spec | 10 ++++------
webkit-jpeg-boolean-fix.patch | 29 -----------------------------
2 files changed, 4 insertions(+), 35 deletions(-)
---
diff --git a/mingw32-webkitgtk.spec b/mingw32-webkitgtk.spec
index 6c0c379..b5af7c9 100644
--- a/mingw32-webkitgtk.spec
+++ b/mingw32-webkitgtk.spec
@@ -48,7 +48,7 @@
Name: mingw32-webkitgtk
Version: 1.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: MinGW Windows web content engine library
Group: Development/Libraries
@@ -58,10 +58,6 @@ URL: http://webkit.org/
#Source0: http://nightly.webkit.org/files/trunk/src/WebKit-r%{svn_revision}.tar.bz2
Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz
-# The Fedora MinGW libjpeg uses the datatype 'jpeg_boolean' instead
-# of 'boolean' to avoid a conflict with the header rpcndr.h
-Patch0: webkit-jpeg-boolean-fix.patch
-
# Several changes required to get webkitgtk cross-compiled
# Originally created by Mikkel Kruse Johnsen
# https://bugs.webkit.org/show_bug.cgi?id=23872
@@ -143,7 +139,6 @@ Static version of the MinGW Windows WebKitGTK+ library.
%prep
%setup -qn "webkit-%{version}"
-%patch0 -p0 -b .jpeg_boolean
%patch1 -p0 -b .mingw
%patch2 -p0 -b .dumprendertree
%patch3 -p0 -b .gcc46
@@ -215,6 +210,9 @@ install -m 755 Programs/.libs/GtkLauncher.exe %{buildroot}%{_mingw32_bindir}
%changelog
+* Sat Jun 04 2011 Kalev Lember <kalev at smartlink.ee> - 1.4.0-4
+- Rebuilt with mingw32-libjpeg-turbo, dropped jpeg_boolean patch (#604702)
+
* Thu Apr 28 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.4.0-3
- Backported an already upstreamed patch and dropped the relevant
parts from our own (non-upstreamed yet) patch
More information about the scm-commits
mailing list