cups: drop patches

(cherry picked from commit 085a74cb42074384958c23bd762af589da570042)
This commit is contained in:
Will Dietz 2018-12-05 18:31:21 -06:00
parent 8fcabc9ee6
commit ec040d9b22
2 changed files with 0 additions and 23 deletions

View file

@ -1,13 +0,0 @@
diff --git a/scheduler/main.c b/scheduler/main.c
index 8925c8373..acf031684 100644
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -893,7 +893,7 @@ main(int argc, /* I - Number of command-line args */
* Write dirty config/state files...
*/
- if (DirtyCleanTime && current_time >= DirtyCleanTime && cupsArrayCount(Clients) == 0)
+ if (DirtyCleanTime && current_time >= DirtyCleanTime)
cupsdCleanDirty();
#ifdef __APPLE__

View file

@ -21,16 +21,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" "man" ];
patches = [
(fetchpatch {
name = "cups"; # weird name to avoid change (for now)
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch"
+ "?h=packages/cups&id=41fefa22ac518";
sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5";
})
./cups-clean-dirty.patch
];
postPatch = ''
substituteInPlace cups/testfile.c \
--replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin'