200bed5c06
```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,\(^--- \)\(./\)*,\1a/, s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1, s/[.][Oo][Rr][Ii][Gg]$// s/[.]patched[.]\([^.]\)/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,\(^+++ \)\(./\)*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ```
22 lines
506 B
Diff
22 lines
506 B
Diff
Fix build with cups>=2.2
|
|
|
|
--- a/prnt/hpcups/CommonDefinitions.h
|
|
+++ b/prnt/hpcups/CommonDefinitions.h
|
|
@@ -40,6 +40,7 @@
|
|
#include <fcntl.h>
|
|
#include <sys/stat.h>
|
|
#include <cups/cups.h>
|
|
+#include <cups/ppd.h>
|
|
#include <cups/raster.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
--- a/prnt/hpijs/hpcupsfax.cpp
|
|
+++ b/prnt/hpijs/hpcupsfax.cpp
|
|
@@ -43,6 +43,7 @@
|
|
#include <arpa/inet.h>
|
|
#include <math.h>
|
|
#include <cups/cups.h>
|
|
+#include <cups/ppd.h>
|
|
#include <cups/raster.h>
|
|
#include <string>
|
|
#ifdef FALSE
|