From 240bb2ab7fbbdf8054763898e6317e76edeaeb12 Mon Sep 17 00:00:00 2001 From: robert Date: Wed, 10 Apr 2013 18:46:43 +0000 Subject: [PATCH] update some patches --- www/chromium/Makefile | 4 +++- www/chromium/patches/patch-base_atomicops_h | 23 ++++++------------- .../patches/patch-chrome_chrome_browser_gypi | 16 ++++++------- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 6b1e2f359fe..37679d77c25 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.133 2013/04/10 16:14:28 robert Exp $ +# $OpenBSD: Makefile,v 1.134 2013/04/10 18:46:43 robert Exp $ ONLY_FOR_ARCHS= i386 amd64 @@ -7,6 +7,8 @@ COMMENT= Chromium browser V= 26.0.1410.63 DISTNAME= chromium-${V} +REVISION= 0 + CATEGORIES= www HOMEPAGE= http://code.google.com/chromium/ diff --git a/www/chromium/patches/patch-base_atomicops_h b/www/chromium/patches/patch-base_atomicops_h index 5884b1878fc..d4278196268 100644 --- a/www/chromium/patches/patch-base_atomicops_h +++ b/www/chromium/patches/patch-base_atomicops_h @@ -1,24 +1,15 @@ -$OpenBSD: patch-base_atomicops_h,v 1.11 2013/04/03 08:19:10 robert Exp $ ---- base/atomicops.h.orig.port Fri Mar 22 02:13:44 2013 -+++ base/atomicops.h Tue Apr 2 21:05:17 2013 +$OpenBSD: patch-base_atomicops_h,v 1.12 2013/04/10 18:46:43 robert Exp $ +--- base/atomicops.h.orig.port Sat Apr 6 09:14:07 2013 ++++ base/atomicops.h Wed Apr 10 18:40:21 2013 @@ -58,7 +58,11 @@ typedef intptr_t Atomic64; // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or // Atomic64 routines below, depending on your architecture. -+#if defined(OS_OPENBSD) && defined(__i386__) -+typedef Atomic32 AtomicWord; -+#else ++//#if defined(OS_OPENBSD) && defined(__i386__) ++//typedef Atomic32 AtomicWord; ++//#else typedef intptr_t AtomicWord; -+#endif ++//#endif // Atomically execute: // result = *ptr; -@@ -156,7 +160,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); - - // On some platforms we need additional declarations to make - // AtomicWord compatible with our other Atomic* types. --#if defined(OS_MACOSX) || defined(OS_OPENBSD) -+#if defined(OS_MACOSX) - #include "base/atomicops_internals_atomicword_compat.h" - #endif - diff --git a/www/chromium/patches/patch-chrome_chrome_browser_gypi b/www/chromium/patches/patch-chrome_chrome_browser_gypi index 3cd9b2efbb9..07820702085 100644 --- a/www/chromium/patches/patch-chrome_chrome_browser_gypi +++ b/www/chromium/patches/patch-chrome_chrome_browser_gypi @@ -1,7 +1,7 @@ -$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.18 2013/04/03 08:19:10 robert Exp $ ---- chrome/chrome_browser.gypi.orig.port Fri Mar 22 02:14:33 2013 -+++ chrome/chrome_browser.gypi Tue Apr 2 21:05:17 2013 -@@ -436,8 +436,6 @@ +$OpenBSD: patch-chrome_chrome_browser_gypi,v 1.19 2013/04/10 18:46:43 robert Exp $ +--- chrome/chrome_browser.gypi.orig.port Sat Apr 6 09:14:56 2013 ++++ chrome/chrome_browser.gypi Wed Apr 10 16:00:56 2013 +@@ -438,8 +438,6 @@ 'browser/chrome_browser_main_android.cc', 'browser/chrome_browser_main_android.h', 'browser/chrome_browser_main_extra_parts.h', @@ -10,7 +10,7 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.18 2013/04/03 08:19:10 robert Exp 'browser/chrome_browser_main_mac.h', 'browser/chrome_browser_main_mac.mm', 'browser/chrome_browser_main_posix.cc', -@@ -1019,22 +1017,6 @@ +@@ -1021,22 +1019,6 @@ 'browser/media/media_stream_capture_indicator.h', 'browser/media/media_stream_devices_controller.cc', 'browser/media/media_stream_devices_controller.h', @@ -33,7 +33,7 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.18 2013/04/03 08:19:10 robert Exp 'browser/media_gallery/mac/mtp_device_delegate_impl_mac.h', 'browser/media_gallery/mac/mtp_device_delegate_impl_mac.mm', 'browser/media_gallery/media_file_system_registry.cc', -@@ -1856,7 +1838,6 @@ +@@ -1858,7 +1840,6 @@ 'browser/speech/tts_controller.h', 'browser/speech/tts_extension_loader_chromeos.cc', 'browser/speech/tts_extension_loader_chromeos.h', @@ -41,7 +41,7 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.18 2013/04/03 08:19:10 robert Exp 'browser/speech/tts_mac.mm', 'browser/speech/tts_platform.cc', 'browser/speech/tts_platform.h', -@@ -2062,16 +2043,12 @@ +@@ -2064,16 +2045,12 @@ 'browser/system_monitor/media_device_notifications_utils.h', 'browser/system_monitor/media_storage_util.cc', 'browser/system_monitor/media_storage_util.h', @@ -58,7 +58,7 @@ $OpenBSD: patch-chrome_chrome_browser_gypi,v 1.18 2013/04/03 08:19:10 robert Exp 'browser/system_monitor/removable_device_notifications_mac.h', 'browser/system_monitor/removable_device_notifications_mac.mm', 'browser/system_monitor/removable_device_notifications_window_win.cc', -@@ -2079,8 +2056,6 @@ +@@ -2081,8 +2058,6 @@ 'browser/system_monitor/removable_storage_notifications.cc', 'browser/system_monitor/removable_storage_notifications.h', 'browser/system_monitor/removable_storage_observer.h',