Sync with f20/latest upstream for epel7.
This commit is contained in:
parent
4e854f7ef7
commit
1637cf147a
2
sources
2
sources
@ -1 +1 @@
|
|||||||
413be319ba171feed9348d1bede6b0a7 webkitgtk-2.0.4.tar.xz
|
613e81c460368ff4d6e02c7887206572 webkitgtk-2.2.3.tar.xz
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.double2ints webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
|
|
||||||
--- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.double2ints 2013-02-12 17:22:38.000000000 +0100
|
|
||||||
+++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp 2013-03-07 18:04:39.778807991 +0100
|
|
||||||
@@ -117,6 +118,17 @@ static double Ints2Double(uint32_t lo, u
|
|
||||||
u.ival64 = (static_cast<uint64_t>(hi) << 32) | lo;
|
|
||||||
return u.dval;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+static void Double2Ints(double input, intptr_t& lo, intptr_t& hi)
|
|
||||||
+{
|
|
||||||
+ union {
|
|
||||||
+ double dval;
|
|
||||||
+ int64_t ival64;
|
|
||||||
+ } u;
|
|
||||||
+ u.dval = input;
|
|
||||||
+ hi = static_cast<intptr_t>(u.ival64 >> 32);
|
|
||||||
+ lo = static_cast<intptr_t>(u.ival64);
|
|
||||||
+}
|
|
||||||
#endif // USE(JSVALUE32_64)
|
|
||||||
|
|
||||||
} // namespace LLint
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -up webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig webkitgtk-1.11.2/Source/WTF/wtf/Platform.h
|
|
||||||
--- webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig 2012-12-16 21:27:29.000000000 +0100
|
|
||||||
+++ webkitgtk-1.11.2/Source/WTF/wtf/Platform.h 2012-12-16 23:16:19.000000000 +0100
|
|
||||||
@@ -1001,7 +1001,7 @@
|
|
||||||
#define ENABLE_REGEXP_TRACING 0
|
|
||||||
|
|
||||||
/* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
|
|
||||||
-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT))
|
|
||||||
+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT))
|
|
||||||
#define ENABLE_YARR_JIT 1
|
|
||||||
|
|
||||||
/* Setting this flag compares JIT results with interpreter results. */
|
|
@ -1,40 +0,0 @@
|
|||||||
diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
|
|
||||||
--- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 2013-03-07 17:55:22.488831605 +0100
|
|
||||||
+++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-03-07 17:56:04.998829804 +0100
|
|
||||||
@@ -1729,7 +1729,7 @@ _llint_op_next_pname:
|
|
||||||
loadi 20[PC], t2
|
|
||||||
loadi PayloadOffset[cfr, t2, 8], t2
|
|
||||||
loadp JSPropertyNameIterator::m_jsStrings[t2], t3
|
|
||||||
- loadi [t3, t0, 8], t3
|
|
||||||
+ loadi PayloadOffset[t3, t0, 8], t3
|
|
||||||
addi 1, t0
|
|
||||||
storei t0, PayloadOffset[cfr, t1, 8]
|
|
||||||
loadi 4[PC], t1
|
|
||||||
diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
|
|
||||||
--- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 2013-03-07 17:56:24.953828958 +0100
|
|
||||||
+++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-03-07 17:58:05.653824691 +0100
|
|
||||||
@@ -263,13 +263,13 @@ macro assertNotConstant(index)
|
|
||||||
end
|
|
||||||
|
|
||||||
macro functionForCallCodeBlockGetter(targetRegister)
|
|
||||||
- loadp Callee[cfr], targetRegister
|
|
||||||
+ loadp Callee + PayloadOffset[cfr], targetRegister
|
|
||||||
loadp JSFunction::m_executable[targetRegister], targetRegister
|
|
||||||
loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
|
|
||||||
end
|
|
||||||
|
|
||||||
macro functionForConstructCodeBlockGetter(targetRegister)
|
|
||||||
- loadp Callee[cfr], targetRegister
|
|
||||||
+ loadp Callee + PayloadOffset[cfr], targetRegister
|
|
||||||
loadp JSFunction::m_executable[targetRegister], targetRegister
|
|
||||||
loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
|
|
||||||
end
|
|
||||||
@@ -824,7 +824,7 @@ macro interpretResolveWithBase(opcodeLen
|
|
||||||
getResolveOperation(4, t0)
|
|
||||||
btpz t0, .slowPath
|
|
||||||
|
|
||||||
- loadp ScopeChain[cfr], t3
|
|
||||||
+ loadp ScopeChain + PayloadOffset[cfr], t3
|
|
||||||
# Get the base
|
|
||||||
loadis ResolveOperation::m_operation[t0], t2
|
|
||||||
|
|
31
webkit-2.1.90-double2intsPPC32.patch
Normal file
31
webkit-2.1.90-double2intsPPC32.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
|
||||||
|
--- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 2013-08-28 21:06:29.000000000 +0200
|
||||||
|
+++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-09-12 15:32:34.000000000 +0200
|
||||||
|
@@ -1679,7 +1679,7 @@ _llint_op_next_pname:
|
||||||
|
loadi 20[PC], t2
|
||||||
|
loadi PayloadOffset[cfr, t2, 8], t2
|
||||||
|
loadp JSPropertyNameIterator::m_jsStrings[t2], t3
|
||||||
|
- loadi [t3, t0, 8], t3
|
||||||
|
+ loadi PayloadOffset[t3, t0, 8], t3
|
||||||
|
addi 1, t0
|
||||||
|
storei t0, PayloadOffset[cfr, t1, 8]
|
||||||
|
loadi 4[PC], t1
|
||||||
|
diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
|
||||||
|
--- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 2013-08-28 21:06:29.000000000 +0200
|
||||||
|
+++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-09-12 15:32:34.000000000 +0200
|
||||||
|
@@ -276,13 +276,13 @@ macro assertNotConstant(index)
|
||||||
|
end
|
||||||
|
|
||||||
|
macro functionForCallCodeBlockGetter(targetRegister)
|
||||||
|
- loadp Callee[cfr], targetRegister
|
||||||
|
+ loadp Callee + PayloadOffset[cfr], targetRegister
|
||||||
|
loadp JSFunction::m_executable[targetRegister], targetRegister
|
||||||
|
loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
|
||||||
|
end
|
||||||
|
|
||||||
|
macro functionForConstructCodeBlockGetter(targetRegister)
|
||||||
|
- loadp Callee[cfr], targetRegister
|
||||||
|
+ loadp Callee + PayloadOffset[cfr], targetRegister
|
||||||
|
loadp JSFunction::m_executable[targetRegister], targetRegister
|
||||||
|
loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
|
||||||
|
end
|
@ -1,63 +0,0 @@
|
|||||||
diff -up webkitgtk-1.11.90/GNUmakefile.in.libatomic webkitgtk-1.11.90/GNUmakefile.in
|
|
||||||
--- webkitgtk-1.11.90/GNUmakefile.in.libatomic 2013-02-21 19:07:19.000000000 +0100
|
|
||||||
+++ webkitgtk-1.11.90/GNUmakefile.in 2013-02-25 11:31:34.824149062 +0100
|
|
||||||
@@ -20933,6 +20933,7 @@ libWTF_la_CXXFLAGS = \
|
|
||||||
$(libWTF_la_CFLAGS)
|
|
||||||
|
|
||||||
libWTF_la_CFLAGS = \
|
|
||||||
+ -latomic \
|
|
||||||
-fstrict-aliasing \
|
|
||||||
-O3 \
|
|
||||||
$(global_cflags) \
|
|
||||||
@@ -22305,7 +22306,7 @@ Programs_WebKitPluginProcess_SOURCES = \
|
|
||||||
|
|
||||||
#if ENABLE_SVG
|
|
||||||
#endif
|
|
||||||
-Programs_WebKitPluginProcess_LDADD = -lpthread \
|
|
||||||
+Programs_WebKitPluginProcess_LDADD = -latomic -lpthread \
|
|
||||||
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
|
|
||||||
libWebCore.la libWebCoreSVG.la libWebCorePlatform.la \
|
|
||||||
libWebCoreGtk2.la $(CAIRO_LIBS) $(COVERAGE_LDFLAGS) \
|
|
||||||
diff -up webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am.libatomic webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am
|
|
||||||
--- webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am.libatomic 2013-02-25 11:28:58.812154709 +0100
|
|
||||||
+++ webkitgtk-1.11.90/Source/WebKit2/GNUmakefile.am 2013-02-25 11:29:14.906154126 +0100
|
|
||||||
@@ -568,6 +568,7 @@ Programs_WebKitPluginProcess_SOURCES = \
|
|
||||||
$(webkit2_plugin_process_sources)
|
|
||||||
|
|
||||||
Programs_WebKitPluginProcess_LDADD = \
|
|
||||||
+ -latomic \
|
|
||||||
-lpthread \
|
|
||||||
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
|
|
||||||
libWebCore.la
|
|
||||||
diff -up webkitgtk-1.11.90/Source/WTF/GNUmakefile.am.libatomic webkitgtk-1.11.90/Source/WTF/GNUmakefile.am
|
|
||||||
--- webkitgtk-1.11.90/Source/WTF/GNUmakefile.am.libatomic 2012-07-19 12:02:14.000000000 +0200
|
|
||||||
+++ webkitgtk-1.11.90/Source/WTF/GNUmakefile.am 2013-02-25 09:21:31.552243859 +0100
|
|
||||||
@@ -25,6 +25,7 @@ libWTF_la_CXXFLAGS = \
|
|
||||||
$(libWTF_la_CFLAGS)
|
|
||||||
|
|
||||||
libWTF_la_CFLAGS = \
|
|
||||||
+ -latomic \
|
|
||||||
-fstrict-aliasing \
|
|
||||||
-O3 \
|
|
||||||
$(global_cflags) \
|
|
||||||
diff -up webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h.libatomic webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h
|
|
||||||
--- webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h.libatomic 2013-01-29 11:00:42.000000000 +0100
|
|
||||||
+++ webkitgtk-1.11.90/Source/WTF/wtf/Atomics.h 2013-02-25 09:21:31.553243859 +0100
|
|
||||||
@@ -107,6 +107,17 @@ inline int atomicDecrement(int volatile*
|
|
||||||
inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; }
|
|
||||||
inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; }
|
|
||||||
|
|
||||||
+#elif COMPILER(GCC) && (__GNUC__ > 4 || (__GNUC__ == 4 \
|
|
||||||
+ && (__GNUC_MINOR__ > 8 || (__GNUC_MINOR__ == 8 \
|
|
||||||
+ && (__GNUC_PATCHLEVEL__ > 0 || (__GNUC_PATCHLEVEL__ == 0)))))) \
|
|
||||||
+ && CPU(PPC)
|
|
||||||
+#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
|
|
||||||
+inline int atomicIncrement(int volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); }
|
|
||||||
+inline int atomicDecrement(int volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); }
|
|
||||||
+
|
|
||||||
+inline int64_t atomicIncrement(int64_t volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); }
|
|
||||||
+inline int64_t atomicDecrement(int64_t volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); }
|
|
||||||
+
|
|
||||||
#elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
|
|
||||||
#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
|
|
||||||
|
|
12
webkitgtk-2.1.1-yarr.patch
Normal file
12
webkitgtk-2.1.1-yarr.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up webkitgtk-2.1.1/Source/WTF/wtf/Platform.h.yarr webkitgtk-2.1.1/Source/WTF/wtf/Platform.h
|
||||||
|
--- webkitgtk-2.1.1/Source/WTF/wtf/Platform.h.yarr 2013-05-29 15:41:14.572995439 +0200
|
||||||
|
+++ webkitgtk-2.1.1/Source/WTF/wtf/Platform.h 2013-05-29 15:42:04.434993292 +0200
|
||||||
|
@@ -823,7 +823,7 @@
|
||||||
|
#define ENABLE_REGEXP_TRACING 0
|
||||||
|
|
||||||
|
/* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
|
||||||
|
-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT))
|
||||||
|
+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT))
|
||||||
|
#define ENABLE_YARR_JIT 1
|
||||||
|
|
||||||
|
/* Setting this flag compares JIT results with interpreter results. */
|
@ -1,12 +1,15 @@
|
|||||||
|
# In f20+ use unversioned docdirs, otherwise the old versioned one
|
||||||
|
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||||
|
|
||||||
## NOTE: Lots of files in various subdirectories have the same name (such as
|
## 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
|
## "LICENSE") so this short macro allows us to distinguish them by using their
|
||||||
## directory names (from the source tree) as prefixes for the files.
|
## directory names (from the source tree) as prefixes for the files.
|
||||||
%define add_to_doc_files() \
|
%define add_to_doc_files() \
|
||||||
mkdir -p %{buildroot}%{_docdir}/%{name}-%{version} ||: ; \
|
mkdir -p %{buildroot}%{_pkgdocdir} ||: ; \
|
||||||
cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')
|
cp -p %1 %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
|
||||||
|
|
||||||
Name: webkitgtk
|
Name: webkitgtk
|
||||||
Version: 2.0.4
|
Version: 2.2.3
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: GTK+ Web content engine library
|
Summary: GTK+ Web content engine library
|
||||||
|
|
||||||
@ -20,11 +23,9 @@ Source0: http://www.webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
|
|||||||
Patch0: webkit-1.3.10-nspluginwrapper.patch
|
Patch0: webkit-1.3.10-nspluginwrapper.patch
|
||||||
# workarounds for non-JIT arches
|
# workarounds for non-JIT arches
|
||||||
# https://bugs.webkit.org/show_bug.cgi?id=104270
|
# https://bugs.webkit.org/show_bug.cgi?id=104270
|
||||||
Patch1: webkit-1.11.2-yarr.patch
|
Patch1: webkitgtk-2.1.1-yarr.patch
|
||||||
# https://bugs.webkit.org/show_bug.cgi?id=103128
|
# https://bugs.webkit.org/show_bug.cgi?id=103128
|
||||||
Patch2: webkit-1.11.2-Double2Ints.patch
|
Patch4: webkit-2.1.90-double2intsPPC32.patch
|
||||||
Patch3: webkitgtk-1.11.5-libatomic.patch
|
|
||||||
Patch4: webkit-1.11.90-double2intsPPC32.patch
|
|
||||||
|
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
@ -36,13 +37,13 @@ BuildRequires: gperf
|
|||||||
BuildRequires: gstreamer1-devel
|
BuildRequires: gstreamer1-devel
|
||||||
BuildRequires: gstreamer1-plugins-base-devel
|
BuildRequires: gstreamer1-plugins-base-devel
|
||||||
BuildRequires: gtk2-devel >= 2.24.10
|
BuildRequires: gtk2-devel >= 2.24.10
|
||||||
BuildRequires: glib2-devel >= 2.36.0
|
BuildRequires: glib2-devel >= 2.36.0
|
||||||
BuildRequires: harfbuzz-devel
|
BuildRequires: harfbuzz-devel
|
||||||
BuildRequires: libsoup-devel >= 2.42.0
|
BuildRequires: libsoup-devel >= 2.42.0
|
||||||
BuildRequires: libicu-devel
|
BuildRequires: libicu-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
BuildRequires: libsecret-devel
|
BuildRequires: libsecret-devel
|
||||||
BuildRequires: libwebp-devel
|
BuildRequires: libwebp-devel
|
||||||
BuildRequires: libxslt-devel
|
BuildRequires: libxslt-devel
|
||||||
BuildRequires: libXt-devel
|
BuildRequires: libXt-devel
|
||||||
BuildRequires: pcre-devel
|
BuildRequires: pcre-devel
|
||||||
@ -56,13 +57,6 @@ BuildRequires: cairo-gobject-devel
|
|||||||
BuildRequires: fontconfig-devel >= 2.5
|
BuildRequires: fontconfig-devel >= 2.5
|
||||||
BuildRequires: freetype-devel
|
BuildRequires: freetype-devel
|
||||||
|
|
||||||
# Needed for patch5:
|
|
||||||
BuildRequires: autoconf automake libtool
|
|
||||||
|
|
||||||
%ifarch ppc
|
|
||||||
BuildRequires: libatomic
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
WebKitGTK+ is the port of the portable web rendering engine WebKit to the
|
WebKitGTK+ is the port of the portable web rendering engine WebKit to the
|
||||||
GTK+ platform.
|
GTK+ platform.
|
||||||
@ -91,26 +85,19 @@ This package contains developer documentation for %{name}.
|
|||||||
%setup -qn "webkitgtk-%{version}"
|
%setup -qn "webkitgtk-%{version}"
|
||||||
%patch0 -p1 -b .nspluginwrapper
|
%patch0 -p1 -b .nspluginwrapper
|
||||||
%patch1 -p1 -b .yarr
|
%patch1 -p1 -b .yarr
|
||||||
%patch2 -p1 -b .double2ints
|
|
||||||
%ifarch ppc
|
|
||||||
%patch3 -p1 -b .libatomic
|
|
||||||
%endif
|
|
||||||
# required for 32-bit big-endians
|
|
||||||
%ifarch ppc s390
|
%ifarch ppc s390
|
||||||
%patch4 -p1 -b .double2intsPPC32
|
%patch4 -p1 -b .double2intsPPC32
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Needed for patch5:
|
|
||||||
autoreconf --verbose --install -I Source/autotools
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifarch s390 %{arm} ppc
|
%ifarch s390 %{arm} ppc
|
||||||
# Use linker flags to reduce memory consumption on low-mem architectures
|
# Use linker flags to reduce memory consumption on low-mem architectures
|
||||||
%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
|
%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
|
||||||
%endif
|
%endif
|
||||||
%ifarch s390 s390x
|
|
||||||
|
%ifarch s390 s390x %{arm}
|
||||||
# Decrease debuginfo verbosity to reduce memory consumption even more
|
# Decrease debuginfo verbosity to reduce memory consumption even more
|
||||||
%global optflags %(echo %{optflags} | sed 's/-g/-g1/')
|
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch ppc
|
%ifarch ppc
|
||||||
@ -122,7 +109,7 @@ autoreconf --verbose --install -I Source/autotools
|
|||||||
# https://bugs.webkit.org/show_bug.cgi?id=91154
|
# https://bugs.webkit.org/show_bug.cgi?id=91154
|
||||||
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
|
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
|
||||||
|
|
||||||
CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure \
|
%configure \
|
||||||
--with-gtk=2.0 \
|
--with-gtk=2.0 \
|
||||||
--disable-webkit2 \
|
--disable-webkit2 \
|
||||||
%ifarch s390 s390x ppc ppc64
|
%ifarch s390 s390x ppc ppc64
|
||||||
@ -135,9 +122,11 @@ CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANA
|
|||||||
mkdir -p DerivedSources/webkit
|
mkdir -p DerivedSources/webkit
|
||||||
mkdir -p DerivedSources/WebCore
|
mkdir -p DerivedSources/WebCore
|
||||||
mkdir -p DerivedSources/ANGLE
|
mkdir -p DerivedSources/ANGLE
|
||||||
|
mkdir -p DerivedSources/WebKit2
|
||||||
mkdir -p DerivedSources/webkitdom/
|
mkdir -p DerivedSources/webkitdom/
|
||||||
mkdir -p DerivedSources/WebKit2/webkit2gtk/webkit2
|
|
||||||
mkdir -p DerivedSources/InjectedBundle
|
mkdir -p DerivedSources/InjectedBundle
|
||||||
|
mkdir -p DerivedSources/Platform
|
||||||
|
mkdir -p DerivedSources/WebKit2/webkit2gtk/webkit2
|
||||||
|
|
||||||
make %{_smp_mflags} V=1
|
make %{_smp_mflags} V=1
|
||||||
|
|
||||||
@ -184,11 +173,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%files -f WebKitGTK-2.0.lang
|
%files -f WebKitGTK-2.0.lang
|
||||||
%doc %{_docdir}/%{name}-%{version}/
|
%doc %{_pkgdocdir}
|
||||||
%{_libdir}/libwebkitgtk-1.0.so.*
|
%{_libdir}/libwebkitgtk-1.0.so.*
|
||||||
%{_libdir}/libjavascriptcoregtk-1.0.so.*
|
%{_libdir}/libjavascriptcoregtk-1.0.so.*
|
||||||
%{_libdir}/girepository-1.0/WebKit-1.0.typelib
|
%{_libdir}/girepository-1.0/WebKit-1.0.typelib
|
||||||
%{_libdir}/girepository-1.0/JSCore-1.0.typelib
|
%{_libdir}/girepository-1.0/JavaScriptCore-1.0.typelib
|
||||||
%{_libexecdir}/%{name}/
|
%{_libexecdir}/%{name}/
|
||||||
%{_datadir}/webkitgtk-1.0
|
%{_datadir}/webkitgtk-1.0
|
||||||
|
|
||||||
@ -200,7 +189,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
|
|||||||
%{_libdir}/pkgconfig/webkit-1.0.pc
|
%{_libdir}/pkgconfig/webkit-1.0.pc
|
||||||
%{_libdir}/pkgconfig/javascriptcoregtk-1.0.pc
|
%{_libdir}/pkgconfig/javascriptcoregtk-1.0.pc
|
||||||
%{_datadir}/gir-1.0/WebKit-1.0.gir
|
%{_datadir}/gir-1.0/WebKit-1.0.gir
|
||||||
%{_datadir}/gir-1.0/JSCore-1.0.gir
|
%{_datadir}/gir-1.0/JavaScriptCore-1.0.gir
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%dir %{_datadir}/gtk-doc
|
%dir %{_datadir}/gtk-doc
|
||||||
@ -209,6 +198,21 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Dec 04 2013 Tomas Popela <tpopela@redhat.com> 2.2.3-1
|
||||||
|
- Update to 2.2.3
|
||||||
|
|
||||||
|
* Mon Nov 11 2013 Tomas Popela <tpopela@redhat.com> 2.2.2-1
|
||||||
|
- Update to 2.2.2
|
||||||
|
|
||||||
|
* Mon Oct 21 2013 Tomas Popela <tpopela@redhat.com> 2.2.1-1
|
||||||
|
- Update to 2.2.1
|
||||||
|
|
||||||
|
* Sun Aug 04 2013 Karsten Hopp <karsten@redhat.com> 2.0.4-3
|
||||||
|
- update ppc libatomic patch
|
||||||
|
|
||||||
|
* Sat Jul 27 2013 Kevin Fenzi <kevin@scrye.com> 2.0.4-2
|
||||||
|
- Fix for unversioned doc dirs
|
||||||
|
|
||||||
* Mon Jul 22 2013 Tomas Popela <tpopela@redhat.com> - 2.0.4-1
|
* Mon Jul 22 2013 Tomas Popela <tpopela@redhat.com> - 2.0.4-1
|
||||||
- Update to 2.0.4
|
- Update to 2.0.4
|
||||||
|
|
||||||
@ -220,7 +224,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
|
|||||||
|
|
||||||
* Wed Apr 17 2013 Tomas Popela <tpopela@redhat.com> - 2.0.1-1
|
* Wed Apr 17 2013 Tomas Popela <tpopela@redhat.com> - 2.0.1-1
|
||||||
- Update to 2.0.1
|
- Update to 2.0.1
|
||||||
- Remove unused patches
|
|
||||||
|
|
||||||
* Wed Apr 3 2013 Tomas Popela <tpopela@redhat.com> - 2.0.0-2
|
* Wed Apr 3 2013 Tomas Popela <tpopela@redhat.com> - 2.0.0-2
|
||||||
- Add cairo-gobject as BR
|
- Add cairo-gobject as BR
|
||||||
|
Loading…
Reference in New Issue
Block a user