[packages/iceape] - removed obsolete/outdated patches
baggins
baggins at pld-linux.org
Sun Jun 12 23:50:21 CEST 2016
commit 037dc2c77b2cc1f278597c199ce423254c5e5617
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jun 12 21:48:26 2016 +0000
- removed obsolete/outdated patches
gcc5.patch | 127 ----------------------------------
iceape-fonts.patch | 140 --------------------------------------
iceape-kill_slim_hidden_def.patch | 11 ---
iceape-ldap-with-nss.patch | 40 -----------
iceape-lib_path.patch | 12 ----
iceape-pixman.patch | 11 ---
iceape-system-xulrunner.patch | 11 ---
iceape-ti-agent.patch | 12 ----
iceape-venkman.desktop | 11 ---
libvpx2.patch | 61 -----------------
makefile.patch | 38 -----------
system-mozldap.patch | 66 ------------------
12 files changed, 540 deletions(-)
---
diff --git a/gcc5.patch b/gcc5.patch
deleted file mode 100644
index d501014..0000000
--- a/gcc5.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- iceape-2.26.1/comm-release/mozilla/js/src/builtin/TypedObject.cpp~ 2014-06-13 02:46:08.000000000 +0200
-+++ iceape-2.26.1/comm-release/mozilla/js/src/builtin/TypedObject.cpp 2015-12-26 19:03:08.174777332 +0100
-@@ -753,7 +753,7 @@
- // Extract ArrayType.prototype
- RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal));
- if (!arrayTypePrototype)
-- return nullptr;
-+ return false;
-
- // Create the instance of ArrayType
- RootedObject obj(
-@@ -766,7 +766,7 @@
- if (!JSObject::defineProperty(cx, obj, cx->names().length,
- lengthVal, nullptr, nullptr,
- JSPROP_READONLY | JSPROP_PERMANENT))
-- return nullptr;
-+ return false;
-
- args.rval().setObject(*obj);
- return true;
-@@ -814,7 +814,7 @@
- if (!JSObject::defineProperty(cx, obj, cx->names().length,
- lengthVal, nullptr, nullptr,
- JSPROP_READONLY | JSPROP_PERMANENT))
-- return nullptr;
-+ return false;
-
- // Add `unsized` property, which is a link from the sized
- // array to the unsized array.
-@@ -822,7 +822,7 @@
- if (!JSObject::defineProperty(cx, obj, cx->names().unsized,
- unsizedTypeObjValue, nullptr, nullptr,
- JSPROP_READONLY | JSPROP_PERMANENT))
-- return nullptr;
-+ return false;
-
- args.rval().setObject(*obj);
- return true;
-@@ -1244,14 +1244,14 @@
- #define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_) \
- if (!DefineSimpleTypeObject<ScalarType>(cx, global, module, constant_, \
- cx->names().name_)) \
-- return nullptr;
-+ return false;
- JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE)
- #undef BINARYDATA_SCALAR_DEFINE
-
- #define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_) \
- if (!DefineSimpleTypeObject<ReferenceType>(cx, global, module, constant_, \
- cx->names().name_)) \
-- return nullptr;
-+ return false;
- JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE)
- #undef BINARYDATA_REFERENCE_DEFINE
-
-@@ -1261,14 +1261,14 @@
- arrayType = DefineMetaTypeObject<ArrayType>(
- cx, global, module, TypedObjectModuleObject::ArrayTypePrototype);
- if (!arrayType)
-- return nullptr;
-+ return false;
-
- RootedValue arrayTypeValue(cx, ObjectValue(*arrayType));
- if (!JSObject::defineProperty(cx, module, cx->names().ArrayType,
- arrayTypeValue,
- nullptr, nullptr,
- JSPROP_READONLY | JSPROP_PERMANENT))
-- return nullptr;
-+ return false;
-
- // StructType.
-
-@@ -1276,23 +1276,23 @@
- structType = DefineMetaTypeObject<StructType>(
- cx, global, module, TypedObjectModuleObject::StructTypePrototype);
- if (!structType)
-- return nullptr;
-+ return false;
-
- RootedValue structTypeValue(cx, ObjectValue(*structType));
- if (!JSObject::defineProperty(cx, module, cx->names().StructType,
- structTypeValue,
- nullptr, nullptr,
- JSPROP_READONLY | JSPROP_PERMANENT))
-- return nullptr;
-+ return false;
-
- // Handle
-
- RootedObject handle(cx, NewBuiltinClassInstance(cx, &JSObject::class_));
- if (!module)
-- return nullptr;
-+ return false;
-
- if (!JS_DefineFunctions(cx, handle, TypedHandle::handleStaticMethods))
-- return nullptr;
-+ return false;
-
- RootedValue handleValue(cx, ObjectValue(*handle));
- if (!JSObject::defineProperty(cx, module, cx->names().Handle,
-@@ -1300,7 +1300,7 @@
- nullptr, nullptr,
- JSPROP_READONLY | JSPROP_PERMANENT))
- {
-- return nullptr;
-+ return false;
- }
-
- // Everything is setup, install module on the global object:
-@@ -1311,7 +1311,7 @@
- nullptr, nullptr,
- 0))
- {
-- return nullptr;
-+ return false;
- }
-
- return module;
-@@ -2404,7 +2404,7 @@
- // Create zeroed wrapper object.
- Rooted<TypedObject*> obj(cx, createZeroed(cx, callee, length));
- if (!obj)
-- return nullptr;
-+ return false;
-
- if (nextArg < argc) {
- RootedValue initial(cx, args[nextArg++]);
diff --git a/iceape-fonts.patch b/iceape-fonts.patch
deleted file mode 100644
index 61ece27..0000000
--- a/iceape-fonts.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- mozilla.orig/modules/libpref/src/init/all.js 2006-05-08 22:22:51.000000000 +0200
-+++ mozilla/modules/libpref/src/init/all.js 2006-07-25 07:44:06.744790000 +0200
-@@ -1886,33 +1886,33 @@
-
- // th
-
--pref("font.name.serif.tr", "Times");
--pref("font.name.sans-serif.tr", "Helvetica");
--pref("font.name.monospace.tr", "Courier");
-+pref("font.name.serif.tr", "serif");
-+pref("font.name.sans-serif.tr", "sans-serif");
-+pref("font.name.monospace.tr", "monospace");
-
- pref("font.name.serif.x-baltic", "serif");
- pref("font.name.sans-serif.x-baltic", "sans-serif");
- pref("font.name.monospace.x-baltic", "monospace");
-
--pref("font.name.serif.x-central-euro", "Times");
--pref("font.name.sans-serif.x-central-euro", "Helvetica");
--pref("font.name.monospace.x-central-euro", "Courier");
-+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.serif.x-cyrillic", "serif");
- pref("font.name.sans-serif.x-cyrillic", "sans-serif");
- pref("font.name.monospace.x-cyrillic", "monospace");
-
--pref("font.name.serif.x-unicode", "Times");
--pref("font.name.sans-serif.x-unicode", "Helvetica");
--pref("font.name.monospace.x-unicode", "Courier");
--
--pref("font.name.serif.x-user-def", "Times");
--pref("font.name.sans-serif.x-user-def", "Helvetica");
--pref("font.name.monospace.x-user-def", "Courier");
--
--pref("font.name.serif.x-western", "Times");
--pref("font.name.sans-serif.x-western", "Helvetica");
--pref("font.name.monospace.x-western", "Courier");
-+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.serif.x-user-def", "serif");
-+pref("font.name.sans-serif.x-user-def", "sans-serif");
-+pref("font.name.monospace.x-user-def", "monospace");
-+
-+pref("font.name.serif.x-western", "serif");
-+pref("font.name.sans-serif.x-western", "sans-serif");
-+pref("font.name.monospace.x-western", "monospace");
-
- pref("font.name.serif.zh-CN", "serif");
- pref("font.name.sans-serif.zh-CN", "sans-serif");
-@@ -1989,63 +1989,63 @@
-
- pref("font.default.ar", "sans-serif");
- pref("font.size.variable.ar", 16);
--pref("font.size.fixed.ar", 12);
-+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", 12);
-+pref("font.size.fixed.el", 14);
-
- pref("font.default.he", "sans-serif");
- pref("font.size.variable.he", 16);
--pref("font.size.fixed.he", 12);
-+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.default.th", "sans-serif");
- pref("font.size.variable.th", 16);
--pref("font.size.fixed.th", 12);
-+pref("font.size.fixed.th", 14);
-
--pref("font.default.tr", "serif");
-+pref("font.default.tr", "sans-serif");
- pref("font.size.variable.tr", 16);
--pref("font.size.fixed.tr", 12);
-+pref("font.size.fixed.tr", 14);
-
--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", 12);
-+pref("font.size.fixed.x-baltic", 14);
-
--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", 12);
-+pref("font.size.fixed.x-central-euro", 14);
-
--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", 12);
-+pref("font.size.fixed.x-cyrillic", 14);
-
--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", 12);
-+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", 12);
-+pref("font.size.fixed.x-western", 14);
-
- pref("font.default.zh-CN", "sans-serif");
- pref("font.size.variable.zh-CN", 16);
--pref("font.size.fixed.zh-CN", 16);
-+pref("font.size.fixed.zh-CN", 14);
-
- pref("font.default.zh-TW", "sans-serif");
- pref("font.size.variable.zh-TW", 16);
--pref("font.size.fixed.zh-TW", 16);
-+pref("font.size.fixed.zh-TW", 14);
-
- pref("font.default.zh-HK", "sans-serif");
- pref("font.size.variable.zh-HK", 16);
--pref("font.size.fixed.zh-HK", 16);
-+pref("font.size.fixed.zh-HK", 14);
-
- // below a certian pixel size outline scaled fonts produce poor results
- pref("font.scale.outline.min", 6);
diff --git a/iceape-kill_slim_hidden_def.patch b/iceape-kill_slim_hidden_def.patch
deleted file mode 100644
index bc0be27..0000000
--- a/iceape-kill_slim_hidden_def.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- seamonkey-1.0.1/gfx/cairo/libpixman/src/icint.h~ 2006-04-15 23:10:51.000000000 +0000
-+++ seamonkey-1.0.1/gfx/cairo/libpixman/src/icint.h 2006-04-15 23:12:12.000000000 +0000
-@@ -34,6 +34,8 @@
- #include <limits.h>
-
- #include "slim_internal.h"
-+#undef slim_hidden_def
-+#define slim_hidden_def(x) /**/
-
- /* Include NSPR's prcpucfg.h for endianness information */
- #include "prcpucfg.h"
diff --git a/iceape-ldap-with-nss.patch b/iceape-ldap-with-nss.patch
deleted file mode 100644
index 211be4d..0000000
--- a/iceape-ldap-with-nss.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- seamonkey-1.1.10/configure.in.orig 2008-06-16 00:25:32.000000000 +0200
-+++ seamonkey-1.1.10/configure.in 2008-07-10 18:30:45.487028766 +0200
-@@ -3746,7 +3746,7 @@
- fi
-
- if test -n "$MOZ_NATIVE_NSS"; then
-- NSS_LIBS="$NSS_LIBS -lcrmf"
-+ NSS_LIBS="-lcrmf $NSS_LIBS"
- else
- NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss'
- NSS_DEP_LIBS="\
-@@ -7629,7 +7629,7 @@
- mkdir "directory/c-sdk/ldap"
- fi
-
-- ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-dist-prefix=$MOZ_BUILD_ROOT/mozilla/dist --without-nss --with-mozilla"
-+ ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-dist-prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-nss --with-mozilla"
- if test -z "$MOZ_DEBUG"; then
- ac_configure_args="$ac_configure_args --disable-debug"
- fi
---- seamonkey-1.1.10/configure.orig 2008-06-16 00:25:31.000000000 +0200
-+++ seamonkey-1.1.10/configure 2008-07-10 18:31:04.379027928 +0200
-@@ -11842,7 +11842,7 @@
- fi
-
- if test -n "$MOZ_NATIVE_NSS"; then
-- NSS_LIBS="$NSS_LIBS -lcrmf"
-+ NSS_LIBS="-lcrmf $NSS_LIBS"
- else
- NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss'
- NSS_DEP_LIBS="\
-@@ -21195,7 +21195,7 @@
- mkdir "directory/c-sdk/ldap"
- fi
-
-- ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-dist-prefix=$MOZ_BUILD_ROOT/mozilla/dist --without-nss --with-mozilla"
-+ ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-dist-prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-nss --with-mozilla"
- if test -z "$MOZ_DEBUG"; then
- ac_configure_args="$ac_configure_args --disable-debug"
- fi
diff --git a/iceape-lib_path.patch b/iceape-lib_path.patch
deleted file mode 100644
index 0bda0f5..0000000
--- a/iceape-lib_path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur seamonkey.orig/config/autoconf.mk.in seamonkey/config/autoconf.mk.in
---- seamonkey.orig/config/autoconf.mk.in 2004-03-21 03:31:17.000000000 +0100
-+++ seamonkey/config/autoconf.mk.in 2004-06-17 09:50:30.000000000 +0200
-@@ -37,7 +37,7 @@
- mandir = @mandir@
- idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-
--mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir = $(libdir)/$(MOZ_APP_NAME)
- mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir = $(mredir)/lib
-
diff --git a/iceape-pixman.patch b/iceape-pixman.patch
deleted file mode 100644
index c265c84..0000000
--- a/iceape-pixman.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- comm-release/config/config.mk.orig 2014-04-29 06:55:06.000000000 +0200
-+++ comm-release/config/config.mk 2014-05-15 19:16:52.358801349 +0200
-@@ -411,7 +411,7 @@
- #
- CCC = $(CXX)
-
--OS_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS)
-+OS_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
-
- INCLUDES = \
- $(LOCAL_INCLUDES) \
diff --git a/iceape-system-xulrunner.patch b/iceape-system-xulrunner.patch
deleted file mode 100644
index 353c6df..0000000
--- a/iceape-system-xulrunner.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iceape-2.15.2/comm-release/suite/browser/Makefile.in.orig 2013-02-03 09:04:13.000000000 +0100
-+++ iceape-2.15.2/comm-release/suite/browser/Makefile.in 2013-02-24 15:15:09.573091923 +0100
-@@ -26,7 +26,7 @@
-
- ifdef LIBXUL_SDK
- PREF_JS_EXPORTS += \
-- $(srcdir)/channel-prefs.js
-+ $(srcdir)/channel-prefs.js \
- $(NULL)
- endif
-
diff --git a/iceape-ti-agent.patch b/iceape-ti-agent.patch
deleted file mode 100644
index f57fda7..0000000
--- a/iceape-ti-agent.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/xpfe/bootstrap/browser-prefs.js.orig 2007-03-21 23:39:25.000000000 +0100
-+++ mozilla/xpfe/bootstrap/browser-prefs.js 2007-03-21 23:39:10.000000000 +0100
-@@ -61,6 +61,9 @@
-
- #expand pref("general.useragent.extra.__MOZ_APP_NAME__", "__MOZ_APP_DISPLAYNAME__/__MOZ_APP_VERSION__");
-
-+pref("general.useragent.vendor", "PLD");
-+pref("general.useragent.vendorSub", "Titanium");
-+
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last
- pref("browser.startup.page", 1);
- pref("browser.startup.homepage", "chrome://navigator-region/locale/region.properties");
diff --git a/iceape-venkman.desktop b/iceape-venkman.desktop
deleted file mode 100644
index 44f7f68..0000000
--- a/iceape-venkman.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Iceape Venkman
-Name[pl]=Iceape Venkman
-Comment=JavaScript Debugger
-Comment[pl]=Debugger JavaScript
-Exec=iceape -venkman
-Icon=iceape
-Terminal=false
-Type=Application
-Categories=Development;WebDevelopment;
-# vi: encoding=utf-8
diff --git a/libvpx2.patch b/libvpx2.patch
deleted file mode 100644
index 2b22440..0000000
--- a/libvpx2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- comm-release/mozilla/content/media/encoder/VP8TrackEncoder.cpp~ 2014-06-13 02:46:03.000000000 +0200
-+++ comm-release/mozilla/content/media/encoder/VP8TrackEncoder.cpp 2015-05-23 22:03:23.420308335 +0200
-@@ -77,7 +77,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;
-@@ -230,9 +230,9 @@
- uint8_t *cb = mMuteFrame.Elements() + yPlanSize;
- uint8_t *cr = mMuteFrame.Elements() + yPlanSize + uvPlanSize;
-
-- 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;
-@@ -261,9 +261,9 @@
- MOZ_ASSERT(yuv);
- const layers::PlanarYCbCrImage::Data *data = yuv->GetData();
-
-- 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;
---- 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<uint8_t*>(input_image.buffer(kYPlane));
-- raw_->planes[PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
-- raw_->planes[PLANE_V] = const_cast<uint8_t*>(input_image.buffer(kVPlane));
-+ raw_->planes[VPX_PLANE_Y] = const_cast<uint8_t*>(input_image.buffer(kYPlane));
-+ raw_->planes[VPX_PLANE_U] = const_cast<uint8_t*>(input_image.buffer(kUPlane));
-+ raw_->planes[VPX_PLANE_V] = const_cast<uint8_t*>(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);
diff --git a/makefile.patch b/makefile.patch
deleted file mode 100644
index 46882cc..0000000
--- a/makefile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- mozilla/Makefile.in~ 2011-08-12 16:52:03.000000000 +0300
-+++ mozilla/Makefile.in 2011-08-26 13:00:59.373870016 +0300
-@@ -26,21 +26,7 @@
-
- include $(topsrcdir)/config/config.mk
-
--default alldep all:: $(topsrcdir)/configure config.status
--
--$(topsrcdir)/configure: $(topsrcdir)/configure.in
-- @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
-- @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
--
--default export libs clean realclean distclean alldep \
-+default export libs clean realclean distclean \
- maybe_clobber_profiledbuild uploadsymbols all:: $(SUBMAKEFILES)
- $(MAKE) -C mozilla $@
-
---- mozilla/client.mk~ 2011-08-26 13:10:08.000000000 +0300
-+++ 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/system-mozldap.patch b/system-mozldap.patch
deleted file mode 100644
index 65a95bb..0000000
--- a/system-mozldap.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- mozilla/configure.in.orig 2010-06-23 19:43:07.000000000 +0200
-+++ mozilla/configure.in 2010-07-06 11:14:54.350499449 +0200
-@@ -134,6 +134,13 @@
- AC_MSG_RESULT([no])
- fi
-
-+dnl system LDAP Support
-+dnl ========================================================
-+MOZ_ARG_WITH_STRING(system-ldap,
-+[ --with-system-ldap[=PFX]
-+ Use system mozldap [installed at prefix PFX]],
-+ MOZ_LDAP_DIR=$withval)
-+
- dnl ========================================================
- dnl = Trademarked Branding
- dnl ========================================================
---- mozilla/mail/configure.in.orig 2010-06-23 19:43:07.000000000 +0200
-+++ mozilla/mail/configure.in 2010-07-06 11:14:54.350499449 +0200
-@@ -59,7 +59,12 @@
- MOZ_LDAP_XPCOM=,
- MOZ_LDAP_XPCOM=1)
-
--if test "$MOZ_LDAP_XPCOM"; then
-+if test "$MOZ_LDAP_DIR" ; then
-+ LDAP_CFLAGS=$(pkg-config --cflags mozldap)
-+ LDAP_LIBS=$(pkg-config --libs mozldap)
-+ LDAP_COMPONENT=mozldap
-+ LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
-+elif test "$MOZ_LDAP_XPCOM"; then
- LDAP_CFLAGS='-I${DIST}/public/ldap'
- if test "$OS_ARCH" = "WINNT"; then
- if test -n "$GNU_CC"; then
-@@ -118,7 +130,7 @@
-
- # if we're building the LDAP XPCOM component, we need to build
- # the c-sdk first.
--if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
-+if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then
- # Save configure args so we can restore them after configuring LDAP.
- _save_ac_configure_args="$ac_configure_args"
- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
---- mozilla/suite/configure.in.orig 2010-06-23 19:43:07.000000000 +0200
-+++ mozilla/suite/configure.in 2010-07-06 11:14:54.350499449 +0200
-@@ -59,7 +59,12 @@
- MOZ_LDAP_XPCOM=,
- MOZ_LDAP_XPCOM=1)
-
--if test "$MOZ_LDAP_XPCOM"; then
-+if test "$MOZ_LDAP_DIR" ; then
-+ LDAP_CFLAGS=$(pkg-config --cflags mozldap)
-+ LDAP_LIBS=$(pkg-config --libs mozldap)
-+ LDAP_COMPONENT=mozldap
-+ LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
-+elif test "$MOZ_LDAP_XPCOM"; then
- LDAP_CFLAGS='-I${DIST}/public/ldap'
- if test "$OS_ARCH" = "WINNT"; then
- if test -n "$GNU_CC"; then
-@@ -113,7 +125,7 @@
-
- # if we're building the LDAP XPCOM component, we need to build
- # the c-sdk first.
--if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
-+if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then
- # Save configure args so we can restore them after configuring LDAP.
- _save_ac_configure_args="$ac_configure_args"
- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceape.git/commitdiff/1ac3d5d8fa17ea9cfcdb16df76c6a22ef75bf2c0
More information about the pld-cvs-commit
mailing list