[Midnightbsd-cvs] mports [17341] trunk/www/chromium: remove old patches
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Sep 15 22:29:33 EDT 2014
Revision: 17341
http://svnweb.midnightbsd.org/mports/?rev=17341
Author: laffer1
Date: 2014-09-15 22:29:32 -0400 (Mon, 15 Sep 2014)
Log Message:
-----------
remove old patches
Added Paths:
-----------
trunk/www/chromium/Makefile.tests
Removed Paths:
-------------
trunk/www/chromium/files/patch-third_party__libusb__libusb.gyp
trunk/www/chromium/files/patch-ui__base__l10n__l10n_util.cc
trunk/www/chromium/files/patch-ui__base__x__x11_util.cc
trunk/www/chromium/files/patch-ui__surface__surface.gyp
trunk/www/chromium/files/patch-ui__surface__transport_dib.h
trunk/www/chromium/files/patch-ui__surface__transport_dib_linux.cc
trunk/www/chromium/files/patch-v8__src__checks.cc
trunk/www/chromium/files/patch-webkit__plugins__ppapi__ppapi_plugin_instance.cc
Added: trunk/www/chromium/Makefile.tests
===================================================================
--- trunk/www/chromium/Makefile.tests (rev 0)
+++ trunk/www/chromium/Makefile.tests 2014-09-16 02:29:32 UTC (rev 17341)
@@ -0,0 +1,22 @@
+#$FreeBSD: head/www/chromium/Makefile.tests 354687 2014-05-20 20:47:17Z rene $
+#telemetry_unittests : unknown ninja target
+TEST_TARGETS= base_unittests \
+ crypto_unittests \
+ cacheinvalidation_unittests \
+ gpu_unittests \
+ sync_unit_tests \
+ printing_unittests \
+ sql_unittests \
+ content_unittests \
+ cc_unittests \
+ ui_unittests \
+ url_unittests \
+ compositor_unittests \
+ ipc_tests \
+ dbus_unittests \
+ net_unittests \
+ media_unittests \
+ chromedriver_unittests \
+ chromedriver_tests \
+ browser_tests \
+ unit_tests
Deleted: trunk/www/chromium/files/patch-third_party__libusb__libusb.gyp
===================================================================
--- trunk/www/chromium/files/patch-third_party__libusb__libusb.gyp 2014-09-16 02:29:08 UTC (rev 17340)
+++ trunk/www/chromium/files/patch-third_party__libusb__libusb.gyp 2014-09-16 02:29:32 UTC (rev 17341)
@@ -1,22 +0,0 @@
---- third_party/libusb/libusb.gyp.orig 2013-06-19 01:35:24.000000000 +0000
-+++ third_party/libusb/libusb.gyp 2013-06-24 21:04:31.000000000 +0000
-@@ -67,6 +67,19 @@
- '_GNU_SOURCE=1',
- ],
- }],
-+ ['OS == "freebsd"', {
-+ 'type': 'none',
-+ 'sources/': [
-+ ['exclude', '^src/libusb/'],
-+ ],
-+ 'direct_dependent_settings': {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lusb',
-+ ],
-+ },
-+ },
-+ }],
- ],
- },
- ],
Deleted: trunk/www/chromium/files/patch-ui__base__l10n__l10n_util.cc
===================================================================
--- trunk/www/chromium/files/patch-ui__base__l10n__l10n_util.cc 2014-09-16 02:29:08 UTC (rev 17340)
+++ trunk/www/chromium/files/patch-ui__base__l10n__l10n_util.cc 2014-09-16 02:29:32 UTC (rev 17341)
@@ -1,20 +0,0 @@
---- ui/base/l10n/l10n_util.cc.orig 2012-06-05 23:55:13.000000000 +0300
-+++ ui/base/l10n/l10n_util.cc 2012-06-06 00:00:11.000000000 +0300
-@@ -33,7 +33,7 @@
- #include "base/android/locale_utils.h"
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- #include <glib.h>
- #endif
-
-@@ -417,7 +417,7 @@
- if (!pref_locale.empty())
- candidates.push_back(pref_locale);
-
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- // If we're on a different Linux system, we have glib.
-
- // GLib implements correct environment variable parsing with
Deleted: trunk/www/chromium/files/patch-ui__base__x__x11_util.cc
===================================================================
--- trunk/www/chromium/files/patch-ui__base__x__x11_util.cc 2014-09-16 02:29:08 UTC (rev 17340)
+++ trunk/www/chromium/files/patch-ui__base__x__x11_util.cc 2014-09-16 02:29:32 UTC (rev 17341)
@@ -1,32 +0,0 @@
---- ui/base/x/x11_util.cc.orig 2011-10-12 12:02:46.000000000 +0300
-+++ ui/base/x/x11_util.cc 2011-10-16 17:17:46.000000000 +0300
-@@ -103,6 +103,12 @@
- static SharedMemorySupport DoQuerySharedMemorySupport(Display* dpy) {
- int dummy;
- Bool pixmaps_supported;
-+
-+#if defined(OS_FREEBSD)
-+ if (!CommandLine::ForCurrentProcess()->HasSwitch("enable-xshm"))
-+ return SHARED_MEMORY_NONE;
-+#endif
-+
- // Query the server's support for XSHM.
- if (!XShmQueryVersion(dpy, &dummy, &dummy, &pixmaps_supported))
- return SHARED_MEMORY_NONE;
-@@ -112,8 +118,6 @@
- if (shmkey == -1)
- return SHARED_MEMORY_NONE;
- void* address = shmat(shmkey, NULL, 0);
-- // Mark the shared memory region for deletion
-- shmctl(shmkey, IPC_RMID, NULL);
-
- XShmSegmentInfo shminfo;
- memset(&shminfo, 0, sizeof(shminfo));
-@@ -125,6 +129,7 @@
- if (gdk_error_trap_pop())
- result = false;
- shmdt(address);
-+ shmctl(shmkey, IPC_RMID, NULL);
- if (!result)
- return SHARED_MEMORY_NONE;
-
Deleted: trunk/www/chromium/files/patch-ui__surface__surface.gyp
===================================================================
--- trunk/www/chromium/files/patch-ui__surface__surface.gyp 2014-09-16 02:29:08 UTC (rev 17340)
+++ trunk/www/chromium/files/patch-ui__surface__surface.gyp 2014-09-16 02:29:32 UTC (rev 17341)
@@ -1,17 +0,0 @@
---- ui/surface/surface.gyp.orig 2011-09-09 21:37:36.000000000 +0300
-+++ ui/surface/surface.gyp 2011-09-09 21:45:23.000000000 +0300
-@@ -14,6 +14,14 @@
- '<(DEPTH)/third_party/angle/include',
- ],
- }],
-+ ['OS == "freebsd"', {
-+ 'sources!': [
-+ 'transport_dib_linux.cc',
-+ ],
-+ 'sources': [
-+ 'transport_dib_freebsd.cc',
-+ ],
-+ }],
- ],
- },
- 'targets': [
Deleted: trunk/www/chromium/files/patch-ui__surface__transport_dib.h
===================================================================
--- trunk/www/chromium/files/patch-ui__surface__transport_dib.h 2014-09-16 02:29:08 UTC (rev 17340)
+++ trunk/www/chromium/files/patch-ui__surface__transport_dib.h 2014-09-16 02:29:32 UTC (rev 17341)
@@ -1,44 +0,0 @@
---- ui/surface/transport_dib.h.orig 2011-11-01 10:43:23.000000000 +0200
-+++ ui/surface/transport_dib.h 2011-11-21 22:35:21.000000000 +0200
-@@ -9,7 +9,7 @@
- #include "base/basictypes.h"
- #include "ui/gfx/surface/surface_export.h"
-
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_FREEBSD)
- #include "base/shared_memory.h"
- #endif
-
-@@ -79,7 +79,7 @@
- static int fake_handle = 10;
- return reinterpret_cast<Handle>(fake_handle++);
- }
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_FREEBSD)
- typedef base::SharedMemoryHandle Handle;
- // On Mac, the inode number of the backing file is used as an id.
- typedef base::SharedMemoryId Id;
-@@ -94,7 +94,7 @@
- static int fake_handle = 10;
- return Handle(fake_handle++, false);
- }
--#elif defined(USE_X11)
-+#elif defined(OS_LINUX)
- typedef int Handle; // These two ints are SysV IPC shared memory keys
- struct Id {
- // Ensure that default initialized Ids are invalid.
-@@ -199,11 +199,12 @@
-
- private:
- TransportDIB();
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_ANDROID) || defined(OS_FREEBSD)
- explicit TransportDIB(base::SharedMemoryHandle dib);
- base::SharedMemory shared_memory_;
- uint32 sequence_num_;
--#elif defined(USE_X11)
-+#endif
-+#if defined(USE_X11)
- Id key_; // SysV shared memory id
- void* address_; // mapped address
- XSharedMemoryId x_shm_; // X id for the shared segment
Deleted: trunk/www/chromium/files/patch-ui__surface__transport_dib_linux.cc
===================================================================
--- trunk/www/chromium/files/patch-ui__surface__transport_dib_linux.cc 2014-09-16 02:29:08 UTC (rev 17340)
+++ trunk/www/chromium/files/patch-ui__surface__transport_dib_linux.cc 2014-09-16 02:29:32 UTC (rev 17341)
@@ -1,28 +0,0 @@
---- ui/surface/transport_dib_linux.cc.orig 2011-09-14 11:02:00.000000000 +0300
-+++ ui/surface/transport_dib_linux.cc 2011-09-21 13:59:55.000000000 +0300
-@@ -31,6 +31,11 @@
- address_ = kInvalidAddress;
- }
-
-+#if defined(OS_FREEBSD)
-+ if(is_valid_id(key_))
-+ shmctl(key_.shmkey, IPC_RMID, 0);
-+#endif
-+
- if (x_shm_) {
- DCHECK(display_);
- ui::DetachSharedMemory(display_, x_shm_);
-@@ -50,10 +55,13 @@
- }
-
- void* address = shmat(shmkey, NULL /* desired address */, 0 /* flags */);
-+ // On BSD we can't access the shared memory after is marked for deletion.
-+#if !defined(OS_FREEBSD)
- // Here we mark the shared memory for deletion. Since we attached it in the
- // line above, it doesn't actually get deleted but, if we crash, this means
- // that the kernel will automatically clean it up for us.
- shmctl(shmkey, IPC_RMID, 0);
-+#endif
- if (address == kInvalidAddress)
- return NULL;
-
Deleted: trunk/www/chromium/files/patch-v8__src__checks.cc
===================================================================
--- trunk/www/chromium/files/patch-v8__src__checks.cc 2014-09-16 02:29:08 UTC (rev 17340)
+++ trunk/www/chromium/files/patch-v8__src__checks.cc 2014-09-16 02:29:32 UTC (rev 17341)
@@ -1,10 +0,0 @@
---- v8/src/checks.cc.orig 2014-01-07 21:03:55.000000000 +0100
-+++ v8/src/checks.cc 2014-01-11 01:09:31.000000000 +0100
-@@ -32,6 +32,7 @@
- # include <execinfo.h>
- #endif // V8_LIBC_GLIBC || V8_OS_BSD
- #include <stdio.h>
-+#include <unistd.h> // size_t
-
- #include "platform.h"
- #include "v8.h"
Deleted: trunk/www/chromium/files/patch-webkit__plugins__ppapi__ppapi_plugin_instance.cc
===================================================================
--- trunk/www/chromium/files/patch-webkit__plugins__ppapi__ppapi_plugin_instance.cc 2014-09-16 02:29:08 UTC (rev 17340)
+++ trunk/www/chromium/files/patch-webkit__plugins__ppapi__ppapi_plugin_instance.cc 2014-09-16 02:29:32 UTC (rev 17341)
@@ -1,11 +0,0 @@
---- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig 2011-07-28 11:01:06.000000000 +0300
-+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc 2011-09-07 01:45:08.000000000 +0300
-@@ -1035,7 +1035,7 @@
- #endif // defined(OS_WIN)
-
- bool ret = false;
--#if defined(OS_LINUX) || (defined(OS_MACOSX) && defined(USE_SKIA))
-+#if defined(OS_LINUX) || (defined(OS_MACOSX) && defined(USE_SKIA)) || defined(OS_FREEBSD)
- // On Linux we just set the final bits in the native metafile
- // (NativeMetafile and PreviewMetafile must have compatible formats,
- // i.e. both PDF for this to work).
More information about the Midnightbsd-cvs
mailing list