Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
f8a4d98eed | ||
|
32e1323d7e |
9 changed files with 311 additions and 1 deletions
10
.gitignore
vendored
Normal file
10
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
webkit-1.3.3.tar.gz
|
||||
/webkit-1.3.4.tar.gz
|
||||
/webkit-1.3.5.tar.gz
|
||||
/webkit-1.3.6.tar.gz
|
||||
/webkit-1.3.7.tar.gz
|
||||
/webkit-1.3.9.tar.gz
|
||||
/webkit-1.3.10.tar.gz
|
||||
/webkit-1.3.11.tar.gz
|
||||
/webkit-1.3.13.tar.gz
|
||||
/webkit-1.4.0.tar.gz
|
||||
26
build-fix.patch
Normal file
26
build-fix.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff -up webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.c.build-fix webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.c
|
||||
--- webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.c.build-fix 2011-02-02 19:54:07.056203345 -0500
|
||||
+++ webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.c 2011-02-02 19:55:00.157539483 -0500
|
||||
@@ -46,7 +46,9 @@
|
||||
#include "xembed.h"
|
||||
#include "gtk2xtbin.h"
|
||||
#include <gtk/gtk.h>
|
||||
+#ifdef GTK_API_VERSION_2
|
||||
#include <gdk/gdkx.h>
|
||||
+#endif
|
||||
#include <glib.h>
|
||||
#include <assert.h>
|
||||
#include <sys/time.h>
|
||||
diff -up webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.h.build-fix webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.h
|
||||
--- webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.h.build-fix 2011-02-02 19:54:16.973079366 -0500
|
||||
+++ webkit-1.3.10/Source/WebCore/plugins/gtk/gtk2xtbin.h 2011-02-02 19:54:35.888842885 -0500
|
||||
@@ -41,6 +41,9 @@
|
||||
#define __GTK_XTBIN_H__
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
+#ifndef GTK_API_VERSION_2
|
||||
+#include <gtk/gtkx.h>
|
||||
+#endif
|
||||
#include <X11/Intrinsic.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xlib.h>
|
||||
|
|
@ -1 +0,0 @@
|
|||
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/AKVB363GFCHHJ5MTHGVYHYT6NLLTF5VM/
|
||||
21
gtk-build.patch
Normal file
21
gtk-build.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
diff -up webkit-1.3.5/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp.gtk webkit-1.3.5/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp
|
||||
--- webkit-1.3.5/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp.gtk 2010-11-03 17:43:58.154241995 -0400
|
||||
+++ webkit-1.3.5/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp 2010-11-03 17:44:12.875241996 -0400
|
||||
@@ -213,7 +213,7 @@ void FullscreenVideoController::hideHud(
|
||||
GdkCursor* cursor = blankCursor();
|
||||
gdk_window_set_cursor(window, cursor);
|
||||
|
||||
- gtk_widget_hide_all(m_hudWindow);
|
||||
+ gtk_widget_hide(m_hudWindow);
|
||||
|
||||
if (m_progressBarUpdateId) {
|
||||
g_source_remove(m_progressBarUpdateId);
|
||||
@@ -350,7 +350,7 @@ void FullscreenVideoController::exitFull
|
||||
if (m_mediaElement->platformMedia().type == WebCore::PlatformMedia::GStreamerGWorldType)
|
||||
m_mediaElement->platformMedia().media.gstreamerGWorld->exitFullscreen();
|
||||
|
||||
- gtk_widget_hide_all(m_window);
|
||||
+ gtk_widget_hide(m_window);
|
||||
|
||||
gtk_widget_destroy(m_hudWindow);
|
||||
m_hudWindow = 0;
|
||||
1
sources
Normal file
1
sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
10c969db3b5484c71df1aa9a338377ff webkit-1.4.0.tar.gz
|
||||
12
webkit-1.1.14-nspluginwrapper.patch
Normal file
12
webkit-1.1.14-nspluginwrapper.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
--- webkit-1.1.17/Source/WebCore/plugins/PluginDatabase.cpp.old 2009-12-01 15:22:10.000000000 +0000
|
||||
+++ webkit-1.1.17/Source/WebCore/plugins/PluginDatabase.cpp 2009-12-01 15:22:21.000000000 +0000
|
||||
@@ -357,6 +357,9 @@ Vector<String> PluginDatabase::defaultPl
|
||||
paths.append("/usr/lib64/mozilla/plugins");
|
||||
paths.append("/usr/lib/nsbrowser/plugins");
|
||||
paths.append("/usr/lib64/nsbrowser/plugins");
|
||||
+ /* And for nspluginwrapper */
|
||||
+ paths.append("/usr/lib64/mozilla/plugins-wrapped");
|
||||
+ paths.append("/usr/lib/mozilla/plugins-wrapped");
|
||||
|
||||
String mozHome(getenv("MOZILLA_HOME"));
|
||||
mozHome.append("/plugins");
|
||||
12
webkit-1.3.4-no-execmem.patch
Normal file
12
webkit-1.3.4-no-execmem.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -Nur webkit-1.3.4.orig/Source/JavaScriptCore/wtf/Platform.h webkit-1.3.4/Source/JavaScriptCore/wtf/Platform.h
|
||||
--- webkit-1.3.4.orig/Source/JavaScriptCore/wtf/Platform.h 2010-09-22 13:09:17.000000000 -0600
|
||||
+++ webkit-1.3.4/Source/JavaScriptCore/wtf/Platform.h 2010-09-23 12:13:19.692721521 -0600
|
||||
@@ -1025,7 +1025,7 @@
|
||||
#endif
|
||||
/* Setting this flag prevents the assembler from using RWX memory; this may improve
|
||||
security but currectly comes at a significant performance cost. */
|
||||
-#if PLATFORM(IOS)
|
||||
+#if PLATFORM(IOS) || PLATFORM(X86) || PLATFORM(X86_64)
|
||||
#define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1
|
||||
#endif
|
||||
|
||||
11
webkit-1.3.9-update-policy.patch
Normal file
11
webkit-1.3.9-update-policy.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
diff -up webkit-1.3.9/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp.update-policy webkit-1.3.9/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp
|
||||
--- webkit-1.3.9/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp.update-policy 2011-01-09 16:58:27.911902010 -0500
|
||||
+++ webkit-1.3.9/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp 2011-01-09 16:58:31.679902010 -0500
|
||||
@@ -545,7 +545,6 @@ void FullscreenVideoController::createHu
|
||||
m_timeHScale = gtk_hscale_new(adjustment);
|
||||
gtk_scale_set_draw_value(GTK_SCALE(m_timeHScale), FALSE);
|
||||
gtk_range_set_show_fill_level(GTK_RANGE(m_timeHScale), TRUE);
|
||||
- gtk_range_set_update_policy(GTK_RANGE(m_timeHScale), GTK_UPDATE_CONTINUOUS);
|
||||
g_signal_connect(m_timeHScale, "button-press-event", G_CALLBACK(timeScaleButtonPressed), this);
|
||||
g_signal_connect(m_timeHScale, "button-release-event", G_CALLBACK(timeScaleButtonReleased), this);
|
||||
m_hscaleUpdateId = g_signal_connect(m_timeHScale, "value-changed", G_CALLBACK(timeScaleValueChanged), this);
|
||||
218
webkitgtk3.spec
Normal file
218
webkitgtk3.spec
Normal file
|
|
@ -0,0 +1,218 @@
|
|||
## NOTE: Lots of files in various subdirectories have the same name (such as
|
||||
## "LICENSE") so this short macro allows us to distinguish them by using their
|
||||
## directory names (from the source tree) as prefixes for the files.
|
||||
%global add_to_doc_files() \
|
||||
mkdir -p %{buildroot}%{_docdir}/%{name}-%{version} ||: ; \
|
||||
cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')
|
||||
|
||||
Name: webkitgtk3
|
||||
Version: 1.4.0
|
||||
Release: 1%{?dist}.1
|
||||
Summary: GTK+ Web content engine library
|
||||
|
||||
Group: Development/Libraries
|
||||
License: LGPLv2+ and BSD
|
||||
URL: http://www.webkitgtk.org/
|
||||
|
||||
Source0: http://www.webkitgtk.org/webkit-%{version}.tar.gz
|
||||
|
||||
Patch1: webkit-1.3.4-no-execmem.patch
|
||||
Patch2: webkit-1.1.14-nspluginwrapper.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: enchant-devel
|
||||
BuildRequires: flex
|
||||
BuildRequires: geoclue-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gperf
|
||||
BuildRequires: gstreamer-devel
|
||||
BuildRequires: gstreamer-plugins-base-devel
|
||||
BuildRequires: gtk3-devel >= 2.99.0
|
||||
BuildRequires: libsoup-devel >= 2.27.91
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: libXt-devel
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: gobject-introspection-devel
|
||||
|
||||
## Conditional dependencies...
|
||||
%if %{with pango}
|
||||
BuildRequires: pango-devel
|
||||
%else
|
||||
BuildRequires: cairo-devel
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: freetype-devel
|
||||
%endif
|
||||
|
||||
%description
|
||||
WebKitGTK+ is the port of the portable web rendering engine WebKit to the
|
||||
GTK+ platform.
|
||||
|
||||
This package contains WebKitGTK+ for GTK+ 3.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
Requires: gtk3-devel
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries, build data, and header
|
||||
files for developing applications that use %{name}.
|
||||
|
||||
%prep
|
||||
%setup -qn "webkit-%{version}"
|
||||
%patch1 -p1 -b .no-execmem
|
||||
%patch2 -p1 -b .nspluginwrapper
|
||||
|
||||
%build
|
||||
%ifarch s390
|
||||
# drop -g flag to prevent memory exhaustion by linker
|
||||
%global optflags %(echo %{optflags} | sed 's/-g//')
|
||||
%endif
|
||||
%ifarch %{arm}
|
||||
#compile -O1 to avoid gcc ICE
|
||||
%global optflags %(echo %{optflags} | sed 's/-O2/-O1/')
|
||||
%endif
|
||||
|
||||
CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \
|
||||
--with-gtk=3.0 \
|
||||
--enable-jit \
|
||||
--enable-geolocation \
|
||||
--enable-introspection
|
||||
|
||||
mkdir -p DerivedSources/webkit
|
||||
mkdir -p DerivedSources/WebCore
|
||||
|
||||
# no %%{_smp_mflags} because of http://bugs.webkit.org/show_bug.cgi?id=34846
|
||||
make
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
chrpath --delete Programs/GtkLauncher
|
||||
install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
|
||||
install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
|
||||
|
||||
# for some reason translations don't get installed in 1.3.7
|
||||
%find_lang webkit-3.0
|
||||
|
||||
## Finally, copy over and rename the various files for %%doc inclusion.
|
||||
%add_to_doc_files Source/WebKit/LICENSE
|
||||
%add_to_doc_files Source/WebKit/gtk/po/README
|
||||
%add_to_doc_files Source/WebKit/gtk/NEWS
|
||||
%add_to_doc_files Source/WebCore/icu/LICENSE
|
||||
%add_to_doc_files Source/WebCore/LICENSE-APPLE
|
||||
%add_to_doc_files Source/WebCore/LICENSE-LGPL-2
|
||||
%add_to_doc_files Source/WebCore/LICENSE-LGPL-2.1
|
||||
%add_to_doc_files Source/JavaScriptCore/COPYING.LIB
|
||||
%add_to_doc_files Source/JavaScriptCore/THANKS
|
||||
%add_to_doc_files Source/JavaScriptCore/AUTHORS
|
||||
%add_to_doc_files Source/JavaScriptCore/icu/README
|
||||
%add_to_doc_files Source/JavaScriptCore/icu/LICENSE
|
||||
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
glib-compile-schemas %{_datadir}/glib-2.0/schemas
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
glib-compile-schemas %{_datadir}/glib-2.0/schemas
|
||||
|
||||
|
||||
%files -f webkit-3.0.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc %{_docdir}/%{name}-%{version}/
|
||||
%exclude %{_libdir}/*.la
|
||||
%{_libdir}/libwebkitgtk-3.0.so.*
|
||||
%{_libdir}/girepository-1.0/WebKit-3.0.typelib
|
||||
%{_libdir}/girepository-1.0/JSCore-3.0.typelib
|
||||
%{_libexecdir}/%{name}/
|
||||
%{_datadir}/glib-2.0/schemas/org.webkitgtk-3.0.gschema.xml
|
||||
%{_datadir}/webkitgtk-3.0
|
||||
%{_datadir}/webkit-3.0
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/jsc-3
|
||||
%{_includedir}/webkit-3.0
|
||||
%{_libdir}/libwebkitgtk-3.0.so
|
||||
%{_libdir}/pkgconfig/webkitgtk-3.0.pc
|
||||
%{_datadir}/gir-1.0/WebKit-3.0.gir
|
||||
%{_datadir}/gir-1.0/JSCore-3.0.gir
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jan 10 2012 Dennis Gilmore <dennis@ausil.us> 1.4.0-1.1
|
||||
- compile -O1 on arm arches
|
||||
|
||||
* Tue Apr 26 2011 Matthias Clasen <mclasen@redhat.com> 1.4.0-1
|
||||
- Update to 1.4.0
|
||||
|
||||
* Tue Mar 22 2011 Matthias Clasen <mclasen@redhat.com> 1.3.13-1
|
||||
- Update to 1.3.13
|
||||
|
||||
* Thu Feb 10 2011 Matthias Clasen <mclasen@redhat.com> 1.3.10-3
|
||||
- Rebuild against newer gtk
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.11-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Wed Feb 2 2011 Matthias Clasen <mclasen@redhat.com> 1.3.11-1
|
||||
- 1.3.11
|
||||
|
||||
* Wed Feb 2 2011 Matthias Clasen <mclasen@redhat.com> 1.3.10-2
|
||||
- Rebuild against newer gtk
|
||||
|
||||
* Mon Jan 10 2011 Matthias Clasen <mclasen@redhat.com> 1.3.10-1
|
||||
- Update to 1.3.10
|
||||
|
||||
* Sun Jan 9 2011 Matthias Clasen <mclasen@redhat.com> 1.3.9-1
|
||||
- Update to 1.3.9
|
||||
|
||||
* Fri Dec 3 2010 Matthias Clasen <mclasen@redhat.com> 1.3.7-2
|
||||
- Rebuild against new gtk
|
||||
|
||||
* Wed Dec 1 2010 Matthias Clasen <mclasen@redhat.com> 1.3.7-1
|
||||
- Update to 1.3.7
|
||||
|
||||
* Wed Nov 11 2010 Matthias Clasen <mclasen@redhat.com> 1.3.6-1
|
||||
- Update to 1.3.6
|
||||
- Disable the s390 patch again :-( Upstream it, maybe ?
|
||||
|
||||
* Thu Nov 11 2010 Dan Horák <dan[at]danny.cz> - 1.3.5-2
|
||||
- Updated and re-enabled the s390 patch
|
||||
|
||||
* Mon Nov 1 2010 Matthias Clasen <mclasen@redhat.com> 1.3.5-1
|
||||
- Update to 1.3.5
|
||||
|
||||
* Wed Sep 29 2010 jkeating - 1.3.4-3
|
||||
- Rebuilt for gcc bug 634757
|
||||
|
||||
* Fri Sep 24 2010 Matthias Clasen <mclasen@redhat.com> 1.3.4-2
|
||||
- Enable JIT/patch for execmem
|
||||
- Move inspector to the main package
|
||||
|
||||
* Thu Sep 23 2010 Matthias Clasen <mclasen@redhat.com> 1.3.4-1
|
||||
- Update to 1.3.4
|
||||
|
||||
* Wed Aug 25 2010 Dan Horák <dan[at]danny.cz> - 1.3.3-4
|
||||
- Do not generate debug information to prevent linker memory exhaustion on s390 with its 2 GB address space
|
||||
|
||||
* Wed Jul 21 2010 Dan Horák <dan[at]danny.cz> - 1.3.3-3
|
||||
- Fix build on s390(x)
|
||||
|
||||
* Thu Jul 15 2010 Colin Walters <walters@verbum.org> - 1.3.3-2
|
||||
- Rebuild with new gobject-introspection
|
||||
|
||||
* Fri Jul 9 2010 Matthias Clasen <mclasen@redhat.com> 1.3.2-2
|
||||
- Fix conflicting gettext domain with webkitgtk
|
||||
- Drop the -doc subpackage
|
||||
|
||||
* Thu Jul 1 2010 Matthias Clasen <mclasen@redhat.com> 1.3.2-1
|
||||
- Initial packaging
|
||||
Loading…
Add table
Add a link
Reference in a new issue