[treewide] delete unused patches

2024-11-21 05:00:16 +00:00 · 2019-05-04 19:52:24 +02:00 · 2019-05-04 19:52:24 +02:00 · 9cb260d091
parent 01c27d6faf
commit 9cb260d091
60 changed files with 0 additions and 2233 deletions
--- a/pkgs/applications/audio/freewheeling/am_path_sdl.patch
+++ b/pkgs/applications/audio/freewheeling/am_path_sdl.patch
@ -1,40 +0,0 @@
--- code-r100/configure.ac	2014-09-25 23:44:41.059174904 +0200
-+++ code-r100.new/configure.ac	2014-09-26 01:37:18.507017390 +0200
-@@ -44,6 +44,8 @@
-   [AC_MSG_ERROR(CONFIG: You need libxml2-dev installed.
- 	        http://www.xmlsoft.org/)])
- 
-+PKG_CHECK_MODULES([libxml], [libxml-2.0])
-+
- AC_CHECK_LIB([m], [sqrt], , [AC_MSG_ERROR(CORE: You need libm installed)])
- AC_CHECK_LIB([pthread], [pthread_self], , [AC_MSG_ERROR(CORE: You need libpthread installed)])
- 
-@@ -79,12 +81,12 @@
-    echo "--- Enabling USB LCD display --";
- fi
- 
-#SDL_VERSION=1.2.4
-#AM_PATH_SDL($SDL_VERSION,
-#            :,
-#	    AC_MSG_ERROR([VIDEO: *** SDL version $SDL_VERSION not found!
-#		          http://www.libsdl.org/])
-#)
-+SDL_VERSION=1.2.4
-+AM_PATH_SDL($SDL_VERSION,
-+            :,
-+	    AC_MSG_ERROR([VIDEO: *** SDL version $SDL_VERSION not found!
-+		          http://www.libsdl.org/])
-+)
- 
- AC_CHECK_LIB([vorbis], [main], , 
-   [AC_MSG_ERROR(AUDIO: You need libvorbis-dev installed.
-@@ -95,6 +97,9 @@
- AC_CHECK_LIB([vorbisenc], [main], , 
-   [AC_MSG_ERROR(AUDIO: You need libvorbis-dev installed.
- 		http://www.xiph.org/ogg/vorbis/)])
-+AC_CHECK_LIB([ogg], [main], , 
-+  [AC_MSG_ERROR(AUDIO: You need libogg-dev installed.
-+		http://www.xiph.org/ogg/)])
- 
- AC_CHECK_LIB([sndfile], [main], , 
-   [AC_MSG_ERROR(AUDIO: you need libsndfile installed.
--- a/pkgs/applications/audio/freewheeling/xml.patch
+++ b/pkgs/applications/audio/freewheeling/xml.patch
@ -1,13 +0,0 @@
--- code-r100/src/Makefile.am	2014-09-25 23:44:41.043174832 +0200
-+++ code-r100.new/src/Makefile.am	2014-09-26 01:21:03.750015888 +0200
-@@ -24,7 +24,8 @@
- 
- fweelindir = $(datadir)/fweelin
- 
-FWEELIN_CFLAGS = -I. -g -Wall -Wno-write-strings -Wno-non-virtual-dtor -D_REENTRANT -DPTHREADS -DNDEBUG -DVERSION=\"$(VERSION)\" -DFWEELIN_DATADIR=\"$(fweelindir)\" -DADDON_DIR=\"/usr/local/lib/jack\" -I/usr/include/freetype2 -I/usr/include/libxml2 -funroll-loops -finline-functions -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing -falign-loops=2 -falign-jumps=2 -falign-functions=2 -O9
-+XML_CFLAGS = `xml2-config --cflags`
-+FWEELIN_CFLAGS = -I. -g -Wall -Wno-write-strings -Wno-non-virtual-dtor -D_REENTRANT -DPTHREADS -DNDEBUG -DVERSION=\"$(VERSION)\" -DFWEELIN_DATADIR=\"$(fweelindir)\" -DADDON_DIR=\"/usr/local/lib/jack\" -I/usr/include/freetype2 $(XML_CFLAGS) -funroll-loops -finline-functions -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing -falign-loops=2 -falign-jumps=2 -falign-functions=2 -O9
- 
- AM_CFLAGS = $(CFLAGS) $(FWEELIN_CFLAGS)
-AM_CXXFLAGS = $(CFLAGS) $(CXXFLAGS) $(FWEELIN_CFLAGS)
-+AM_CXXFLAGS = $(CFLAGS) $(CXXFLAGS) $(FWEELIN_CFLAGS) ${libxml2_CFLAGS}
--- a/pkgs/applications/editors/rstudio/fix-cmake.patch
+++ b/pkgs/applications/editors/rstudio/fix-cmake.patch
@ -1,15 +0,0 @@
-diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt
-index f5701bf735..27af4148ff 100644
--- a/src/cpp/desktop/CMakeLists.txt
-+++ b/src/cpp/desktop/CMakeLists.txt
-@@ -112,6 +112,7 @@ find_package(Qt5WebEngine REQUIRED)
- find_package(Qt5WebEngineWidgets REQUIRED)
- find_package(Qt5PrintSupport REQUIRED)
- find_package(Qt5Quick REQUIRED)
-+find_package(Qt5QuickWidgets REQUIRED)
- find_package(Qt5Positioning REQUIRED)
- find_package(Qt5Sensors REQUIRED)
- find_package(Qt5Svg REQUIRED)
-- 
-2.17.1
-
--- a/pkgs/applications/networking/browsers/firefox/fix-debug.patch
+++ b/pkgs/applications/networking/browsers/firefox/fix-debug.patch
@ -1,77 +0,0 @@
-
-# HG changeset patch
-# User Michelangelo De Simone <mdesimone@mozilla.com>
-# Date 1479198095 28800
-# Node ID fde6e9ccfc72fbc0fcd93af7a40436b216e7ea1a
-# Parent  687eac6845a77d2cac5505da9c8912885c2a9e57
-Bug 1013882 - TestInterfaceJS should be packaged only if it's available. r=glandium, a=jcristau
-
-MozReview-Commit-ID: IEHesdoU4Sz
-
-diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
--- a/b2g/installer/package-manifest.in
-+++ b/b2g/installer/package-manifest.in
-@@ -570,17 +570,17 @@
- @RESPATH@/components/InputMethod.manifest
- #ifdef MOZ_B2G
- @RESPATH@/components/inputmethod.xpt
- #endif
- 
- @RESPATH@/components/SystemUpdate.manifest
- @RESPATH@/components/SystemUpdateManager.js
- 
-#ifdef MOZ_DEBUG
-+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @RESPATH@/components/TestInterfaceJS.js
- @RESPATH@/components/TestInterfaceJS.manifest
- @RESPATH@/components/TestInterfaceJSMaplike.js
- #endif
- 
- ; Modules
- @RESPATH@/modules/*
- 
-diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
-+++ b/browser/installer/package-manifest.in
-@@ -554,17 +554,17 @@
- @RESPATH@/components/PresentationControlService.js
- @RESPATH@/components/PresentationDataChannelSessionTransport.js
- @RESPATH@/components/PresentationDataChannelSessionTransport.manifest
- 
- ; InputMethod API
- @RESPATH@/components/MozKeyboard.js
- @RESPATH@/components/InputMethod.manifest
- 
-#ifdef MOZ_DEBUG
-+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @RESPATH@/components/TestInterfaceJS.js
- @RESPATH@/components/TestInterfaceJS.manifest
- @RESPATH@/components/TestInterfaceJSMaplike.js
- #endif
- 
- ; [Extensions]
- @RESPATH@/components/extensions-toolkit.manifest
- @RESPATH@/browser/components/extensions-browser.manifest
-diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
--- a/mobile/android/installer/package-manifest.in
-+++ b/mobile/android/installer/package-manifest.in
-@@ -381,17 +381,17 @@
- 
- @BINPATH@/components/CaptivePortalDetectComponents.manifest
- @BINPATH@/components/captivedetect.js
- 
- #ifdef MOZ_WEBSPEECH
- @BINPATH@/components/dom_webspeechsynth.xpt
- #endif
- 
-#ifdef MOZ_DEBUG
-+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @BINPATH@/components/TestInterfaceJS.js
- @BINPATH@/components/TestInterfaceJS.manifest
- @BINPATH@/components/TestInterfaceJSMaplike.js
- #endif
- 
- @BINPATH@/components/nsAsyncShutdown.manifest
- @BINPATH@/components/nsAsyncShutdown.js
- 
-
--- a/pkgs/applications/office/libreoffice/xdg-open.patch
+++ b/pkgs/applications/office/libreoffice/xdg-open.patch
@ -1,25 +0,0 @@
-diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
--- a/shell/source/unix/exec/shellexec.cxx
-+++ b/shell/source/unix/exec/shellexec.cxx
-@@ -150,7 +150,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
-         if (std::getenv("LIBO_FLATPAK") != nullptr) {
-             aBuffer.append("/app/bin/xdg-open");
-         } else {
-            aBuffer.append("/usr/bin/xdg-open");
-+            aBuffer.append("xdg-open");
-         }
- #endif
-         aBuffer.append(" ");
-diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh
-index 4519e01f26e2..8985711a2c01 100755
--- a/shell/source/unix/misc/senddoc.sh
-+++ b/shell/source/unix/misc/senddoc.sh
-@@ -393,6 +393,8 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
-             MAILER=/usr/bin/kde-open
-         elif [ -x /usr/bin/xdg-open ] ; then
-             MAILER=/usr/bin/xdg-open
-+        elif type -p xdg-open >/dev/null 2>&1 ; then
-+            MAILER="$(type -p xdg-open)"
-         else
-             echo "Unsupported mail client: `basename $MAILER | sed 's/-.*^//'`"
-             exit 2
--- a/pkgs/applications/science/robotics/qgroundcontrol/0001-fix-gcc-cmath-namespace-issues.patch
+++ b/pkgs/applications/science/robotics/qgroundcontrol/0001-fix-gcc-cmath-namespace-issues.patch
@ -1,140 +0,0 @@
-From fffc383c10c7c194e427d78c83802c3b910fa1c2 Mon Sep 17 00:00:00 2001
-From: Patrick Callahan <pxcallahan@gmail.com>
-Date: Thu, 24 Mar 2016 18:17:57 -0700
-Subject: [PATCH] fix gcc cmath namespace issues
-
---
- src/Vehicle/Vehicle.cc        | 6 +++---
- src/comm/QGCFlightGearLink.cc | 4 ++--
- src/comm/QGCJSBSimLink.cc     | 4 ++--
- src/uas/UAS.cc                | 8 ++++----
- src/ui/QGCDataPlot2D.cc       | 4 ++--
- 5 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
-index a0d3605..205b1de 100644
--- a/src/Vehicle/Vehicle.cc
-+++ b/src/Vehicle/Vehicle.cc
-@@ -638,17 +638,17 @@ void Vehicle::setLongitude(double longitude){
- 
- void Vehicle::_updateAttitude(UASInterface*, double roll, double pitch, double yaw, quint64)
- {
-    if (isinf(roll)) {
-+    if (std::isinf(roll)) {
-         _rollFact.setRawValue(0);
-     } else {
-         _rollFact.setRawValue(roll * (180.0 / M_PI));
-     }
-    if (isinf(pitch)) {
-+    if (std::isinf(pitch)) {
-         _pitchFact.setRawValue(0);
-     } else {
-         _pitchFact.setRawValue(pitch * (180.0 / M_PI));
-     }
-    if (isinf(yaw)) {
-+    if (std::isinf(yaw)) {
-         _headingFact.setRawValue(0);
-     } else {
-         yaw = yaw * (180.0 / M_PI);
-diff --git a/src/comm/QGCFlightGearLink.cc b/src/comm/QGCFlightGearLink.cc
-index 2a520fb..886aecf 100644
--- a/src/comm/QGCFlightGearLink.cc
-+++ b/src/comm/QGCFlightGearLink.cc
-@@ -230,7 +230,7 @@ void QGCFlightGearLink::updateControls(quint64 time, float rollAilerons, float p
-     Q_UNUSED(systemMode);
-     Q_UNUSED(navMode);
- 
-    if(!isnan(rollAilerons) && !isnan(pitchElevator) && !isnan(yawRudder) && !isnan(throttle))
-+    if(!std::isnan(rollAilerons) && !std::isnan(pitchElevator) && !std::isnan(yawRudder) && !std::isnan(throttle))
-     {
-         QString state("%1\t%2\t%3\t%4\t%5\n");
-         state = state.arg(rollAilerons).arg(pitchElevator).arg(yawRudder).arg(true).arg(throttle);
-@@ -240,7 +240,7 @@ void QGCFlightGearLink::updateControls(quint64 time, float rollAilerons, float p
-     }
-     else
-     {
-        qDebug() << "HIL: Got NaN values from the hardware: isnan output: roll: " << isnan(rollAilerons) << ", pitch: " << isnan(pitchElevator) << ", yaw: " << isnan(yawRudder) << ", throttle: " << isnan(throttle);
-+        qDebug() << "HIL: Got NaN values from the hardware: std::isnan output: roll: " << std::isnan(rollAilerons) << ", pitch: " << std::isnan(pitchElevator) << ", yaw: " << std::isnan(yawRudder) << ", throttle: " << std::isnan(throttle);
-     }
- }
- 
-diff --git a/src/comm/QGCJSBSimLink.cc b/src/comm/QGCJSBSimLink.cc
-index 1210621..89db371 100644
--- a/src/comm/QGCJSBSimLink.cc
-+++ b/src/comm/QGCJSBSimLink.cc
-@@ -242,7 +242,7 @@ void QGCJSBSimLink::updateControls(quint64 time, float rollAilerons, float pitch
-     Q_UNUSED(systemMode);
-     Q_UNUSED(navMode);
- 
-    if(!isnan(rollAilerons) && !isnan(pitchElevator) && !isnan(yawRudder) && !isnan(throttle))
-+    if(!std::isnan(rollAilerons) && !std::isnan(pitchElevator) && !std::isnan(yawRudder) && !std::isnan(throttle))
-     {
-         QString state("%1\t%2\t%3\t%4\t%5\n");
-         state = state.arg(rollAilerons).arg(pitchElevator).arg(yawRudder).arg(true).arg(throttle);
-@@ -250,7 +250,7 @@ void QGCJSBSimLink::updateControls(quint64 time, float rollAilerons, float pitch
-     }
-     else
-     {
-        qDebug() << "HIL: Got NaN values from the hardware: isnan output: roll: " << isnan(rollAilerons) << ", pitch: " << isnan(pitchElevator) << ", yaw: " << isnan(yawRudder) << ", throttle: " << isnan(throttle);
-+        qDebug() << "HIL: Got NaN values from the hardware: isnan output: roll: " << std::isnan(rollAilerons) << ", pitch: " << std::isnan(pitchElevator) << ", yaw: " << std::isnan(yawRudder) << ", throttle: " << std::isnan(throttle);
-     }
-     //qDebug() << "Updated controls" << state;
- }
-diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
-index 4d5c1c2..ac88852 100644
--- a/src/uas/UAS.cc
-+++ b/src/uas/UAS.cc
-@@ -558,7 +558,7 @@ void UAS::receiveMessage(mavlink_message_t message)
- 
-             setAltitudeAMSL(hud.alt);
-             setGroundSpeed(hud.groundspeed);
-            if (!isnan(hud.airspeed))
-+            if (!std::isnan(hud.airspeed))
-                 setAirSpeed(hud.airspeed);
-             speedZ = -hud.climb;
-             emit altitudeChanged(this, altitudeAMSL, altitudeRelative, -speedZ, time);
-@@ -654,7 +654,7 @@ void UAS::receiveMessage(mavlink_message_t message)
- 
-                     float vel = pos.vel/100.0f;
-                     // Smaller than threshold and not NaN
-                    if ((vel < 1000000) && !isnan(vel) && !isinf(vel)) {
-+                    if ((vel < 1000000) && !std::isnan(vel) && !std::isinf(vel)) {
-                         setGroundSpeed(vel);
-                         emit speedChanged(this, groundSpeed, airSpeed, time);
-                     } else {
-@@ -1439,8 +1439,8 @@ void UAS::setExternalControlSetpoint(float roll, float pitch, float yaw, float t
-     if (countSinceLastTransmission++ >= 5) {
-         sendCommand = true;
-         countSinceLastTransmission = 0;
-    } else if ((!isnan(roll) && roll != manualRollAngle) || (!isnan(pitch) && pitch != manualPitchAngle) ||
-             (!isnan(yaw) && yaw != manualYawAngle) || (!isnan(thrust) && thrust != manualThrust) ||
-+    } else if ((!std::isnan(roll) && roll != manualRollAngle) || (!std::isnan(pitch) && pitch != manualPitchAngle) ||
-+             (!std::isnan(yaw) && yaw != manualYawAngle) || (!std::isnan(thrust) && thrust != manualThrust) ||
-              buttons != manualButtons) {
-         sendCommand = true;
- 
-diff --git a/src/ui/QGCDataPlot2D.cc b/src/ui/QGCDataPlot2D.cc
-index 2e530b2..9d5a774 100644
--- a/src/ui/QGCDataPlot2D.cc
-+++ b/src/ui/QGCDataPlot2D.cc
-@@ -535,7 +535,7 @@ void QGCDataPlot2D::loadCsvLog(QString file, QString xAxisName, QString yAxisFil
-                 {
-                     bool okx = true;
-                     x = text.toDouble(&okx);
-                    if (okx && !isnan(x) && !isinf(x))
-+                    if (okx && !std::isnan(x) && !std::isinf(x))
-                     {
-                         headerfound = true;
-                     }
-@@ -561,7 +561,7 @@ void QGCDataPlot2D::loadCsvLog(QString file, QString xAxisName, QString yAxisFil
-                         y = text.toDouble(&oky);
-                         // Only INF is really an issue for the plot
-                         // NaN is fine
-                        if (oky && !isnan(y) && !isinf(y) && text.length() > 0 && text != " " && text != "\n" && text != "\r" && text != "\t")
-+                        if (oky && !std::isnan(y) && !std::isinf(y) && text.length() > 0 && text != " " && text != "\n" && text != "\r" && text != "\t")
-                         {
-                             // Only append definitely valid values
-                             xValues.value(curveName)->append(x);
-- 
-2.7.4
-
--- a/pkgs/applications/search/recoll/nodeblayout.patch
+++ b/pkgs/applications/search/recoll/nodeblayout.patch
@ -1,12 +0,0 @@
-diff -ru recoll-1.21.3-orig/recollinstall.in recoll-1.21.3/recollinstall.in
--- recoll-1.21.3-orig/recollinstall.in	2015-09-28 08:08:42.000000000 +0100
-+++ recoll-1.21.3/recollinstall.in	2015-12-13 22:48:30.361776374 +0000
-@@ -45,9 +45,6 @@
-    mandir=$DESTDIR/$mandir
-    ROOTFORPYTHON="--root=${DESTDIR}"
- fi
-if test -f /etc/debian_version ; then
-   OPTSFORPYTHON=--install-layout=deb
-fi
- 
- echo "Installing to $PREFIX"
--- a/pkgs/applications/search/recoll/versionawk.patch
+++ b/pkgs/applications/search/recoll/versionawk.patch
@ -1,12 +0,0 @@
-diff -ru recoll-1.21.3-orig/filters/rclpdf recoll-1.21.3/filters/rclpdf
--- recoll-1.21.3-orig/filters/rclpdf	2015-09-28 08:08:15.000000000 +0100
-+++ recoll-1.21.3/filters/rclpdf	2015-12-14 21:37:01.984945925 +0000
-@@ -129,7 +129,7 @@
- {
-     # Test poppler version: at some point before 0.24, poppler began
-     # to properly escape text inside the header (but not the body).
-    XYZ=`pdftotext -v 2>&1 | awk '/pdftotext/{print $3}'`
-+    XYZ=`pdftotext -v 2>&1 | awk '/version/{print $3}'`
-     MAJOR=`echo $XYZ | cut -d. -f 1`
-     MINOR=`echo $XYZ | cut -d. -f 2`
-     escapeheader=1
--- a/pkgs/applications/window-managers/tabbed/xft.patch
+++ b/pkgs/applications/window-managers/tabbed/xft.patch
@ -1,234 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index b3da7f0..ce43686 100644
--- a/config.def.h
-+++ b/config.def.h
-@@ -1,7 +1,7 @@
- /* See LICENSE file for copyright and license details. */
- 
- /* appearance */
-static const char font[]        = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";
-+static const char font[]        = "monospace-9";
- static const char* normbgcolor  = "#222222";
- static const char* normfgcolor  = "#cccccc";
- static const char* selbgcolor   = "#555555";
-diff --git a/config.mk b/config.mk
-index dd741e4..ed3a2e9 100644
--- a/config.mk
-+++ b/config.mk
-@@ -9,7 +9,7 @@ MANPREFIX = ${PREFIX}/share/man
- 
- # includes and libs
- INCS = -I. -I/usr/include
-LIBS = -L/usr/lib -lc -lX11
-+LIBS = -L/usr/lib -lc -lXft -lX11
- 
- # flags
- CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
-diff --git a/tabbed.c b/tabbed.c
-index b15f9cb..6e50c41 100644
--- a/tabbed.c
-+++ b/tabbed.c
-@@ -15,6 +15,7 @@
- #include <X11/Xproto.h>
- #include <X11/Xutil.h>
- #include <X11/XKBlib.h>
-+#include <X11/Xft/Xft.h>
- 
- #include "arg.h"
- 
-@@ -64,17 +65,16 @@ typedef struct {
- 
- typedef struct {
- 	int x, y, w, h;
-	unsigned long norm[ColLast];
-	unsigned long sel[ColLast];
-	unsigned long urg[ColLast];
-+	XftColor norm[ColLast];
-+	XftColor sel[ColLast];
-+	XftColor urg[ColLast];
- 	Drawable drawable;
- 	GC gc;
- 	struct {
- 		int ascent;
- 		int descent;
- 		int height;
-		XFontSet set;
-		XFontStruct *xfont;
-+		XftFont *xfont;
- 	} font;
- } DC; /* draw context */
- 
-@@ -97,7 +97,7 @@ static void unmapnotify(const XEvent *e);
- static void destroynotify(const XEvent *e);
- static void die(const char *errstr, ...);
- static void drawbar(void);
-static void drawtext(const char *text, unsigned long col[ColLast]);
-+static void drawtext(const char *text, XftColor col[ColLast]);
- static void *ecalloc(size_t n, size_t size);
- static void *erealloc(void *o, size_t size);
- static void expose(const XEvent *e);
-@@ -107,7 +107,7 @@ static void focusonce(const Arg *arg);
- static void fullscreen(const Arg *arg);
- static char* getatom(int a);
- static int getclient(Window w);
-static unsigned long getcolor(const char *colstr);
-+static XftColor getcolor(const char *colstr);
- static int getfirsttab(void);
- static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
- static void initfont(const char *fontstr);
-@@ -220,12 +220,6 @@ cleanup(void) {
- 	free(clients);
- 	clients = NULL;
- 
-	if(dc.font.set) {
-		XFreeFontSet(dpy, dc.font.set);
-	} else {
-		XFreeFont(dpy, dc.font.xfont);
-	}
-
- 	XFreePixmap(dpy, dc.drawable);
- 	XFreeGC(dpy, dc.gc);
- 	XDestroyWindow(dpy, win);
-@@ -315,7 +309,7 @@ die(const char *errstr, ...) {
- 
- void
- drawbar(void) {
-	unsigned long *col;
-+	XftColor *col;
- 	int c, cc, fc, width;
- 	char *name = NULL;
- 
-@@ -368,12 +362,13 @@ drawbar(void) {
- }
- 
- void
-drawtext(const char *text, unsigned long col[ColLast]) {
-+drawtext(const char *text, XftColor col[ColLast]) {
- 	int i, x, y, h, len, olen;
- 	char buf[256];
-+	XftDraw *d;
- 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
- 
-	XSetForeground(dpy, dc.gc, col[ColBG]);
-+	XSetForeground(dpy, dc.gc, col[ColBG].pixel);
- 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
- 	if(!text)
- 		return;
-@@ -394,13 +389,12 @@ drawtext(const char *text, unsigned long col[ColLast]) {
- 		for(i = len; i && i > len - 3; buf[--i] = '.');
- 	}
- 
-	XSetForeground(dpy, dc.gc, col[ColFG]);
-	if(dc.font.set) {
-		XmbDrawString(dpy, dc.drawable, dc.font.set,
-				dc.gc, x, y, buf, len);
-	} else {
-		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-	}
-+	XSetForeground(dpy, dc.gc, col[ColFG].pixel);
-+
-+	d = XftDrawCreate(dpy, dc.drawable, DefaultVisual(dpy, screen), DefaultColormap(dpy,screen));
-+
-+	XftDrawStringUtf8(d, &col[ColFG], dc.font.xfont, x, y, (XftChar8 *) buf, len);
-+	XftDrawDestroy(d);
- }
- 
- void *
-@@ -537,15 +531,14 @@ getclient(Window w) {
- 	return -1;
- }
- 
-unsigned long
-+XftColor
- getcolor(const char *colstr) {
-	Colormap cmap = DefaultColormap(dpy, screen);
-	XColor color;
-+	XftColor color;
- 
-	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
-+	if(!XftColorAllocName(dpy, DefaultVisual(dpy, screen), DefaultColormap(dpy, screen), colstr, &color))
- 		die("tabbed: cannot allocate color '%s'\n", colstr);
- 
-	return color.pixel;
-+	return color;
- }
- 
- int
-@@ -594,41 +587,11 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
- 
- void
- initfont(const char *fontstr) {
-	char *def, **missing, **font_names;
-	int i, n;
-	XFontStruct **xfonts;
-
-	missing = NULL;
-	if(dc.font.set)
-		XFreeFontSet(dpy, dc.font.set);
-
-	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-	if(missing) {
-		while(n--)
-			fprintf(stderr, "tabbed: missing fontset: %s\n", missing[n]);
-		XFreeStringList(missing);
-	}
-
-	if(dc.font.set) {
-		dc.font.ascent = dc.font.descent = 0;
-		n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
-		for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-			dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
-			dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
-			xfonts++;
-		}
-	} else {
-		if(dc.font.xfont)
-			XFreeFont(dpy, dc.font.xfont);
-		dc.font.xfont = NULL;
-		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
-				&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed"))) {
-			die("tabbed: cannot load font: '%s'\n", fontstr);
-		}
-+	if(!(dc.font.xfont = XftFontOpenName(dpy,screen,fontstr)) && !(dc.font.xfont = XftFontOpenName(dpy,screen,"fixed")))
-+		die("error, cannot load font: '%s'\n", fontstr);
- 
-		dc.font.ascent = dc.font.xfont->ascent;
-		dc.font.descent = dc.font.xfont->descent;
-	}
-+	dc.font.ascent = dc.font.xfont->ascent;
-+	dc.font.descent = dc.font.xfont->descent;
- 	dc.font.height = dc.font.ascent + dc.font.descent;
- }
- 
-@@ -1000,11 +963,9 @@ setup(void) {
- 	dc.drawable = XCreatePixmap(dpy, root, ww, wh,
- 			DefaultDepth(dpy, screen));
- 	dc.gc = XCreateGC(dpy, root, 0, 0);
-	if(!dc.font.set)
-		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
- 
- 	win = XCreateSimpleWindow(dpy, root, wx, wy, ww, wh, 0,
-			dc.norm[ColFG], dc.norm[ColBG]);
-+			dc.norm[ColFG].pixel, dc.norm[ColBG].pixel);
- 	XMapRaised(dpy, win);
- 	XSelectInput(dpy, win, SubstructureNotifyMask|FocusChangeMask|
- 			ButtonPressMask|ExposureMask|KeyPressMask|PropertyChangeMask|
-@@ -1070,15 +1031,9 @@ spawn(const Arg *arg) {
- 
- int
- textnw(const char *text, unsigned int len) {
-	XRectangle r;
-
-	if(dc.font.set) {
-		XmbTextExtents(dc.font.set, text, len, NULL, &r);
-
-		return r.width;
-	}
-
-	return XTextWidth(dc.font.xfont, text, len);
-+	XGlyphInfo ext;
-+	XftTextExtentsUtf8(dpy, dc.font.xfont, (XftChar8 *) text, len, &ext);
-+	return ext.xOff;
- }
- 
- void
--- a/pkgs/desktops/enlightenment/elementary.patch
+++ b/pkgs/desktops/enlightenment/elementary.patch
@ -1,18 +0,0 @@
--- a/elementary.pc.in	2015-05-16 21:08:14.321148417 +0200
-+++ b/elementary.pc.in	2015-05-16 21:08:30.643412725 +0200
-@@ -14,4 +14,4 @@
- Requires.private: @requirement_elm_pc@
- Version: @VERSION@
- Libs: -L${libdir} -lelementary @ELEMENTARY_PC_LIBS@
-Cflags: -I${includedir}/elementary-@VMAJ@
-+Cflags: -I${includedir}/elementary-@VMAJ@ @ELEMENTARY_PC_CFLAGS@
--- a/Makefile.am	2015-05-16 21:08:14.322148433 +0200
-+++ b/Makefile.am	2015-05-16 21:08:30.643412725 +0200
-@@ -84,6 +84,7 @@
- -e 's,@requirement_elm_pc\@,$(requirement_elm_pc),g' \
- -e 's,@ELEMENTARY_LIBS\@,$(ELEMENTARY_LIBS),g' \
- -e 's,@ELEMENTARY_PC_LIBS\@,$(ELEMENTARY_PC_LIBS),g' \
-+-e 's,@ELEMENTARY_PC_CFLAGS\@,$(ELEMENTARY_PC_CFLAGS),g' \
- < $< > $@ || rm $@
- 
- pc_verbose = $(pc_verbose_@AM_V@)
--- a/pkgs/desktops/gnustep/back/fixup-tools.patch
+++ b/pkgs/desktops/gnustep/back/fixup-tools.patch
@ -1,14 +0,0 @@
-diff -c gnustep-back-0.24.0/Tools/GNUmakefile.preamble gnustep-back-0.24.0.patched/Tools/GNUmakefile.preamble
--- gnustep-back-0.24.0/Tools/GNUmakefile.preamble	2013-07-04 22:44:28.000000000 +0600
-+++ gnustep-back-0.24.0.patched/Tools/GNUmakefile.preamble	2014-12-01 16:40:37.000000000 +0600
-@@ -52,6 +52,9 @@
- # Additional libraries when linking applications
- #ADDITIONAL_GUI_LIBS +=
- 
-+# Additional libraries when linking tools
-+gpbs_TOOL_LIBS += -lgnustep-gui -lgnustep-base $(SYSTEM_LIBS)
-+
- #
- # Flags dealing with installing and uninstalling
- #
-
--- a/pkgs/desktops/gnustep/base/fixup-base-makefile-installdir.patch
+++ b/pkgs/desktops/gnustep/base/fixup-base-makefile-installdir.patch
@ -1,29 +0,0 @@
--- gnustep-base-1.24.7/Makefile.postamble	2011-07-15 19:53:45.000000000 +0600
-+++ gnustep-base-1.24.7.patched/Makefile.postamble	2014-11-29 22:25:07.000000000 +0600
-@@ -38,13 +38,13 @@
- # Things to do after compiling
- # after-all::
- 
-$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional:
-	$(ECHO_CREATING)$(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional$(END_ECHO)
-+$(DESTDIR_GNUSTEP_MAKEFILES)/Additional:
-+	$(ECHO_CREATING)$(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional$(END_ECHO)
- 
- # Things to do before installing
-before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional
-+before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional
- 	$(ECHO_NOTHING)$(INSTALL_DATA) base.make \
-	    $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO)
-+	    $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO)
- 
- # Things to do after installing
- # after-install::
-@@ -54,7 +54,7 @@
- 
- # Things to do after uninstalling
- after-uninstall::
-	$(ECHO_NOTHING)rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO)
-+	$(ECHO_NOTHING)rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/base.make$(END_ECHO)
- 
- # Things to do before cleaning
- # before-clean::
--- a/pkgs/desktops/gnustep/gorm/fix-gs-makefiles.patch
+++ b/pkgs/desktops/gnustep/gorm/fix-gs-makefiles.patch
@ -1,27 +0,0 @@
-diff -ru gorm-1.2.20/GNUmakefile gorm-1.2.20.patched/GNUmakefile
--- gorm-1.2.20/GNUmakefile	2010-05-30 12:55:26.000000000 +0600
-+++ gorm-1.2.20.patched/GNUmakefile	2014-12-10 22:21:18.000000000 +0600
-@@ -24,6 +24,23 @@
- #   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
- 
-+ifeq ($(GNUSTEP_MAKEFILES),)
-+ GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
-+  ifeq ($(GNUSTEP_MAKEFILES),)
-+    $(warning )
-+    $(warning Unable to obtain GNUSTEP_MAKEFILES setting from gnustep-config!)
-+    $(warning Perhaps gnustep-make is not properly installed,)
-+    $(warning so gnustep-config is not in your PATH.)
-+    $(warning )
-+    $(warning Your PATH is currently $(PATH))
-+    $(warning )
-+  endif
-+endif
-+
-+ifeq ($(GNUSTEP_MAKEFILES),)
-+  $(error You need to set GNUSTEP_MAKEFILES before compiling!)
-+endif
-+
- PACKAGE_NAME = gorm
- export PACKAGE_NAME
- include $(GNUSTEP_MAKEFILES)/common.make
--- a/pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch
+++ b/pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch
@ -1,28 +0,0 @@
--- gnustep-gui-0.24.0/GNUmakefile.postamble	2010-05-17 22:38:59.000000000 +0600
-+++ gnustep-gui-0.24.0.patched/GNUmakefile.postamble	2014-12-01 13:44:05.000000000 +0600
-@@ -40,20 +40,20 @@
- # The following rule is important mainly for packaging, because in that case 
- # you install into a fake system tree, and the directory is not there.
- #
-$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional:
-	$(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional
-+$(DESTDIR_GNUSTEP_MAKEFILES)/Additional:
-+	$(MKDIRS) $(DESTDIR_GNUSTEP_MAKEFILES)/Additional
- 
- # Things to do before installing
-before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional
-+before-install:: $(DESTDIR_GNUSTEP_MAKEFILES)/Additional
- 	$(INSTALL_DATA) gui.make \
-	   $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make
-+	   $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make
- 
- # Things to do after installing
- # after-install::
- 
- # Things to do before uninstalling
-  before-uninstall::
-	rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make
-+	rm -f $(DESTDIR_GNUSTEP_MAKEFILES)/Additional/gui.make
- 
- # Things to do after uninstalling
- # after-uninstall::
--- a/pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch
+++ b/pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch
@ -1,11 +0,0 @@
--- gnustep-gui-0.24.0/TextConverters/RTF/GNUmakefile.preamble	2008-06-10 10:01:49.000000000 +0600
-+++ gnustep-gui-0.24.0.patched/TextConverters/RTF/GNUmakefile.preamble	2014-12-01 13:02:11.000000000 +0600
-@@ -49,7 +49,7 @@
- ADDITIONAL_INCLUDE_DIRS +=-I../../Headers/Additions -I../../Headers
- 
- # Additional LDFLAGS to pass to the linker
-#ADDITIONAL_LDFLAGS += 
-+ADDITIONAL_LDFLAGS += -lgnustep-gui
- 
- # Additional library directories the linker should search
- ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR)
--- a/pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch
+++ b/pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch
@ -1,14 +0,0 @@
--- gnustep-gui-0.24.0/Tools/GNUmakefile.preamble	2006-02-22 12:43:48.000000000 +0600
-+++ gnustep-gui-0.24.0.patched/Tools/GNUmakefile.preamble	2014-12-01 12:52:41.000000000 +0600
-@@ -32,9 +32,11 @@
- ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR) -L../Model/$(GNUSTEP_OBJ_DIR)
- 
- # Additional libraries when linking tools
-+make_services_TOOL_LIBS += -lgnustep-base
- gpbs_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
- set_show_service_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
- gopen_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
-+gclose_TOOL_LIBS += -lgnustep-base
- gcloseall_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
- GSspell_TOOL_LIBS += $(ADDITIONAL_DEPENDS)
- 
--- a/pkgs/desktops/gnustep/make/gs-makefiles-additional.patch
+++ b/pkgs/desktops/gnustep/make/gs-makefiles-additional.patch
@ -1,145 +0,0 @@
-diff -ru gnustep-make-2.6.6/common.make gnustep-make-2.6.6.patched/common.make
--- gnustep-make-2.6.6/common.make	2013-03-04 17:21:55.000000000 +0600
-+++ gnustep-make-2.6.6.patched/common.make	2014-12-09 21:29:10.000000000 +0600
-@@ -135,7 +135,9 @@
- endif
- # Then include makefiles with flags/config options installed by the 
- # libraries themselves
--include $(GNUSTEP_MAKEFILES)/Additional/*.make
-+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),)
-+-include $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)
-+endif
- 
- #
- # Determine target specific settings
-diff -ru gnustep-make-2.6.6/GNUmakefile.in gnustep-make-2.6.6.patched/GNUmakefile.in
--- gnustep-make-2.6.6/GNUmakefile.in	2013-09-20 12:13:15.000000000 +0600
-+++ gnustep-make-2.6.6.patched/GNUmakefile.in	2014-12-07 20:35:27.000000000 +0600
-@@ -173,7 +173,6 @@
- 		"$(makedir)/$(GNUSTEP_TARGET_CPU)" \
- 		"$(makedir)/$(GNUSTEP_TARGET_DIR)" \
- 		"$(makedir)/$(GNUSTEP_TARGET_LDIR)" \
-		"$(makedir)/Additional" \
- 		"$(makedir)/Auxiliary" \
- 		"$(makedir)/Master" \
- 		"$(makedir)/Instance" \
-@@ -314,7 +313,6 @@
- 	-rmdir "$(makedir)/Instance"
- 	-rmdir "$(makedir)/Master"
- 	-rmdir "$(makedir)/Auxiliary"
-	-rmdir "$(makedir)/Additional"
- 	-rmdir "$(makedir)/$(GNUSTEP_TARGET_LDIR)"
- 	-rmdir "$(makedir)/$(GNUSTEP_TARGET_DIR)"
- 	-rmdir "$(makedir)/$(GNUSTEP_TARGET_CPU)"
-diff -ru gnustep-make-2.6.6/gnustep-config.in gnustep-make-2.6.6.patched/gnustep-config.in
--- gnustep-make-2.6.6/gnustep-config.in	2013-07-02 16:06:24.000000000 +0600
-+++ gnustep-make-2.6.6.patched/gnustep-config.in	2014-12-09 21:29:49.000000000 +0600
-@@ -66,6 +66,7 @@
-     echo "    --variable=OBJCXX"
-     echo "    --variable=GNUMAKE"
-     echo "    --variable=GNUSTEP_MAKEFILES"
-+    echo "    --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL"
-     echo "    --variable=GNUSTEP_USER_DEFAULTS_DIR"
-     echo "    --variable=GNUSTEP_HOST"
-     echo "    --variable=GNUSTEP_HOST_CPU"
-@@ -153,6 +154,8 @@
- 
- export GNUSTEP_MAKEFILES
- 
-+export NIX_GNUSTEP_MAKEFILES_ADDITIONAL
-+
- #
- # If all they want to know if GNUSTEP_MAKEFILES or anything that
- # we can compute only using GNUSTEP_MAKEFILES, we can print it out
-@@ -168,6 +171,8 @@
-               exit 0;;
-   --variable=GNUSTEP_MAKEFILES) echo "$GNUSTEP_MAKEFILES"
-               exit 0;;
-+  --variable=NIX_GNUSTEP_MAKEFILES_ADDITIONAL) echo "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL"
-+              exit 0;;
-   --variable=GNUMAKE) echo "@GNUMAKE@"
-               exit 0;;
-   --debug-flags) @GNUMAKE@ -s -f "$GNUSTEP_MAKEFILES/empty.make" print-gnustep-make-objc-flags quiet=yes debug=yes 2>/dev/null
-diff -ru gnustep-make-2.6.6/GNUstep.csh.in gnustep-make-2.6.6.patched/GNUstep.csh.in
--- gnustep-make-2.6.6/GNUstep.csh.in	2011-05-03 13:40:10.000000000 +0600
-+++ gnustep-make-2.6.6.patched/GNUstep.csh.in	2014-12-09 20:14:05.000000000 +0600
-@@ -130,6 +130,10 @@
-   setenv GNUSTEP_MAKEFILES "@GNUSTEP_MAKEFILES@"
- endif
- 
-+if ( ! ${?NIX_GNUSTEP_MAKEFILES_ADDITIONAL} ) then
-+  setenv NIX_GNUSTEP_MAKEFILES_ADDITIONAL "@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@"
-+endif
-+
- if ( "${GNUSTEP_MAKE_STRICT_V2_MODE}" == "yes" ) then
-   unsetenv GNUSTEP_USER_DIR
-   unsetenv GNUSTEP_USER_ROOT
-diff -ru gnustep-make-2.6.6/GNUstep.sh.in gnustep-make-2.6.6.patched/GNUstep.sh.in
--- gnustep-make-2.6.6/GNUstep.sh.in	2012-02-21 20:21:38.000000000 +0600
-+++ gnustep-make-2.6.6.patched/GNUstep.sh.in	2014-12-09 20:14:19.000000000 +0600
-@@ -173,6 +173,10 @@
- fi
- export GNUSTEP_MAKEFILES
- 
-+if [ -z "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" ]; then
-+  NIX_GNUSTEP_MAKEFILES_ADDITIONAL=@NIX_GNUSTEP_MAKEFILES_ADDITIONAL@
-+fi
-+export NIX_GNUSTEP_MAKEFILES_ADDITIONAL
- 
- if [ "$GNUSTEP_MAKE_STRICT_V2_MODE" = "yes" ]; then
-   # Make sure this is never set in gnustep-make v2 strict mode; it
-diff -ru gnustep-make-2.6.6/GNUstep-strict-v2.conf.in gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in
--- gnustep-make-2.6.6/GNUstep-strict-v2.conf.in	2008-01-15 20:35:36.000000000 +0600
-+++ gnustep-make-2.6.6.patched/GNUstep-strict-v2.conf.in	2014-12-07 22:04:56.000000000 +0600
-@@ -47,7 +47,6 @@
- # Traditionally, this is /usr/GNUstep/System/Library/Makefiles
- GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@
- 
-
- # This is where the user home directories are.  Only used to provide
- # NSUserDirectory in gnustep-base.  Never used anywhere else.
- GNUSTEP_SYSTEM_USERS_DIR=@GNUSTEP_SYSTEM_USERS_DIR@
-diff -ru gnustep-make-2.6.6/library-combo.make gnustep-make-2.6.6.patched/library-combo.make
--- gnustep-make-2.6.6/library-combo.make	2012-02-21 19:53:02.000000000 +0600
-+++ gnustep-make-2.6.6.patched/library-combo.make	2014-12-09 20:15:05.000000000 +0600
-@@ -142,7 +142,7 @@
- #
- # Third-party foundations not using make package
- # Our own foundation will install a base.make file into 
-# $GNUSTEP_MAKEFILES/Additional/ to set the needed flags
-+# $NIX_GNUSTEP_MAKEFILES_ADDITIONAL to set the needed flags
- #
- ifeq ($(FOUNDATION_LIB), nx)
-   # -framework Foundation is used both to find headers, and to link
-@@ -166,7 +166,7 @@
- 
- #
- # FIXME - Ask Helge to move this inside his libFoundation, and have 
-# it installed as a $(GNUSTEP_MAKEFILES)/Additional/libFoundation.make
-+# it installed as a $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/libFoundation.make
- #
- ifeq ($(FOUNDATION_LIB),fd)
-   -include $(GNUSTEP_MAKEFILES)/libFoundation.make
-@@ -193,7 +193,7 @@
- GUI_LIBS = 
- #
- # Third-party GUI libraries - our own sets its flags into 
-# $(GNUSTEP_MAKEFILES)/Additional/gui.make
-+# $(NIX_GNUSTEP_MAKEFILES_ADDITIONAL)/gui.make
- #
- ifeq ($(GUI_LIB), nx)
-   GUI_DEFINE = -DNeXT_GUI_LIBRARY=1
-diff -ru gnustep-make-2.6.6/rules.make gnustep-make-2.6.6.patched/rules.make
--- gnustep-make-2.6.6/rules.make	2013-07-04 16:05:44.000000000 +0600
-+++ gnustep-make-2.6.6.patched/rules.make	2014-12-09 21:31:04.000000000 +0600
-@@ -667,7 +667,9 @@
- 	exit 1$(END_ECHO)
- endif
- 
-$(GNUSTEP_MAKEFILES)/Additional/*.make: ;
-+ifneq ($(NIX_GNUSTEP_MAKEFILES_ADDITIONAL),)
-+$(NIX_GNUSTEP_MAKEFILES_ADDITIONAL): ;
-+endif
- 
- $(GNUSTEP_MAKEFILES)/Master/*.make: ;
- 
--- a/pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch
+++ b/pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch
@ -1,14 +0,0 @@
-diff -c ProjectCenter-0.6.2/GNUmakefile.preamble ProjectCenter-0.6.2.patched/GNUmakefile.preamble
--- ProjectCenter-0.6.2/GNUmakefile.preamble	2010-08-08 03:56:04.000000000 +0600
-+++ artyom/ProjectCenter-0.6.2.patched/GNUmakefile.preamble	2014-12-01 20:08:31.000000000 +0600
-@@ -39,7 +39,7 @@
- ADDITIONAL_INCLUDE_DIRS += -I./ -I./Headers
- 
- # Additional LDFLAGS to pass to the linker
-ADDITIONAL_LDFLAGS += 
-+ADDITIONAL_LDFLAGS += -lgnustep-base -lgnustep-gui
- 
- # Additional library directories the linker should search
- ADDITIONAL_LIB_DIRS += -L./Framework/ProjectCenter.framework/$(GNUSTEP_TARGET_LDIR)
-
-Diff finished.  Mon Dec  1 20:08:50 2014
--- a/pkgs/desktops/xfce4-13/exo/gtk3-only.patch
+++ b/pkgs/desktops/xfce4-13/exo/gtk3-only.patch
@ -1,28 +0,0 @@
-diff -urNZ a/configure.ac.in b/configure.ac.in
--- a/configure.ac.in	2017-11-20 02:57:40.476664918 +0000
-+++ b/configure.ac.in	2017-11-20 03:07:18.999128370 +0000
-@@ -165,11 +165,9 @@
- dnl ***********************************
- XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
- XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
- XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0])
- XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0])
- XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features])
- 
-diff -urNZ a/exo/Makefile.am b/exo/Makefile.am
--- a/exo/Makefile.am	2017-11-20 02:57:34.444785202 +0000
-+++ b/exo/Makefile.am	2017-11-20 03:00:49.402897465 +0000
-@@ -117,7 +117,7 @@
- 
- libexo_2_includedir = $(includedir)/exo-2/exo
- 
-lib_LTLIBRARIES += libexo-2.la
-+lib_LTLIBRARIES = libexo-2.la
- 
- libexo_2_include_HEADERS =						\
- 	exo.h								\
-Binary files a/.git/index and b/.git/index differ
--- a/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch
+++ b/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch
@ -1,11 +0,0 @@
--- Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj.old	2015-01-11 06:46:39.000000000 +0000
-+++ Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj	2015-05-25 21:29:40.546808622 +0100
-@@ -52,6 +52,8 @@
-     <Reference Include="System.Data.Linq" />
-     <Reference Include="System.Drawing" />
-     <Reference Include="System.Numerics" />
-+    <Reference Include="System.Collections" />
-+    <Reference Include="System.Runtime" />
-     <Reference Include="System.Runtime.Serialization" />
-     <Reference Include="System.Web" />
-     <Reference Include="System.Web.Extensions" />
--- a/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch
+++ b/pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch
@ -1,37 +0,0 @@
-diff --git a/Setup.hs b/Setup.hs
-index ddf5a02..7ad1f26 100644
--- a/Setup.hs
-+++ b/Setup.hs
-@@ -1,4 +1,4 @@
-
-+{-# LANGUAGE CPP #-}
- import Control.Monad (when)
- import Language.Haskell.TH
- import Distribution.Simple                (defaultMainWithHooks, simpleUserHooks, UserHooks(postConf), Args)
-@@ -6,14 +6,25 @@ import Distribution.Simple.Utils          (cabalVersion)
- import Distribution.Simple.LocalBuildInfo
- import Distribution.Simple.Setup          (ConfigFlags)
- import Distribution.Version               (Version(..))
-+#if MIN_VERSION_Cabal(1,25,0)
-+import Distribution.Version               (mkVersion)
-+#endif
- import Distribution.PackageDescription    (PackageDescription)
- import Debug.Trace
- 
-+#if MIN_VERSION_Cabal(1,25,0)
-+versionBranch :: Version -> Version
-+versionBranch = id
-+#else
-+mkVersion :: [Int] -> Version
-+mkVersion vs = Version vs []
-+#endif
-+
- -- I couldn't figure out a way to do this check from the cabal file, so we drop down
- -- here to do it instead:
- checkGoodVersion :: IO ()
- checkGoodVersion =
-  if   cabalVersion >= Version [1,17,0] []
-+  if   cabalVersion >= mkVersion [1,17,0]
-   then putStrLn (" [Setup.hs] This version of Cabal is ok for profiling: "++show cabalVersion)
-   else error (" [Setup.hs] This package should not be used in profiling mode with cabal version "++
-                         show (versionBranch cabalVersion)++" < 1.17.0\n"++
--- a/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch
+++ b/pkgs/development/haskell-modules/patches/graphviz-fix-ghc710.patch
@ -1,11 +0,0 @@
-diff -ru3 graphviz.old/Data/GraphViz/Algorithms.hs graphviz/Data/GraphViz/Algorithms.hs
--- graphviz.old/Data/GraphViz/Algorithms.hs	2015-05-18 15:21:38.379771357 +0300
-+++ graphviz/Data/GraphViz/Algorithms.hs	2015-05-18 15:01:01.940122684 +0300
-@@ -38,6 +38,7 @@
- import Data.GraphViz.Types.Canonical
- import Data.GraphViz.Types.Internal.Common
- 
-+import           Prelude                   hiding (traverse)
- import           Control.Arrow             (first, second, (***))
- import           Control.Monad             (unless)
- import           Control.Monad.Trans.State
--- a/pkgs/development/haskell-modules/patches/hie-testsuite.patch
+++ b/pkgs/development/haskell-modules/patches/hie-testsuite.patch
@ -1,40 +0,0 @@
-diff --git a/test/HaRePluginSpec.hs b/test/HaRePluginSpec.hs
-index 039c094..d0d1fa4 100644
--- a/test/HaRePluginSpec.hs
-+++ b/test/HaRePluginSpec.hs
-@@ -326,35 +326,6 @@ hareSpec = do
-                               $ List [TextEdit (Range (Position 4 0) (Position 8 12))
-                                        "parseStr = char '\"' *> (many1 (noneOf \"\\\"\")) <* char '\"'"])
-           Nothing)
-    it "finds definition across components" $ do
-      let u = filePathToUri "./app/Main.hs"
-      let lreq = setTypecheckedModule u
-      let req = findDef u (toPos (7,8))
-      r <- dispatchRequestPGoto $ lreq >> req
-      r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib.hs")
-                                           (Range (toPos (6,1)) (toPos (6,9)))]
-      let req2 = findDef u (toPos (7,20))
-      r2 <- dispatchRequestPGoto $ lreq >> req2
-      r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib2.hs")
-                                            (Range (toPos (5,1)) (toPos (5,2)))]
-    it "finds definition in the same component" $ do
-      let u = filePathToUri "./src/Lib2.hs"
-      let lreq = setTypecheckedModule u
-      let req = findDef u (toPos (6,5))
-      r <- dispatchRequestPGoto $ lreq >> req
-      r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib.hs")
-                                           (Range (toPos (6,1)) (toPos (6,9)))]
-    it "finds local definitions" $ do
-      let u = filePathToUri "./src/Lib2.hs"
-      let lreq = setTypecheckedModule u
-      let req = findDef u (toPos (7,11))
-      r <- dispatchRequestPGoto $ lreq >> req
-      r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib2.hs")
-                                           (Range (toPos (10,9)) (toPos (10,10)))]
-      let req2 = findDef u (toPos (10,13))
-      r2 <- dispatchRequestPGoto $ lreq >> req2
-      r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib2.hs")
-                                            (Range (toPos (9,9)) (toPos (9,10)))]
- 
- 
-     -- ---------------------------------
--- a/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch
+++ b/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch
@ -1,15 +0,0 @@
-index 60e134c..246d8ca 100644
--- lambdabot-core/src/Lambdabot/Config.hs
-+++ lambdabot-core/src/Lambdabot/Config.hs
-@@ -29,9 +29,9 @@ import Data.Typeable
- import Data.Generics (everywhere, mkT)
- import Language.Haskell.TH
- 
-data Config t where Config :: (Typeable1 k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t
-+data Config t where Config :: (Typeable k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t
- 
-cast1 :: (Typeable1 f, Typeable1 g) => f a -> Maybe (g a)
-+cast1 :: (Typeable f, Typeable g) => f a -> Maybe (g a)
- cast1 = fmap runIdentity . gcast1 . Identity
- 
- instance GEq Config where
--- a/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch
+++ b/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch
@ -1,107 +0,0 @@
-From 86595e193e8d46c769ab2a1cee961e8e04dfd1b9 Mon Sep 17 00:00:00 2001
-From: Michiel Derhaeg <derhaeg.michiel@gmail.com>
-Date: Tue, 20 Mar 2018 22:06:18 +0100
-Subject: [PATCH] update to work with GHC 8.4.1
-
---
- XMonad/Hooks/FadeWindows.hs     |  6 +++++-
- XMonad/Hooks/WallpaperSetter.hs |  6 +++++-
- XMonad/Layout/Mosaic.hs         |  6 +++++-
- xmonad-contrib.cabal            |  5 +++--
- 5 files changed, 33 insertions(+), 5 deletions(-)
-
-diff --git a/XMonad/Hooks/FadeWindows.hs b/XMonad/Hooks/FadeWindows.hs
-index 4b8e62b6..01d06792 100644
--- a/XMonad/Hooks/FadeWindows.hs
-+++ b/XMonad/Hooks/FadeWindows.hs
-@@ -61,7 +61,8 @@ import           Control.Monad.Reader                    (ask
-                                                          ,asks)
- import           Control.Monad.State                     (gets)
- import qualified Data.Map                    as M
-import           Data.Monoid
-+import           Data.Monoid                      hiding ((<>))
-+import           Data.Semigroup
- 
- import           Graphics.X11.Xlib.Extras                (Event(..))
- 
-@@ -134,6 +135,9 @@ instance Monoid Opacity where
-   r      `mappend` OEmpty = r
-   _      `mappend` r      = r
- 
-+instance Semigroup Opacity where
-+  (<>) = mappend
-+
- -- | A FadeHook is similar to a ManageHook, but records window opacity.
- type FadeHook = Query Opacity
- 
-diff --git a/XMonad/Hooks/WallpaperSetter.hs b/XMonad/Hooks/WallpaperSetter.hs
-index 00a3b1c3..d4f5ccb2 100644
--- a/XMonad/Hooks/WallpaperSetter.hs
-+++ b/XMonad/Hooks/WallpaperSetter.hs
-@@ -41,7 +41,8 @@ import Data.Ord (comparing)
- import Control.Monad
- import Control.Applicative
- import Data.Maybe
-import Data.Monoid
-+import Data.Monoid hiding ((<>))
-+import Data.Semigroup
- 
- -- $usage
- -- This module requires imagemagick and feh to be installed, as these are utilized
-@@ -86,6 +87,9 @@ instance Monoid WallpaperList where
-   mappend (WallpaperList w1) (WallpaperList w2) =
-     WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1)
- 
-+instance Semigroup WallpaperList where
-+  (<>) = mappend
-+
- -- | Complete wallpaper configuration passed to the hook
- data WallpaperConf = WallpaperConf {
-     wallpaperBaseDir :: FilePath  -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/)
-diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs
-index 05655d4c..da44fc50 100644
--- a/XMonad/Layout/Mosaic.hs
-+++ b/XMonad/Layout/Mosaic.hs
-@@ -38,7 +38,8 @@ import Control.Monad(mplus)
- import Data.Foldable(Foldable,foldMap, sum)
- import Data.Function(on)
- import Data.List(sortBy)
-import Data.Monoid(Monoid,mempty, mappend)
-+import Data.Monoid(Monoid,mempty, mappend, (<>))
-+import Data.Semigroup
- 
- 
- -- $usage
-@@ -202,6 +203,9 @@ instance Monoid (Tree a) where
-     mappend x Empty = x
-     mappend x y = Branch x y
- 
-+instance Semigroup (Tree a) where
-+    (<>) = mappend
-+
- makeTree ::  (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a
- makeTree _ [] = Empty
- makeTree _ [x] = Leaf x
-diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
-index dde3ccda..c401c6e6 100644
--- a/xmonad-contrib.cabal
-+++ b/xmonad-contrib.cabal
-@@ -36,7 +36,7 @@ cabal-version:      >= 1.6
- build-type:         Simple
- bug-reports:        https://github.com/xmonad/xmonad-contrib/issues
- 
-tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1
-+tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1
- 
- source-repository head
-   type:     git
-@@ -66,7 +66,8 @@ library
-                    unix,
-                    X11>=1.6.1 && < 1.9,
-                    xmonad>=0.13   && < 0.14,
-                   utf8-string
-+                   utf8-string,
-+                   semigroups
- 
-     if flag(use_xft)
-         build-depends: X11-xft >= 0.2
--- a/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch
+++ b/pkgs/development/interpreters/spidermonkey/aarch64-48bit-va-fix.patch
@ -1,106 +0,0 @@
-From a0c0f32299419359b44ac0f880c1ea9073ae51e1 Mon Sep 17 00:00:00 2001
-From: Zheng Xu <zheng.xu@linaro.org>
-Date: Fri, 02 Sep 2016 17:40:05 +0800
-Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits are clear. r=ehoogeveen
-
-There might be 48-bit VA on arm64 depending on kernel configuration.
-Manually mmap heap memory to align with the assumption made by JS engine.
-
-Change-Id: Ic5d2b2fe4b758b3c87cc0688348af7e71a991146
---
-
-diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
-index 5b386a2..38101cf 100644
--- a/js/src/gc/Memory.cpp
-+++ b/js/src/gc/Memory.cpp
-@@ -309,6 +309,75 @@
- #endif
- }
- 
-+static inline void *
-+MapMemory(size_t length, int prot, int flags, int fd, off_t offset)
-+{
-+#if defined(__ia64__)
-+    /*
-+     * The JS engine assumes that all allocated pointers have their high 17 bits clear,
-+     * which ia64's mmap doesn't support directly. However, we can emulate it by passing
-+     * mmap an "addr" parameter with those bits clear. The mmap will return that address,
-+     * or the nearest available memory above that address, providing a near-guarantee
-+     * that those bits are clear. If they are not, we return NULL below to indicate
-+     * out-of-memory.
-+     *
-+     * The addr is chosen as 0x0000070000000000, which still allows about 120TB of virtual
-+     * address space.
-+     *
-+     * See Bug 589735 for more information.
-+     */
-+    void *region = mmap((void*)0x0000070000000000, length, prot, flags, fd, offset);
-+    if (region == MAP_FAILED)
-+        return MAP_FAILED;
-+    /*
-+     * If the allocated memory doesn't have its upper 17 bits clear, consider it
-+     * as out of memory.
-+     */
-+    if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) {
-+        JS_ALWAYS_TRUE(0 == munmap(region, length));
-+        return MAP_FAILED;
-+    }
-+    return region;
-+#elif defined(__aarch64__)
-+   /*
-+    * There might be similar virtual address issue on arm64 which depends on
-+    * hardware and kernel configurations. But the work around is slightly
-+    * different due to the different mmap behavior.
-+    *
-+    * TODO: Merge with the above code block if this implementation works for
-+    * ia64 and sparc64.
-+    */
-+    const uintptr_t start = (uintptr_t)(0x0000070000000000UL);
-+    const uintptr_t end   = (uintptr_t)(0x0000800000000000UL);
-+    const uintptr_t step  = ChunkSize;
-+   /*
-+    * Optimization options if there are too many retries in practice:
-+    * 1. Examine /proc/self/maps to find an available address. This file is
-+    *    not always available, however. In addition, even if we examine
-+    *    /proc/self/maps, we may still need to retry several times due to
-+    *    racing with other threads.
-+    * 2. Use a global/static variable with lock to track the addresses we have
-+    *    allocated or tried.
-+    */
-+    uintptr_t hint;
-+    void* region = MAP_FAILED;
-+    for (hint = start; region == MAP_FAILED && hint + length <= end; hint += step) {
-+        region = mmap((void*)hint, length, prot, flags, fd, offset);
-+        if (region != MAP_FAILED) {
-+            if ((uintptr_t(region) + (length - 1)) & 0xffff800000000000) {
-+                if (munmap(region, length)) {
-+                    MOZ_ASSERT(errno == ENOMEM);
-+                }
-+                region = MAP_FAILED;
-+            }
-+        }
-+    }
-+    return region == MAP_FAILED ? NULL : region;
-+#else
-+    return mmap(NULL, length, prot, flags, fd, offset);
-+#endif
-+}
-+
- void *
- MapAlignedPages(size_t size, size_t alignment)
- {
-@@ -322,12 +391,12 @@
- 
-     /* Special case: If we want page alignment, no further work is needed. */
-     if (alignment == PageSize) {
-        return mmap(NULL, size, prot, flags, -1, 0);
-+        return MapMemory(size, prot, flags, -1, 0);
-     }
- 
-     /* Overallocate and unmap the region's edges. */
-     size_t reqSize = Min(size + 2 * alignment, 2 * size);
-    void *region = mmap(NULL, reqSize, prot, flags, -1, 0);
-+    void *region = MapMemory(reqSize, prot, flags, -1, 0);
-     if (region == MAP_FAILED)
-         return NULL;
- 
--- a/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch
+++ b/pkgs/development/interpreters/spidermonkey/aarch64-double-conversion.patch
@ -1,13 +0,0 @@
-diff -ru mozjs17.0.0-orig/mfbt/double-conversion/utils.h mozjs17.0.0/mfbt/double-conversion/utils.h
--- mozjs17.0.0-orig/mfbt/double-conversion/utils.h	2013-02-11 17:33:28.000000000 -0500
-+++ mozjs17.0.0/mfbt/double-conversion/utils.h	2016-12-03 20:39:07.915042988 -0500
-@@ -58,7 +58,8 @@
-     defined(__mips__) || defined(__powerpc__) || \
-     defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
-     defined(__SH4__) || defined(__alpha__) || \
-    defined(_MIPS_ARCH_MIPS32R2)
-+    defined(_MIPS_ARCH_MIPS32R2) || \
-+    defined(__AARCH64EL__)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
- #if defined(_WIN32)
--- a/pkgs/development/libraries/c-ares/release.patch
+++ b/pkgs/development/libraries/c-ares/release.patch
@ -1,19 +0,0 @@
-diff -aur c-ares-cares-1_13_0/ares_version.h c-ares-1.13.0/ares_version.h
--- c-ares-cares-1_13_0/ares_version.h	2017-06-20 02:00:21.000000000 -0400
-+++ c-ares-1.13.0/ares_version.h	2017-06-20 02:03:54.000000000 -0400
-@@ -6,12 +6,12 @@
- #define ARES_COPYRIGHT "2004 - 2016 Daniel Stenberg, <daniel@haxx.se>."
- 
- #define ARES_VERSION_MAJOR 1
-#define ARES_VERSION_MINOR 12
-#define ARES_VERSION_PATCH 1
-+#define ARES_VERSION_MINOR 13
-+#define ARES_VERSION_PATCH 0
- #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
-                        (ARES_VERSION_MINOR<<8)|\
-                        (ARES_VERSION_PATCH))
-#define ARES_VERSION_STR "1.12.1-DEV"
-+#define ARES_VERSION_STR "1.13.0"
- 
- #if (ARES_VERSION >= 0x010700)
- #  define CARES_HAVE_ARES_LIBRARY_INIT 1
--- a/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch
+++ b/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch
@ -1,24 +0,0 @@
-diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
-index 1d33ce9..dface51 100644
--- a/libavcodec/libvpxenc.c
-+++ b/libavcodec/libvpxenc.c
-@@ -78,19 +78,11 @@ typedef struct VP8EncoderContext {
- 
- /** String mappings for enum vp8e_enc_control_id */
- static const char *ctlidstr[] = {
-    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
-    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
-    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
-    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
-    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
-    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
-     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
-     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
-     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
-    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
-     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
-     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
-    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
-     [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
-     [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
-     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
--- a/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch
+++ b/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch
@ -1,24 +0,0 @@
-diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
-index 4f1adb8..1791952 100644
--- a/libavcodec/libvpxenc.c
-+++ b/libavcodec/libvpxenc.c
-@@ -87,19 +87,11 @@ typedef struct VP8EncoderContext {
- 
- /** String mappings for enum vp8e_enc_control_id */
- static const char *const ctlidstr[] = {
-    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
-    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
-    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
-    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
-    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
-    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
-     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
-     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
-     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
-    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
-     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
-     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
-    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
-     [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
-     [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
-     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
--- a/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch
+++ b/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch
@ -1,15 +0,0 @@
-diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
-index 5676074..37a0d00 100644
--- a/include/freetype/config/ftoption.h
-+++ b/include/freetype/config/ftoption.h
-@@ -856,7 +856,7 @@ FT_BEGIN_HEADER
-   /* If this option is activated, it can be controlled with the            */
-   /* `no-long-family-names' property of the pcf driver module.             */
-   /*                                                                       */
-#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
-+/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
- 
- 
-   /*************************************************************************/
-- 
-cgit v1.0-41-gc330
--- a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
+++ b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
@ -1,18 +0,0 @@
--- a/meson.build
-+++ b/meson.build
-@@ -186,13 +186,8 @@
- gmodule_dep = dependency('gmodule-no-export-2.0')
- gio_dep = dependency('gio-2.0')
- 
-# On non-Windows/macOS systems we always required shared-mime-info and GIO
-if host_system != 'windows' and host_system != 'darwin'
-  shared_mime_dep = dependency('shared-mime-info')
-  gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1)
-else
-  shared_mime_dep = []
-endif
-+# No MIME sniffing for now
-+shared_mime_dep = []
- 
- gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ]
- 
--- a/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch
+++ b/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch
@ -1,11 +0,0 @@
--- a/nscd/nscd_stat.c
-+++ b/nscd/nscd_stat.c
-@@ -37,7 +37,7 @@
- 
- 
- /* We use this to make sure the receiver is the same.  */
-static const char compilation[21] = __DATE__ " " __TIME__;
-+static const char compilation[] = "@out@";
- 
- /* Statistic data for one database.  */
- struct dbstat
--- a/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch
+++ b/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch
@ -1,12 +0,0 @@
-diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
-index 928d19f..cbe9713 100644 (file)
--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
-+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
-@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
- 
- set_target_properties(Gpgmepp PROPERTIES
-   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
-  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
-+  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
-   IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
- )
--- a/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch
+++ b/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch
@ -1,25 +0,0 @@
-From e19de4f0d4cb70e30017edfc6b4ca1b89ffbd381 Mon Sep 17 00:00:00 2001
-From: Franz Pletz <fpletz@fnordicwalking.de>
-Date: Thu, 14 Jan 2016 14:58:23 +0100
-Subject: [PATCH] Disable SSLv3
-
---
- src/idevice.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/idevice.c b/src/idevice.c
-index ce27495..8f03094 100644
--- a/src/idevice.c
-+++ b/src/idevice.c
-@@ -678,7 +678,7 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne
- 	}
- 	BIO_set_fd(ssl_bio, (int)(long)connection->data, BIO_NOCLOSE);
- 
-	SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv3_method());
-+	SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv23_method());
- 	if (ssl_ctx == NULL) {
- 		debug_info("ERROR: Could not create SSL context.");
- 		BIO_free(ssl_bio);
-- 
-2.7.0
-
--- a/pkgs/development/libraries/physics/rivet/key_val.patch
+++ b/pkgs/development/libraries/physics/rivet/key_val.patch
@ -1,12 +0,0 @@
-diff --git a/bin/rivet-cmphistos b/bin/rivet-cmphistos
--- a/bin/rivet-cmphistos
-+++ b/bin/rivet-cmphistos
-@@ -371,7 +371,7 @@ if __name__ == '__main__':
-         #     plot[key] = val
-         if plotoptions.has_key("PLOT"):
-             for key_val in plotoptions["PLOT"]:
-                key, val = [s.strip() for s in key_val.split("=")]
-+                key, val = [s.strip() for s in key_val.split("=", 1)]
-                 plot[key] = val
-         if opts.LINEAR:
-             plot['LogY'] = '0'
--- a/pkgs/development/libraries/physics/rivet/zaxis_fix.patch
+++ b/pkgs/development/libraries/physics/rivet/zaxis_fix.patch
@ -1,42 +0,0 @@
-diff --git a/bin/make-plots b/bin/make-plots
-index abb024d..f59293d 100755
--- a/bin/make-plots
-+++ b/bin/make-plots
-@@ -1152,8 +1152,8 @@ class ColorScale(Described):
- 
-         zcustommajortickmarks = int(self.description.get('ZMajorTickMarks', -1))
-         zcustomminortickmarks = int(self.description.get('ZMinorTickMarks', -1))
-        zcustommajorticks=[]
-        zcustomminorticks=[]
-+        zcustommajorticks=None
-+        zcustomminorticks=None
-         if self.description.has_key('ZCustomMajorTicks') and self.description['ZCustomMajorTicks']!='':
-             # TODO: Would be nice to have less invisible separation of the custom ticks than split on tabs
-             ticks = self.description['ZCustomMajorTicks'].strip().split('\t')
-@@ -2214,7 +2214,7 @@ class Ticks(object):
- 
- class XTicks(Ticks):
- 
-    def draw(self, custommajorticks=[], customminorticks=[], custommajortickmarks=-1, customminortickmarks=-1,drawlabels=True):
-+    def draw(self, custommajorticks=None, customminorticks=None, custommajortickmarks=-1, customminortickmarks=-1,drawlabels=True):
-         twosided = bool(int(self.description.get('XTwosidedTicks', '0')))
-         out = ""
-         out += ('\n%\n% X-Ticks\n%\n')
-@@ -2265,7 +2265,7 @@ class XTicks(Ticks):
- 
- class YTicks(Ticks):
- 
-    def draw(self, custommajorticks=[], customminorticks=[], custommajortickmarks=-1, customminortickmarks=-1, drawlabels=True):
-+    def draw(self, custommajorticks=None, customminorticks=None, custommajortickmarks=-1, customminortickmarks=-1, drawlabels=True):
-         twosided = bool(int(self.description.get('YTwosidedTicks', '0')))
-         out = ""
-         out += ('\n%\n% Y-Ticks\n%\n')
-@@ -2320,7 +2320,7 @@ class ZTicks(Ticks):
-         self.description = description
-         self.coors = coors
- 
-    def draw(self, custommajorticks=[], customminorticks=[],
-+    def draw(self, custommajorticks=None, customminorticks=None,
-             custommajortickmarks=-1, customminortickmarks=-1,
-             drawlabels=True):
-         out = ""
--- a/pkgs/development/libraries/v8/build-standalone-static-library.patch
+++ b/pkgs/development/libraries/v8/build-standalone-static-library.patch
@ -1,14 +0,0 @@
-diff --git a/build/standalone.gypi b/build/standalone.gypi
-index b6519c4..ef9e7c5 100644
--- a/build/standalone.gypi
-+++ b/build/standalone.gypi
-@@ -373,6 +373,9 @@
-       }],
-     ],
-     'target_conditions': [
-+      ['_type=="static_library"', {
-+        'standalone_static_library': 1,
-+      }],
-       ['v8_code == 0', {
-         'defines!': [
-           'DEBUG',
--- a/pkgs/development/libraries/v8/disable-building-tests.patch
+++ b/pkgs/development/libraries/v8/disable-building-tests.patch
@ -1,27 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 9761265..80169b2 100644
--- a/Makefile
-+++ b/Makefile
-@@ -248,8 +248,6 @@ NACL_ARCHES = nacl_ia32 nacl_x64
- GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
- 	   build/shim_headers.gypi build/features.gypi build/standalone.gypi \
- 	   build/toolchain.gypi build/all.gyp build/mac/asan.gyp \
-	   test/cctest/cctest.gyp \
-	   test/unittests/unittests.gyp tools/gyp/v8.gyp \
- 	   tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
- 	   buildtools/third_party/libc++abi/libc++abi.gyp \
- 	   buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \
-diff --git a/build/all.gyp b/build/all.gyp
-index 4aeb507..1ff2c7a 100644
--- a/build/all.gyp
-+++ b/build/all.gyp
-@@ -10,8 +10,6 @@
-       'dependencies': [
-         '../samples/samples.gyp:*',
-         '../src/d8.gyp:d8',
-        '../test/cctest/cctest.gyp:*',
-        '../test/unittests/unittests.gyp:*',
-       ],
-       'conditions': [
-         ['component!="shared_library"', {
-
--- a/pkgs/development/libraries/v8/fPIC-for-static.patch
+++ b/pkgs/development/libraries/v8/fPIC-for-static.patch
@ -1,13 +0,0 @@
-diff --git a/build/standalone.gypi b/build/standalone.gypi
-index 7670e5b..230518c 100644
--- a/build/standalone.gypi
-+++ b/build/standalone.gypi
-@@ -205,7 +205,7 @@
-           [ 'visibility=="hidden" and v8_enable_backtrace==0', {
-             'cflags': [ '-fvisibility=hidden' ],
-           }],
-          [ 'component=="shared_library"', {
-+          [ 'component=="shared_library" or component=="static_library" and (v8_target_arch=="x64" or v8_target_arch=="arm64")', {
-             'cflags': [ '-fPIC', ],
-           }],
-         ],
--- a/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch
+++ b/pkgs/development/perl-modules/File-Slurp/silence-deprecation.patch
@ -1,10 +0,0 @@
--- File-Slurp-9999.19.orig/lib/File/Slurp.pm	2011-05-30 21:58:53.000000000 +0200
-+++ File-Slurp-9999.19/lib/File/Slurp.pm	2017-04-28 10:05:59.047681755 +0200
-@@ -4,6 +4,7 @@
- 
- use strict;
- use warnings ;
-+no warnings 'deprecated';
- 
- use Carp ;
- use Exporter ;
--- a/pkgs/development/perl-modules/dbiclassx-fix.patch
+++ b/pkgs/development/perl-modules/dbiclassx-fix.patch
@ -1,24 +0,0 @@
-From adcc1df0049e0093cb94c867bd2be8c9fe242a61 Mon Sep 17 00:00:00 2001
-From: Peter Rabbitson <ribasushi@cpan.org>
-Date: Tue, 13 Sep 2016 17:15:48 +0200
-Subject: [PATCH] Fix for upcoming (not yet available via DBD::SQLite)
- libsqlite version
-
---
- Changes              | 2 ++
- t/prefetch/grouped.t | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/t/prefetch/grouped.t b/t/prefetch/grouped.t
-index 4aad6b1..c0d2224 100644
--- a/t/prefetch/grouped.t
-+++ b/t/prefetch/grouped.t
-@@ -101,7 +101,7 @@ my @cdids = sort $cd_rs->get_column ('cdid')->all;
- 
-   # add an extra track to one of the cds, and then make sure we can get it on top
-   # (check if limit works)
-  my $top_cd = $cd_rs->slice (1,1)->next;
-+  my $top_cd = $cd_rs->search({}, { order_by => 'cdid' })->slice (1,1)->next;
-   $top_cd->create_related ('tracks', {
-     title => 'over the top',
-   });
--- a/pkgs/development/python-modules/cgkit/scons-env.patch
+++ b/pkgs/development/python-modules/cgkit/scons-env.patch
@ -1,22 +0,0 @@
-diff --git a/supportlib/SConstruct b/supportlib/SConstruct
-index 7f797b9..07907e9 100644
--- a/supportlib/SConstruct
-+++ b/supportlib/SConstruct
-@@ -5,7 +5,7 @@
- # library.
- ######################################################################
- 
-import sys, glob, os.path
-+import sys, glob, os.path, os
- 
- # Read the options
- vars = Variables("cpp_config.cfg")
-@@ -16,7 +16,7 @@ vars.Add("CPPPATH", "The include directories", [])
- vars.Add("MSVS_VERSION", "The preferred version of MS Visual Studio")
- 
- # Create the construction environment
-env = Environment(variables = vars)
-+env = Environment(variables = vars, ENV = os.environ)
- 
- # Build the files in "obj"
- env.VariantDir("obj", "src", duplicate=0)
--- a/pkgs/development/python-modules/configparser/0001-namespace-fix.patch
+++ b/pkgs/development/python-modules/configparser/0001-namespace-fix.patch
@ -1,42 +0,0 @@
-From daae1ae35e13bc8107dc97d9219dfb8e172d5d2a Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk <fridh@fridh.nl>
-Date: Tue, 14 Mar 2017 15:00:33 +0100
-Subject: [PATCH] namespace fix
-
-configparser broke other namespace packages
-https://github.com/NixOS/nixpkgs/issues/23855#issuecomment-286427428
-This patch seems to solve that issue.
---
- setup.py                  | 1 -
- src/backports/__init__.py | 6 ------
- 2 files changed, 7 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 3b07823..63ed25d 100644
--- a/setup.py
-+++ b/setup.py
-@@ -42,7 +42,6 @@ setup(
-     py_modules=modules,
-     package_dir={'': 'src'},
-     packages=find_packages('src'),
-    namespace_packages=['backports'],
-     include_package_data=True,
-     zip_safe=False,
-     install_requires=requirements,
-diff --git a/src/backports/__init__.py b/src/backports/__init__.py
-index f84d25c..febdb2f 100644
--- a/src/backports/__init__.py
-+++ b/src/backports/__init__.py
-@@ -3,9 +3,3 @@
- 
- from pkgutil import extend_path
- __path__ = extend_path(__path__, __name__)
-
-try:
-    import pkg_resources
-    pkg_resources.declare_namespace(__name__)
-except ImportError:
-    pass
-- 
-2.11.1
-
--- a/pkgs/development/python-modules/pygame/pygame-v4l.patch
+++ b/pkgs/development/python-modules/pygame/pygame-v4l.patch
@ -1,88 +0,0 @@
-diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in
-*** pygame-1.9.1release/Setup.in	Thu Jul  2 06:41:56 2009
--- pygame-1.9.1release-v4lpatch//Setup.in	Thu Mar 24 17:31:22 2011
-***************
-*** 34,40 ****
-  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
-  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
-  
-  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
--- 34,40 ----
-  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
-  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
-  
-  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
-diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c
-*** pygame-1.9.1release/src/_camera.c	Sun Mar 15 20:30:41 2009
--- pygame-1.9.1release-v4lpatch//src/_camera.c	Thu Mar 24 16:58:18 2011
-***************
-*** 160,179 ****
-  {
-  #if defined(__unix__)
-      if (v4l2_open_device(self) == 0) {
-!         if (v4l_open_device(self) == 0) {
-!             v4l2_close_device(self);
-!             return NULL;
-!         } else {
-!             self->camera_type = CAM_V4L;
-!             if (v4l_init_device(self) == 0) {
-!                 v4l2_close_device(self);
-!                 return NULL;
-!             }
-!             if (v4l_start_capturing(self) == 0) {
-!                 v4l2_close_device(self);
-!                 return NULL;
-!             }
-!         }
-      } else {
-          self->camera_type = CAM_V4L2;
-          if (v4l2_init_device(self) == 0) {
--- 160,167 ----
-  {
-  #if defined(__unix__)
-      if (v4l2_open_device(self) == 0) {
-! 	v4l2_close_device(self);
-!         return NULL;
-      } else {
-          self->camera_type = CAM_V4L2;
-          if (v4l2_init_device(self) == 0) {
-diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h
-*** pygame-1.9.1release/src/camera.h	Fri Oct 10 04:37:10 2008
--- pygame-1.9.1release-v4lpatch//src/camera.h	Thu Mar 24 16:44:32 2011
-***************
-*** 39,45 ****
-  
-      #include <asm/types.h>          /* for videodev2.h */
-  
-     #include <linux/videodev.h>
-      #include <linux/videodev2.h>
-  #endif
-  
--- 39,44 ----
-***************
-*** 51,57 ****
-  #define RGB_OUT 1
-  #define YUV_OUT 2
-  #define HSV_OUT 4
- #define CAM_V4L 1
-  #define CAM_V4L2 2
-  
-  struct buffer 
--- 50,55 ----
-***************
-*** 111,118 ****
-  int v4l2_close_device (PyCameraObject* self);
-  int v4l2_open_device (PyCameraObject* self);
-  
- /* internal functions specific to v4l */
- int v4l_open_device (PyCameraObject* self);
- int v4l_init_device(PyCameraObject* self);
- int v4l_start_capturing(PyCameraObject* self);
-  #endif
--- 109,112 ----
--- a/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch
+++ b/pkgs/development/python-modules/quandl/allow-requests-v2.18.patch
@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
--- a/setup.py
-+++ b/setup.py
-@@ -18,7 +18,7 @@ from version import VERSION  # NOQA
- install_requires = [
-     'pandas >= 0.14',
-     'numpy >= 1.8',
-    'requests >= 2.7.0, < 2.18',  # Version 2.18 appears to break pulling data.
-+    'requests >= 2.7.0', # Works fine
-     'inflection >= 0.3.1',
-     'python-dateutil',
-     'six',
--- a/pkgs/development/r-modules/patches/RMySQL.patch
+++ b/pkgs/development/r-modules/patches/RMySQL.patch
@ -1,13 +0,0 @@
-diff -ru3 RMySQL_orig/configure RMySQL/configure
--- RMySQL_orig/configure	2015-02-19 22:49:15.812455730 +0300
-+++ RMySQL/configure	2015-02-19 22:49:42.066407256 +0300
-@@ -1,7 +1,7 @@
- # If $MYSQL_DIR is specified, use that
- if [ "$MYSQL_DIR" ]; then
-  echo "PKG_CPPFLAGS= -I$MYSQL_DIR/include" > src/Makevars
-  echo "PKG_LIBS= -L$MYSQL_DIR/lib -lmysqlclient -lz" >> src/Makevars
-+  echo "PKG_CPPFLAGS= -I$MYSQL_DIR/include/mysql" > src/Makevars
-+  echo "PKG_LIBS= -L$MYSQL_DIR/lib/mysql -lmysqlclient -lz" >> src/Makevars
-   exit 0
- fi
- 
--- a/pkgs/games/the-powder-toy/fix-env.patch
+++ b/pkgs/games/the-powder-toy/fix-env.patch
@ -1,11 +0,0 @@
--- a/SConscript
-+++ b/SConscript
-@@ -99,7 +99,7 @@
- elif platform == "Windows" and not GetOption('msvc'):
- 	env = Environment(tools=['mingw'], ENV={'PATH' : os.environ['PATH']})
- else:
-	env = Environment(tools=['default'], ENV={'PATH' : os.environ['PATH']})
-+	env = Environment(tools=['default'], ENV = os.environ)
- 
- #attempt to automatically find cross compiler
- if not tool and compilePlatform == "Linux" and compilePlatform != platform:
--- a/pkgs/games/trigger/search.patch
+++ b/pkgs/games/trigger/search.patch
@ -1,14 +0,0 @@
-diff --git a/src/Trigger/main.cpp b/src/Trigger/main.cpp
-index 39539e1..680c12c 100644
--- a/src/Trigger/main.cpp
-+++ b/src/Trigger/main.cpp
-@@ -890,7 +890,8 @@ bool MainApp::loadAll()
-                 std::smatch mr; // Match Results
-                 std::regex pat(R"(^(\w+)(\..+)$)"); // Pattern
- 
-                if (!std::regex_search(std::string(*fname), mr, pat))
-+                std::string search(*fname);
-+                if (!std::regex_search(search, mr, pat))
-                     continue;
- 
-                 std::string basefname = mr[1];
--- a/pkgs/misc/drivers/sc-controller/fix-udev.patch
+++ b/pkgs/misc/drivers/sc-controller/fix-udev.patch
@ -1,22 +0,0 @@
-diff --git a/scc/lib/eudevmonitor.py b/scc/lib/eudevmonitor.py
-index 6c1bd18..182eff2 100644
--- a/scc/lib/eudevmonitor.py
-+++ b/scc/lib/eudevmonitor.py
-@@ -28,12 +28,11 @@ class Eudev:
- 	
- 	def __init__(self):
- 		self._ctx = None
-		self._lib = ctypes.CDLL(find_library(self.LIB_NAME))
-		if self._lib is None:
-			# Alternative approach for NixOS
-			try:
-				self._lib = ctypes.cdll.LoadLibrary("libudev.so")
-			except OSError:
-+		try:
-+			self._lib = ctypes.cdll.LoadLibrary("libudev.so")
-+		except OSError:
-+			self._lib = ctypes.CDLL(find_library(self.LIB_NAME))
-+			if self._lib is None:
- 				raise ImportError("No library named udev")
- 		Eudev._setup_lib(self._lib)
- 		self._ctx = self._lib.udev_new()
--- a/pkgs/os-specific/darwin/xcode/gcc-fix-enum-attributes.patch
+++ b/pkgs/os-specific/darwin/xcode/gcc-fix-enum-attributes.patch
@ -1,13 +0,0 @@
-diff --git a/System/Library/Frameworks/Foundation.framework/Headers/NSUserNotification.h b/System/Library/Frameworks/Foundation.framework/Headers/NSUserNotification.h
-index fa0c290..7da7e0c 100644
--- a/System/Library/Frameworks/Foundation.framework/Headers/NSUserNotification.h
-+++ b/System/Library/Frameworks/Foundation.framework/Headers/NSUserNotification.h
-@@ -13,7 +13,7 @@ typedef NS_ENUM(NSInteger, NSUserNotificationActivationType) {
-     NSUserNotificationActivationTypeNone = 0,
-     NSUserNotificationActivationTypeContentsClicked = 1,
-     NSUserNotificationActivationTypeActionButtonClicked = 2,
-    NSUserNotificationActivationTypeReplied NS_AVAILABLE(10_9, NA) = 3
-+    NSUserNotificationActivationTypeReplied = 3
- } NS_ENUM_AVAILABLE(10_8, NA);
- 
- NS_CLASS_AVAILABLE(10_8, NA)
--- a/pkgs/os-specific/linux/nvidia-x11/atomic64_t.patch
+++ b/pkgs/os-specific/linux/nvidia-x11/atomic64_t.patch
@ -1,12 +0,0 @@
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index e8de161..6c284e9 100755
--- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -1784,7 +1784,6 @@ compile_test() {
-                 atomic64_t data;
-                 atomic64_read(&data);
-                 atomic64_set(&data, 0);
-                atomic64_inc(&data);
-             }"
- 
-             compile_check_conftest "$CODE" "NV_ATOMIC64_PRESENT" "" "types"
--- a/pkgs/servers/sql/mysql/abi_check.patch
+++ b/pkgs/servers/sql/mysql/abi_check.patch
@ -1,20 +0,0 @@
-diff -rc mysql-5.1.40/Makefile.in mysql-5.1.40-new/Makefile.in
-*** mysql-5.1.40/Makefile.in	2009-10-06 19:57:22.000000000 +0200
--- mysql-5.1.40-new/Makefile.in	2009-12-16 13:07:16.060108763 +0100
-***************
-*** 891,897 ****
-  		--srcdir=$(top_srcdir)
-  	storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI
-  
-! all-local:		@ABI_CHECK@	
-  
-  tags:
-  	support-files/build-tags
--- 891,897 ----
-  		--srcdir=$(top_srcdir)
-  	storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI
-  
-! all-local:		
-  
-  tags:
-  	support-files/build-tags
--- a/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch
+++ b/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch
@ -1,25 +0,0 @@
-From 34c27f66210570adf5aba624d7da3c0382d5493f Mon Sep 17 00:00:00 2001
-From: "William A. Kennington III" <william@wkennington.com>
-Date: Sun, 21 Sep 2014 12:19:30 -0700
-Subject: [PATCH] Makefile-env: Don't force /sbin
-
---
- src/Makefile-env.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index f2ab655..bf8876e 100644
--- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -27,7 +27,7 @@ bin_DEBUGPROGRAMS =
- ceph_sbindir = $(sbindir)
- 
- # certain things go straight into /sbin, though!
-su_sbindir = /sbin
-+su_sbindir = $(sbindir)
- 
- # C/C++ tests to build will be appended to this
- check_PROGRAMS =
-- 
-2.1.0
-
--- a/pkgs/tools/filesystems/ceph/fix-pythonpath.patch
+++ b/pkgs/tools/filesystems/ceph/fix-pythonpath.patch
@ -1,31 +0,0 @@
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index e176596..384e230 100644
--- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -40,7 +40,7 @@ check_SCRIPTS =
- export VERBOSE = true
- 
- # python unit tests need to know where the scripts are located
-export PYTHONPATH=$(top_srcdir)/src/pybind
-+export PYTHONPATH+=:$(top_srcdir)/src/pybind
- 
- # when doing a debug build, make sure to make the targets
- if WITH_DEBUG
-diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
-index 3e5ad03..66d6683 100644
--- a/src/ceph-detect-init/Makefile.am
-+++ b/src/ceph-detect-init/Makefile.am
-@@ -64,9 +64,10 @@ install-data-local::
- 	if test "$(DESTDIR)" ; then \
- 		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- 			options=--install-layout=deb ; \
-		else \
-			options=--prefix=/usr ; \
- 		fi ; \
- 		root="--root=$(DESTDIR)" ; \
- 	fi ; \
-	python setup.py install $$root $$options
-+	if test "$(prefix)"; then \
-+		prefix="--prefix=$(prefix)" ; \
-+	fi ; \
-+	python setup.py install $$prefix $$root $$options
--- a/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch
+++ b/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch
@ -1,36 +0,0 @@
-From b34a33255f56bbd2317c26da12d702796d67ed50 Mon Sep 17 00:00:00 2001
-From: Geo Van Osterom <george.vo@alum.rpi.edu>
-Date: Thu, 22 Oct 2015 00:12:42 -0400
-Subject: [PATCH] Fix gcc 5 compile errors
-
---
- src/net.c     | 2 +-
- src/tclhash.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/net.c b/src/net.c
-index a1937de..c369fda 100644
--- a/src/net.c
-+++ b/src/net.c
-@@ -560,7 +560,7 @@ int open_address_listen(sockname_t *addr)
- /* Returns a socket number for a listening socket that will accept any
-  * connection -- port # is returned in port
-  */
-inline int open_listen(int *port)
-+extern inline int open_listen(int *port)
- {
-   int sock;
-   sockname_t name;
-diff --git a/src/tclhash.c b/src/tclhash.c
-index 9729acb..22c3d05 100644
--- a/src/tclhash.c
-+++ b/src/tclhash.c
-@@ -113,7 +113,7 @@ static inline void tcl_bind_list_delete(tcl_bind_list_t *tl)
-   nfree(tl);
- }
-
-inline void garbage_collect_tclhash(void)
-+extern inline void garbage_collect_tclhash(void)
- {
-   tcl_bind_list_t *tl, *tl_next, *tl_prev;
-   tcl_bind_mask_t *tm, *tm_next, *tm_prev;
--- a/pkgs/tools/networking/inadyn/remove-unused-macro.patch
+++ b/pkgs/tools/networking/inadyn/remove-unused-macro.patch
@ -1,242 +0,0 @@
-From b5c70461822003238784ff56f4c8eead10cfc2c1 Mon Sep 17 00:00:00 2001
-From: Joachim Nilsson <troglobit@gmail.com>
-Date: Sun, 2 Jul 2017 21:01:33 +0200
-Subject: [PATCH] Remove UNUSED() macro and disable the compiler warning
- instead
-
-Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
-
-diff --git a/plugins/common.c b/plugins/common.c
-index 55c1ac3..9e7ba7b 100644
--- a/plugins/common.c
-+++ b/plugins/common.c
-@@ -64,7 +64,7 @@ int common_request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
-  * DynDNS response validator -- common to many other DDNS providers as well
-  *  'good' or 'nochg' are the good answers,
-  */
-int common_response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+int common_response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *body = trans->rsp_body;
- 
-diff --git a/plugins/ddnss.c b/plugins/ddnss.c
-index fea41e9..5184db0 100644
--- a/plugins/ddnss.c
-+++ b/plugins/ddnss.c
-@@ -60,7 +60,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/dhis.c b/plugins/dhis.c
-index 11edd2c..b6e8e0b 100644
--- a/plugins/dhis.c
-+++ b/plugins/dhis.c
-@@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias)
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *rsp = trans->rsp_body;
- 
-diff --git a/plugins/dnsexit.c b/plugins/dnsexit.c
-index c456f38..4bf0a08 100644
--- a/plugins/dnsexit.c
-+++ b/plugins/dnsexit.c
-@@ -62,7 +62,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	int   code = -1;
- 	char *tmp;
-diff --git a/plugins/dtdns.c b/plugins/dtdns.c
-index e7996fe..38f0977 100644
--- a/plugins/dtdns.c
-+++ b/plugins/dtdns.c
-@@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/duckdns.c b/plugins/duckdns.c
-index 9ca46ae..66d9c25 100755
--- a/plugins/duckdns.c
-+++ b/plugins/duckdns.c
-@@ -78,7 +78,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/duiadns.c b/plugins/duiadns.c
-index 7c4ced3..7dc09c9 100644
--- a/plugins/duiadns.c
-+++ b/plugins/duiadns.c
-@@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/dynv6-ipv4.c b/plugins/dynv6-ipv4.c
-index 5dab9f1..f37215a 100644
--- a/plugins/dynv6-ipv4.c
-+++ b/plugins/dynv6-ipv4.c
-@@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/dynv6.c b/plugins/dynv6.c
-index 84b7c40..03b1b4c 100644
--- a/plugins/dynv6.c
-+++ b/plugins/dynv6.c
-@@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/easydns.c b/plugins/easydns.c
-index c9d8059..7718c56 100644
--- a/plugins/easydns.c
-+++ b/plugins/easydns.c
-@@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- /*
-  * NOERROR is the OK code here
-  */
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/freedns.c b/plugins/freedns.c
-index 2c56ca4..2a2991f 100644
--- a/plugins/freedns.c
-+++ b/plugins/freedns.c
-@@ -134,7 +134,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
-     fail blabla and n.n.n.n
-     are the good answers. We search our own IP address in response and that's enough.
- */
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias)
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/generic.c b/plugins/generic.c
-index 8f23de4..3cee1f2 100644
--- a/plugins/generic.c
-+++ b/plugins/generic.c
-@@ -238,7 +238,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 	return ret;
- }
- 
-static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 	size_t i;
-diff --git a/plugins/giradns.c b/plugins/giradns.c
-index 2d6043e..ea19f77 100644
--- a/plugins/giradns.c
-+++ b/plugins/giradns.c
-@@ -57,7 +57,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->server_name.name, info->user_agent);
- }
- 
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/sitelutions.c b/plugins/sitelutions.c
-index c484a62..611c865 100644
--- a/plugins/sitelutions.c
-+++ b/plugins/sitelutions.c
-@@ -64,7 +64,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/tunnelbroker.c b/plugins/tunnelbroker.c
-index 1f58990..17eb2b9 100644
--- a/plugins/tunnelbroker.c
-+++ b/plugins/tunnelbroker.c
-@@ -77,7 +77,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
-  * Hurricate Electric IPv6 tunnelbroker specific response validator
-  * Own IP address and 'already in use' are the good answers.
-  */
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias)
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/tzo.c b/plugins/tzo.c
-index 0a36e87..eba3da4 100644
--- a/plugins/tzo.c
-+++ b/plugins/tzo.c
-@@ -66,7 +66,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- }
- 
- /* TZO specific response validator. */
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	int code = -1;
- 
-diff --git a/plugins/zerigo.c b/plugins/zerigo.c
-index 4fb29ab..cc71348 100644
--- a/plugins/zerigo.c
-+++ b/plugins/zerigo.c
-@@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
-  * Server error
-  *  Status: 5xx
-  */
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *ptr, *rsp = trans->rsp_body;
- 
-diff --git a/plugins/zoneedit.c b/plugins/zoneedit.c
-index 7178b9c..464ed66 100644
--- a/plugins/zoneedit.c
-+++ b/plugins/zoneedit.c
-@@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
-  *  CODE=200, 201
-  *  CODE=707, for duplicated updates
-  */
-static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	int code = -1;
- 
--- a/pkgs/tools/security/qdigidoc/qt511.patch
+++ b/pkgs/tools/security/qdigidoc/qt511.patch
@ -1,62 +0,0 @@
-diff --git a/client/Application.cpp b/client/Application.cpp
-index fce9eee..cec84ae 100644
--- a/client/Application.cpp
-+++ b/client/Application.cpp
-@@ -54,6 +54,7 @@
- #include <QtGui/QFileOpenEvent>
- #include <QtNetwork/QNetworkProxy>
- #include <QtNetwork/QSslConfiguration>
-+#include <QtWidgets/QAction>
- #include <QtWidgets/QMessageBox>
- #include <QtWidgets/QProgressBar>
- #include <QtWidgets/QProgressDialog>
-diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp
-index 06d561e..b4aa0d5 100644
--- a/client/MainWindow.cpp
-+++ b/client/MainWindow.cpp
-@@ -44,6 +44,8 @@
- #include <QtPrintSupport/QPrinter>
- #include <QtPrintSupport/QPrinterInfo>
- #include <QtPrintSupport/QPrintPreviewDialog>
-+#include <QtWidgets/QActionGroup>
-+#include <QtWidgets/QButtonGroup>
- #include <QtWidgets/QCompleter>
- #include <QtWidgets/QMessageBox>
- 
-diff --git a/client/MainWindow.h b/client/MainWindow.h
-index b9515dd..661418a 100644
--- a/client/MainWindow.h
-+++ b/client/MainWindow.h
-@@ -24,6 +24,7 @@
- #include <QtCore/QStringList>
- 
- class DigiDoc;
-+class QActionGroup;
- class QPrinter;
- 
- class MainWindow: public QWidget, private Ui::MainWindow
-diff --git a/crypto/MainWindow.cpp b/crypto/MainWindow.cpp
-index c3d3115..f12d984 100644
--- a/crypto/MainWindow.cpp
-+++ b/crypto/MainWindow.cpp
-@@ -35,6 +35,8 @@
- #include <QtGui/QDesktopServices>
- #include <QtGui/QDragEnterEvent>
- #include <QtNetwork/QSslKey>
-+#include <QtWidgets/QActionGroup>
-+#include <QtWidgets/QButtonGroup>
- #include <QtWidgets/QMessageBox>
- #include <QtWidgets/QProgressBar>
- #include <QtWidgets/QProgressDialog>
-diff --git a/crypto/MainWindow.h b/crypto/MainWindow.h
-index 16dbec4..01ec99f 100644
--- a/crypto/MainWindow.h
-+++ b/crypto/MainWindow.h
-@@ -21,6 +21,7 @@
- 
- #include "ui_MainWindow.h"
- 
-+class QActionGroup;
- class CKey;
- class CryptoDoc;
- 
--- a/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch
+++ b/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch
@ -1,27 +0,0 @@
-From 11f0d238d3149c31c4440b8f6a58fe6a00b82d3a Mon Sep 17 00:00:00 2001
-From: Daniel Aleksandersen <code@daniel.priv.no>
-Date: Mon, 13 Mar 2017 16:29:33 +0100
-Subject: [PATCH 1/3] Remove the unnecessary = from ipset cmds
-
---
- src/fw/sshg-fw-ipset.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/fw/sshg-fw-ipset.sh b/src/fw/sshg-fw-ipset.sh
-index 510bc2c..dc7f86b 100644
--- a/src/fw/sshg-fw-ipset.sh
-+++ b/src/fw/sshg-fw-ipset.sh
-@@ -3,8 +3,8 @@
- # This file is part of SSHGuard.
- 
- fw_init() {
-    ipset -quiet create -exist sshguard4 hash:ip family=inet
-    ipset -quiet create -exist sshguard6 hash:ip family=inet6
-+    ipset -quiet create -exist sshguard4 hash:ip family inet
-+    ipset -quiet create -exist sshguard6 hash:ip family inet6
- }
- 
- fw_block() {
-- 
-2.10.0
-
--- a/pkgs/tools/typesetting/tex/texlive/texlinks.patch
+++ b/pkgs/tools/typesetting/tex/texlive/texlinks.patch
@ -1,15 +0,0 @@
-Don't overwrite already existing files!
-
-diff --git a/texmf-dist/scripts/texlive/texlinks.sh b/texmf-dist/scripts/texlive/texlinks.sh
-index 91540ea..9b1d7ed 100755
--- a/texmf-dist/scripts/texlive/texlinks.sh
-+++ b/texmf-dist/scripts/texlive/texlinks.sh
-@@ -157,7 +157,7 @@ install_link()
-       verbose_echo "skipped ConTeXtish symlink $src -> $dest (special case)"
-       ;;
-     *)
-      test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" &&
-+      test ! -f "$src" &&
-         rm -f "$src"
-   
-       if test -f "$src"; then