diff options
author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-12-01 05:36:54 +0100 |
---|---|---|
committer | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-12-01 06:11:20 +0100 |
commit | f41aba37396530c3fca935343069bf29b4564df3 (patch) | |
tree | 60b592cae108d3fa08ceb2f4ed7c78343d0c443a /pkgs/applications | |
parent | e47087ddbed7b0dfe3783011ff6f0b576b12350c (diff) |
treewide: remove unreferenced patch files
Found with `fd \\.patch$ pkgs/ -x bash -c 'rg -F "{/}" pkgs/ -q || echo {}'`
Diffstat (limited to 'pkgs/applications')
13 files changed, 0 insertions, 690 deletions
diff --git a/pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch b/pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch deleted file mode 100644 index c461d8a642912..0000000000000 --- a/pkgs/applications/graphics/dia/poppler-22_09-build-fix.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/plug-ins/pdf/pdf-import.cpp b/plug-ins/pdf/pdf-import.cpp -index 189737908..a2a479693 100644 ---- a/plug-ins/pdf/pdf-import.cpp -+++ b/plug-ins/pdf/pdf-import.cpp -@@ -152,12 +152,12 @@ public : - void - updateLineDash (GfxState *state) - { -- double *dashPattern; -- int dashLength; -- double dashStart; -- -- state->getLineDash (&dashPattern, &dashLength, &dashStart); -- this->dash_length = dashLength ? dashPattern[0] * scale : 1.0; -+ const double *dashPattern=NULL; -+ int dashLength=0; -+ double dashStart=0; -+ const std::vector<double> &dash = state->getLineDash(&dashStart); // > Poppler 22.09 ... -+ dashPattern = dash.data(); -+ dashLength = dash.size(); - - if (dashLength == 0) - this->line_style = DIA_LINE_STYLE_SOLID; -@@ -318,10 +318,11 @@ public : - //FIXME: Dia is really unhappy about zero size fonts - if (!(state->getFontSize() > 0.0)) - return; -- GfxFont *f = state->getFont(); -+ const std::shared_ptr<GfxFont> f = state->getFont(); // poppler 22.05 ... header changed -+ gconstpointer f1 = &f; // GLib typedef const void * gconstpointer; - - // instead of building the same font over and over again -- if (g_hash_table_lookup (this->font_map, f)) { -+ if (g_hash_table_lookup (this->font_map, f1)) { - ++font_map_hits; - return; - } -@@ -333,8 +334,9 @@ public : - gchar *family = g_strdup (f->getFamily() ? f->getFamily()->c_str() : "sans"); - - // we are (not anymore) building the same font over and over again -+ f1 = &f; - g_print ("Font 0x%x: '%s' size=%g (* %g)\n", -- GPOINTER_TO_INT (f), family, state->getTransformedFontSize(), scale); -+ GPOINTER_TO_INT (f1), family, state->getTransformedFontSize(), scale); - - // now try to make a fontname Dia/Pango can cope with - // strip style postfix - we already have extracted the style bits above -@@ -354,7 +356,9 @@ public : - fsize *= fabs(fm[3] / fm[0]); - font = dia_font_new (family, style, fsize * scale / 0.8); - -- g_hash_table_insert (this->font_map, f, font); -+ f1 = &f; -+ gpointer f2 = (gpointer)f1; // GLib typedef void* gpointer; -+ g_hash_table_insert (this->font_map, f2, font); - g_free (family); - } - void updateTextShift(GfxState *state, double shift) -@@ -721,11 +725,12 @@ DiaOutputDev::drawString(GfxState *state, GooString *s) - return; - if (!(state->getFontSize() > 0.0)) - return; -- font = (DiaFont *)g_hash_table_lookup (this->font_map, state->getFont()); -+ gconstpointer f_1 = &state->getFont(); -+ font = (DiaFont *)g_hash_table_lookup (this->font_map, f_1); - - // we have to decode the string data first - { -- GfxFont *f = state->getFont(); -+ const std::shared_ptr<GfxFont> f = state->getFont(); - const char *p = s->c_str(); - CharCode code; - int j = 0, m, n; -@@ -870,8 +875,8 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_ - std::unique_ptr<PDFDoc> doc; - GooString *fileName = new GooString(filename); - // no passwords yet -- GooString *ownerPW = NULL; -- GooString *userPW = NULL; -+ const std::optional<GooString> ownerPW; -+ const std::optional<GooString> userPW; - gboolean ret = FALSE; - - // without this we will get strange crashes (at least with /O2 build) -@@ -899,6 +904,7 @@ import_pdf(const gchar *filename, DiagramData *dia, DiaContext *ctx, void* user_ - delete diaOut; - ret = TRUE; - } -+ doc.reset(); - delete fileName; - - return ret; diff --git a/pkgs/applications/graphics/gimp/plugins/patches/focusblur-glib.patch b/pkgs/applications/graphics/gimp/plugins/patches/focusblur-glib.patch deleted file mode 100644 index b1079ab366043..0000000000000 --- a/pkgs/applications/graphics/gimp/plugins/patches/focusblur-glib.patch +++ /dev/null @@ -1,200 +0,0 @@ -ls diff --git focusblur-3.2.6/src/aaa.h focusblur-3.2.6/src/aaa.h -index 4a6d90b..c74cab2 100644 ---- focusblur-3.2.6/src/aaa.h -+++ focusblur-3.2.6/src/aaa.h -@@ -19,8 +19,7 @@ - #ifndef __AAA_H__ - #define __AAA_H__ - --#include <glib/gmacros.h> --#include <glib/gtypes.h> -+#include <glib.h> - - - G_BEGIN_DECLS -diff --git focusblur-3.2.6/src/brush.h focusblur-3.2.6/src/brush.h -index 685b253..8778fec 100644 ---- focusblur-3.2.6/src/brush.h -+++ focusblur-3.2.6/src/brush.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_BRUSH_H__ - #define __FOCUSBLUR_BRUSH_H__ - --#include <glib/gtypes.h> -+#include <glib.h> - #include "focusblurtypes.h" - - G_BEGIN_DECLS -diff --git focusblur-3.2.6/src/depthmap.h focusblur-3.2.6/src/depthmap.h -index 78f5e99..baee540 100644 ---- focusblur-3.2.6/src/depthmap.h -+++ focusblur-3.2.6/src/depthmap.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_DEPTHMAP_H__ - #define __FOCUSBLUR_DEPTHMAP_H__ - --#include <glib/gtypes.h> -+#include <glib.h> - - #include "focusblurtypes.h" - #include "focusblurenums.h" -diff --git focusblur-3.2.6/src/diffusion.h focusblur-3.2.6/src/diffusion.h -index 07ffe4b..3c1e4b9 100644 ---- focusblur-3.2.6/src/diffusion.h -+++ focusblur-3.2.6/src/diffusion.h -@@ -23,7 +23,7 @@ - #define __FOCUSBLUR_DIFFUSION_H__ - - --#include <glib/gtypes.h> -+#include <glib.h> - - #include "focusblur.h" - #include "focusblurtypes.h" -diff --git focusblur-3.2.6/src/fftblur.h focusblur-3.2.6/src/fftblur.h -index 124bcba..cd809fa 100644 ---- focusblur-3.2.6/src/fftblur.h -+++ focusblur-3.2.6/src/fftblur.h -@@ -23,8 +23,7 @@ - #define __FOCUSBLUR_FFTBLUR_H__ - - --#include <glib/gmacros.h> --#include <glib/gtypes.h> -+#include <glib.h> - #include <libgimpwidgets/gimpwidgetstypes.h> - - #include "focusblurparam.h" -diff --git focusblur-3.2.6/src/fftblurbuffer.h focusblur-3.2.6/src/fftblurbuffer.h -index b34d682..42e6380 100644 ---- focusblur-3.2.6/src/fftblurbuffer.h -+++ focusblur-3.2.6/src/fftblurbuffer.h -@@ -28,8 +28,7 @@ - #endif - #include <fftw3.h> - --#include <glib/gmacros.h> --#include <glib/gtypes.h> -+#include <glib.h> - #include <gtk/gtkstyle.h> - #include <libgimp/gimptypes.h> - #include <libgimpwidgets/gimpwidgetstypes.h> -diff --git focusblur-3.2.6/src/fftblurproc.h focusblur-3.2.6/src/fftblurproc.h -index 495572d..10a34f4 100644 ---- focusblur-3.2.6/src/fftblurproc.h -+++ focusblur-3.2.6/src/fftblurproc.h -@@ -23,8 +23,7 @@ - #define __FOCUSBLUR_FFTBLUR_PROC_H__ - - --#include <glib/gmacros.h> --#include <glib/gtypes.h> -+#include <glib.h> - - #include "focusblurtypes.h" - -diff --git focusblur-3.2.6/src/focusblur.h focusblur-3.2.6/src/focusblur.h -index 54ca40a..d7e13a6 100644 ---- focusblur-3.2.6/src/focusblur.h -+++ focusblur-3.2.6/src/focusblur.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_H__ - #define __FOCUSBLUR_H__ - --#include <glib/gmacros.h> -+#include <glib.h> - - G_BEGIN_DECLS - -diff --git focusblur-3.2.6/src/focusblurparam.h focusblur-3.2.6/src/focusblurparam.h -index 64c887b..32865b4 100644 ---- focusblur-3.2.6/src/focusblurparam.h -+++ focusblur-3.2.6/src/focusblurparam.h -@@ -22,8 +22,7 @@ - #ifndef __FOCUSBLUR_PARAM_H__ - #define __FOCUSBLUR_PARAM_H__ - --#include <glib/gmacros.h> --#include <glib/gtypes.h> -+#include <glib.h> - #include <gtk/gtkstyle.h> - #include <libgimp/gimptypes.h> - -diff --git focusblur-3.2.6/src/focusblurstock.h focusblur-3.2.6/src/focusblurstock.h -index 15f3603..cfc0567 100644 ---- focusblur-3.2.6/src/focusblurstock.h -+++ focusblur-3.2.6/src/focusblurstock.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_STOCK_H__ - #define __FOCUSBLUR_STOCK_H__ - --#include <glib/gtypes.h> -+#include <glib.h> - - G_BEGIN_DECLS - -diff --git focusblur-3.2.6/src/focusblurtypes.h focusblur-3.2.6/src/focusblurtypes.h -index 0954c60..1531c84 100644 ---- focusblur-3.2.6/src/focusblurtypes.h -+++ focusblur-3.2.6/src/focusblurtypes.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_TYPES_H__ - #define __FOCUSBLUR_TYPES_H__ - --#include <glib/gmacros.h> -+#include <glib.h> - - - G_BEGIN_DECLS -diff --git focusblur-3.2.6/src/interface.h focusblur-3.2.6/src/interface.h -index 6defd27..e819c60 100644 ---- focusblur-3.2.6/src/interface.h -+++ focusblur-3.2.6/src/interface.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_INTERFACE_H__ - #define __FOCUSBLUR_INTERFACE_H__ - --#include <glib/gtypes.h> -+#include <glib.h> - - #include "focusblurtypes.h" - -diff --git focusblur-3.2.6/src/render.h focusblur-3.2.6/src/render.h -index febbd24..a501f1e 100644 ---- focusblur-3.2.6/src/render.h -+++ focusblur-3.2.6/src/render.h -@@ -24,7 +24,7 @@ - - #include "config.h" - --#include <glib/gtypes.h> -+#include <glib.h> - //#include <libgimp/gimp.h> - #include <libgimp/gimpui.h> - -diff --git focusblur-3.2.6/src/shine.h focusblur-3.2.6/src/shine.h -index c5a3621..86b4c09 100644 ---- focusblur-3.2.6/src/shine.h -+++ focusblur-3.2.6/src/shine.h -@@ -22,7 +22,7 @@ - #ifndef __FOCUSBLUR_SHINE_H__ - #define __FOCUSBLUR_SHINE_H__ - --#include <glib/gtypes.h> -+#include <glib.h> - #include <libgimp/gimptypes.h> - - #include "focusblurtypes.h" -diff --git focusblur-3.2.6/src/source.h focusblur-3.2.6/src/source.h -index 50d34ca..8eec35c 100644 ---- focusblur-3.2.6/src/source.h -+++ focusblur-3.2.6/src/source.h -@@ -24,7 +24,7 @@ - - #include "config.h" - --#include <glib/gtypes.h> -+#include <glib.h> - #include <libgimp/gimptypes.h> - - #include "focusblurtypes.h" diff --git a/pkgs/applications/misc/cura/numpy-cast.patch b/pkgs/applications/misc/cura/numpy-cast.patch deleted file mode 100644 index efb14182b3e65..0000000000000 --- a/pkgs/applications/misc/cura/numpy-cast.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN Cura-15.04.old/Cura/util/sliceEngine.py Cura-15.04/Cura/util/sliceEngine.py ---- Cura-15.04.old/Cura/util/sliceEngine.py 2016-05-07 20:34:17.305020334 +0200 -+++ Cura-15.04/Cura/util/sliceEngine.py 2016-05-07 20:40:02.993286467 +0200 -@@ -343,7 +343,7 @@ - objMax[1] = max(oMax[1], objMax[1]) - if objMin is None: - return -- pos += (objMin + objMax) / 2.0 * 1000 -+ pos = numpy.add( pos, (objMin + objMax) / 2.0 * 1000, out=pos, casting='unsafe') - commandList += ['-s', 'posx=%d' % int(pos[0]), '-s', 'posy=%d' % int(pos[1])] - - vertexTotal = [0] * 4 diff --git a/pkgs/applications/misc/tellico/hex.patch b/pkgs/applications/misc/tellico/hex.patch deleted file mode 100644 index 999c502287e99..0000000000000 --- a/pkgs/applications/misc/tellico/hex.patch +++ /dev/null @@ -1,15 +0,0 @@ -index 7ea81c7..0c19767 100644 ---- a/src/utils/iso5426converter.cpp -+++ b/src/utils/iso5426converter.cpp -@@ -1211,7 +1211,11 @@ QChar Iso5426Converter::getCombiningChar(uint c) { - return 0x1EF1; // SMALL LETTER U WITH HORN AND DOT BELOW - - default: -+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) -+ myDebug() << "no match for" << hex << c; -+#else - myDebug() << "no match for" << Qt::hex << c; -+#endif - return QChar(); - } - } diff --git a/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch b/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch deleted file mode 100644 index f14d7f7180271..0000000000000 --- a/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 86cc27022015697a61d1ec1b13e52f9dbe7f6c57 Mon Sep 17 00:00:00 2001 -From: worldofpeace <worldofpeace@protonmail.ch> -Date: Mon, 23 Mar 2020 18:34:00 -0400 -Subject: [PATCH] Adjust get_data_path for NixOS - -We construct the ulauncher data path from xdg_data_dirs -and prevent it from being a nix store path or being xdg_data_home. -We do this to prevent /nix/store paths being hardcoded to shortcuts.json. -On NixOS this path will either be /run/current-system/sw/share/ulauncher -or $HOME/.nix-profile/share/ulauncher if the user used nix-env. ---- - ulauncher/config.py | 27 ++++++++++++++++++--------- - 1 file changed, 18 insertions(+), 9 deletions(-) - -diff --git a/ulauncher/config.py b/ulauncher/config.py -index f21014e..cc636e1 100644 ---- a/ulauncher/config.py -+++ b/ulauncher/config.py -@@ -50,15 +50,24 @@ def get_data_path(): - is specified at installation time. - """ - -- # Get pathname absolute or relative. -- path = os.path.join( -- os.path.dirname(__file__), __ulauncher_data_directory__) -- -- abs_data_path = os.path.abspath(path) -- if not os.path.exists(abs_data_path): -- raise ProjectPathNotFoundError(abs_data_path) -- -- return abs_data_path -+ paths = list( -+ filter( -+ os.path.exists, -+ [ -+ os.path.join(dir, "ulauncher") -+ for dir in xdg_data_dirs -+ # Get path that isn't in the /nix/store so they don't get hardcoded into configs -+ if not dir.startswith("/nix/store/") -+ # Exclude .local/share/ulauncher which isn't what we want -+ if not dir.startswith(xdg_data_home) -+ ], -+ ) -+ ) -+ -+ try: -+ return paths[0] -+ except: -+ raise ProjectPathNotFoundError() - - - def is_wayland(): --- -2.25.1 - diff --git a/pkgs/applications/office/calligra/qt5_11.patch b/pkgs/applications/office/calligra/qt5_11.patch deleted file mode 100644 index 66ff8c6eedcd5..0000000000000 --- a/pkgs/applications/office/calligra/qt5_11.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp -index 0ffdcf6..cdca006 100644 ---- a/libs/widgets/KoCsvImportDialog.cpp -+++ b/libs/widgets/KoCsvImportDialog.cpp -@@ -21,6 +21,7 @@ - #include "KoCsvImportDialog.h" - - // Qt -+#include <QButtonGroup> - #include <QTextCodec> - #include <QTextStream> - -diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp -index f91555c..a3816f9 100644 ---- a/libs/widgets/KoPageLayoutWidget.cpp -+++ b/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include <KoUnit.h> - -+#include <QButtonGroup> -+ - class Q_DECL_HIDDEN KoPageLayoutWidget::Private - { - public: -diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp -index c0d5136..d2a772e 100644 ---- a/plugins/chartshape/dialogs/TableEditorDialog.cpp -+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp -@@ -24,6 +24,7 @@ - - // Qt - #include <QAbstractItemModel> -+#include <QAction> - - // Calligra - #include <KoIcon.h> -diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp -index ed10919..8f52177 100644 ---- a/plugins/formulashape/FormulaToolWidget.cpp -+++ b/plugins/formulashape/FormulaToolWidget.cpp -@@ -30,6 +30,7 @@ - #include <QWidgetAction> - #include <QTableWidget> - #include <QAction> -+#include <QHeaderView> - #include <QMenu> - - FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) -diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp -index a0a9832..7d7db53 100644 ---- a/sheets/dialogs/LayoutDialog.cpp -+++ b/sheets/dialogs/LayoutDialog.cpp -@@ -36,6 +36,7 @@ - #include <math.h> - - #include <QIntValidator> -+#include <QButtonGroup> - #include <QCheckBox> - #include <QFrame> - #include <QLabel> -diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp -index d64208c..bfddb3a 100644 ---- a/words/part/dialogs/KWAnchoringProperties.cpp -+++ b/words/part/dialogs/KWAnchoringProperties.cpp -@@ -35,6 +35,7 @@ - - #include <kundo2command.h> - -+#include <QButtonGroup> - #include <QComboBox> - - const int KWAnchoringProperties::vertRels[4][20] = { -diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp -index e38599a..7e8b2d5 100644 ---- a/words/part/dialogs/KWRunAroundProperties.cpp -+++ b/words/part/dialogs/KWRunAroundProperties.cpp -@@ -28,6 +28,8 @@ - - #include <kundo2command.h> - -+#include <QButtonGroup> -+ - KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) - : m_state(state) - { -diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp -index ae743da..3007f91 100644 ---- a/stage/part/KPrPresentationTool.cpp -+++ b/stage/part/KPrPresentationTool.cpp -@@ -32,6 +32,7 @@ - #include <QDesktopServices> - #include <QUrl> - #include <QDBusConnection> -+#include <QFrame> - - #include <KoShape.h> - #include <KoShapeManager.h> diff --git a/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch b/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch deleted file mode 100644 index d095eada9d6e1..0000000000000 --- a/pkgs/applications/science/electronics/flatcam/shapely-library-paths.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/shapely/geos.py b/shapely/geos.py -index 88c5f53..1ccd6e4 100644 ---- a/shapely/geos.py -+++ b/shapely/geos.py -@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'): - alt_paths = [ - 'libgeos_c.so.1', - 'libgeos_c.so', -+ '@libgeos_c@', - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -@@ -160,6 +161,7 @@ elif sys.platform == 'darwin': - "/usr/local/lib/libgeos_c.dylib", - # homebrew Apple Silicon - "/opt/homebrew/lib/libgeos_c.dylib", -+ "@libgeos_c@", - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -diff --git a/tests/test_dlls.py b/tests/test_dlls.py -index c71da8e..c36262c 100644 ---- a/tests/test_dlls.py -+++ b/tests/test_dlls.py -@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase): - '/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS) - os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux) - 'libgeos_c.so.1', -- 'libgeos_c.so']) -+ 'libgeos_c.so', -+ '@libgeos_c@']) diff --git a/pkgs/applications/science/math/yacas/fix-test-script.patch b/pkgs/applications/science/math/yacas/fix-test-script.patch deleted file mode 100644 index da85f0dc0e1bc..0000000000000 --- a/pkgs/applications/science/math/yacas/fix-test-script.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git i/tests/test-yacas w/tests/test-yacas -index b375d78b..0e3a616b 100755 ---- i/tests/test-yacas -+++ w/tests/test-yacas -@@ -35,9 +35,9 @@ FAILED_TESTS="" # list of failed tests - FAILURES=0 # number of failed tests - TOTALTESTS=0 # total number of tests - --TESTFILE=/tmp/test-yacas.$$ --TIMEFILE=/tmp/time-yacas.$$ --VERSIONF=/tmp/version-yacas-$$.ys -+TESTFILE="$(mktemp -t test-yacas.XXX)" -+TIMEFILE="$(mktemp -t time-yacas.XXX)" -+VERSIONF="$(mktemp -t version-yacas-XXX.ys)" - LOGFILE=yacas-logfile.txt - echo "Print(Version());" > $VERSIONF - VERSION=`$CMD $VERSIONF` -@@ -69,7 +69,7 @@ for scr in $SCRIPTS; do - # fi - echo "Running $scr" - if [ -f $TESTFILE ]; then rm $TESTFILE ; fi -- /bin/bash -c "time -p ($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \ -+ bash -c "time -p ($CMD $f || echo \"Error: exit status $?\") | tee $TESTFILE" \ - 2> $TIMEFILE \ - || (echo "Error -- User interrupt" > $TESTFILE) - # cat $TIMEFILE diff --git a/pkgs/applications/system/glances/skip-failing-tests.patch b/pkgs/applications/system/glances/skip-failing-tests.patch deleted file mode 100644 index f47f1218aea56..0000000000000 --- a/pkgs/applications/system/glances/skip-failing-tests.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/unitest.py b/unitest.py ---- a/unitest.py -+++ b/unitest.py -@@ -59,6 +59,7 @@ class TestGlances(unittest.TestCase): - """The function is called *every time* before test_*.""" - print('\n' + '=' * 78) - -+ @unittest.skip("Requires access to /etc/mtab") - def test_000_update(self): - """Update stats (mandatory step for all the stats). - -@@ -87,6 +88,7 @@ class TestGlances(unittest.TestCase): - for plugin in plugins_to_check: - self.assertTrue(plugin in plugins_list) - -+ @unittest.skip("Fails on NixOS") - def test_002_system(self): - """Check SYSTEM plugin.""" - stats_to_check = ['hostname', 'os_name'] -@@ -97,6 +99,7 @@ class TestGlances(unittest.TestCase): - self.assertTrue(stat in stats_grab, msg='Cannot find key: %s' % stat) - print('INFO: SYSTEM stats: %s' % stats_grab) - -+ @unittest.skip("Fails on NixOS") - def test_003_cpu(self): - """Check CPU plugin.""" - stats_to_check = ['system', 'user', 'idle'] -@@ -110,7 +113,7 @@ class TestGlances(unittest.TestCase): - self.assertLessEqual(stats_grab[stat], 100) - print('INFO: CPU stats: %s' % stats_grab) - -- @unittest.skipIf(WINDOWS, "Load average not available on Windows") -+ @unittest.skip("Fails on NixOS") - def test_004_load(self): - """Check LOAD plugin.""" - stats_to_check = ['cpucore', 'min1', 'min5', 'min15'] -@@ -123,6 +126,7 @@ class TestGlances(unittest.TestCase): - self.assertGreaterEqual(stats_grab[stat], 0) - print('INFO: LOAD stats: %s' % stats_grab) - -+ @unittest.skip("Fails on NixOS") - def test_005_mem(self): - """Check MEM plugin.""" - stats_to_check = ['available', 'used', 'free', 'total'] -@@ -135,6 +139,7 @@ class TestGlances(unittest.TestCase): - self.assertGreaterEqual(stats_grab[stat], 0) - print('INFO: MEM stats: %s' % stats_grab) - -+ @unittest.skip("Fails on NixOS") - def test_006_swap(self): - """Check MEMSWAP plugin.""" - stats_to_check = ['used', 'free', 'total'] diff --git a/pkgs/applications/video/olive-editor/q-painter-path.patch b/pkgs/applications/video/olive-editor/q-painter-path.patch deleted file mode 100644 index 232f157e7cdd9..0000000000000 --- a/pkgs/applications/video/olive-editor/q-painter-path.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/effects/internal/texteffect.cpp b/effects/internal/texteffect.cpp -index 279f406d9..7fe9e8e72 100644 ---- a/effects/internal/texteffect.cpp -+++ b/effects/internal/texteffect.cpp -@@ -20,6 +20,7 @@ - - #include "texteffect.h" - -+#include <QPainterPath> - #include <QGridLayout> - #include <QLabel> - #include <QOpenGLTexture> -diff --git a/effects/internal/timecodeeffect.cpp b/effects/internal/timecodeeffect.cpp -index 4de3e3497..fd0fa6224 100644 ---- a/effects/internal/timecodeeffect.cpp -+++ b/effects/internal/timecodeeffect.cpp -@@ -20,6 +20,7 @@ - - #include "timecodeeffect.h" - -+#include <QPainterPath> - #include <QGridLayout> - #include <QLabel> - #include <QOpenGLTexture> -diff --git a/ui/graphview.cpp b/ui/graphview.cpp -index 3e13075cd..c441133a8 100644 ---- a/ui/graphview.cpp -+++ b/ui/graphview.cpp -@@ -20,6 +20,7 @@ - - #include "graphview.h" - -+#include <QPainterPath> - #include <QPainter> - #include <QMouseEvent> - #include <QtMath> -diff --git a/ui/timelineheader.cpp b/ui/timelineheader.cpp -index f39065b4f..aa7fd638d 100644 ---- a/ui/timelineheader.cpp -+++ b/ui/timelineheader.cpp -@@ -20,6 +20,7 @@ - - #include "timelineheader.h" - -+#include <QPainterPath> - #include <QPainter> - #include <QMouseEvent> - #include <QScrollBar> diff --git a/pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patch b/pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patch deleted file mode 100644 index d3f207de00b29..0000000000000 --- a/pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/Makefile b/Makefile -index 0070ada..802cef0 100644 ---- a/Makefile -+++ b/Makefile -@@ -202,7 +202,7 @@ $(BIN_NAME): $(BIN_OBJS) - ##### Public rules ##### - - all: CPPFLAGS += -DNDEBUG --all: shared static tools -+all: shared tools - - # Run with ASAN_OPTIONS="protect_shadow_gap=0" to avoid CUDA OOM errors - debug: CFLAGS += -pedantic -fsanitize=undefined -fno-omit-frame-pointer -fno-common -fsanitize=address -@@ -232,7 +232,6 @@ install: all - # Install header files - $(INSTALL) -m 644 $(LIB_INCS) $(DESTDIR)$(includedir) - # Install library files -- $(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir) - $(INSTALL) -m 755 $(LIB_SHARED) $(DESTDIR)$(libdir) - $(LN) -sf $(LIB_SONAME) $(DESTDIR)$(libdir)/$(LIB_SYMLINK) - $(LDCONFIG) -n $(DESTDIR)$(libdir) diff --git a/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch b/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch deleted file mode 100644 index 0594a2f19d459..0000000000000 --- a/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: /trunk/configure -=================================================================== ---- a/configure (revision 90360) -+++ b/configure (revision 90377) -@@ -1588,5 +1588,5 @@ - if [ $? -eq 0 ]; then - echo "(Qt5 from pkg-config)" >> $LOG -- FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags` -+ FLGQT5=`pkg-config Qt5Core --cflags` - # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk) - [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11" diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/portals.patch b/pkgs/applications/window-managers/hyprwm/hyprland/portals.patch deleted file mode 100644 index cb3d97c371cae..0000000000000 --- a/pkgs/applications/window-managers/hyprwm/hyprland/portals.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/Compositor.cpp b/src/Compositor.cpp -index 1d978aed..56665389 100644 ---- a/src/Compositor.cpp -+++ b/src/Compositor.cpp -@@ -2365,17 +2365,16 @@ void CCompositor::performUserChecks() { - - static auto* const PSUPPRESSPORTAL = &g_pConfigManager->getConfigValuePtr("misc:suppress_portal_warnings")->intValue; - -- if (!*PSUPPRESSPORTAL) { -- if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/" + portal + ".portal"); })) { -+ static auto* const PORTALDIRENV = getenv("XDG_DESKTOP_PORTAL_DIR"); -+ -+ static auto const PORTALDIR = PORTALDIRENV != NULL ? std::string(PORTALDIRENV) : ""; -+ -+ if (!*PSUPPRESSPORTAL && PORTALDIR != "") { -+ if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists(PORTALDIR + "/" + portal + ".portal"); })) { - // bad portal detected - g_pHyprNotificationOverlay->addNotification("You have one or more incompatible xdg-desktop-portal impls installed. Please remove incompatible ones to avoid issues.", - CColor(0), 15000, ICON_ERROR); - } -- -- if (std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/hyprland.portal") && std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/wlr.portal")) { -- g_pHyprNotificationOverlay->addNotification("You have xdg-desktop-portal-hyprland and -wlr installed simultaneously. Please uninstall one to avoid issues.", CColor(0), -- 15000, ICON_ERROR); -- } - } - } - |