[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/20.0.1132.27_r140692-2-4-g27d5ac6
Giuseppe Iuculano
iuculano at debian.org
Wed Jun 20 17:06:18 UTC 2012
The following commit has been merged in the master branch:
commit 27d5ac63b06edaef066d07bd5194d0ac62d2cc90
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Wed Jun 20 19:07:00 2012 +0200
Updated changelog and added missing arm.patch
diff --git a/debian/changelog b/debian/changelog
index f47cda0..08aabc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+chromium-browser (20.0.1132.34~r141824-1) unstable; urgency=low
+
+ * [29f002e] Add -DUSE_EABI_HARDFLOAT in gyp defines for armhf
+ * [3a003ca] Added some armel and armhf patches.
+ Thanks to Shawn
+ * [2f15044] Search te correct icon when minimised.
+ Thanks to Jonathan Nieder (Closes: #651455)
+
+ -- Giuseppe Iuculano <iuculano at debian.org> Wed, 20 Jun 2012 19:05:50 +0200
+
chromium-browser (20.0.1132.27~r140692-2) unstable; urgency=low
* [c0e9499] Improved sqlite patch.
diff --git a/debian/patches/arm.patch b/debian/patches/arm.patch
new file mode 100644
index 0000000..fa44108
--- /dev/null
+++ b/debian/patches/arm.patch
@@ -0,0 +1,50 @@
+Index: sid/src/skia/skia.gyp
+===================================================================
+--- sid.orig/src/skia/skia.gyp 2012-05-19 16:54:19.000000000 +0200
++++ sid/src/skia/skia.gyp 2012-06-20 14:34:13.131318952 +0200
+@@ -1157,9 +1157,11 @@
+ [ 'target_arch == "arm" and armv7 != 1', {
+ 'sources': [
+ '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
++ '../third_party/skia/src/opts/opts_check_arm.cpp',
+ ],
+ 'sources!': [
+ '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
++ '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
+ ],
+ }],
+ ],
+Index: sid/src/ui/base/resource/data_pack.cc
+===================================================================
+--- sid.orig/src/ui/base/resource/data_pack.cc 2012-05-19 16:55:37.000000000 +0200
++++ sid/src/ui/base/resource/data_pack.cc 2012-06-20 14:38:32.507316901 +0200
+@@ -130,9 +130,11 @@
+ // 2) Verify the entries are within the appropriate bounds. There's an extra
+ // entry after the last item which gives us the length of the last item.
+ for (size_t i = 0; i < resource_count_ + 1; ++i) {
++ uint32 t;
+ const DataPackEntry* entry = reinterpret_cast<const DataPackEntry*>(
+ mmap_->data() + kHeaderLength + (i * sizeof(DataPackEntry)));
+- if (entry->file_offset > mmap_->length()) {
++ memcpy(&t, &entry->file_offset, 32/8);
++ if (t > mmap_->length()) {
+ LOG(ERROR) << "Entry #" << i << " in data pack points off end of file. "
+ << "Was the file corrupted?";
+ UMA_HISTOGRAM_ENUMERATION("DataPack.Load", ENTRY_NOT_FOUND,
+Index: sid/src/v8/src/arm/macro-assembler-arm.cc
+===================================================================
+--- sid.orig/src/v8/src/arm/macro-assembler-arm.cc 2012-05-19 16:57:27.000000000 +0200
++++ sid/src/v8/src/arm/macro-assembler-arm.cc 2012-06-20 14:35:27.339318363 +0200
+@@ -61,9 +61,9 @@
+ // We do not support thumb inter-working with an arm architecture not supporting
+ // the blx instruction (below v5t). If you know what CPU you are compiling for
+ // you can use -march=armv7 or similar.
+-#if defined(USE_THUMB_INTERWORK) && !defined(CAN_USE_THUMB_INSTRUCTIONS)
+-# error "For thumb inter-working we require an architecture which supports blx"
+-#endif
++//#if defined(USE_THUMB_INTERWORK) && !defined(CAN_USE_THUMB_INSTRUCTIONS)
++//# error "For thumb inter-working we require an architecture which supports blx"
++//#endif
+
+
+ // Using bx does not yield better code, so use it only when required
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list