From 2317f0a89151f506992966a220daeab909bc4d15 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 29 Nov 2015 16:50:43 +0100 Subject: [PATCH] - removed obsolete patches --- icedove-fonts.patch | 143 ----------------------------------------- icedove-makefile.patch | 38 ----------- icedove.spec | 4 -- libvpx2.patch | 74 --------------------- 4 files changed, 259 deletions(-) delete mode 100644 icedove-fonts.patch delete mode 100644 icedove-makefile.patch delete mode 100644 libvpx2.patch diff --git a/icedove-fonts.patch b/icedove-fonts.patch deleted file mode 100644 index f0eac8f..0000000 --- a/icedove-fonts.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff -ur comm-1.9.1/mozilla/modules/libpref/src/init/all.js comm-1.9.1.new/mozilla/modules/libpref/src/init/all.js ---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-12-05 02:56:20.000000000 +0100 -+++ comm-1.9.1.new/mozilla/modules/libpref/src/init/all.js 2009-12-21 09:16:41.372169512 +0100 -@@ -1240,9 +1240,9 @@ - pref("font.name.monospace.th", "Tahoma"); - pref("font.name.cursive.th", "Tahoma"); - --pref("font.name.serif.tr", "Times New Roman"); --pref("font.name.sans-serif.tr", "Arial"); --pref("font.name.monospace.tr", "Courier New"); -+pref("font.name.serif.tr", "serif"); -+pref("font.name.sans-serif.tr", "sans-serif"); -+pref("font.name.monospace.tr", "monospace"); - pref("font.name.cursive.tr", "Comic Sans MS"); - - pref("font.name.serif.x-baltic", "Times New Roman"); -@@ -1250,9 +1250,9 @@ - pref("font.name.monospace.x-baltic", "Courier New"); - pref("font.name.cursive.x-baltic", "Comic Sans MS"); - --pref("font.name.serif.x-central-euro", "Times New Roman"); --pref("font.name.sans-serif.x-central-euro", "Arial"); --pref("font.name.monospace.x-central-euro", "Courier New"); -+pref("font.name.serif.x-central-euro", "serif"); -+pref("font.name.sans-serif.x-central-euro", "sans-serif"); -+pref("font.name.monospace.x-central-euro", "monospace"); - pref("font.name.cursive.x-central-euro", "Comic Sans MS"); - - pref("font.name.serif.x-cyrillic", "Times New Roman"); -@@ -1260,9 +1260,9 @@ - pref("font.name.monospace.x-cyrillic", "Courier New"); - pref("font.name.cursive.x-cyrillic", "Comic Sans MS"); - --pref("font.name.serif.x-unicode", "Times New Roman"); --pref("font.name.sans-serif.x-unicode", "Arial"); --pref("font.name.monospace.x-unicode", "Courier New"); -+pref("font.name.serif.x-unicode", "serif"); -+pref("font.name.sans-serif.x-unicode", "sans-serif"); -+pref("font.name.monospace.x-unicode", "monospace"); - pref("font.name.cursive.x-unicode", "Comic Sans MS"); - - pref("font.name.serif.x-western", "Times New Roman"); -@@ -1396,23 +1396,23 @@ - - pref("font.default.ar", "sans-serif"); - pref("font.size.variable.ar", 16); --pref("font.size.fixed.ar", 13); -+pref("font.size.fixed.ar", 14); - --pref("font.default.el", "serif"); -+pref("font.default.el", "sans-serif"); - pref("font.size.variable.el", 16); --pref("font.size.fixed.el", 13); -+pref("font.size.fixed.el", 14); - - pref("font.default.he", "sans-serif"); - pref("font.size.variable.he", 16); --pref("font.size.fixed.he", 13); -+pref("font.size.fixed.he", 14); - - pref("font.default.ja", "sans-serif"); - pref("font.size.variable.ja", 16); --pref("font.size.fixed.ja", 16); -+pref("font.size.fixed.ja", 14); - - pref("font.default.ko", "sans-serif"); - pref("font.size.variable.ko", 16); --pref("font.size.fixed.ko", 16); -+pref("font.size.fixed.ko", 14); - - pref("font.default.th", "serif"); - pref("font.size.variable.th", 16); -@@ -1856,22 +1856,22 @@ - pref("font.size.variable.ko", 16); - pref("font.size.fixed.ko", 16); - --pref("font.default.th", "serif"); -+pref("font.default.th", "sans-serif"); - pref("font.size.variable.th", 16); --pref("font.size.fixed.th", 13); -+pref("font.size.fixed.th", 14); - pref("font.minimum-size.th", 10); - --pref("font.default.tr", "serif"); -+pref("font.default.tr", "sans-serif"); - pref("font.size.variable.tr", 16); --pref("font.size.fixed.tr", 13); -+pref("font.size.fixed.tr", 14); - - pref("font.default.x-armn", "serif"); - pref("font.size.variable.x-armn", 16); - pref("font.size.fixed.x-armn", 13); - --pref("font.default.x-baltic", "serif"); -+pref("font.default.x-baltic", "sans-serif"); - pref("font.size.variable.x-baltic", 16); --pref("font.size.fixed.x-baltic", 13); -+pref("font.size.fixed.x-baltic", 14); - - pref("font.default.x-beng", "serif"); - pref("font.size.variable.x-beng", 16); -@@ -1881,9 +1881,9 @@ - pref("font.size.variable.x-cans", 16); - pref("font.size.fixed.x-cans", 13); - --pref("font.default.x-central-euro", "serif"); -+pref("font.default.x-central-euro", "sans-serif"); - pref("font.size.variable.x-central-euro", 16); --pref("font.size.fixed.x-central-euro", 13); -+pref("font.size.fixed.x-central-euro", 14); - - pref("font.default.x-cyrillic", "serif"); - pref("font.size.variable.x-cyrillic", 16); -@@ -2126,9 +2126,9 @@ - pref("font.size.variable.x-central-euro", 16); - pref("font.size.fixed.x-central-euro", 13); - --pref("font.default.x-cyrillic", "serif"); -+pref("font.default.x-cyrillic", "sans-serif"); - pref("font.size.variable.x-cyrillic", 16); --pref("font.size.fixed.x-cyrillic", 13); -+pref("font.size.fixed.x-cyrillic", 14); - - pref("font.default.x-devanagari", "serif"); - pref("font.size.variable.x-devanagari", 16); -@@ -2138,13 +2138,13 @@ - pref("font.size.variable.x-tibt", 16); - pref("font.size.fixed.x-tibt", 13); - --pref("font.default.x-unicode", "serif"); -+pref("font.default.x-unicode", "sans-serif"); - pref("font.size.variable.x-unicode", 16); --pref("font.size.fixed.x-unicode", 13); -+pref("font.size.fixed.x-unicode", 14); - --pref("font.default.x-western", "serif"); -+pref("font.default.x-western", "sans-serif"); - pref("font.size.variable.x-western", 16); --pref("font.size.fixed.x-western", 13); -+pref("font.size.fixed.x-western", 14); - - pref("font.default.zh-CN", "sans-serif"); - pref("font.size.variable.zh-CN", 16); diff --git a/icedove-makefile.patch b/icedove-makefile.patch deleted file mode 100644 index 4588322..0000000 --- a/icedove-makefile.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- icedove-6.0/mozilla/mozilla/Makefile.in~ 2011-08-12 16:52:03.000000000 +0300 -+++ icedove-6.0/mozilla/mozilla/Makefile.in 2011-08-26 13:00:59.373870016 +0300 -@@ -26,22 +26,6 @@ - @exit 1 - endif - --$(topsrcdir)/configure: $(topsrcdir)/configure.in --$(topsrcdir)/js/src/configure: $(topsrcdir)/js/src/configure.in --$(topsrcdir)/configure $(topsrcdir)/js/src/configure: -- @echo "STOP! configure.in has changed, and your configure is out of date." -- @echo "Please rerun autoconf and configure." -- @echo "To ignore this message, touch 'configure' in the source directory." -- @exit 1 -- --config.status: $(topsrcdir)/configure --js/src/config.status: $(topsrcdir)/js/src/configure --config.status js/src/config.status: -- @echo "STOP! configure has changed and needs to be run in this build directory." -- @echo "Please rerun configure." -- @echo "To ignore this message, touch 'config.status' in the build directory." -- @exit 1 -- - # Regenerate the build backend if it is out of date. We only have this rule in - # this main make file because having it in rules.mk and applied to partial tree - # builds resulted in a world of hurt. Gory details are in bug 877308. ---- icedove-6.0/mozilla/mozilla/client.mk~ 2011-08-26 13:10:08.000000000 +0300 -+++ icedove-6.0/mozilla/mozilla/client.mk 2011-08-26 13:10:11.365956960 +0300 -@@ -278,8 +278,8 @@ - $(TOPSRCDIR)/mozilla/js/src/aclocal.m4 \ - $(NULL) - --$(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS) -- @echo Generating $@ using autoconf -+$(CONFIGURES): -+ echo Generating $@ using autoconf - cd $(@D); $(AUTOCONF) - - CONFIG_STATUS_DEPS := \ diff --git a/icedove.spec b/icedove.spec index e0fa9af..97757aa 100644 --- a/icedove.spec +++ b/icedove.spec @@ -38,10 +38,8 @@ Source2: %{name}-branding.tar.xz Source4: %{name}.desktop Source5: %{name}.sh Patch0: %{name}-branding.patch -Patch1: %{name}-fonts.patch Patch2: %{name}-prefs.patch Patch3: system-mozldap.patch -Patch4: %{name}-makefile.patch Patch5: %{name}-extensiondir.patch Patch6: no-subshell.patch # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade @@ -154,10 +152,8 @@ funkcjonalność kalendarza. %setup -q -T -D -a2 cd mozilla %patch0 -p1 -#%patch1 -p1 %patch2 -p1 %patch3 -p1 -#%patch4 -p2 %patch5 -p2 %patch6 -p1 %patch7 -p1 diff --git a/libvpx2.patch b/libvpx2.patch deleted file mode 100644 index 85a1a2d..0000000 --- a/libvpx2.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- comm-release/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc~ 2014-06-13 02:45:44.000000000 +0200 -+++ comm-release/mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc 2015-05-23 22:04:53.241382776 +0200 -@@ -180,7 +180,7 @@ - // Creating a wrapper to the image - setting image data to NULL. Actual - // pointer will be set in encode. Setting align to 1, as it is meaningless - // (actual memory is not allocated). -- raw_ = vpx_img_wrap(NULL, IMG_FMT_I420, codec_.width, codec_.height, -+ raw_ = vpx_img_wrap(NULL, VPX_IMG_FMT_I420, codec_.width, codec_.height, - 1, NULL); - // populate encoder configuration with default values - if (vpx_codec_enc_config_default(vpx_codec_vp8_cx(), config_, 0)) { -@@ -349,9 +349,9 @@ - } - // Image in vpx_image_t format. - // Input image is const. VP8's raw image is not defined as const. -- raw_->planes[PLANE_Y] = const_cast(input_image.buffer(kYPlane)); -- raw_->planes[PLANE_U] = const_cast(input_image.buffer(kUPlane)); -- raw_->planes[PLANE_V] = const_cast(input_image.buffer(kVPlane)); -+ raw_->planes[VPX_PLANE_Y] = const_cast(input_image.buffer(kYPlane)); -+ raw_->planes[VPX_PLANE_U] = const_cast(input_image.buffer(kUPlane)); -+ raw_->planes[VPX_PLANE_V] = const_cast(input_image.buffer(kVPlane)); - // TODO(mikhal): Stride should be set in initialization. - raw_->stride[VPX_PLANE_Y] = input_image.stride(kYPlane); - raw_->stride[VPX_PLANE_U] = input_image.stride(kUPlane); ---- mozilla/mozilla/content/media/encoder/VP8TrackEncoder.cpp~ 2015-02-25 19:21:17.000000000 +0100 -+++ mozilla/mozilla/content/media/encoder/VP8TrackEncoder.cpp 2015-05-23 22:11:33.299057650 +0200 -@@ -84,7 +84,7 @@ - // Creating a wrapper to the image - setting image data to NULL. Actual - // pointer will be set in encode. Setting align to 1, as it is meaningless - // (actual memory is not allocated). -- vpx_img_wrap(mVPXImageWrapper, IMG_FMT_I420, -+ vpx_img_wrap(mVPXImageWrapper, VPX_IMG_FMT_I420, - mFrameWidth, mFrameHeight, 1, nullptr); - - config.g_w = mFrameWidth; -@@ -239,9 +239,9 @@ - uint8_t *cb = mMuteFrame.Elements() + yPlaneSize; - uint8_t *cr = mMuteFrame.Elements() + yPlaneSize + uvPlaneSize; - -- mVPXImageWrapper->planes[PLANE_Y] = y; -- mVPXImageWrapper->planes[PLANE_U] = cb; -- mVPXImageWrapper->planes[PLANE_V] = cr; -+ mVPXImageWrapper->planes[VPX_PLANE_Y] = y; -+ mVPXImageWrapper->planes[VPX_PLANE_U] = cb; -+ mVPXImageWrapper->planes[VPX_PLANE_V] = cr; - mVPXImageWrapper->stride[VPX_PLANE_Y] = mFrameWidth; - mVPXImageWrapper->stride[VPX_PLANE_U] = halfWidth; - mVPXImageWrapper->stride[VPX_PLANE_V] = halfWidth; -@@ -297,9 +297,9 @@ - const PlanarYCbCrImage::Data *data = yuv->GetData(); - - if (isYUV420(data) && !data->mCbSkip) { // 420 planar -- mVPXImageWrapper->planes[PLANE_Y] = data->mYChannel; -- mVPXImageWrapper->planes[PLANE_U] = data->mCbChannel; -- mVPXImageWrapper->planes[PLANE_V] = data->mCrChannel; -+ mVPXImageWrapper->planes[VPX_PLANE_Y] = data->mYChannel; -+ mVPXImageWrapper->planes[VPX_PLANE_U] = data->mCbChannel; -+ mVPXImageWrapper->planes[VPX_PLANE_V] = data->mCrChannel; - mVPXImageWrapper->stride[VPX_PLANE_Y] = data->mYStride; - mVPXImageWrapper->stride[VPX_PLANE_U] = data->mCbCrStride; - mVPXImageWrapper->stride[VPX_PLANE_V] = data->mCbCrStride; -@@ -355,9 +355,9 @@ - return NS_ERROR_NOT_IMPLEMENTED; - } - -- mVPXImageWrapper->planes[PLANE_Y] = y; -- mVPXImageWrapper->planes[PLANE_U] = cb; -- mVPXImageWrapper->planes[PLANE_V] = cr; -+ mVPXImageWrapper->planes[VPX_PLANE_Y] = y; -+ mVPXImageWrapper->planes[VPX_PLANE_U] = cb; -+ mVPXImageWrapper->planes[VPX_PLANE_V] = cr; - mVPXImageWrapper->stride[VPX_PLANE_Y] = mFrameWidth; - mVPXImageWrapper->stride[VPX_PLANE_U] = halfWidth; - mVPXImageWrapper->stride[VPX_PLANE_V] = halfWidth; -- 2.43.0