rpms/xulrunner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed xulrunner build on fedora 23, #1243104

Browse source
This commit is contained in:
Petr Jašíček 2015-07-21 12:46:14 +02:00
commit 588fddfcfc
3 changed files with 333 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

152
mozilla-1005535.patch
View file

@ -3,15 +3,11 @@
# User Steve Singer <steve@ssinger.info>
Bug 1005535 - Get skia GPU building on big endian.
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -8231,21 +8231,21 @@ dnl Skia
dnl ========================================================
if test "$MOZ_ENABLE_SKIA"; then
AC_DEFINE(MOZ_ENABLE_SKIA)
AC_DEFINE(USE_SKIA)
if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then
Index: mozilla-release/configure.in
===================================================================
--- mozilla-release.orig/configure.in
+++ mozilla-release/configure.in
@@ -8243,11 +8243,11 @@ if test "$MOZ_ENABLE_SKIA"; then
AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK)
fi
@ -25,63 +21,35 @@ diff --git a/configure.in b/configure.in
fi
AC_SUBST(MOZ_ENABLE_SKIA)
dnl ========================================================
dnl disable xul
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(xul,
[ --disable-xul Disable XUL],
diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -236,17 +236,17 @@ def generate_separated_sources(platform_
return True
return False
separated = {
Index: mozilla-release/gfx/skia/generate_mozbuild.py
===================================================================
--- mozilla-release.orig/gfx/skia/generate_mozbuild.py
+++ mozilla-release/gfx/skia/generate_mozbuild.py
@@ -242,7 +242,6 @@ def generate_separated_sources(platform_
'common': {
#'trunk/src/effects/gradients/SkGradientTileProc.cpp',
'trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
- 'trunk/src/ports/SkDiscardableMemory_none.cpp',
+ #'trunk/src/ports/SkDiscardableMemory_none.cpp',
'trunk/src/ports/SkImageDecoder_empty.cpp',
'trunk/src/ports/SkMemory_mozalloc.cpp',
# 'trunk/src/images/SkImages.cpp',
# 'trunk/src/images/SkImageRef.cpp',
# 'trunk/src/images/SkImageRef_GlobalPool.cpp',
# 'trunk/src/images/SkImageRefPool.cpp',
# 'trunk/src/images/SkImageDecoder.cpp',
# 'trunk/src/images/SkImageDecoder_Factory.cpp',
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -847,17 +847,16 @@ else:
'trunk/src/opts/SkBitmapProcState_opts_none.cpp',
'trunk/src/opts/SkBlitMask_opts_none.cpp',
'trunk/src/opts/SkBlitRow_opts_none.cpp',
'trunk/src/opts/SkBlurImage_opts_none.cpp',
'trunk/src/opts/SkMorphology_opts_none.cpp',
'trunk/src/opts/SkTextureCompression_opts_none.cpp',
'trunk/src/opts/SkUtils_opts_none.cpp',
'trunk/src/opts/SkXfermode_opts_none.cpp',
- 'trunk/src/ports/SkDiscardableMemory_none.cpp',
]
# can we find a better way of dealing with asm sources?
# left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
SOURCES += [
diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/trunk/include/config/SkUserConfig.h
--- a/gfx/skia/trunk/include/config/SkUserConfig.h
+++ b/gfx/skia/trunk/include/config/SkUserConfig.h
@@ -192,16 +192,17 @@
#if defined(SK_CPU_ARM32) || defined(SK_CPU_ARM64)
# define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_arm.h"
#else
# define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_x86.h"
Index: mozilla-release/gfx/skia/moz.build
===================================================================
--- mozilla-release.orig/gfx/skia/moz.build
+++ mozilla-release/gfx/skia/moz.build
@@ -663,7 +663,6 @@ UNIFIED_SOURCES += [
'trunk/src/pathops/SkReduceOrder.cpp',
'trunk/src/pipe/SkGPipeRead.cpp',
'trunk/src/pipe/SkGPipeWrite.cpp',
- 'trunk/src/ports/SkDiscardableMemory_none.cpp',
'trunk/src/ports/SkGlobalInitialization_default.cpp',
'trunk/src/ports/SkImageDecoder_empty.cpp',
'trunk/src/ports/SkMemory_mozalloc.cpp',
Index: mozilla-release/gfx/skia/trunk/include/config/SkUserConfig.h
===================================================================
--- mozilla-release.orig/gfx/skia/trunk/include/config/SkUserConfig.h
+++ mozilla-release/gfx/skia/trunk/include/config/SkUserConfig.h
@@ -197,6 +197,7 @@
#endif
// On all platforms we have this byte order
@ -89,20 +57,11 @@ diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/trunk/inclu
#define SK_A32_SHIFT 24
#define SK_R32_SHIFT 16
#define SK_G32_SHIFT 8
#define SK_B32_SHIFT 0
#define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0
#define SK_SUPPORT_LEGACY_GETDEVICE
diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/core/SkColorPriv.h
--- a/gfx/skia/trunk/include/core/SkColorPriv.h
+++ b/gfx/skia/trunk/include/core/SkColorPriv.h
@@ -27,37 +27,27 @@
* For easier compatibility with Skia's GPU backend, we further restrict these
* to either (in memory-byte-order) RGBA or BGRA. Note that this "order" does
* not directly correspond to the same shift-order, since we have to take endianess
* into account.
*
Index: mozilla-release/gfx/skia/trunk/include/core/SkColorPriv.h
===================================================================
--- mozilla-release.orig/gfx/skia/trunk/include/core/SkColorPriv.h
+++ mozilla-release/gfx/skia/trunk/include/core/SkColorPriv.h
@@ -32,17 +32,7 @@
* Here we enforce this constraint.
*/
@ -120,9 +79,7 @@ diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/
#define SK_RGBA_R32_SHIFT 0
#define SK_RGBA_G32_SHIFT 8
#define SK_RGBA_B32_SHIFT 16
#define SK_RGBA_A32_SHIFT 24
#define SK_BGRA_B32_SHIFT 0
@@ -52,7 +42,7 @@
#define SK_BGRA_G32_SHIFT 8
#define SK_BGRA_R32_SHIFT 16
#define SK_BGRA_A32_SHIFT 24
@ -131,20 +88,11 @@ diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/
#if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
#error "can't define PMCOLOR to be RGBA and BGRA"
#endif
#define LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA \
(SK_A32_SHIFT == SK_RGBA_A32_SHIFT && \
SK_R32_SHIFT == SK_RGBA_R32_SHIFT && \
diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/trunk/include/core/SkImageInfo.h
--- a/gfx/skia/trunk/include/core/SkImageInfo.h
+++ b/gfx/skia/trunk/include/core/SkImageInfo.h
@@ -83,19 +83,20 @@ enum SkColorType {
kLastEnum_SkColorType = kIndex_8_SkColorType,
#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
kN32_SkColorType = kBGRA_8888_SkColorType,
Index: mozilla-release/gfx/skia/trunk/include/core/SkImageInfo.h
===================================================================
--- mozilla-release.orig/gfx/skia/trunk/include/core/SkImageInfo.h
+++ mozilla-release/gfx/skia/trunk/include/core/SkImageInfo.h
@@ -88,9 +88,10 @@ enum SkColorType {
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
kN32_SkColorType = kRGBA_8888_SkColorType,
#else
@ -156,20 +104,11 @@ diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/trunk/include/
#ifdef SK_SUPPORT_LEGACY_N32_NAME
kPMColor_SkColorType = kN32_SkColorType
#endif
};
static int SkColorTypeBytesPerPixel(SkColorType ct) {
static const uint8_t gSize[] = {
0, // Unknown
diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/trunk/include/gpu/GrTypes.h
--- a/gfx/skia/trunk/include/gpu/GrTypes.h
+++ b/gfx/skia/trunk/include/gpu/GrTypes.h
@@ -304,25 +304,23 @@ enum GrPixelConfig {
* Byte order is r, g, b, a. This color format is 32 bits per channel
*/
kRGBA_float_GrPixelConfig,
kLast_GrPixelConfig = kRGBA_float_GrPixelConfig
};
Index: mozilla-release/gfx/skia/trunk/include/gpu/GrTypes.h
===================================================================
--- mozilla-release.orig/gfx/skia/trunk/include/gpu/GrTypes.h
+++ mozilla-release/gfx/skia/trunk/include/gpu/GrTypes.h
@@ -309,15 +309,13 @@ enum GrPixelConfig {
static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
// Aliases for pixel configs that match skia's byte order.
@ -187,8 +126,3 @@ diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/trunk/include/gpu/G
#endif
// Returns true if the pixel config is a GPU-specific compressed format
// representation.
static inline bool GrPixelConfigIsCompressed(GrPixelConfig config) {
switch (config) {
case kETC1_GrPixelConfig:
case kLATC_GrPixelConfig:

284
mozilla-1243104.patch Normal file
View file

@ -0,0 +1,284 @@
From e3ee5c0dbc8814f5114cdddb0f050691e7573b34 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
Date: Tue, 14 Jul 2015 21:02:13 +0200
Subject: [PATCH] fixed build
---
firefox-nss-3.18.0.patch | 13 ----
mozilla-1005535.patch | 152 ++++++++++++++---------------------------------
xulrunner.spec | 9 ++-
3 files changed, 49 insertions(+), 125 deletions(-)
delete mode 100644 firefox-nss-3.18.0.patch
diff --git a/firefox-nss-3.18.0.patch b/firefox-nss-3.18.0.patch
deleted file mode 100644
index a693832..0000000
--- a/firefox-nss-3.18.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up mozilla-release/configure.in.old mozilla-release/configure.in
---- mozilla-release/configure.in.old 2015-04-28 20:31:45.000000000 +0200
-+++ mozilla-release/configure.in 2015-04-28 20:32:40.807783614 +0200
-@@ -3627,7 +3627,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
- _USE_SYSTEM_NSS=1 )
-
- if test -n "$_USE_SYSTEM_NSS"; then
-- AM_PATH_NSS(3.18.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
-+ AM_PATH_NSS(3.18.0, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
- fi
-
- if test -n "$MOZ_NATIVE_NSS"; then
-diff -up mozilla-release/media/webrtc/trunk/Makefile.old mozilla-release/media/webrtc/trunk/Makefile
diff --git a/mozilla-1005535.patch b/mozilla-1005535.patch
index 2f0381b..ef4f1ac 100644
--- a/mozilla-1005535.patch
+++ b/mozilla-1005535.patch
@@ -3,15 +3,11 @@
# User Steve Singer <steve@ssinger.info>
Bug 1005535 - Get skia GPU building on big endian.
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -8231,21 +8231,21 @@ dnl Skia
- dnl ========================================================
- if test "$MOZ_ENABLE_SKIA"; then
- AC_DEFINE(MOZ_ENABLE_SKIA)
- AC_DEFINE(USE_SKIA)
- if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then
+Index: mozilla-release/configure.in
+===================================================================
+--- mozilla-release.orig/configure.in
++++ mozilla-release/configure.in
+@@ -8243,11 +8243,11 @@ if test "$MOZ_ENABLE_SKIA"; then
AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK)
fi
@@ -25,63 +21,35 @@ diff --git a/configure.in b/configure.in
fi
AC_SUBST(MOZ_ENABLE_SKIA)
- dnl ========================================================
- dnl disable xul
- dnl ========================================================
- MOZ_ARG_DISABLE_BOOL(xul,
- [ --disable-xul Disable XUL],
-diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
---- a/gfx/skia/generate_mozbuild.py
-+++ b/gfx/skia/generate_mozbuild.py
-@@ -236,17 +236,17 @@ def generate_separated_sources(platform_
- return True
-
- return False
-
- separated = {
+Index: mozilla-release/gfx/skia/generate_mozbuild.py
+===================================================================
+--- mozilla-release.orig/gfx/skia/generate_mozbuild.py
++++ mozilla-release/gfx/skia/generate_mozbuild.py
+@@ -242,7 +242,6 @@ def generate_separated_sources(platform_
'common': {
#'trunk/src/effects/gradients/SkGradientTileProc.cpp',
'trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
- 'trunk/src/ports/SkDiscardableMemory_none.cpp',
-+ #'trunk/src/ports/SkDiscardableMemory_none.cpp',
'trunk/src/ports/SkImageDecoder_empty.cpp',
'trunk/src/ports/SkMemory_mozalloc.cpp',
# 'trunk/src/images/SkImages.cpp',
- # 'trunk/src/images/SkImageRef.cpp',
- # 'trunk/src/images/SkImageRef_GlobalPool.cpp',
- # 'trunk/src/images/SkImageRefPool.cpp',
- # 'trunk/src/images/SkImageDecoder.cpp',
- # 'trunk/src/images/SkImageDecoder_Factory.cpp',
-diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
---- a/gfx/skia/moz.build
-+++ b/gfx/skia/moz.build
-@@ -847,17 +847,16 @@ else:
- 'trunk/src/opts/SkBitmapProcState_opts_none.cpp',
- 'trunk/src/opts/SkBlitMask_opts_none.cpp',
- 'trunk/src/opts/SkBlitRow_opts_none.cpp',
- 'trunk/src/opts/SkBlurImage_opts_none.cpp',
- 'trunk/src/opts/SkMorphology_opts_none.cpp',
- 'trunk/src/opts/SkTextureCompression_opts_none.cpp',
- 'trunk/src/opts/SkUtils_opts_none.cpp',
- 'trunk/src/opts/SkXfermode_opts_none.cpp',
-- 'trunk/src/ports/SkDiscardableMemory_none.cpp',
- ]
-
-
- # can we find a better way of dealing with asm sources?
-
- # left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
- if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
- SOURCES += [
-diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/trunk/include/config/SkUserConfig.h
---- a/gfx/skia/trunk/include/config/SkUserConfig.h
-+++ b/gfx/skia/trunk/include/config/SkUserConfig.h
-@@ -192,16 +192,17 @@
-
- #if defined(SK_CPU_ARM32) || defined(SK_CPU_ARM64)
- # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_arm.h"
- #else
- # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_x86.h"
+Index: mozilla-release/gfx/skia/moz.build
+===================================================================
+--- mozilla-release.orig/gfx/skia/moz.build
++++ mozilla-release/gfx/skia/moz.build
+@@ -663,7 +663,6 @@ UNIFIED_SOURCES += [
+ 'trunk/src/pathops/SkReduceOrder.cpp',
+ 'trunk/src/pipe/SkGPipeRead.cpp',
+ 'trunk/src/pipe/SkGPipeWrite.cpp',
+- 'trunk/src/ports/SkDiscardableMemory_none.cpp',
+ 'trunk/src/ports/SkGlobalInitialization_default.cpp',
+ 'trunk/src/ports/SkImageDecoder_empty.cpp',
+ 'trunk/src/ports/SkMemory_mozalloc.cpp',
+Index: mozilla-release/gfx/skia/trunk/include/config/SkUserConfig.h
+===================================================================
+--- mozilla-release.orig/gfx/skia/trunk/include/config/SkUserConfig.h
++++ mozilla-release/gfx/skia/trunk/include/config/SkUserConfig.h
+@@ -197,6 +197,7 @@
#endif
// On all platforms we have this byte order
@@ -89,20 +57,11 @@ diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/trunk/inclu
#define SK_A32_SHIFT 24
#define SK_R32_SHIFT 16
#define SK_G32_SHIFT 8
- #define SK_B32_SHIFT 0
-
- #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0
-
- #define SK_SUPPORT_LEGACY_GETDEVICE
-diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/core/SkColorPriv.h
---- a/gfx/skia/trunk/include/core/SkColorPriv.h
-+++ b/gfx/skia/trunk/include/core/SkColorPriv.h
-@@ -27,37 +27,27 @@
- * For easier compatibility with Skia's GPU backend, we further restrict these
- * to either (in memory-byte-order) RGBA or BGRA. Note that this "order" does
- * not directly correspond to the same shift-order, since we have to take endianess
- * into account.
- *
+Index: mozilla-release/gfx/skia/trunk/include/core/SkColorPriv.h
+===================================================================
+--- mozilla-release.orig/gfx/skia/trunk/include/core/SkColorPriv.h
++++ mozilla-release/gfx/skia/trunk/include/core/SkColorPriv.h
+@@ -32,17 +32,7 @@
* Here we enforce this constraint.
*/
@@ -120,9 +79,7 @@ diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/
#define SK_RGBA_R32_SHIFT 0
#define SK_RGBA_G32_SHIFT 8
#define SK_RGBA_B32_SHIFT 16
- #define SK_RGBA_A32_SHIFT 24
-
- #define SK_BGRA_B32_SHIFT 0
+@@ -52,7 +42,7 @@
#define SK_BGRA_G32_SHIFT 8
#define SK_BGRA_R32_SHIFT 16
#define SK_BGRA_A32_SHIFT 24
@@ -131,20 +88,11 @@ diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/
#if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
#error "can't define PMCOLOR to be RGBA and BGRA"
- #endif
-
- #define LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA \
- (SK_A32_SHIFT == SK_RGBA_A32_SHIFT && \
- SK_R32_SHIFT == SK_RGBA_R32_SHIFT && \
-diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/trunk/include/core/SkImageInfo.h
---- a/gfx/skia/trunk/include/core/SkImageInfo.h
-+++ b/gfx/skia/trunk/include/core/SkImageInfo.h
-@@ -83,19 +83,20 @@ enum SkColorType {
-
- kLastEnum_SkColorType = kIndex_8_SkColorType,
-
- #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
- kN32_SkColorType = kBGRA_8888_SkColorType,
+Index: mozilla-release/gfx/skia/trunk/include/core/SkImageInfo.h
+===================================================================
+--- mozilla-release.orig/gfx/skia/trunk/include/core/SkImageInfo.h
++++ mozilla-release/gfx/skia/trunk/include/core/SkImageInfo.h
+@@ -88,9 +88,10 @@ enum SkColorType {
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
kN32_SkColorType = kRGBA_8888_SkColorType,
#else
@@ -156,20 +104,11 @@ diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/trunk/include/
#ifdef SK_SUPPORT_LEGACY_N32_NAME
kPMColor_SkColorType = kN32_SkColorType
#endif
- };
-
- static int SkColorTypeBytesPerPixel(SkColorType ct) {
- static const uint8_t gSize[] = {
- 0, // Unknown
-diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/trunk/include/gpu/GrTypes.h
---- a/gfx/skia/trunk/include/gpu/GrTypes.h
-+++ b/gfx/skia/trunk/include/gpu/GrTypes.h
-@@ -304,25 +304,23 @@ enum GrPixelConfig {
- * Byte order is r, g, b, a. This color format is 32 bits per channel
- */
- kRGBA_float_GrPixelConfig,
- kLast_GrPixelConfig = kRGBA_float_GrPixelConfig
- };
+Index: mozilla-release/gfx/skia/trunk/include/gpu/GrTypes.h
+===================================================================
+--- mozilla-release.orig/gfx/skia/trunk/include/gpu/GrTypes.h
++++ mozilla-release/gfx/skia/trunk/include/gpu/GrTypes.h
+@@ -309,15 +309,13 @@ enum GrPixelConfig {
static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
// Aliases for pixel configs that match skia's byte order.
@@ -187,8 +126,3 @@ diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/trunk/include/gpu/G
#endif
// Returns true if the pixel config is a GPU-specific compressed format
- // representation.
- static inline bool GrPixelConfigIsCompressed(GrPixelConfig config) {
- switch (config) {
- case kETC1_GrPixelConfig:
- case kLATC_GrPixelConfig:
diff --git a/xulrunner.spec b/xulrunner.spec
index 9570fd8..e9447b3 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -78,7 +78,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 39.0
-Release: 1%{?pre_tag}%{?dist}
+Release: 2%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -98,7 +98,6 @@ Patch19: xulrunner-24.0-s390-inlines.patch
Patch20: firefox-build-prbool.patch
Patch21: aarch64-fix-skia.patch
Patch22: mozilla-1005535.patch
-Patch23: firefox-nss-3.18.0.patch
Patch24: rhbz-1219542-s390-build.patch
# Fedora specific patches
@@ -242,7 +241,6 @@ cd %{tarballdir}
%patch20 -p1 -b .prbool
%patch21 -p1 -b .aarch64-fix-skia
%patch22 -p1 -b .mozilla-1005535
-%patch23 -p1 -b .nss-3.18.0
%ifarch s390
%patch24 -p1 -b .rhbz-1219542-s390
%endif
@@ -554,6 +552,11 @@ fi
#---------------------------------------------------------------------
%changelog
+* Tue Jul 14 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 39.0-2
+- fixed build
+ - dropped firefox-nss-3.18.0.patch as we have 3.19.2 available
+ - refreshed mozilla-1005535.patch patch to apply
+
* Fri Jul 10 2015 Martin Stransky <stransky@redhat.com> - 39.0-1
- Update to 39.0
--
2.4.5

9
xulrunner.spec
View file

@ -78,7 +78,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 39.0
Release: 1%{?pre_tag}%{?dist}
Release: 2%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@ -98,7 +98,6 @@ Patch19: xulrunner-24.0-s390-inlines.patch
Patch20: firefox-build-prbool.patch
Patch21: aarch64-fix-skia.patch
Patch22: mozilla-1005535.patch
Patch23: firefox-nss-3.18.0.patch
Patch24: rhbz-1219542-s390-build.patch
# Fedora specific patches
@ -242,7 +241,6 @@ cd %{tarballdir}
%patch20 -p1 -b .prbool
%patch21 -p1 -b .aarch64-fix-skia
%patch22 -p1 -b .mozilla-1005535
%patch23 -p1 -b .nss-3.18.0
%ifarch s390
%patch24 -p1 -b .rhbz-1219542-s390
%endif
@ -554,6 +552,11 @@ fi
#---------------------------------------------------------------------
%changelog
* Tue Jul 14 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 39.0-2
- fixed build
- dropped firefox-nss-3.18.0.patch as we have 3.19.2 available
- refreshed mozilla-1005535.patch patch to apply
* Fri Jul 10 2015 Martin Stransky <stransky@redhat.com> - 39.0-1
- Update to 39.0