├── LICENSE ├── README └── kiss-wayland ├── fcft ├── build ├── checksums ├── depends ├── sources └── version ├── firefox ├── build ├── checksums ├── depends ├── patches │ ├── disable-minidump.patch │ └── no-gtk2.patch ├── post-install ├── sources └── version ├── font-util ├── build ├── checksums ├── sources └── version ├── foot ├── build ├── checksums ├── depends ├── post-install ├── sources └── version ├── gammastep ├── build ├── checksums ├── depends ├── files │ ├── configure.patch │ ├── makefile.patch │ └── makefilesrc.patch ├── sources └── version ├── grim ├── build ├── checksums ├── depends ├── sources └── version ├── gtk+3 ├── build ├── checksums ├── depends ├── patches.bak │ └── remove-atkbridge.patch ├── post-install ├── sources └── version ├── libvncserver ├── build ├── checksums ├── sources └── version ├── mesa ├── build ├── checksums ├── depends ├── sources └── version ├── slurp ├── build ├── checksums ├── depends ├── sources └── version ├── sway ├── build ├── checksums ├── depends ├── post-install ├── sources └── version ├── swaybg ├── build ├── checksums ├── depends ├── sources └── version ├── swayidle ├── build ├── checksums ├── depends ├── sources └── version ├── swaylock ├── build ├── checksums ├── depends ├── sources └── version ├── tllist ├── build ├── checksums ├── sources └── version ├── wayland-protocols ├── build ├── checksums ├── depends ├── sources └── version ├── wayland ├── build ├── checksums ├── depends ├── sources └── version ├── wayvnc ├── build ├── checksums ├── depends ├── sources └── version ├── wl-clipboard ├── build ├── checksums ├── depends ├── sources └── version ├── wlroots ├── build ├── checksums ├── depends ├── sources └── version ├── wlsunset-git ├── build ├── depends ├── sources └── version ├── wlvncc ├── build ├── checksums ├── depends ├── sources └── version └── xorg-server ├── build ├── checksums ├── depends ├── patches └── rootless_modesetting.patch ├── post-install ├── sources └── version /LICENSE: -------------------------------------------------------------------------------- 1 | Copyright (c) 2020 Caleb JA 2 | 3 | Permission to use, copy, modify, and/or distribute this software for any 4 | purpose with or without fee is hereby granted. 5 | 6 | THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH 7 | REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 8 | AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, 9 | INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM 10 | LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR 11 | OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR 12 | PERFORMANCE OF THIS SOFTWARE. 13 | -------------------------------------------------------------------------------- /README: -------------------------------------------------------------------------------- 1 | Archving since the official repositories have wayland packages now. See: 2 | - https://github.com/kisslinux/repo/tree/master/wayland 3 | 4 | |/ 5 | |\ISS Repo https://k1ss.org 6 | ________________________________________________________________________________ 7 | 8 | 9 | KISS Wayland Repository 10 | ________________________________________________________________________________ 11 | 12 | A KISS Linux repository for Wayland packages. 13 | 14 | After the archival of sdsddsd1's mywayland[1] repo I needed a way to continue 15 | getting updates to my wayland install, and thus kiss-wayland was born. 16 | 17 | If a package you used/want is missing, feel free to make a pr adding it the 18 | repo, so far I've only got the ones I use added. 19 | 20 | To use this repo you should have the following repositories in your KISS_PATH: 21 | - kisslinux/repo/* [2] 22 | - kisslinux/community [3] 23 | 24 | 25 | Mirrors 26 | ________________________________________________________________________________ 27 | 28 | This git repository is mirrored to the following locations: 29 | 30 | - https://git.himmalerin.net/kiss-wayland 31 | - https://github.com/Himmalerin/kiss-wayland 32 | - https://git.sr.ht/~himmalerin/kiss-wayland 33 | 34 | 35 | License 36 | ________________________________________________________________________________ 37 | 38 | All files in this repository are available under the BSD Zero Clause license. 39 | 40 | 41 | References 42 | ________________________________________________________________________________ 43 | 44 | [1]: https://github.com/sdsddsd1/mywayland 45 | [2]: https://github.com/kisslinux/repo 46 | [3]: https://github.com/kisslinux/community 47 | -------------------------------------------------------------------------------- /kiss-wayland/fcft/build: -------------------------------------------------------------------------------- 1 | #!/bin/sh -e 2 | 3 | sed -i 's|fcft/fcft.h|fcft.h|g' meson.build 4 | sed -i 's|fcft/stride.h|stride.h|g' meson.build 5 | 6 | sed -i 's|fcft/fcft.h|fcft.h|g' fcft.c 7 | sed -i 's|fcft/stride.h|stride.h|g' fcft.c 8 | 9 | export DESTDIR="$1" 10 | 11 | meson \ 12 | --prefix=/usr \ 13 | --buildtype=release \ 14 | . output 15 | 16 | ninja -C output 17 | ninja -C output install 18 | -------------------------------------------------------------------------------- /kiss-wayland/fcft/checksums: -------------------------------------------------------------------------------- 1 | 726fdebb1d29bc40c665015666fd9037981c0b4d0ba3ecafa1994053091e7fa8 2 | -------------------------------------------------------------------------------- /kiss-wayland/fcft/depends: -------------------------------------------------------------------------------- 1 | fontconfig 2 | freetype-harfbuzz 3 | pixman 4 | scdoc make 5 | tllist make 6 | -------------------------------------------------------------------------------- /kiss-wayland/fcft/sources: -------------------------------------------------------------------------------- 1 | https://codeberg.org/dnkl/fcft/archive/2.3.2.tar.gz 2 | -------------------------------------------------------------------------------- /kiss-wayland/fcft/version: -------------------------------------------------------------------------------- 1 | 2.3.2 1 2 | -------------------------------------------------------------------------------- /kiss-wayland/firefox/build: -------------------------------------------------------------------------------- 1 | #!/bin/sh -e 2 | 3 | for patch in *.patch; do 4 | patch -p1 < "$patch" 5 | done 6 | 7 | # Remove libc header which conflicts with 7 or so Linux 8 | # kernel headers. See: https://github.com/kisslinux/repo/issues/207 9 | sed -i '/net\/if/d' \ 10 | dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c 11 | 12 | # Build autoconf 2.13 for Firefox's sole use. 13 | # See: https://bugzilla.mozilla.org/show_bug.cgi?id=104642 14 | ( 15 | cd autoconf2.13 16 | 17 | ./configure \ 18 | --prefix="$PWD/../junk" \ 19 | --program-suffix=-2.13 20 | 21 | make 22 | make install 23 | ) 24 | 25 | # Build yasm for Firefox's sole use. 26 | # Firefox is the only package which needs it 27 | # and upstream is kinda dead. 28 | ( 29 | cd yasm 30 | 31 | ./configure \ 32 | --prefix="$PWD/../junk" 33 | 34 | make 35 | make install 36 | ) 37 | export PATH="$PWD/junk/bin:$PATH" 38 | 39 | # Bypass 'ccache' as it's totally useless when building 40 | # Firefox and only slows things down. 41 | export CC="${CC:-/usr/bin/cc}" 42 | export CXX="${CXX:-/usr/bin/c++}" 43 | 44 | export RUSTFLAGS="$RUSTFLAGS -Cdebuginfo=0" 45 | export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/firefox" 46 | 47 | export MOZ_NOSPAM=1 48 | export MOZ_DEBUG_FLAGS=-g0 49 | export MACH_USE_SYSTEM_PYTHON=1 50 | 51 | export GDK_BACKEND="wayland" 52 | export MOZ_WAYLAND=1 53 | export MOZ_X11=0 54 | 55 | cat > .mozconfig << EOF 56 | ac_add_options --prefix=/usr 57 | ac_add_options --libdir=/usr/lib 58 | ac_add_options --enable-alsa 59 | ac_add_options --enable-strip 60 | ac_add_options --enable-release 61 | ac_add_options --enable-rust-simd 62 | ac_add_options --enable-install-strip 63 | ac_add_options --enable-official-branding 64 | ac_add_options --enable-application=browser 65 | ac_add_options --enable-optimize="$CFLAGS -w" 66 | ac_add_options --with-system-ffi 67 | ac_add_options --with-system-png 68 | ac_add_options --with-system-jpeg 69 | ac_add_options --with-system-zlib 70 | ac_add_options --with-system-pixman 71 | ac_add_options --without-system-nss 72 | ac_add_options --without-system-nspr 73 | ac_add_options --without-system-libvpx 74 | ac_add_options --disable-eme 75 | ac_add_options --disable-dbus 76 | ac_add_options --disable-gold 77 | ac_add_options --disable-tests 78 | ac_add_options --disable-vtune 79 | ac_add_options --disable-updater 80 | ac_add_options --disable-jemalloc 81 | ac_add_options --disable-elf-hack 82 | ac_add_options --disable-callgrind 83 | ac_add_options --disable-profiling 84 | ac_add_options --disable-necko-wifi 85 | ac_add_options --disable-crashreporter 86 | ac_add_options --disable-pulseaudio 87 | ac_add_options --disable-accessibility 88 | ac_add_options --disable-debug-symbols 89 | ac_add_options --disable-parental-controls 90 | ac_add_options --disable-system-extension-dirs 91 | EOF 92 | 93 | ./mach build 94 | DESTDIR="$1" ./mach install 95 | 96 | # Remove a lot of uneeded "stuff". 97 | rm -rf "$1/usr/include" 98 | rm -rf "$1/usr/lib/firefox-devel" 99 | rm -rf "$1/usr/share/idl" 100 | rm -rf "$1/usr/lib/firefox/gtk2" # Drop GTK+2 runtime dependency. 101 | rm -f "$1/usr/lib/firefox/browser/features/fxmonitor@mozilla.org.xpi" 102 | rm -f "$1/usr/lib/firefox/browser/features/screenshots@mozilla.org.xpi" 103 | rm -f "$1/usr/lib/firefox/browser/features/webcompat-reporter@mozilla.org.xpi" 104 | rm -f "$1/usr/lib/firefox/browser/features/webcompat@mozilla.org.xpi" 105 | rm -f "$1/usr/lib/firefox/browser/features/doh-rollout@mozilla.org.xpi" 106 | -------------------------------------------------------------------------------- /kiss-wayland/firefox/checksums: -------------------------------------------------------------------------------- 1 | ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab 2 | f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e 3 | 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f 4 | e70e19057173913197b97c20abf8a2f66334255b3931c3a3d6d30130a2bd28dc 5 | 2e519e7caeed0365b13100198eb89824aad4353010c914852a87c28fa72319ab 6 | -------------------------------------------------------------------------------- /kiss-wayland/firefox/depends: -------------------------------------------------------------------------------- 1 | alsa-lib 2 | atk 3 | bzip2 4 | cairo 5 | cbindgen make 6 | clang make 7 | expat 8 | ffmpeg 9 | fontconfig 10 | freetype-harfbuzz 11 | fribidi 12 | gdk-pixbuf 13 | glib 14 | gtk+3 15 | libICE 16 | libSM 17 | libX11 18 | libXau 19 | libXcomposite 20 | libXcursor 21 | libXdamage 22 | libXext 23 | libXfixes 24 | libXi 25 | libXinerama 26 | libXrandr 27 | libXrender 28 | libXt 29 | libXxf86vm 30 | libdrm 31 | libepoxy 32 | libffi 33 | libjpeg-turbo 34 | libpng 35 | libvpx 36 | libxcb 37 | libxshmfence 38 | llvm make 39 | m4 make 40 | mesa 41 | nasm make 42 | nodejs make 43 | pango 44 | perl make 45 | pixman 46 | pkgconf make 47 | python make 48 | rust make 49 | zip make 50 | zlib 51 | -------------------------------------------------------------------------------- /kiss-wayland/firefox/patches/disable-minidump.patch: -------------------------------------------------------------------------------- 1 | Patch from Void Linux. Here's the full message for the ff87-update, but 2 | we're only taking the minidump_writer_linux part as it's the only 3 | relevant one for Firefox on Wyverkiss. 4 | 5 | From 9fd26c1bd4ecc5aa2d4336963ca2b0b2726bc5c8 Mon Sep 17 00:00:00 2001 6 | From: =?UTF-8?q?=C3=89rico=20Nogueira?= 7 | Date: Wed, 24 Mar 2021 09:59:36 -0300 8 | Subject: [PATCH] firefox: update to 87.0. 9 | 10 | minidump_writer_linux has issues on musl and doesn't support all 11 | platforms Void does (thread_info doesn't touch ppc*), so we add a patch 12 | to not build it at all. It seems to be a build system bug where 13 | oxidized_breakpad can be enabled even when --disable-backtrace is set. 14 | If next version still only enables it for x86_64, it might build/work 15 | fine for us, see: https://github.com/msirringhaus/minidump_writer_linux/issues/4 16 | 17 | diff --git a/Cargo.toml b/Cargo.toml 18 | index 4076a60577..945f26f638 100644 19 | --- a/Cargo.toml 20 | +++ b/Cargo.toml 21 | @@ -13,7 +13,6 @@ members = [ 22 | "netwerk/test/http3server", 23 | "security/manager/ssl/osclientcerts", 24 | "testing/geckodriver", 25 | - "toolkit/crashreporter/rust_minidump_writer_linux", 26 | "toolkit/library/gtest/rust", 27 | "toolkit/library/rust/", 28 | "toolkit/mozapps/defaultagent/rust", 29 | @@ -79,7 +78,6 @@ spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4" } 30 | # failure's backtrace feature might break our builds, see bug 1608157. 31 | failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } 32 | failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } 33 | -minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "9191af36343846b2c7ada65b9602b481b717c4d8" } 34 | 35 | [patch.crates-io.cranelift-codegen] 36 | git = "https://github.com/mozilla-spidermonkey/wasmtime" 37 | diff --git a/toolkit/moz.configure b/toolkit/moz.configure 38 | index 806576b1ef..43ef8309f1 100644 39 | --- a/toolkit/moz.configure 40 | +++ b/toolkit/moz.configure 41 | @@ -2487,8 +2487,6 @@ 42 | # ============================================================== 43 | @depends(target) 44 | def oxidized_breakpad(target): 45 | - if target.kernel == "Linux" and target.os != "Android": 46 | - return target.cpu in ("x86", "x86_64") 47 | return False 48 | 49 | 50 | -------------------------------------------------------------------------------- /kiss-wayland/firefox/patches/no-gtk2.patch: -------------------------------------------------------------------------------- 1 | diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in 2 | index 566e643..cb1e0dd 100644 3 | --- a/browser/installer/package-manifest.in 4 | +++ b/browser/installer/package-manifest.in 5 | @@ -107,7 +107,6 @@ 6 | #endif 7 | #ifdef MOZ_GTK 8 | @BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@ 9 | -@BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@ 10 | #ifdef MOZ_WAYLAND 11 | @BINPATH@/@DLL_PREFIX@mozwayland@DLL_SUFFIX@ 12 | #endif 13 | diff --git a/dom/moz.build b/dom/moz.build 14 | index 9989f50..8c8167e 100644 15 | --- a/dom/moz.build 16 | +++ b/dom/moz.build 17 | @@ -120,7 +120,7 @@ TEST_DIRS += [ 18 | "imptests", 19 | ] 20 | 21 | -if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("gtk", "cocoa", "windows"): 22 | +if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("cocoa", "windows"): 23 | TEST_DIRS += ["plugins/test"] 24 | 25 | SPHINX_TREES["/dom"] = "docs" 26 | diff --git a/dom/plugins/base/npapi.h b/dom/plugins/base/npapi.h 27 | index d6b189b..80dcb73 100644 28 | --- a/dom/plugins/base/npapi.h 29 | +++ b/dom/plugins/base/npapi.h 30 | @@ -41,7 +41,7 @@ 31 | # endif 32 | #endif 33 | 34 | -#if defined(XP_UNIX) 35 | +#if defined(MOZ_X11) 36 | # include 37 | # if defined(MOZ_X11) 38 | # include 39 | @@ -211,7 +211,7 @@ typedef struct _NPAsyncSurface { 40 | /* Exact meaning must be spec'd in event model. */ 41 | # define kNPEventStartIME 2 42 | 43 | -# if defined(XP_UNIX) 44 | +# if 0 45 | /* 46 | * Unix specific structures and definitions 47 | */ 48 | @@ -229,7 +229,7 @@ typedef struct { 49 | 50 | typedef struct { 51 | int32_t type; 52 | -# if defined(MOZ_X11) 53 | +# if 0 54 | Display* display; 55 | Visual* visual; 56 | Colormap colormap; 57 | @@ -291,7 +291,7 @@ typedef enum { 58 | , 59 | NPDrawingModelSyncWin = 5 60 | # endif 61 | -# if defined(MOZ_X11) 62 | +# if 0 63 | , 64 | NPDrawingModelSyncX = 6 65 | # endif 66 | @@ -330,7 +330,7 @@ typedef enum { 67 | * gcc 3.x generated vtables on UNIX and OSX are incompatible with 68 | * previous compilers. 69 | */ 70 | -# if (defined(XP_UNIX) && defined(__GNUC__) && (__GNUC__ >= 3)) 71 | +# if 0 72 | # define _NP_ABI_MIXIN_FOR_GCC3 NP_ABI_GCC3_MASK 73 | # else 74 | # define _NP_ABI_MIXIN_FOR_GCC3 0 75 | @@ -530,7 +530,7 @@ typedef struct _NPWindow { 76 | uint32_t width; /* Maximum window size */ 77 | uint32_t height; 78 | NPRect clipRect; /* Clipping rectangle in port coordinates */ 79 | -# if (defined(XP_UNIX) || defined(XP_SYMBIAN)) && !defined(XP_MACOSX) 80 | +# if (defined(XP_SYMBIAN)) && !defined(XP_MACOSX) 81 | void* ws_info; /* Platform-dependent additional data */ 82 | # endif /* XP_UNIX */ 83 | NPWindowType type; /* Is this a window or a drawable? */ 84 | @@ -583,7 +583,7 @@ typedef struct _NPEvent { 85 | uintptr_t wParam; 86 | intptr_t lParam; 87 | } NPEvent; 88 | -# elif defined(XP_UNIX) && defined(MOZ_X11) 89 | +# elif 0 90 | typedef XEvent NPEvent; 91 | # else 92 | typedef void* NPEvent; 93 | @@ -597,7 +597,7 @@ typedef RgnHandle NPQDRegion; 94 | typedef CGPathRef NPCGRegion; 95 | # elif defined(XP_WIN) 96 | typedef HRGN NPRegion; 97 | -# elif defined(XP_UNIX) && defined(MOZ_X11) 98 | +# elif 0 99 | typedef Region NPRegion; 100 | # elif defined(XP_SYMBIAN) 101 | typedef QRegion* NPRegion; 102 | @@ -828,7 +828,7 @@ extern "C" { 103 | 104 | /* NPP_* functions are provided by the plugin and called by the navigator. */ 105 | 106 | -# if defined(XP_UNIX) 107 | +# if 0 108 | const char* NPP_GetMIMEDescription(void); 109 | # endif 110 | 111 | diff --git a/dom/plugins/base/nsNPAPIPlugin.cpp b/dom/plugins/base/nsNPAPIPlugin.cpp 112 | index 6d30257..c704df8 100644 113 | --- a/dom/plugins/base/nsNPAPIPlugin.cpp 114 | +++ b/dom/plugins/base/nsNPAPIPlugin.cpp 115 | @@ -58,7 +58,7 @@ 116 | #endif 117 | 118 | // needed for nppdf plugin 119 | -#if (MOZ_WIDGET_GTK) 120 | +#if 0 121 | # include 122 | # include 123 | #endif 124 | @@ -77,7 +77,7 @@ using mozilla::PluginLibrary; 125 | using mozilla::plugins::PluginModuleChromeParent; 126 | using mozilla::plugins::PluginModuleContentParent; 127 | 128 | -#ifdef MOZ_X11 129 | +#if 0 130 | # include "mozilla/X11Util.h" 131 | #endif 132 | 133 | @@ -1227,9 +1227,9 @@ NPError _getvalue(NPP npp, NPNVariable variable, void* result) { 134 | // Cast NPNVariable enum to int to avoid warnings about including switch 135 | // cases for android_npapi.h's non-standard ANPInterface values. 136 | switch (static_cast(variable)) { 137 | -#if defined(XP_UNIX) && !defined(XP_MACOSX) 138 | +#if 0 139 | case NPNVxDisplay: { 140 | -# if defined(MOZ_X11) 141 | +# if 0 142 | if (npp) { 143 | nsNPAPIPluginInstance* inst = (nsNPAPIPluginInstance*)npp->ndata; 144 | bool windowless = false; 145 | @@ -1263,7 +1263,7 @@ NPError _getvalue(NPP npp, NPNVariable variable, void* result) { 146 | return NPERR_GENERIC_ERROR; 147 | #endif 148 | 149 | -#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) 150 | +#if defined(XP_WIN) 151 | case NPNVnetscapeWindow: { 152 | if (!npp || !npp->ndata) return NPERR_INVALID_INSTANCE_ERROR; 153 | 154 | @@ -1305,7 +1305,7 @@ NPError _getvalue(NPP npp, NPNVariable variable, void* result) { 155 | } 156 | 157 | case NPNVToolkit: { 158 | -#ifdef MOZ_WIDGET_GTK 159 | +#if 0 160 | *((NPNToolkitType*)result) = NPNVGtk2; 161 | #endif 162 | 163 | @@ -1315,7 +1315,7 @@ NPError _getvalue(NPP npp, NPNVariable variable, void* result) { 164 | } 165 | 166 | case NPNVSupportsXEmbedBool: { 167 | -#ifdef MOZ_WIDGET_GTK 168 | +#if 0 169 | *(NPBool*)result = true; 170 | #else 171 | *(NPBool*)result = false; 172 | @@ -1336,8 +1336,7 @@ NPError _getvalue(NPP npp, NPNVariable variable, void* result) { 173 | } 174 | 175 | case NPNVSupportsWindowless: { 176 | -#if defined(XP_WIN) || defined(XP_MACOSX) || \ 177 | - (defined(MOZ_X11) && defined(MOZ_WIDGET_GTK)) 178 | +#if defined(XP_WIN) || defined(XP_MACOSX) 179 | *(NPBool*)result = true; 180 | #else 181 | *(NPBool*)result = false; 182 | diff --git a/dom/plugins/base/nsNPAPIPluginInstance.cpp b/dom/plugins/base/nsNPAPIPluginInstance.cpp 183 | index a1462f6..b878c4e 100644 184 | --- a/dom/plugins/base/nsNPAPIPluginInstance.cpp 185 | +++ b/dom/plugins/base/nsNPAPIPluginInstance.cpp 186 | @@ -317,7 +317,7 @@ nsresult nsNPAPIPluginInstance::SetWindow(NPWindow* window) { 187 | // NPAPI plugins don't want a SetWindow(nullptr). 188 | if (!window || RUNNING != mRunning) return NS_OK; 189 | 190 | -#if MOZ_WIDGET_GTK 191 | +#if 0 192 | // bug 108347, flash plugin on linux doesn't like window->width <= 0 193 | return NS_OK; 194 | #endif 195 | diff --git a/dom/plugins/base/nsNPAPIPluginInstance.h b/dom/plugins/base/nsNPAPIPluginInstance.h 196 | index 1ca2569..16a9706 100644 197 | --- a/dom/plugins/base/nsNPAPIPluginInstance.h 198 | +++ b/dom/plugins/base/nsNPAPIPluginInstance.h 199 | @@ -38,7 +38,7 @@ class Element; 200 | 201 | #if defined(OS_WIN) 202 | const NPDrawingModel kDefaultDrawingModel = NPDrawingModelSyncWin; 203 | -#elif defined(MOZ_X11) 204 | +#elif 0 205 | const NPDrawingModel kDefaultDrawingModel = NPDrawingModelSyncX; 206 | #elif defined(XP_MACOSX) 207 | # ifndef NP_NO_QUICKDRAW 208 | diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp 209 | index 4cc7d89..d35bcb9 100644 210 | --- a/dom/plugins/base/nsPluginHost.cpp 211 | +++ b/dom/plugins/base/nsPluginHost.cpp 212 | @@ -112,7 +112,7 @@ 213 | # include "windows.h" 214 | # include "winbase.h" 215 | #endif 216 | -#if (MOZ_WIDGET_GTK) 217 | +#if 0 218 | # include 219 | # include 220 | #endif 221 | @@ -289,7 +289,7 @@ nsPluginHost::nsPluginHost() 222 | Preferences::GetBool("plugin.override_internal_types", false); 223 | 224 | bool waylandBackend = false; 225 | -#if defined(MOZ_WIDGET_GTK) && defined(MOZ_X11) 226 | +#if 0 227 | GdkDisplay* display = gdk_display_get_default(); 228 | if (display) { 229 | waylandBackend = !GDK_IS_X11_DISPLAY(display); 230 | --- a/dom/plugins/base/nsPluginNativeWindow.cpp 231 | +++ b/dom/plugins/base/nsPluginNativeWindow.cpp 232 | @@ -17,7 +17,7 @@ class nsPluginNativeWindowImpl : public nsPluginNativeWindow { 233 | nsPluginNativeWindowImpl(); 234 | virtual ~nsPluginNativeWindowImpl(); 235 | 236 | -#if defined(MOZ_WIDGET_GTK) && defined(MOZ_X11) 237 | +#if 0 238 | NPSetWindowCallbackStruct mWsInfo; 239 | #endif 240 | }; 241 | @@ -32,14 +32,14 @@ nsPluginNativeWindowImpl::nsPluginNativeWindowImpl() : nsPluginNativeWindow() { 242 | memset(&clipRect, 0, sizeof(clipRect)); 243 | type = NPWindowTypeWindow; 244 | 245 | -#if defined(MOZ_WIDGET_GTK) && defined(MOZ_X11) 246 | +#if 0 247 | ws_info = &mWsInfo; 248 | mWsInfo.type = 0; 249 | mWsInfo.display = nullptr; 250 | mWsInfo.visual = nullptr; 251 | mWsInfo.colormap = 0; 252 | mWsInfo.depth = 0; 253 | -#elif defined(XP_UNIX) && !defined(XP_MACOSX) 254 | +#elif 0 255 | ws_info = nullptr; 256 | #endif 257 | } 258 | diff --git a/dom/plugins/ipc/NPEventUnix.h b/dom/plugins/ipc/NPEventUnix.h 259 | index 55494b4..822d3b8 100644 260 | --- a/dom/plugins/ipc/NPEventUnix.h 261 | +++ b/dom/plugins/ipc/NPEventUnix.h 262 | @@ -9,7 +9,7 @@ 263 | 264 | #include "npapi.h" 265 | 266 | -#ifdef MOZ_X11 267 | +#if 0 268 | # include "mozilla/X11Util.h" 269 | #endif 270 | 271 | @@ -59,7 +59,7 @@ struct ParamTraits // synonym for XEvent 272 | return false; 273 | } 274 | 275 | -#ifdef MOZ_X11 276 | +#if 0 277 | SetXDisplay(aResult->event); 278 | #endif 279 | return true; 280 | @@ -70,7 +70,7 @@ struct ParamTraits // synonym for XEvent 281 | aLog->append(L"(XEvent)"); 282 | } 283 | 284 | -#ifdef MOZ_X11 285 | +#if 0 286 | private: 287 | static void SetXDisplay(XEvent& ev) { 288 | Display* display = mozilla::DefaultXDisplay(); 289 | diff --git a/dom/plugins/ipc/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp 290 | index 403a735..fbe273a 100644 291 | --- a/dom/plugins/ipc/PluginInstanceChild.cpp 292 | +++ b/dom/plugins/ipc/PluginInstanceChild.cpp 293 | @@ -16,7 +16,7 @@ 294 | #include "nsNPAPIPluginInstance.h" 295 | #include "mozilla/gfx/2D.h" 296 | #include "mozilla/gfx/Logging.h" 297 | -#ifdef MOZ_X11 298 | +#if 0 299 | # include "gfxXlibSurface.h" 300 | #endif 301 | #ifdef XP_WIN 302 | @@ -45,7 +45,7 @@ using namespace mozilla::layers; 303 | using namespace mozilla::gfx; 304 | using namespace mozilla::widget; 305 | 306 | -#ifdef MOZ_WIDGET_GTK 307 | +#if 0 308 | 309 | # include 310 | # include 311 | @@ -189,10 +189,10 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface, 312 | mWindow.type = NPWindowTypeWindow; 313 | mData.ndata = (void*)this; 314 | mData.pdata = nullptr; 315 | -#if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX) 316 | +#if 0 317 | mWindow.ws_info = &mWsInfo; 318 | memset(&mWsInfo, 0, sizeof(mWsInfo)); 319 | -# ifdef MOZ_WIDGET_GTK 320 | +# if 1 321 | mWsInfo.display = nullptr; 322 | # else 323 | mWsInfo.display = DefaultXDisplay(); 324 | @@ -357,7 +357,7 @@ NPError PluginInstanceChild::NPN_GetValue(NPNVariable aVar, void* aValue) { 325 | AutoStackHelper guard(this); 326 | 327 | switch (aVar) { 328 | -#if defined(MOZ_X11) 329 | +#if 0 330 | case NPNVToolkit: 331 | *((NPNToolkitType*)aValue) = NPNVGtk2; 332 | return NPERR_NO_ERROR; 333 | @@ -429,7 +429,7 @@ NPError PluginInstanceChild::NPN_GetValue(NPNVariable aVar, void* aValue) { 334 | *static_cast(aValue) = mPluginWindowHWND; 335 | return NPERR_NO_ERROR; 336 | } 337 | -#elif defined(MOZ_X11) 338 | +#elif 0 339 | NPError result; 340 | CallNPN_GetValue_NPNVnetscapeWindow(static_cast(aValue), &result); 341 | return result; 342 | @@ -843,7 +843,7 @@ mozilla::ipc::IPCResult PluginInstanceChild::AnswerNPP_HandleEvent( 343 | AssertPluginThread(); 344 | AutoStackHelper guard(this); 345 | 346 | -#if defined(MOZ_X11) && defined(DEBUG) 347 | +#if 0 348 | if (GraphicsExpose == event.event.type) 349 | PLUGIN_LOG_DEBUG( 350 | (" received drawable 0x%lx\n", event.event.xgraphicsexpose.drawable)); 351 | @@ -900,7 +900,7 @@ mozilla::ipc::IPCResult PluginInstanceChild::AnswerNPP_HandleEvent( 352 | } 353 | #endif 354 | 355 | -#ifdef MOZ_X11 356 | +#if 0 357 | if (GraphicsExpose == event.event.type) { 358 | // Make sure the X server completes the drawing before the parent 359 | // draws on top and destroys the Drawable. 360 | @@ -1155,7 +1155,7 @@ mozilla::ipc::IPCResult PluginInstanceChild::AnswerNPP_SetWindow( 361 | AssertPluginThread(); 362 | AutoStackHelper guard(this); 363 | 364 | -#if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX) 365 | +#if 0 366 | NS_ASSERTION(mWsInfo.display, "We should have a valid display!"); 367 | 368 | // The minimum info is sent over IPC to allow this 369 | @@ -1251,14 +1251,14 @@ mozilla::ipc::IPCResult PluginInstanceChild::AnswerNPP_SetWindow( 370 | #elif defined(MOZ_WIDGET_UIKIT) || defined(MOZ_WAYLAND) 371 | // Don't care 372 | #else 373 | -# error Implement me for your OS 374 | +//# error Implement me for your OS 375 | #endif 376 | 377 | return IPC_OK(); 378 | } 379 | 380 | bool PluginInstanceChild::Initialize() { 381 | -#if defined(MOZ_WIDGET_GTK) && defined(MOZ_X11) 382 | +#if 0 383 | if (mWsInfo.display) { 384 | // Already initialized 385 | return true; 386 | @@ -2846,7 +2846,7 @@ bool PluginInstanceChild::CreateOptSurface(void) { 387 | ? SurfaceFormat::A8R8G8B8_UINT32 388 | : SurfaceFormat::X8R8G8B8_UINT32; 389 | 390 | -#ifdef MOZ_X11 391 | +#if 0 392 | Display* dpy = mWsInfo.display; 393 | Screen* screen = DefaultScreenOfDisplay(dpy); 394 | if (format == SurfaceFormat::X8R8G8B8_UINT32 && 395 | @@ -2902,7 +2902,7 @@ bool PluginInstanceChild::MaybeCreatePlatformHelperSurface(void) { 396 | return false; 397 | } 398 | 399 | -#ifdef MOZ_X11 400 | +#if 0 401 | bool supportNonDefaultVisual = false; 402 | Screen* screen = DefaultScreenOfDisplay(mWsInfo.display); 403 | Visual* defaultVisual = DefaultVisualOfScreen(screen); 404 | @@ -3054,12 +3054,12 @@ bool PluginInstanceChild::EnsureCurrentBuffer(void) { 405 | } 406 | 407 | void PluginInstanceChild::UpdateWindowAttributes(bool aForceSetWindow) { 408 | -#if defined(MOZ_X11) || defined(XP_WIN) 409 | +#if 0 410 | RefPtr curSurface = 411 | mHelperSurface ? mHelperSurface : mCurrentSurface; 412 | #endif // Only used within MOZ_X11 or XP_WIN blocks. Unused variable otherwise 413 | bool needWindowUpdate = aForceSetWindow; 414 | -#ifdef MOZ_X11 415 | +#if 0 416 | Visual* visual = nullptr; 417 | Colormap colormap = 0; 418 | if (curSurface && curSurface->GetType() == gfxSurfaceType::Xlib) { 419 | @@ -3158,7 +3158,7 @@ void PluginInstanceChild::PaintRectToPlatformSurface(const nsIntRect& aRect, 420 | // We should not send an async surface if we're using direct rendering. 421 | MOZ_ASSERT(!IsUsingDirectDrawing()); 422 | 423 | -#ifdef MOZ_X11 424 | +#if 0 425 | { 426 | NS_ASSERTION(aSurface->GetType() == gfxSurfaceType::Xlib, 427 | "Non supported platform surface type"); 428 | @@ -3206,7 +3206,7 @@ void PluginInstanceChild::PaintRectToSurface(const nsIntRect& aRect, 429 | // Render using temporary X surface, with copy to image surface 430 | nsIntRect plPaintRect(aRect); 431 | RefPtr renderSurface = aSurface; 432 | -#ifdef MOZ_X11 433 | +#if 0 434 | if (mIsTransparent && (GetQuirks() & QUIRK_FLASH_EXPOSE_COORD_TRANSLATION)) { 435 | // Work around a bug in Flash up to 10.1 d51 at least, where expose event 436 | // top left coordinates within the plugin-rect and not at the drawable 437 | @@ -3549,7 +3549,7 @@ bool PluginInstanceChild::ShowPluginFrame() { 438 | NPRect r = {(uint16_t)rect.y, (uint16_t)rect.x, (uint16_t)rect.YMost(), 439 | (uint16_t)rect.XMost()}; 440 | SurfaceDescriptor currSurf; 441 | -#ifdef MOZ_X11 442 | +#if 0 443 | if (mCurrentSurface->GetType() == gfxSurfaceType::Xlib) { 444 | gfxXlibSurface* xsurf = static_cast(mCurrentSurface.get()); 445 | currSurf = SurfaceDescriptorX11(xsurf); 446 | @@ -3597,7 +3597,7 @@ bool PluginInstanceChild::ReadbackDifferenceRect(const nsIntRect& rect) { 447 | 448 | // We can read safely from XSurface,SharedDIBSurface and Unsafe 449 | // SharedMemory, because PluginHost is not able to modify that surface 450 | -#if defined(MOZ_X11) 451 | +#if 0 452 | if (mBackSurface->GetType() != gfxSurfaceType::Xlib && 453 | !gfxSharedImageSurface::IsSharedImage(mBackSurface)) 454 | return false; 455 | @@ -3605,7 +3605,7 @@ bool PluginInstanceChild::ReadbackDifferenceRect(const nsIntRect& rect) { 456 | if (!SharedDIBSurface::IsSharedDIBSurface(mBackSurface)) return false; 457 | #endif 458 | 459 | -#if defined(MOZ_X11) || defined(XP_WIN) 460 | +#if 0 461 | if (mCurrentSurface->GetContentType() != mBackSurface->GetContentType()) 462 | return false; 463 | 464 | @@ -3723,7 +3723,7 @@ mozilla::ipc::IPCResult PluginInstanceChild::RecvUpdateBackground( 465 | if (!mBackground) { 466 | // XXX refactor me 467 | switch (aBackground.type()) { 468 | -#ifdef MOZ_X11 469 | +#if 0 470 | case SurfaceDescriptor::TSurfaceDescriptorX11: { 471 | mBackground = aBackground.get_SurfaceDescriptorX11().OpenForeign(); 472 | break; 473 | diff --git a/dom/plugins/ipc/PluginInstanceChild.h b/dom/plugins/ipc/PluginInstanceChild.h 474 | index 479c060..512a0cb 100644 475 | --- a/dom/plugins/ipc/PluginInstanceChild.h 476 | +++ b/dom/plugins/ipc/PluginInstanceChild.h 477 | @@ -363,7 +363,7 @@ class PluginInstanceChild : public PPluginInstanceChild { 478 | PluginScriptableObjectChild* mCachedWindowActor; 479 | PluginScriptableObjectChild* mCachedElementActor; 480 | 481 | -#if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX) 482 | +#if 0 483 | NPSetWindowCallbackStruct mWsInfo; 484 | #elif defined(OS_WIN) 485 | HWND mPluginWindowHWND; 486 | diff --git a/dom/plugins/ipc/PluginInstanceParent.cpp b/dom/plugins/ipc/PluginInstanceParent.cpp 487 | index 6e29171..5cb7ae7 100644 488 | --- a/dom/plugins/ipc/PluginInstanceParent.cpp 489 | +++ b/dom/plugins/ipc/PluginInstanceParent.cpp 490 | @@ -27,7 +27,7 @@ 491 | #include "nsNPAPIPluginInstance.h" 492 | #include "nsPluginInstanceOwner.h" 493 | #include "nsFocusManager.h" 494 | -#ifdef MOZ_X11 495 | +#if 0 496 | # include "gfxXlibSurface.h" 497 | #endif 498 | #include "gfxUtils.h" 499 | @@ -62,7 +62,7 @@ 500 | # include "GPUVideoImage.h" 501 | # include "mozilla/layers/SynchronousTask.h" 502 | extern const wchar_t* kFlashFullscreenClass; 503 | -#elif defined(MOZ_WIDGET_GTK) 504 | +#elif 0 505 | # include "mozilla/dom/ContentChild.h" 506 | # include 507 | #elif defined(XP_MACOSX) 508 | @@ -183,7 +183,7 @@ void PluginInstanceParent::ActorDestroy(ActorDestroyReason why) { 509 | if (mImageContainer) { 510 | mImageContainer->ClearAllImages(); 511 | } 512 | -#ifdef MOZ_X11 513 | +#if 0 514 | FinishX(DefaultXDisplay()); 515 | #endif 516 | } 517 | @@ -228,7 +228,7 @@ PluginInstanceParent::AnswerNPN_GetValue_NPNVnetscapeWindow( 518 | #ifdef XP_WIN 519 | HWND id; 520 | #elif defined(MOZ_X11) 521 | - XID id; 522 | + int id; 523 | #elif defined(XP_DARWIN) 524 | intptr_t id; 525 | #elif defined(ANDROID) || defined(MOZ_WAYLAND) 526 | @@ -406,7 +406,7 @@ PluginInstanceParent::AnswerNPN_SetValue_NPPVpluginDrawingModel( 527 | case NPDrawingModelAsyncWindowsDXGISurface: 528 | allowed = SupportsPluginDirectDXGISurfaceDrawing(); 529 | break; 530 | -#elif defined(MOZ_X11) 531 | +#elif 0 532 | case NPDrawingModelSyncX: 533 | allowed = true; 534 | break; 535 | @@ -969,7 +969,7 @@ mozilla::ipc::IPCResult PluginInstanceParent::RecvShow( 536 | return IPC_OK(); 537 | } 538 | #endif 539 | -#ifdef MOZ_X11 540 | +#if 0 541 | else if (newSurface.type() == SurfaceDescriptor::TSurfaceDescriptorX11) { 542 | surface = newSurface.get_SurfaceDescriptorX11().OpenForeign(); 543 | } 544 | @@ -986,7 +986,7 @@ mozilla::ipc::IPCResult PluginInstanceParent::RecvShow( 545 | // This is the "old front buffer" we're about to hand back to 546 | // the plugin. We might still have drawing operations 547 | // referencing it. 548 | -#ifdef MOZ_X11 549 | +#if 0 550 | if (mFrontSurface->GetType() == gfxSurfaceType::Xlib) { 551 | // Finish with the surface and XSync here to ensure the server has 552 | // finished operations on the surface before the plugin starts 553 | @@ -1225,7 +1225,7 @@ nsresult PluginInstanceParent::EndUpdateBackground(const nsIntRect& aRect) { 554 | ("[InstanceParent][%p] EndUpdateBackground for ", 555 | this, aRect.x, aRect.y, aRect.width, aRect.height)); 556 | 557 | -#ifdef MOZ_X11 558 | +#if 0 559 | // Have to XSync here to avoid the plugin trying to draw with this 560 | // surface racing with its creation in the X server. We also want 561 | // to avoid the plugin drawing onto stale pixels, then handing us 562 | @@ -1271,7 +1271,7 @@ bool PluginInstanceParent::CreateBackground(const nsIntSize& aSize) { 563 | 564 | // XXX refactor me 565 | 566 | -#if defined(MOZ_X11) 567 | +#if 0 568 | Screen* screen = DefaultScreenOfDisplay(DefaultXDisplay()); 569 | Visual* visual = DefaultVisualOfScreen(screen); 570 | mBackground = gfxXlibSurface::Create( 571 | @@ -1311,7 +1311,7 @@ PluginInstanceParent::BackgroundDescriptor() { 572 | 573 | // XXX refactor me 574 | 575 | -#ifdef MOZ_X11 576 | +#if 0 577 | gfxXlibSurface* xsurf = static_cast(mBackground.get()); 578 | return SurfaceDescriptorX11(xsurf); 579 | #endif 580 | @@ -1428,7 +1428,7 @@ NPError PluginInstanceParent::NPP_SetWindow(const NPWindow* aWindow) { 581 | } 582 | #endif 583 | 584 | -#if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX) 585 | +#if 0 586 | const NPSetWindowCallbackStruct* ws_info = 587 | static_cast(aWindow->ws_info); 588 | window.visualID = ws_info->visual ? ws_info->visual->visualid : 0; 589 | @@ -1622,7 +1622,7 @@ int16_t PluginInstanceParent::NPP_HandleEvent(void* event) { 590 | } 591 | #endif 592 | 593 | -#if defined(MOZ_X11) 594 | +#if 0 595 | switch (npevent->type) { 596 | case GraphicsExpose: 597 | PLUGIN_LOG_DEBUG((" schlepping drawable 0x%lx across the pipe\n", 598 | @@ -1642,7 +1642,7 @@ int16_t PluginInstanceParent::NPP_HandleEvent(void* event) { 599 | // Release any active pointer grab so that the plugin X client can 600 | // grab the pointer if it wishes. 601 | Display* dpy = DefaultXDisplay(); 602 | -# ifdef MOZ_WIDGET_GTK 603 | +# if 0 604 | // GDK attempts to (asynchronously) track whether there is an active 605 | // grab so ungrab through GDK. 606 | // 607 | diff --git a/dom/plugins/ipc/PluginMessageUtils.cpp b/dom/plugins/ipc/PluginMessageUtils.cpp 608 | index 4d639b6..4e585fc 100644 609 | --- a/dom/plugins/ipc/PluginMessageUtils.cpp 610 | +++ b/dom/plugins/ipc/PluginMessageUtils.cpp 611 | @@ -49,7 +49,7 @@ NPRemoteWindow::NPRemoteWindow() 612 | width(0), 613 | height(0), 614 | type(NPWindowTypeDrawable) 615 | -#if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX) 616 | +#if 0 617 | , 618 | visualID(0), 619 | colormap(0) 620 | @@ -81,7 +81,7 @@ ipc::RacyInterruptPolicy MediateRace(const MessageChannel::MessageInfo& parent, 621 | } 622 | } 623 | 624 | -#if defined(OS_LINUX) || defined(OS_SOLARIS) 625 | +#if defined(OS_SOLARIS) 626 | static string ReplaceAll(const string& haystack, const string& needle, 627 | const string& with) { 628 | string munged = haystack; 629 | @@ -97,7 +97,7 @@ static string ReplaceAll(const string& haystack, const string& needle, 630 | #endif 631 | 632 | string MungePluginDsoPath(const string& path) { 633 | -#if defined(OS_LINUX) || defined(OS_SOLARIS) 634 | +#if defined(OS_SOLARIS) 635 | // https://bugzilla.mozilla.org/show_bug.cgi?id=519601 636 | return ReplaceAll(path, "netscape", "netsc@pe"); 637 | #else 638 | @@ -106,7 +106,7 @@ string MungePluginDsoPath(const string& path) { 639 | } 640 | 641 | string UnmungePluginDsoPath(const string& munged) { 642 | -#if defined(OS_LINUX) || defined(OS_SOLARIS) 643 | +#if defined(OS_SOLARIS) 644 | return ReplaceAll(munged, "netsc@pe", "netscape"); 645 | #else 646 | return munged; 647 | diff --git a/dom/plugins/ipc/PluginMessageUtils.h b/dom/plugins/ipc/PluginMessageUtils.h 648 | index c21aa10..7bf8180 100644 649 | --- a/dom/plugins/ipc/PluginMessageUtils.h 650 | +++ b/dom/plugins/ipc/PluginMessageUtils.h 651 | @@ -87,7 +87,7 @@ struct NPRemoteWindow { 652 | uint32_t height; 653 | NPRect clipRect; 654 | NPWindowType type; 655 | -#if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX) 656 | +#if 0 657 | VisualID visualID; 658 | Colormap colormap; 659 | #endif /* XP_UNIX */ 660 | @@ -113,9 +113,9 @@ struct NPAudioDeviceStateChangedIPC { 661 | 662 | #ifdef XP_WIN 663 | typedef HWND NativeWindowHandle; 664 | -#elif defined(MOZ_X11) 665 | +#elif 0 666 | typedef XID NativeWindowHandle; 667 | -#elif defined(XP_DARWIN) || defined(ANDROID) || defined(MOZ_WAYLAND) 668 | +#elif defined(XP_DARWIN) || defined(ANDROID) || defined(MOZ_WAYLAND) || defined(MOZ_X11) 669 | typedef intptr_t NativeWindowHandle; // never actually used, will always be 0 670 | #else 671 | # error Need NativeWindowHandle for this platform 672 | @@ -323,7 +323,7 @@ struct ParamTraits { 673 | WriteParam(aMsg, aParam.height); 674 | WriteParam(aMsg, aParam.clipRect); 675 | WriteParam(aMsg, aParam.type); 676 | -#if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX) 677 | +#if 0 678 | aMsg->WriteULong(aParam.visualID); 679 | aMsg->WriteULong(aParam.colormap); 680 | #endif 681 | @@ -345,7 +345,7 @@ struct ParamTraits { 682 | ReadParam(aMsg, aIter, &clipRect) && ReadParam(aMsg, aIter, &type))) 683 | return false; 684 | 685 | -#if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX) 686 | +#if 0 687 | unsigned long visualID; 688 | unsigned long colormap; 689 | if (!(aMsg->ReadULong(aIter, &visualID) && 690 | @@ -365,7 +365,7 @@ struct ParamTraits { 691 | aResult->height = height; 692 | aResult->clipRect = clipRect; 693 | aResult->type = type; 694 | -#if defined(MOZ_X11) && defined(XP_UNIX) && !defined(XP_MACOSX) 695 | +#if 0 696 | aResult->visualID = visualID; 697 | aResult->colormap = colormap; 698 | #endif 699 | diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp 700 | index 81eb846..1d17be7 100644 701 | --- a/dom/plugins/ipc/PluginModuleChild.cpp 702 | +++ b/dom/plugins/ipc/PluginModuleChild.cpp 703 | @@ -12,7 +12,7 @@ 704 | 705 | #include "mozilla/ipc/MessageChannel.h" 706 | 707 | -#ifdef MOZ_WIDGET_GTK 708 | +#if 0 709 | # include 710 | # include 711 | #endif 712 | @@ -25,7 +25,7 @@ 713 | #include "nsPluginsDir.h" 714 | #include "nsXULAppAPI.h" 715 | 716 | -#ifdef MOZ_X11 717 | +#if 0 718 | # include "nsX11ErrorHandler.h" 719 | # include "mozilla/X11Util.h" 720 | #endif 721 | @@ -101,7 +101,7 @@ PluginModuleChild::PluginModuleChild(bool aIsChrome) 722 | #if defined(OS_WIN) || defined(OS_MACOSX) 723 | , 724 | mGetEntryPointsFunc(0) 725 | -#elif defined(MOZ_WIDGET_GTK) 726 | +#elif 0 727 | , 728 | mNestedLoopTimerId(0) 729 | #endif 730 | @@ -255,7 +255,7 @@ bool PluginModuleChild::InitForChrome(const std::string& aPluginFilename, 731 | // XXX quirks isn't initialized yet 732 | mAsyncRenderSupport = info.fSupportsAsyncRender; 733 | #endif 734 | -#if defined(MOZ_X11) 735 | +#if 0 736 | constexpr auto flash10Head = "Shockwave Flash 10."_ns; 737 | if (StringBeginsWith(nsDependentCString(info.fDescription), flash10Head)) { 738 | AddQuirk(QUIRK_FLASH_EXPOSE_COORD_TRANSLATION); 739 | @@ -268,7 +268,7 @@ bool PluginModuleChild::InitForChrome(const std::string& aPluginFilename, 740 | mozilla::plugins::PluginUtilsOSX::SetProcessName(nameBuffer); 741 | #endif 742 | pluginFile.FreePluginInfo(info); 743 | -#if defined(MOZ_X11) || defined(XP_MACOSX) 744 | +#if 0 745 | if (!mLibrary) 746 | #endif 747 | { 748 | @@ -331,7 +331,7 @@ bool PluginModuleChild::InitForChrome(const std::string& aPluginFilename, 749 | return true; 750 | } 751 | 752 | -#if defined(MOZ_WIDGET_GTK) 753 | +#if 0 754 | 755 | typedef void (*GObjectDisposeFn)(GObject*); 756 | typedef gboolean (*GtkWidgetScrollEventFn)(GtkWidget*, GdkEventScroll*); 757 | @@ -551,7 +551,7 @@ bool PluginModuleChild::ShouldContinueFromReplyTimeout() { 758 | } 759 | 760 | bool PluginModuleChild::InitGraphics() { 761 | -#if defined(MOZ_WIDGET_GTK) 762 | +#if 0 763 | // Work around plugins that don't interact well with GDK 764 | // client-side windows. 765 | PR_SetEnv("GDK_NATIVE_WINDOWS=1"); 766 | @@ -589,7 +589,7 @@ bool PluginModuleChild::InitGraphics() { 767 | #else 768 | // may not be necessary on all platforms 769 | #endif 770 | -#ifdef MOZ_X11 771 | +#if 0 772 | // Do this after initializing GDK, or GDK will install its own handler. 773 | InstallX11ErrorHandler(); 774 | #endif 775 | @@ -597,7 +597,7 @@ bool PluginModuleChild::InitGraphics() { 776 | } 777 | 778 | void PluginModuleChild::DeinitGraphics() { 779 | -#if defined(MOZ_X11) && defined(NS_FREE_PERMANENT_DATA) 780 | +#if 0 781 | // We free some data off of XDisplay close hooks, ensure they're 782 | // run. Closing the display is pretty scary, so we only do it to 783 | // silence leak checkers. 784 | @@ -995,7 +995,7 @@ NPError _getvalue(NPP aNPP, NPNVariable aVariable, void* aValue) { 785 | switch (aVariable) { 786 | // Copied from nsNPAPIPlugin.cpp 787 | case NPNVToolkit: 788 | -#if defined(MOZ_WIDGET_GTK) 789 | +#if 0 790 | *static_cast(aValue) = NPNVGtk2; 791 | return NPERR_NO_ERROR; 792 | #endif 793 | @@ -1021,7 +1021,7 @@ NPError _getvalue(NPP aNPP, NPNVariable aVariable, void* aValue) { 794 | case NPNVSupportsWindowless: 795 | *(NPBool*)aValue = true; 796 | return NPERR_NO_ERROR; 797 | -#if defined(MOZ_WIDGET_GTK) 798 | +#if 0 799 | case NPNVxDisplay: { 800 | if (!aNPP) { 801 | return NPERR_INVALID_INSTANCE_ERROR; 802 | @@ -1549,8 +1549,8 @@ NPError PluginModuleChild::DoNP_Initialize(const PluginSettings& aSettings) { 803 | SetEventHooks(); 804 | #endif 805 | 806 | -#ifdef MOZ_X11 807 | -# ifdef MOZ_WIDGET_GTK 808 | +#if 0 809 | +# if 0 810 | if (!GDK_IS_X11_DISPLAY(gdk_display_get_default())) { 811 | // We don't support NPAPI plugins on Wayland. 812 | return NPERR_GENERIC_ERROR; 813 | diff --git a/dom/plugins/ipc/PluginModuleChild.h b/dom/plugins/ipc/PluginModuleChild.h 814 | index 31d4eaf..cec8ca2 100644 815 | --- a/dom/plugins/ipc/PluginModuleChild.h 816 | +++ b/dom/plugins/ipc/PluginModuleChild.h 817 | @@ -32,7 +32,7 @@ 818 | #include "mozilla/plugins/PluginMessageUtils.h" 819 | #include "mozilla/plugins/PluginQuirks.h" 820 | 821 | -#if defined(MOZ_WIDGET_GTK) 822 | +#if 0 823 | # include 824 | #endif 825 | 826 | @@ -210,7 +210,7 @@ class PluginModuleChild : public PPluginModuleChild { 827 | bool InitGraphics(); 828 | void DeinitGraphics(); 829 | 830 | -#if defined(MOZ_WIDGET_GTK) 831 | +#if 0 832 | static gboolean DetectNestedEventLoop(gpointer data); 833 | static gboolean ProcessBrowserEvents(gpointer data); 834 | 835 | @@ -242,7 +242,7 @@ class PluginModuleChild : public PPluginModuleChild { 836 | 837 | PluginSettings mCachedSettings; 838 | 839 | -#if defined(MOZ_WIDGET_GTK) 840 | +#if 0 841 | // If a plugin spins a nested glib event loop in response to a 842 | // synchronous IPC message from the browser, the loop might break 843 | // only after the browser responds to a request sent by the 844 | diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp 845 | index 6743ed1..44ae006 100644 846 | --- a/dom/plugins/ipc/PluginModuleParent.cpp 847 | +++ b/dom/plugins/ipc/PluginModuleParent.cpp 848 | @@ -55,7 +55,7 @@ 849 | # include "PluginUtilsWin.h" 850 | #endif 851 | 852 | -#ifdef MOZ_WIDGET_GTK 853 | +#if 0 854 | # include 855 | #elif XP_MACOSX 856 | # include "PluginInterposeOSX.h" 857 | @@ -1596,7 +1596,7 @@ mozilla::ipc::IPCResult PluginModuleChromeParent:: 858 | 859 | mozilla::ipc::IPCResult PluginModuleParent::RecvBackUpXResources( 860 | const FileDescriptor& aXSocketFd) { 861 | -#ifndef MOZ_X11 862 | +#if 1 863 | MOZ_CRASH("This message only makes sense on X11 platforms"); 864 | #else 865 | MOZ_ASSERT(0 > mPluginXSocketFdDup.get(), "Already backed up X resources??"); 866 | @@ -1782,7 +1782,7 @@ void PluginModuleChromeParent::CachedSettingChanged(const char* aPref, 867 | module->CachedSettingChanged(); 868 | } 869 | 870 | -#if defined(XP_UNIX) && !defined(XP_MACOSX) 871 | +#if 0 872 | nsresult PluginModuleParent::NP_Initialize(NPNetscapeFuncs* bFuncs, 873 | NPPluginFuncs* pFuncs, 874 | NPError* error) { 875 | @@ -1837,6 +1837,22 @@ nsresult PluginModuleChromeParent::NP_Initialize(NPNetscapeFuncs* bFuncs, 876 | 877 | return NS_OK; 878 | } 879 | +#endif 880 | + 881 | +#if defined(XP_UNIX) && !defined(XP_MACOSX) 882 | +nsresult PluginModuleParent::NP_Initialize(NPNetscapeFuncs* bFuncs, 883 | + NPPluginFuncs* pFuncs, 884 | + NPError* error) { 885 | +*error = NPERR_GENERIC_ERROR; 886 | +return NS_ERROR_FAILURE; 887 | +} 888 | + 889 | +nsresult PluginModuleChromeParent::NP_Initialize(NPNetscapeFuncs* bFuncs, 890 | + NPPluginFuncs* pFuncs, 891 | + NPError* error) { 892 | + *error = NPERR_GENERIC_ERROR; 893 | + return NS_ERROR_FAILURE; 894 | +} 895 | 896 | #else 897 | 898 | @@ -2040,7 +2056,7 @@ class nsCaseInsensitiveUTF8StringArrayComparator { 899 | } 900 | }; 901 | 902 | -#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) 903 | +#if defined(XP_WIN) 904 | static void ForceWindowless(nsTArray& names, 905 | nsTArray& values) { 906 | nsCaseInsensitiveUTF8StringArrayComparator comparator; 907 | @@ -2123,7 +2139,7 @@ nsresult PluginModuleParent::NPP_NewInternal( 908 | # endif 909 | ForceWindowless(names, values); 910 | } 911 | -#elif defined(MOZ_WIDGET_GTK) 912 | +#elif 0 913 | // We no longer support windowed mode on Linux. 914 | ForceWindowless(names, values); 915 | #endif 916 | @@ -2237,7 +2253,7 @@ mozilla::ipc::IPCResult PluginModuleParent::AnswerProcessSomeEvents() { 917 | return IPC_OK(); 918 | } 919 | 920 | -#elif !defined(MOZ_WIDGET_GTK) 921 | +#elif 1 922 | mozilla::ipc::IPCResult PluginModuleParent::AnswerProcessSomeEvents() { 923 | MOZ_CRASH("unreached"); 924 | } 925 | diff --git a/dom/plugins/ipc/PluginModuleParent.h b/dom/plugins/ipc/PluginModuleParent.h 926 | index 9fd7490..b77279b 100644 927 | --- a/dom/plugins/ipc/PluginModuleParent.h 928 | +++ b/dom/plugins/ipc/PluginModuleParent.h 929 | @@ -288,7 +288,7 @@ class PluginModuleParent : public PPluginModuleParent, 930 | int32_t mSandboxLevel; 931 | bool mIsFlashPlugin; 932 | 933 | -#ifdef MOZ_X11 934 | +#if 0 935 | // Dup of plugin's X socket, used to scope its resources to this 936 | // object instead of the plugin process's lifetime 937 | ScopedClose mPluginXSocketFdDup; 938 | diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build 939 | index 62a726e..7273ba7 100644 940 | --- a/dom/plugins/ipc/moz.build 941 | +++ b/dom/plugins/ipc/moz.build 942 | @@ -139,9 +139,6 @@ DEFINES["FORCE_PR_LOG"] = True 943 | 944 | if CONFIG["MOZ_WIDGET_TOOLKIT"] != "gtk": 945 | CXXFLAGS += CONFIG["TK_CFLAGS"] 946 | -else: 947 | - # Force build against gtk+2 for struct offsets and such. 948 | - CXXFLAGS += CONFIG["MOZ_GTK2_CFLAGS"] 949 | 950 | CXXFLAGS += CONFIG["MOZ_CAIRO_CFLAGS"] 951 | 952 | diff --git a/dom/plugins/test/moz.build b/dom/plugins/test/moz.build 953 | index 7f40fb3..a2feb2f 100644 954 | --- a/dom/plugins/test/moz.build 955 | +++ b/dom/plugins/test/moz.build 956 | @@ -6,6 +6,6 @@ 957 | 958 | DIRS += ["testplugin"] 959 | 960 | -if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("gtk", "cocoa", "windows"): 961 | +if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("cocoa", "windows"): 962 | MOCHITEST_MANIFESTS += ["mochitest/mochitest.ini"] 963 | BROWSER_CHROME_MANIFESTS += ["mochitest/browser.ini"] 964 | diff --git a/dom/plugins/test/testplugin/nptest.cpp b/dom/plugins/test/testplugin/nptest.cpp 965 | index 2a9d20c..d9b6d06 100644 966 | --- a/dom/plugins/test/testplugin/nptest.cpp 967 | +++ b/dom/plugins/test/testplugin/nptest.cpp 968 | @@ -2692,7 +2692,7 @@ bool stallPlugin(NPObject* npobj, const NPVariant* args, uint32_t argCount, 969 | return true; 970 | } 971 | 972 | -#if defined(MOZ_WIDGET_GTK) 973 | +#if 0 974 | bool getClipboardText(NPObject* npobj, const NPVariant* args, uint32_t argCount, 975 | NPVariant* result) { 976 | NPP npp = static_cast(npobj)->npp; 977 | diff --git a/dom/plugins/test/testplugin/testplugin.mozbuild b/dom/plugins/test/testplugin/testplugin.mozbuild 978 | index 2c46640..ad87356 100644 979 | --- a/dom/plugins/test/testplugin/testplugin.mozbuild 980 | +++ b/dom/plugins/test/testplugin/testplugin.mozbuild 981 | @@ -18,11 +18,6 @@ if toolkit == 'cocoa': 982 | UNIFIED_SOURCES += [ 983 | 'nptest_macosx.mm' 984 | ] 985 | -elif toolkit == 'gtk': 986 | - UNIFIED_SOURCES += [ 987 | - 'nptest_gtk2.cpp', 988 | - ] 989 | -elif toolkit == 'windows': 990 | UNIFIED_SOURCES += [ 991 | 'nptest_windows.cpp', 992 | ] 993 | @@ -46,14 +41,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': 994 | if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and CONFIG['TARGET_CPU'] == 'x86_64': 995 | OS_LIBS += ['-framework Carbon'] 996 | 997 | -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': 998 | - CXXFLAGS += CONFIG['MOZ_GTK2_CFLAGS'] 999 | - CFLAGS += CONFIG['MOZ_GTK2_CFLAGS'] 1000 | - OS_LIBS += CONFIG['MOZ_GTK2_LIBS'] 1001 | - OS_LIBS += CONFIG['XLDFLAGS'] 1002 | - OS_LIBS += CONFIG['XLIBS'] 1003 | - OS_LIBS += CONFIG['XEXT_LIBS'] 1004 | - 1005 | if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': 1006 | FINAL_TARGET = 'dist/plugins/%s.plugin/Contents/MacOS' % cocoa_name 1007 | OBJDIR_FILES.dist.plugins['%s.plugin' % cocoa_name].Contents += ['%s/Info.plist' % relative_path] 1008 | diff --git a/gfx/gl/GLContextProviderGLX.cpp b/gfx/gl/GLContextProviderGLX.cpp 1009 | index 8f97256..a371581 100644 1010 | --- a/gfx/gl/GLContextProviderGLX.cpp 1011 | +++ b/gfx/gl/GLContextProviderGLX.cpp 1012 | @@ -3,7 +3,7 @@ 1013 | * License, v. 2.0. If a copy of the MPL was not distributed with this 1014 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 1015 | 1016 | -#ifdef MOZ_WIDGET_GTK 1017 | +#if 0 1018 | # include 1019 | # include 1020 | # define GET_NATIVE_WINDOW(aWidget) \ 1021 | @@ -42,7 +42,7 @@ 1022 | 1023 | #include "gfxCrashReporterUtils.h" 1024 | 1025 | -#ifdef MOZ_WIDGET_GTK 1026 | +#if MOZ_WIDGET_GTK 1027 | # include "gfxPlatformGtk.h" 1028 | #endif 1029 | 1030 | diff --git a/gfx/gl/GLContextProviderWayland.cpp b/gfx/gl/GLContextProviderWayland.cpp 1031 | index 4f7c153..25ee2d4 100644 1032 | --- a/gfx/gl/GLContextProviderWayland.cpp 1033 | +++ b/gfx/gl/GLContextProviderWayland.cpp 1034 | @@ -3,7 +3,7 @@ 1035 | * License, v. 2.0. If a copy of the MPL was not distributed with this 1036 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 1037 | 1038 | -#ifdef MOZ_WIDGET_GTK 1039 | +#if 0 1040 | # include 1041 | # include 1042 | #endif 1043 | @@ -21,41 +21,24 @@ static class GLContextProviderEGL sGLContextProviderEGL; 1044 | already_AddRefed GLContextProviderWayland::CreateForCompositorWidget( 1045 | CompositorWidget* aCompositorWidget, bool aWebRender, 1046 | bool aForceAccelerated) { 1047 | - if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) { 1048 | - return sGLContextProviderX11.CreateForCompositorWidget( 1049 | - aCompositorWidget, aWebRender, aForceAccelerated); 1050 | - } else { 1051 | return sGLContextProviderEGL.CreateForCompositorWidget( 1052 | aCompositorWidget, aWebRender, aForceAccelerated); 1053 | - } 1054 | } 1055 | 1056 | /*static*/ 1057 | already_AddRefed GLContextProviderWayland::CreateHeadless( 1058 | const GLContextCreateDesc& desc, nsACString* const out_failureId) { 1059 | - if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) { 1060 | - return sGLContextProviderX11.CreateHeadless(desc, out_failureId); 1061 | - } else { 1062 | return sGLContextProviderEGL.CreateHeadless(desc, out_failureId); 1063 | - } 1064 | } 1065 | 1066 | /*static*/ 1067 | GLContext* GLContextProviderWayland::GetGlobalContext() { 1068 | - if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) { 1069 | - return sGLContextProviderX11.GetGlobalContext(); 1070 | - } else { 1071 | return sGLContextProviderEGL.GetGlobalContext(); 1072 | - } 1073 | } 1074 | 1075 | /*static*/ 1076 | void GLContextProviderWayland::Shutdown() { 1077 | - if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) { 1078 | - sGLContextProviderX11.Shutdown(); 1079 | - } else { 1080 | sGLContextProviderEGL.Shutdown(); 1081 | - } 1082 | } 1083 | 1084 | } // namespace mozilla::gl 1085 | diff --git a/gfx/thebes/gfxGdkNativeRenderer.cpp b/gfx/thebes/gfxGdkNativeRenderer.cpp 1086 | index 49f3afd..95760b1 100644 1087 | --- a/gfx/thebes/gfxGdkNativeRenderer.cpp 1088 | +++ b/gfx/thebes/gfxGdkNativeRenderer.cpp 1089 | @@ -7,7 +7,7 @@ 1090 | #include "gfxContext.h" 1091 | #include "gfxPlatformGtk.h" 1092 | 1093 | -#ifdef MOZ_X11 1094 | +#if 0 1095 | # include 1096 | # include "cairo-xlib.h" 1097 | # include "gfxXlibSurface.h" 1098 | diff --git a/gfx/thebes/gfxGdkNativeRenderer.h b/gfx/thebes/gfxGdkNativeRenderer.h 1099 | index e11a3ba..1cfaf8c 100644 1100 | --- a/gfx/thebes/gfxGdkNativeRenderer.h 1101 | +++ b/gfx/thebes/gfxGdkNativeRenderer.h 1102 | @@ -6,9 +6,9 @@ 1103 | #ifndef GFXGDKNATIVERENDER_H_ 1104 | #define GFXGDKNATIVERENDER_H_ 1105 | 1106 | -#include 1107 | +//#include 1108 | #include "nsSize.h" 1109 | -#ifdef MOZ_X11 1110 | +#if MOZ_X11 1111 | # include "gfxXlibNativeRenderer.h" 1112 | #endif 1113 | 1114 | diff --git a/widget/gtk/mozgtk/gtk2/moz.build b/widget/gtk/mozgtk/gtk2/moz.build 1115 | deleted file mode 100644 1116 | index 93e43c3..0000000 1117 | --- a/widget/gtk/mozgtk/gtk2/moz.build 1118 | +++ /dev/null 1119 | @@ -1,40 +0,0 @@ 1120 | -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- 1121 | -# vim: set filetype=python: 1122 | -# This Source Code Form is subject to the terms of the Mozilla Public 1123 | -# License, v. 2.0. If a copy of the MPL was not distributed with this 1124 | -# file, You can obtain one at http://mozilla.org/MPL/2.0/. 1125 | - 1126 | -SOURCES += [ 1127 | - "../mozgtk.c", 1128 | -] 1129 | - 1130 | -DEFINES["GTK3_SYMBOLS"] = True 1131 | - 1132 | -SharedLibrary("mozgtk2") 1133 | - 1134 | -SHARED_LIBRARY_NAME = "mozgtk" 1135 | - 1136 | -FINAL_TARGET = "dist/bin/gtk2" 1137 | - 1138 | -# If LDFLAGS contains -Wl,--as-needed or if it's the default for the toolchain, 1139 | -# we need to add -Wl,--no-as-needed before the gtk libraries, otherwise the 1140 | -# linker will drop those dependencies because no symbols are used from them. 1141 | -# But those dependencies need to be kept for things to work properly. 1142 | -# Ideally, we'd only add -Wl,--no-as-needed if necessary, but it's just simpler 1143 | -# to add it unconditionally. This library is also simple enough that forcing 1144 | -# -Wl,--as-needed after the gtk libraries is not going to make a significant 1145 | -# difference. 1146 | -if CONFIG["GCC_USE_GNU_LD"]: 1147 | - no_as_needed = ["-Wl,--no-as-needed"] 1148 | - as_needed = ["-Wl,--as-needed"] 1149 | -else: 1150 | - no_as_needed = [] 1151 | - as_needed = [] 1152 | - 1153 | -OS_LIBS += [f for f in CONFIG["MOZ_GTK2_LIBS"] if f.startswith("-L")] 1154 | -OS_LIBS += no_as_needed 1155 | -OS_LIBS += [ 1156 | - "gtk-x11-2.0", 1157 | - "gdk-x11-2.0", 1158 | -] 1159 | -OS_LIBS += as_needed 1160 | diff --git a/widget/gtk/mozgtk/gtk3/moz.build b/widget/gtk/mozgtk/gtk3/moz.build 1161 | index b4ab68e..e6e4a6d 100644 1162 | --- a/widget/gtk/mozgtk/gtk3/moz.build 1163 | +++ b/widget/gtk/mozgtk/gtk3/moz.build 1164 | @@ -8,8 +8,6 @@ SOURCES += [ 1165 | "../mozgtk.c", 1166 | ] 1167 | 1168 | -DEFINES["GTK2_SYMBOLS"] = True 1169 | - 1170 | SharedLibrary("mozgtk") 1171 | 1172 | SONAME = "mozgtk" 1173 | diff --git a/widget/gtk/mozgtk/moz.build b/widget/gtk/mozgtk/moz.build 1174 | index 8288583..cca6db0 100644 1175 | --- a/widget/gtk/mozgtk/moz.build 1176 | +++ b/widget/gtk/mozgtk/moz.build 1177 | @@ -4,4 +4,4 @@ 1178 | # License, v. 2.0. If a copy of the MPL was not distributed with this 1179 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. 1180 | 1181 | -DIRS += ["stub", "gtk2", "gtk3"] 1182 | +DIRS += ["stub", "gtk3"] 1183 | diff --git a/widget/gtk/mozgtk/mozgtk.c b/widget/gtk/mozgtk/mozgtk.c 1184 | index 0b2e3fd..0bb4ac0 100644 1185 | --- a/widget/gtk/mozgtk/mozgtk.c 1186 | +++ b/widget/gtk/mozgtk/mozgtk.c 1187 | @@ -646,21 +646,6 @@ STUB(gtk_color_chooser_get_rgba) 1188 | STUB(gtk_color_chooser_set_use_alpha) 1189 | #endif 1190 | 1191 | -#ifdef GTK2_SYMBOLS 1192 | -STUB(gdk_drawable_get_screen) 1193 | -STUB(gdk_rgb_get_colormap) 1194 | -STUB(gdk_rgb_get_visual) 1195 | -STUB(gdk_window_lookup) 1196 | -STUB(gdk_window_set_back_pixmap) 1197 | -STUB(gdk_x11_colormap_foreign_new) 1198 | -STUB(gdk_x11_colormap_get_xcolormap) 1199 | -STUB(gdk_x11_drawable_get_xdisplay) 1200 | -STUB(gdk_x11_drawable_get_xid) 1201 | -STUB(gdk_x11_window_get_drawable_impl) 1202 | -STUB(gdkx_visual_get) 1203 | -STUB(gtk_object_get_type) 1204 | -#endif 1205 | - 1206 | #ifndef GTK3_SYMBOLS 1207 | // Only define the following workaround when using GTK3, which we detect 1208 | // by checking if GTK3 stubs are not provided. 1209 | diff --git a/widget/gtk/mozgtk/stub/moz.build b/widget/gtk/mozgtk/stub/moz.build 1210 | index 8af0cc1..d523310 100644 1211 | --- a/widget/gtk/mozgtk/stub/moz.build 1212 | +++ b/widget/gtk/mozgtk/stub/moz.build 1213 | @@ -8,7 +8,7 @@ SOURCES += [ 1214 | "../mozgtk.c", 1215 | ] 1216 | 1217 | -for var in ("COMMON_SYMBOLS", "GTK2_SYMBOLS", "GTK3_SYMBOLS"): 1218 | +for var in ("COMMON_SYMBOLS", "GTK3_SYMBOLS"): 1219 | DEFINES[var] = True 1220 | 1221 | SharedLibrary("mozgtk_stub") 1222 | diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h 1223 | index 5bfdcd9..95caf91 100644 1224 | --- a/widget/gtk/nsWindow.h 1225 | +++ b/widget/gtk/nsWindow.h 1226 | @@ -8,14 +8,14 @@ 1227 | #ifndef __nsWindow_h__ 1228 | #define __nsWindow_h__ 1229 | 1230 | -#include 1231 | +//#include 1232 | #include 1233 | #ifdef MOZ_X11 1234 | # include 1235 | # include "X11UndefineNone.h" 1236 | #endif /* MOZ_X11 */ 1237 | #ifdef MOZ_WAYLAND 1238 | -# include 1239 | +//# include 1240 | # include "base/thread.h" 1241 | # include "WaylandVsyncSource.h" 1242 | #endif 1243 | --- a/old-configure 1244 | +++ b/old-configure 1245 | @@ -746,7 +746,6 @@ 1246 | GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_42 1247 | GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_42 1248 | CAIRO_VERSION=1.10 1249 | -GTK2_VERSION=2.18.0 1250 | GTK3_VERSION=3.14.0 1251 | GDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_14 1252 | W32API_VERSION=3.14 1253 | @@ -7904,85 +7903,6 @@ 1254 | EOF 1255 | 1256 | fi 1257 | - if test "$MOZ_ENABLE_GTK"; then 1258 | - cat >> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 gdk-x11-2.0""... $ac_c" 1>&6 1285 | -echo "configure:7936: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 gdk-x11-2.0" >&5 1286 | - 1287 | - if test -n "$PKG_CONFIG_SYSROOT_DIR"; then 1288 | - export PKG_CONFIG_SYSROOT_DIR 1289 | - fi 1290 | - if test -n "$PKG_CONFIG_LIBDIR"; then 1291 | - export PKG_CONFIG_LIBDIR 1292 | - fi 1293 | - 1294 | - if $PKG_CONFIG --exists "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 gdk-x11-2.0" ; then 1295 | - echo "$ac_t""yes" 1>&6 1296 | - succeeded=yes 1297 | - 1298 | - echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 1299 | -echo "configure:7950: checking MOZ_GTK2_CFLAGS" >&5 1300 | - MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 gdk-x11-2.0"` 1301 | - echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 1302 | - 1303 | - echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 1304 | -echo "configure:7955: checking MOZ_GTK2_LIBS" >&5 1305 | - ## Remove evil flags like -Wl,--export-dynamic 1306 | - MOZ_GTK2_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 gdk-x11-2.0\" |sed s/-Wl,--export-dynamic//g`" 1307 | - echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 1308 | - else 1309 | - MOZ_GTK2_CFLAGS="" 1310 | - MOZ_GTK2_LIBS="" 1311 | - ## If we have a custom action on failure, don't print errors, but 1312 | - ## do set a variable so people can do so. 1313 | - MOZ_GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 gdk-x11-2.0"` 1314 | - echo $MOZ_GTK2_PKG_ERRORS 1315 | - fi 1316 | - 1317 | - 1318 | - 1319 | - else 1320 | - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." 1321 | - echo "*** See http://www.freedesktop.org/software/pkgconfig" 1322 | - fi 1323 | - fi 1324 | - 1325 | - if test $succeeded = yes; then 1326 | - : 1327 | - else 1328 | - if test "$COMPILE_ENVIRONMENT"; then 1329 | - { echo "configure: error: Library requirements (gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 gdk-x11-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; echo "configure: error: Library requirements (gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 >= $GLIB_VERSION gobject-2.0 gio-unix-2.0 gdk-x11-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&5; exit 1; } 1330 | - fi 1331 | - fi 1332 | - 1333 | - MOZ_GTK2_CFLAGS="-I${_topsrcdir}/widget/gtk/compat $MOZ_GTK2_CFLAGS" 1334 | - fi 1335 | - fi 1336 | fi # COMPILE_ENVIRONMENT 1337 | 1338 | 1339 | @@ -10640,8 +10560,6 @@ 1340 | (''' MOZ_ANDROID_MAX_SDK_VERSION ''', r''' $MOZ_ANDROID_MAX_SDK_VERSION ''') 1341 | (''' MOZ_GTK3_CFLAGS ''', list(split(r''' $MOZ_GTK3_CFLAGS '''))) 1342 | (''' MOZ_GTK3_LIBS ''', list(split(r''' $MOZ_GTK3_LIBS '''))) 1343 | - (''' MOZ_GTK2_CFLAGS ''', list(split(r''' $MOZ_GTK2_CFLAGS '''))) 1344 | - (''' MOZ_GTK2_LIBS ''', list(split(r''' $MOZ_GTK2_LIBS '''))) 1345 | (''' MOZ_FS_LAYOUT ''', r''' $MOZ_FS_LAYOUT ''') 1346 | (''' TK_CFLAGS ''', list(split(r''' $TK_CFLAGS '''))) 1347 | (''' TK_LIBS ''', list(split(r''' $TK_LIBS '''))) 1348 | --- a/dom/plugins/base/nsPluginInstanceOwner.cpp 1349 | +++ b/dom/plugins/base/nsPluginInstanceOwner.cpp 1350 | @@ -1266,7 +1266,7 @@ 1351 | void nsPluginInstanceOwner::Paint(const RECT& aDirty, HDC aDC) { return; } 1352 | #endif 1353 | 1354 | -#if defined(MOZ_X11) 1355 | +#if 0 1356 | void nsPluginInstanceOwner::Paint(gfxContext* aContext, 1357 | const gfxRect& aFrameRect, 1358 | const gfxRect& aDirtyRect) { 1359 | @@ -1491,7 +1491,7 @@ 1360 | // passing HDC till paint event when it is really 1361 | // needed. Change spec? 1362 | mPluginWindow->window = nullptr; 1363 | -#ifdef MOZ_X11 1364 | +#if 0 1365 | // Fill in the display field. 1366 | NPSetWindowCallbackStruct* ws_info = 1367 | static_cast(mPluginWindow->ws_info); 1368 | -------------------------------------------------------------------------------- /kiss-wayland/firefox/post-install: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | cat </d;/atk_bridge_adaptor_init/d' \ 8 | gtk/a11y/gtkaccessibility.c 9 | 10 | # Don't build GTK examples/demos/testsuite. 11 | sed -i 's/demos tests testsuite examples//' Makefile.am Makefile.in 12 | sed -i 's/docs m4macros/m4macros/' Makefile.am Makefile.in 13 | 14 | ./configure \ 15 | --prefix=/usr \ 16 | --sysconfdir=/etc \ 17 | --localstatedir=/var \ 18 | --enable-xkb \ 19 | --enable-xinerama \ 20 | --enable-xrandr \ 21 | --enable-xfixes \ 22 | --enable-xcomposite \ 23 | --enable-xdamage \ 24 | --enable-x11-backend \ 25 | --enable-wayland-backend \ 26 | --disable-schemas-compile \ 27 | --disable-cups \ 28 | --disable-papi \ 29 | --disable-cloudprint \ 30 | --disable-glibtest \ 31 | --disable-nls \ 32 | --disable-installed-tests \ 33 | --enable-introspection=no \ 34 | --enable-colord=no \ 35 | --enable-gtk-doc-html=no 36 | 37 | make 38 | make DESTDIR="$1" install 39 | 40 | # We don't compile with librsvg which leads to this 41 | # utility solely causing compiler errors for some 42 | # packages. It has no use at all. 43 | rm -f "$1/usr/bin/gtk-encode-symbolic-svg" 44 | -------------------------------------------------------------------------------- /kiss-wayland/gtk+3/checksums: -------------------------------------------------------------------------------- 1 | 2cc1b2dc5cad15d25b6abd115c55ffd8331e8d4677745dd3ce6db725b4fff1e9 2 | -------------------------------------------------------------------------------- /kiss-wayland/gtk+3/depends: -------------------------------------------------------------------------------- 1 | atk 2 | fribidi 3 | gdk-pixbuf 4 | libXcomposite 5 | libXcursor 6 | libXdamage 7 | libXext 8 | libXi 9 | libXinerama 10 | libXrandr 11 | libxkbcommon 12 | libepoxy 13 | pango 14 | python make 15 | wayland 16 | wayland-protocols make 17 | -------------------------------------------------------------------------------- /kiss-wayland/gtk+3/patches.bak/remove-atkbridge.patch: -------------------------------------------------------------------------------- 1 | diff --git a/meson.build b/meson.build 2 | index 945c5de..0be0a88 100644 3 | --- a/meson.build 4 | +++ b/meson.build 5 | @@ -572,7 +571,6 @@ if x11_enabled 6 | xfixes_dep = dependency('xfixes', required: false) 7 | xcomposite_dep = dependency('xcomposite', required: false) 8 | fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) 9 | - atkbridge_dep = dependency('atk-bridge-2.0', version: atk_req) 10 | 11 | x11_pkgs = ['fontconfig', 'x11', 'xext', 'xi', 'xrandr'] 12 | 13 | @@ -589,8 +587,6 @@ if x11_enabled 14 | x11_pkgs += ['xdamage'] 15 | endif 16 | 17 | - atk_pkgs += ['atk-bridge-2.0'] 18 | - 19 | cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false) 20 | cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false) 21 | cdata.set('HAVE_XCOMPOSITE', xcomposite_dep.found() ? 1 : false) 22 | -------------------------------------------------------------------------------- /kiss-wayland/gtk+3/post-install: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | glib-compile-schemas /usr/share/glib-2.0/schemas/ 4 | -------------------------------------------------------------------------------- /kiss-wayland/gtk+3/sources: -------------------------------------------------------------------------------- 1 | https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.26.tar.xz 2 | -------------------------------------------------------------------------------- /kiss-wayland/gtk+3/version: -------------------------------------------------------------------------------- 1 | 3.24.26 1 2 | -------------------------------------------------------------------------------- /kiss-wayland/libvncserver/build: -------------------------------------------------------------------------------- 1 | #!/bin/sh -e 2 | 3 | export DESTDIR="$1" 4 | 5 | cmake -B build \ 6 | -DCMAKE_INSTALL_PREFIX=/usr 7 | 8 | cmake --build build 9 | cmake --install build 10 | -------------------------------------------------------------------------------- /kiss-wayland/libvncserver/checksums: -------------------------------------------------------------------------------- 1 | 0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a 2 | -------------------------------------------------------------------------------- /kiss-wayland/libvncserver/sources: -------------------------------------------------------------------------------- 1 | https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.13.tar.gz 2 | -------------------------------------------------------------------------------- /kiss-wayland/libvncserver/version: -------------------------------------------------------------------------------- 1 | 0.9.13 1 2 | -------------------------------------------------------------------------------- /kiss-wayland/mesa/build: -------------------------------------------------------------------------------- 1 | #!/bin/sh -e 2 | 3 | # Install python-mako which is solely needed for mesa 4 | # and thus contained in this build. 5 | { 6 | cd mako 7 | 8 | python3 setup.py build 9 | python3 setup.py install \ 10 | --prefix=/usr \ 11 | --root="$PWD/dist" 12 | 13 | # Use a glob to avoid having to figure out the Python 14 | # version for the path below. 15 | cd dist/usr/lib/python*/site-packages 16 | 17 | # Set the PYTHONPATH so python knows where to find mako. 18 | # The one liner simply appends the existing path and 19 | # handles the case where an unset PYTHONPATH breaks 20 | # python as it will only contain our new addition. 21 | PYTHONPATH=$PWD:$(python -c "import sys; print(':'.join(sys.path))") 22 | 23 | cd -; cd .. 24 | } 25 | 26 | export PYTHONPATH 27 | export DESTDIR="$1" 28 | export CFLAGS="$CFLAGS -DGLX_X86_READONLY_TEXT" 29 | 30 | # Fix issues with musl and firefox. 31 | # https://bugs.freedesktop.org/show_bug.cgi?id=35268 32 | # https://github.com/mesa3d/mesa/commit/9f37c9903b87f86a533bfaffa72f0ecb285b02b2 33 | sed -i "/pre_args += '-DUSE_ELF_TLS'/d" meson.build 34 | 35 | python3 bin/git_sha1_gen.py --output include/git_sha1.h 36 | 37 | meson \ 38 | --prefix=/usr \ 39 | --sysconfdir=/etc \ 40 | --mandir=/usr/share/man \ 41 | --localstatedir=/var \ 42 | --buildtype=release \ 43 | -Dplatforms=x11,wayland \ 44 | -Dzstd=disabled \ 45 | . output 46 | 47 | ninja -C output 48 | ninja -C output install 49 | -------------------------------------------------------------------------------- /kiss-wayland/mesa/checksums: -------------------------------------------------------------------------------- 1 | 46c1dc5bb54a372dee43ec3c067229c299187d5bdadf1402756bbf66a6df5b88 2 | 8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27 3 | -------------------------------------------------------------------------------- /kiss-wayland/mesa/depends: -------------------------------------------------------------------------------- 1 | bison make 2 | expat 3 | flex make 4 | libX11 5 | libXdamage 6 | libXext 7 | libXrandr 8 | libXrender 9 | libXxf86vm 10 | libdrm 11 | libelf 12 | libxcb 13 | libxshmfence 14 | linux-headers make 15 | llvm 16 | m4 make 17 | meson make 18 | pkgconf make 19 | python make 20 | wayland make 21 | wayland-protocols make 22 | xorgproto 23 | zlib 24 | -------------------------------------------------------------------------------- /kiss-wayland/mesa/sources: -------------------------------------------------------------------------------- 1 | https://archive.mesa3d.org/mesa-21.0.2.tar.xz 2 | https://files.pythonhosted.org/packages/source/M/Mako/Mako-1.1.3.tar.gz mako 3 | -------------------------------------------------------------------------------- /kiss-wayland/mesa/version: -------------------------------------------------------------------------------- 1 | 21.0.2 1 2 | -------------------------------------------------------------------------------- /kiss-wayland/slurp/build: -------------------------------------------------------------------------------- 1 | #!/bin/sh -e 2 | 3 | export DESTDIR="$1" 4 | 5 | meson \ 6 | --prefix=/usr \ 7 | . build 8 | 9 | ninja -C build 10 | ninja -C build install 11 | -------------------------------------------------------------------------------- /kiss-wayland/slurp/checksums: -------------------------------------------------------------------------------- 1 | afe8714c6782a0e548b0f539676783a922ac61e7ba3fc7c0815644e72293fa3a 2 | -------------------------------------------------------------------------------- /kiss-wayland/slurp/depends: -------------------------------------------------------------------------------- 1 | cairo 2 | libxcb 3 | wayland 4 | -------------------------------------------------------------------------------- /kiss-wayland/slurp/sources: -------------------------------------------------------------------------------- 1 | https://github.com/emersion/slurp/archive/v1.3.1.tar.gz 2 | -------------------------------------------------------------------------------- /kiss-wayland/slurp/version: -------------------------------------------------------------------------------- 1 | 1.3.1 1 2 | -------------------------------------------------------------------------------- /kiss-wayland/sway/build: -------------------------------------------------------------------------------- 1 | #!/bin/sh -e 2 | 3 | export DESTDIR="$1" 4 | 5 | meson \ 6 | --prefix=/usr \ 7 | . output 8 | 9 | ninja -C output 10 | ninja -C output install 11 | -------------------------------------------------------------------------------- /kiss-wayland/sway/checksums: -------------------------------------------------------------------------------- 1 | 9ecfd2f38239f7e90922a13cd348fc95fc059e8fa0e4b75b8ffcc7b61685a5fb 2 | -------------------------------------------------------------------------------- /kiss-wayland/sway/depends: -------------------------------------------------------------------------------- 1 | cairo 2 | eudev 3 | glib 4 | json-c 5 | libevdev 6 | libinput 7 | libxcb 8 | libxkbcommon 9 | linux-headers make 10 | mesa 11 | pango 12 | pcre 13 | pixman 14 | swaybg 15 | wayland 16 | wayland-protocols make 17 | wlroots 18 | -------------------------------------------------------------------------------- /kiss-wayland/sway/post-install: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | chmod u+s "$KISS_ROOT/usr/bin/sway" 4 | 5 | cat <fd_passed) 5 | return TRUE; 6 | 7 | + ret = drmIsMaster(ms->fd); 8 | + if (ret) 9 | + return TRUE; 10 | + 11 | ret = drmSetMaster(ms->fd); 12 | if (ret) 13 | xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "drmSetMaster failed: %s\n", 14 | 15 | -------------------------------------------------------------------------------- /kiss-wayland/xorg-server/post-install: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | # Give Xorg setgid to /dev/input. 4 | chown :input "$KISS_ROOT/usr/bin/Xorg" 5 | chmod g+s "$KISS_ROOT/usr/bin/Xorg" 6 | 7 | cat < addgroup USER video 18 | 19 | EOF 20 | -------------------------------------------------------------------------------- /kiss-wayland/xorg-server/sources: -------------------------------------------------------------------------------- 1 | https://x.org/releases/individual/xserver/xorg-server-1.20.10.tar.bz2 2 | patches/rootless_modesetting.patch 3 | -------------------------------------------------------------------------------- /kiss-wayland/xorg-server/version: -------------------------------------------------------------------------------- 1 | 1.20.10 2 2 | --------------------------------------------------------------------------------