diff options
author | Max Liebkies | 2018-12-14 15:49:57 +0100 |
---|---|---|
committer | Max Liebkies | 2018-12-14 15:49:57 +0100 |
commit | 01e970205934714936bae828eebda703088f257e (patch) | |
tree | 058e7c54ba3cc36601eb03f83f904b629311283c | |
parent | dfd0a83a491e9c981b07ad6bed50be40a30548f5 (diff) | |
download | aur-01e970205934714936bae828eebda703088f257e.tar.gz |
Remove patch files
-rw-r--r-- | 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch | 35 | ||||
-rw-r--r-- | 0002-dont-delete-clipboard-data-after-focus-out.patch | 124 |
2 files changed, 0 insertions, 159 deletions
diff --git a/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch b/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch deleted file mode 100644 index 6fd00ca1c5ad..000000000000 --- a/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e2d8a02d878aa27687f907b64fd41344ad1b2468 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io> -Date: Tue, 30 Oct 2018 22:21:52 +0100 -Subject: [PATCH] Keep mozilla-release building with newer cbindgen versions. - ---- - servo/components/style/cbindgen.toml | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/servo/components/style/cbindgen.toml b/servo/components/style/cbindgen.toml -index 46162e43db5e..1df99ffc5160 100644 ---- a/servo/components/style/cbindgen.toml -+++ b/servo/components/style/cbindgen.toml -@@ -23,11 +23,17 @@ derive_helper_methods = true - - [export] - prefix = "Style" - include = [ - "StyleAppearance", - "StyleDisplay", - "StyleDisplayMode", - "StyleFillRule", -- "StylePathCommand" -+ "StylePathCommand", -+ -+ "Appearance", -+ "Display", -+ "DisplayMode", -+ "FillRule", -+ "PathCommand" - ] - item_types = ["enums", "structs", "typedefs"] --- -2.17.2 - diff --git a/0002-dont-delete-clipboard-data-after-focus-out.patch b/0002-dont-delete-clipboard-data-after-focus-out.patch deleted file mode 100644 index 6755d7ee404a..000000000000 --- a/0002-dont-delete-clipboard-data-after-focus-out.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff --git a/widget/gtk/nsClipboardWayland.h b/widget/gtk/nsClipboardWayland.h ---- a/widget/gtk/nsClipboardWayland.h -+++ b/widget/gtk/nsClipboardWayland.h -@@ -125,10 +125,8 @@ - void AddDragAndDropDataOffer(wl_data_offer *aWaylandDataOffer); - nsWaylandDragContext* GetDragContext(); - -- void ClearClipboardDataOffers(); - void ClearDragAndDropDataOffer(); - -- void ConfigureKeyboard(wl_seat_capability caps); - void TransferFastTrackClipboard(int aClipboardRequestNumber, - GtkSelectionData *aSelectionData); - -diff --git a/widget/gtk/nsClipboardWayland.cpp b/widget/gtk/nsClipboardWayland.cpp ---- a/widget/gtk/nsClipboardWayland.cpp -+++ b/widget/gtk/nsClipboardWayland.cpp -@@ -525,15 +525,6 @@ - } - - void --nsRetrievalContextWayland::ClearClipboardDataOffers(void) --{ -- if (mClipboardOffer) -- mClipboardOffer = nullptr; -- if (mPrimaryOffer) -- mPrimaryOffer = nullptr; --} -- --void - nsRetrievalContextWayland::ClearDragAndDropDataOffer(void) - { - mDragContext = nullptr; -@@ -716,81 +707,6 @@ - return mPrimarySelectionDataDeviceManager != nullptr; - } - --static void --keyboard_handle_keymap(void *data, struct wl_keyboard *keyboard, -- uint32_t format, int fd, uint32_t size) --{ --} -- --static void --keyboard_handle_enter(void *data, struct wl_keyboard *keyboard, -- uint32_t serial, struct wl_surface *surface, -- struct wl_array *keys) --{ --} -- --static void --keyboard_handle_leave(void *data, struct wl_keyboard *keyboard, -- uint32_t serial, struct wl_surface *surface) --{ -- // We lost focus so our clipboard data are outdated -- nsRetrievalContextWayland *context = -- static_cast<nsRetrievalContextWayland*>(data); -- -- context->ClearClipboardDataOffers(); --} -- --static void --keyboard_handle_key(void *data, struct wl_keyboard *keyboard, -- uint32_t serial, uint32_t time, uint32_t key, -- uint32_t state) --{ --} -- --static void --keyboard_handle_modifiers(void *data, struct wl_keyboard *keyboard, -- uint32_t serial, uint32_t mods_depressed, -- uint32_t mods_latched, uint32_t mods_locked, -- uint32_t group) --{ --} -- --static const struct wl_keyboard_listener keyboard_listener = { -- keyboard_handle_keymap, -- keyboard_handle_enter, -- keyboard_handle_leave, -- keyboard_handle_key, -- keyboard_handle_modifiers, --}; -- --void --nsRetrievalContextWayland::ConfigureKeyboard(wl_seat_capability caps) --{ -- // ConfigureKeyboard() is called when wl_seat configuration is changed. -- // We look for the keyboard only, get it when is't available and release it -- // when it's lost (we don't have focus for instance). -- if (caps & WL_SEAT_CAPABILITY_KEYBOARD) { -- mKeyboard = wl_seat_get_keyboard(mSeat); -- wl_keyboard_add_listener(mKeyboard, &keyboard_listener, this); -- } else if (mKeyboard && !(caps & WL_SEAT_CAPABILITY_KEYBOARD)) { -- wl_keyboard_destroy(mKeyboard); -- mKeyboard = nullptr; -- } --} -- --static void --seat_handle_capabilities(void *data, struct wl_seat *seat, -- unsigned int caps) --{ -- nsRetrievalContextWayland *context = -- static_cast<nsRetrievalContextWayland*>(data); -- context->ConfigureKeyboard((wl_seat_capability)caps); --} -- --static const struct wl_seat_listener seat_listener = { -- seat_handle_capabilities, --}; -- - void - nsRetrievalContextWayland::InitDataDeviceManager(wl_registry *registry, - uint32_t id, -@@ -816,7 +732,6 @@ - void *data) - { - mSeat = (wl_seat*)wl_registry_bind(registry, id, &wl_seat_interface, 1); -- wl_seat_add_listener(mSeat, &seat_listener, data); - } - - static void - |