[Pkg-chromium-commit] [pkg-chromium] 01/01: release 30.0.1599.101-2
Michael Gilbert
mgilbert at alioth.debian.org
Sun Nov 3 02:38:39 UTC 2013
This is an automated email from the git hooks/post-receive script.
mgilbert pushed a commit to branch master
in repository pkg-chromium.
commit be3c5943dd7f25a4bdc8b825475f270dad8519c9
Author: Michael Gilbert <mgilbert at debian.org>
Date: Sun Nov 3 02:49:52 2013 +0000
release 30.0.1599.101-2
---
debian/changelog | 12 +++++++
debian/chromium.lintian-overrides | 5 ++-
debian/control | 8 ++---
debian/copyright | 4 +--
debian/patches/arm-neon.patch | 71 -------------------------------------
debian/patches/arm.patch | 17 ---------
debian/patches/armv4.patch | 13 -------
debian/patches/ps-print.patch | 12 +++++++
debian/patches/series | 4 +--
debian/rules | 18 ++++------
10 files changed, 39 insertions(+), 125 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index aaac4af..65b42a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+chromium-browser (30.0.1599.101-2) unstable; urgency=medium
+
+ * Use system zlib.
+ * Remove arm patches.
+ * Update lintian overrides.
+ * Remove an unsafe symlink.
+ * Remove icu build dependency.
+ * Support poststript printing (closes: #717722).
+ * Use fonts-ipafont instead of ttf-kochi (closes: #725800).
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 02 Nov 2013 21:25:50 +0000
+
chromium-browser (30.0.1599.101-1) unstable; urgency=low
[ Giuseppe Iuculano ]
diff --git a/debian/chromium.lintian-overrides b/debian/chromium.lintian-overrides
index 00f1371..3868981 100644
--- a/debian/chromium.lintian-overrides
+++ b/debian/chromium.lintian-overrides
@@ -1,6 +1,5 @@
chromium: embedded-library usr/lib/chromium/chromium: sqlite
chromium: embedded-library usr/lib/chromium/libffmpegsumo.so: libavcodec
chromium: embedded-library usr/lib/chromium/libffmpegsumo.so: libavutil
-chromium: statically-linked-binary usr/lib/chromium/nacl_irt_x86_64.nexe
-chromium: statically-linked-binary usr/lib/chromium/nacl_irt_x86_32.nexe
-chromium: embedded-library usr/lib/chromium/chromium: libpng
+chromium: setuid-binary usr/lib/chromium/chrome-sandbox 4755 root/root
+chromium: shlib-with-non-pic-code usr/lib/chromium/libffmpegsumo.so
diff --git a/debian/control b/debian/control
index d4b50af..9300c9c 100644
--- a/debian/control
+++ b/debian/control
@@ -25,12 +25,11 @@ Build-Depends:
xvfb,
x11-apps,
xfonts-base,
- ttf-kochi-gothic,
- ttf-kochi-mincho,
+ fonts-ipafont-gothic,
+ fonts-ipafont-mincho,
libjpeg-dev,
libpng-dev,
libbz2-dev,
- zlib1g-dev,
libxml2-dev,
libxslt1-dev,
lzma-dev,
@@ -44,12 +43,10 @@ Build-Depends:
libgl1-mesa-dev,
libglu1-mesa-dev,
libxss-dev,
- libpango1.0-dev,
libglib2.0-dev,
libgtk2.0-dev,
libdbus-glib-1-dev,
libgconf2-dev,
- libicu-dev (>= 4.2.1),
libevent-dev (>= 1.4.13),
yasm,
libprotobuf-dev,
@@ -133,6 +130,7 @@ Description: Debugging symbols for the chromium web browser
Package: chromium-l10n
Architecture: all
+Section: localization
Depends:
${misc:Depends},
chromium (>= ${source:Version}),
diff --git a/debian/copyright b/debian/copyright
index dc7fdff..1c5e715 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20765,7 +20765,7 @@ License: BSL-1
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-License GPL-2+
+License: GPL-2+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -20783,7 +20783,7 @@ License GPL-2+
On debian/ubuntu the full license text can be found here:
/usr/share/common-licenses/GPL-2
-License GPL (v3 or later)
+License: GPL (v3 or later)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
diff --git a/debian/patches/arm-neon.patch b/debian/patches/arm-neon.patch
deleted file mode 100644
index 04e8853..0000000
--- a/debian/patches/arm-neon.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: GYP assumes ARMv7 always wants NEON, even if compile flags disable.
-Origin: http://code.google.com/p/chromium/issues/detail?id=154107
-Author: Chad Miller <chad.miller at canonical.com>
-Bug-Chromium: 154107
-Bug-Ubuntu: 1084852
-
-Index: sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
-===================================================================
---- sid.orig/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi 2013-10-12 16:35:09.654312844 +0200
-+++ sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi 2013-10-12 16:35:09.650312844 +0200
-@@ -72,7 +72,7 @@
- 'WEBRTC_LINUX',
- ],
- }],
-- ['target_arch=="arm" and armv7==1', {
-+ ['target_arch=="arm" and armv7==1 and arm_neon==1', {
- 'dependencies': [ 'isac_neon', ],
- 'sources': [
- 'lattice_armv7.S',
-Index: sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc
-===================================================================
---- sid.orig/src/third_party/webrtc/system_wrappers/source/cpu_features.cc 2013-10-12 16:35:09.654312844 +0200
-+++ sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc 2013-10-12 16:35:09.650312844 +0200
-@@ -18,6 +18,47 @@
-
- #include "webrtc/typedefs.h"
-
-+#include <elf.h>
-+#ifdef __arm__
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <linux/auxvec.h>
-+#include <asm/hwcap.h>
-+#endif
-+
-+#ifdef __arm__
-+uint64_t WebRtc_GetCPUFeaturesARM() {
-+ static bool detected = false;
-+ static uint64_t have_neon = 0;
-+
-+ int fd;
-+ Elf32_auxv_t auxv;
-+ unsigned int hwcaps;
-+
-+ if (!detected) {
-+ int fd;
-+ Elf32_auxv_t auxv;
-+ unsigned int hwcaps;
-+
-+ fd = open("/proc/self/auxv", O_RDONLY);
-+ if (fd >= 0) {
-+ while (read(fd, &auxv, sizeof(Elf32_auxv_t)) == sizeof(Elf32_auxv_t)) {
-+ if (auxv.a_type == AT_HWCAP) {
-+ have_neon = (auxv.a_un.a_val & HWCAP_NEON) ? kCPUFeatureNEON : 0;
-+ break;
-+ }
-+ }
-+ close (fd);
-+ } else {
-+ have_neon = 0;
-+ }
-+ detected = true;
-+ }
-+
-+ return 0 | have_neon; // others here as we need them
-+}
-+#endif
-+
- // No CPU feature is available => straight C path.
- int GetCPUInfoNoASM(CPUFeature feature) {
- (void)feature;
diff --git a/debian/patches/arm.patch b/debian/patches/arm.patch
deleted file mode 100644
index b23de5b..0000000
--- a/debian/patches/arm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: sid/src/ui/base/resource/data_pack.cc
-===================================================================
---- sid.orig/src/ui/base/resource/data_pack.cc 2013-10-12 16:35:04.850312830 +0200
-+++ sid/src/ui/base/resource/data_pack.cc 2013-10-12 16:35:04.846312830 +0200
-@@ -147,9 +147,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,
diff --git a/debian/patches/armv4.patch b/debian/patches/armv4.patch
deleted file mode 100644
index c8d5582..0000000
--- a/debian/patches/armv4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Do not use armv4 incopatible code
-Index: sid/src/build/common.gypi
-===================================================================
---- sid.orig/src/build/common.gypi 2013-10-12 16:34:55.630312804 +0200
-+++ sid/src/build/common.gypi 2013-10-12 16:34:55.626312804 +0200
-@@ -3026,6 +3026,7 @@
- # silences those warnings, as they are not helpful and
- # clutter legitimate warnings.
- '-Wno-abi',
-+ '-fno-tree-sink',
- ],
- 'conditions': [
- ['arm_arch!=""', {
diff --git a/debian/patches/ps-print.patch b/debian/patches/ps-print.patch
new file mode 100644
index 0000000..583e80f
--- /dev/null
+++ b/debian/patches/ps-print.patch
@@ -0,0 +1,12 @@
+description: add ps printing capability
+author: Salvatore Bonaccorso
+--- a/src/chrome/browser/printing/print_dialog_gtk.cc
++++ b/src/chrome/browser/printing/print_dialog_gtk.cc
+@@ -241,6 +241,7 @@
+ // Since we only generate PDF, only show printers that support PDF.
+ // TODO(thestig) Add more capabilities to support?
+ GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
++ GTK_PRINT_CAPABILITY_GENERATE_PS |
+ GTK_PRINT_CAPABILITY_GENERATE_PDF |
+ GTK_PRINT_CAPABILITY_PAGE_SET |
+ GTK_PRINT_CAPABILITY_COPIES |
diff --git a/debian/patches/series b/debian/patches/series
index 8a8ed68..5f5bb11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ nspr.patch
nss.patch
expat.patch
prefs.patch
-armv4.patch
#ffmpeg_arm.patch
system-speech.patch
#glew.patch
@@ -14,8 +13,7 @@ fix-manpage.patch
#javascript-i18n.patch
#icu.patch
#system_v8.patch
-arm.patch
icon.patch
-arm-neon.patch
gold-linker.patch
third-party-cookies-off-by-default.patch
+ps-print.patch
diff --git a/debian/rules b/debian/rules
index e921994..c636e10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,20 +73,20 @@ GYP_DEFINES += use_gnome_keyring=1 linux_link_gnome_keyring=1
# and GIO, which contains GSettings (the new GNOME config system)
GYP_DEFINES += use_gconf=1 use_gio=1
-#Disable nacl
+# disable native client (nacl)
GYP_DEFINES += disable_nacl=1
-# do not use third_party/gold as the linker.
+# do not use embedded third_party/gold as the linker.
GYP_DEFINES += linux_use_gold_binary=0 linux_use_gold_flags=0
-#disable tcmalloc
+# disable tcmalloc
GYP_DEFINES += linux_use_tcmalloc=0
# Use explicit library dependencies instead of dlopen.
# This makes breakages easier to detect by revdep-rebuild.
GYP_DEFINES += linux_link_gsettings=1
-# Disable breakpad crash reporting
+# disable breakpad crash reporting
GYP_DEFINES += linux_breakpad=0
DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
@@ -293,11 +293,6 @@ USE_SYSTEM_SQLITE := 0
USE_SYSTEM_LIBWEBP := $(shell pkg-config 'libwebp >= 0.3.0' && echo 1 || echo 0)
USE_SYSTEM_LIBWEBP := 0
-ifneq (,$(filter 8.10 9.04,$(DEBIAN_DIST)))
-# Don't build with system zlib on Intrepid/Jaunty. See http://crbug.com/38073
-GYP_DEFINES += use_system_zlib=0
-endif
-
# System libs
ifeq (1,$(WANT_SYSTEM_LIBS))
GYP_DEFINES += \
@@ -307,7 +302,7 @@ GYP_DEFINES += \
use_system_sqlite=$(USE_SYSTEM_SQLITE) \
use_system_libxml=1 \
use_system_libxslt=1 \
- use_system_zlib=0 \
+ use_system_zlib=1 \
use_system_libevent=1 \
use_system_icu=0 \
use_system_yasm=1 \
@@ -810,8 +805,9 @@ endif
# Remove unused webkit layout tests
rm -rf $(TMP_DDIR)/src/third_party/WebKit/LayoutTests
- # Remove unsafe symlink
+ # Remove unsafe symlinks
rm -rf src/native_client/toolchain/pnacl_linux_x86/newlib/sysroot/sys-include
+ rm -rf src/third_party/mesa/src/src/gallium/state_trackers/d3d1x/w32api
gos-pack: TMP_DIR = $(TMP_DDIR)
ifneq (,$(DEBIAN_TAG))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git
More information about the Pkg-chromium-commit
mailing list