diff options
Diffstat (limited to 'gnu/packages/patches')
6 files changed, 152 insertions, 2 deletions
diff --git a/gnu/packages/patches/ableton-link-system-libraries-debian.patch b/gnu/packages/patches/ableton-link-system-libraries-debian.patch new file mode 100644 index 0000000000..184896ee61 --- /dev/null +++ b/gnu/packages/patches/ableton-link-system-libraries-debian.patch @@ -0,0 +1,29 @@ +This patch was borrowed from Debian's package: +https://salsa.debian.org/multimedia-team/ableton-link/-/blob/9c65141bf5bba0872811c179af77ac95770352cc/debian/patches/DEBIAN_system_libraries.patch +Description: Drop dependencies on included 3rd-party libs + upstream includes git-submodules for Catch and ASIO (not found in the tarball). + on Debian we want to use the system provided libraries. +Author: IOhannes m zmölnig +Origin: Debian +Forwarded: not-needed +Last-Update: 2016-10-26 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- ableton-link.orig/cmake_include/AsioStandaloneConfig.cmake ++++ ableton-link/cmake_include/AsioStandaloneConfig.cmake +@@ -1,6 +1,2 @@ + add_library(AsioStandalone::AsioStandalone IMPORTED INTERFACE) + +-set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY +- INTERFACE_INCLUDE_DIRECTORIES +- ${CMAKE_CURRENT_LIST_DIR}/../modules/asio-standalone/asio/include +-) +--- ableton-link.orig/cmake_include/CatchConfig.cmake ++++ ableton-link/cmake_include/CatchConfig.cmake +@@ -1,6 +1,2 @@ + add_library(Catch::Catch IMPORTED INTERFACE) + +-set_property(TARGET Catch::Catch APPEND PROPERTY +- INTERFACE_INCLUDE_DIRECTORIES +- ${CMAKE_SOURCE_DIR}/third_party/catch +-) diff --git a/gnu/packages/patches/gnome-todo-delete-esource-duplicate.patch b/gnu/packages/patches/gnome-todo-delete-esource-duplicate.patch new file mode 100644 index 0000000000..c680e86495 --- /dev/null +++ b/gnu/packages/patches/gnome-todo-delete-esource-duplicate.patch @@ -0,0 +1,10 @@ +From: Emmanuele Bassi <ebassi@gnome.org> + +See also: https://gitlab.gnome.org/GNOME/gnome-todo/commit/6cdabc4dd0c6c804a093b94c269461ce376fed4f +--- gnome-todo-3.28.1/plugins/eds/gtd-eds-autoptr.h.orig 2020-05-06 14:20:49.589902539 +0200 ++++ gnome-todo-3.28.1/plugins/eds/gtd-eds-autoptr.h 2020-05-06 14:20:54.593919721 +0200 +@@ -25,4 +25,3 @@ + G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponent, g_object_unref); + G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalComponentId, e_cal_component_free_id); + G_DEFINE_AUTOPTR_CLEANUP_FUNC (ECalClient, g_object_unref); +-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ESource, g_object_unref); diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index c2c59ec855..2978a5789e 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -25,7 +25,7 @@ index 8be2362..48716f2 100755 -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n ad3ea069c3d23aab360ad04ff4d0f5e556d3538f7dd4eae0690c4e9241537570 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -37,7 +37,7 @@ index 8be2362..48716f2 100755 +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc -+# echo -n ad3ea069c3d23aab360ad04ff4d0f5e556d3538f7dd4eae0690c4e9241537570 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz diff --git a/gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch b/gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch new file mode 100644 index 0000000000..228adc23f1 --- /dev/null +++ b/gnu/packages/patches/icecat-use-older-reveal-hidden-html.patch @@ -0,0 +1,70 @@ +From 2e8618d22568b6e00892a17303d437dd700eca98 Mon Sep 17 00:00:00 2001 +From: Mark H Weaver <mhw@netris.org> +Date: Tue, 5 May 2020 21:27:41 -0400 +Subject: [PATCH] Revert "Update Reveal hidden HTML." + +I prefer the user interface of the old version. + +This reverts commit f6e3adb6b2344ee2c7bb453a305fd2d6fb4c194c. +--- + .../passive_improve_css.js | 23 ++++++++++++++----- + 1 file changed, 17 insertions(+), 6 deletions(-) + +diff --git a/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js b/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js +index 7692990..ca57982 100644 +--- a/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js ++++ b/data/extensions/SubmitMe@0xbeef.coffee/passive_improve_css.js +@@ -10,6 +10,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI + */ + + ++var bad = []; ++ + function escapeHTML (unsafe_str) { + return unsafe_str + .replace(/&/g, '&') +@@ -20,9 +22,14 @@ function escapeHTML (unsafe_str) { + .replace(/\//g, '/') + } + ++function dounhide(){ ++ for(var i = 0; i < bad.length; i++){ ++ bad[i].remove(); ++ } ++} ++ + console.log("passive_improve_css.js"); + function reveal_css(){ +- var bad = []; + + var elements = document.getElementsByTagName("style"); + for(var i = 0; i < elements.length; i++){ +@@ -41,16 +48,20 @@ function reveal_css(){ + + } + } +- if(bad.length > 0 && window.confirm("Hidden HTML detected, would you like to reveal it?")){ +- for(var i = 0; i < bad.length; i++){ +- bad[i].remove(); +- } ++ if(bad.length > 0){ ++ const insertedDiv = document.createElement('div'); ++ insertedDiv.innerHTML= '<p id="unhide" class="button white" style="text-decoration:none!important; color:#000!important; font-size:1em !important; font-family:\'sans-serif\'!important; font-weight:normal !important; background-color:transparent!important; margin:0!important; padding:0!important; font-size:10px!important; line-height:1!important"' + ++ 'alt="Click to reveal hidden elements in this page">' + ++ '<span>Reveal hidden elements</span>' + ++ '</a>'; ++ insertedDiv.style="position:fixed; bottom:1em; right:1em; opacity:0.8; z-index: 2147483647 !important; border-radius: 3px !important; background-color: #fff !important; padding: 0.5em !important; box-shadow: 0 0 3px grey !important; font-color:#bbb!important; cursor: pointer!important;"; ++ insertedDiv.addEventListener("click", dounhide, false); ++ document.body.insertBefore(insertedDiv, document.body.firstChild); + } + } + + reveal_css(); + +- + /* + var a = document.getElementsByTagName("style")[2]; + var btn = document.createElement("style"); // Create a <button> element +-- +2.26.2 + diff --git a/gnu/packages/patches/warsow-qfusion-fix-bool-return-type.patch b/gnu/packages/patches/warsow-qfusion-fix-bool-return-type.patch new file mode 100644 index 0000000000..ec22377446 --- /dev/null +++ b/gnu/packages/patches/warsow-qfusion-fix-bool-return-type.patch @@ -0,0 +1,22 @@ +diff --git a/source/ref_gl/r_imagelib.cpp b/source/ref_gl/r_imagelib.cpp +index 418028a..f76916b 100644 +--- a/source/ref_gl/r_imagelib.cpp ++++ b/source/ref_gl/r_imagelib.cpp +@@ -762,7 +762,7 @@ static void q_jpg_noop( j_decompress_ptr cinfo ) { + + static boolean q_jpg_fill_input_buffer( j_decompress_ptr cinfo ) { + Com_DPrintf( "Premature end of jpeg file\n" ); +- return 1; ++ return TRUE; + } + + static void q_jpg_skip_input_data( j_decompress_ptr cinfo, long num_bytes ) { +@@ -955,7 +955,7 @@ bool WriteJPG( const char *name, r_imginfo_t *info, int quality ) { + } + + // start compression +- qjpeg_start_compress( &cinfo, true ); ++ qjpeg_start_compress( &cinfo, TRUE ); + + // feed scanline data + w3 = cinfo.image_width * info->samples; diff --git a/gnu/packages/patches/webkitgtk-share-store.patch b/gnu/packages/patches/webkitgtk-share-store.patch new file mode 100644 index 0000000000..053d86fcf4 --- /dev/null +++ b/gnu/packages/patches/webkitgtk-share-store.patch @@ -0,0 +1,19 @@ +Tell bubblewrap to share the store. Required for programs that use the +sandboxing features such as Epiphany. + +See <https://bugs.gnu.org/40837>. +Author: Jack Hill <jackhill@jackhill.us> +--- +diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +--- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp ++++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +@@ -737,6 +737,9 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces + "--ro-bind-try", "/usr/local/share", "/usr/local/share", + "--ro-bind-try", DATADIR, DATADIR, + ++ // Bind mount the store inside the WebKitGTK sandbox. ++ "--ro-bind", "@storedir@", "@storedir@", ++ + // We only grant access to the libdirs webkit is built with and + // guess system libdirs. This will always have some edge cases. + "--ro-bind-try", "/lib", "/lib", |