Skip to content

Commit 0b7b38f

Browse files
OdyXOdyX
committed
Commit patch queue (exported by git-debrebase)
[git-debrebase make-patches: export and commit patches]
1 parent 85fa156 commit 0b7b38f

28 files changed

Lines changed: 3826 additions & 0 deletions

File tree

‎debian/patches/0001-Update-makefiles-to-Debian-best-practices.patch‎

Lines changed: 227 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,227 @@
1+
From: Steffen Joeris <white@debian.org>
2+
Date: Tue, 4 Oct 2016 11:43:43 +0200
3+
Subject: Update makefiles to Debian best-practices
4+
5+
Author: Luca Capello <luca@pca.it>
6+
Author: Didier Raboud <odyx@debian.org>
7+
---
8+
Makefile | 71 +++++++++++++++++++++++++++------------------------------
9+
icc2ps/Makefile | 4 ++--
10+
2 files changed, 35 insertions(+), 40 deletions(-)
11+
12+
diff --git a/Makefile b/Makefile
13+
index e198d57..ea8b2a4 100644
14+
--- a/Makefile
15+
+++ b/Makefile
16+
@@ -17,9 +17,7 @@ SYSNAME := $(shell uname -n)
17+
VERSION=0.0
18+
19+
# Installation prefix...
20+
-PREFIX=/usr/local
21+
PREFIX=/usr
22+
-PREFIX=$(DESTDIR)/usr
23+
24+
# Pathnames for this package...
25+
BIN=$(PREFIX)/bin
26+
@@ -39,7 +37,7 @@ INSTALL=install
27+
ROOT=root
28+
29+
# Pathnames for referenced packages...
30+
-FOODB=$(DESTDIR)/usr/share/foomatic/db/source
31+
+FOODB=$(DESTDIR)/share/foomatic/db/source
32+
33+
# User ID's
34+
LPuid=-oroot
35+
@@ -473,34 +471,34 @@ all-done:
36+
37+
38+
foo2ddst: foo2ddst.o $(LIBJBG)
39+
- $(CC) $(CFLAGS) -o $@ foo2ddst.o $(LIBJBG)
40+
+ $(CC) $(CFLAGS) -o $@ foo2ddst.o $(LIBJBG) $(LDFLAGS)
41+
42+
foo2hbpl2: foo2hbpl2.o $(LIBJBG)
43+
- $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG)
44+
+ $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG) $(LDFLAGS)
45+
46+
foo2hp: foo2hp.o $(LIBJBG)
47+
- $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG)
48+
+ $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) $(LDFLAGS)
49+
50+
foo2hiperc: foo2hiperc.o $(LIBJBG)
51+
- $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG)
52+
+ $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG) $(LDFLAGS)
53+
54+
foo2lava: foo2lava.o $(LIBJBG)
55+
- $(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG)
56+
+ $(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG) $(LDFLAGS)
57+
58+
foo2oak: foo2oak.o $(LIBJBG)
59+
- $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG)
60+
+ $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG) $(LDFLAGS)
61+
62+
foo2qpdl: foo2qpdl.o $(LIBJBG)
63+
- $(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG)
64+
+ $(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG) $(LDFLAGS)
65+
66+
foo2slx: foo2slx.o $(LIBJBG)
67+
- $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG)
68+
+ $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG) $(LDFLAGS)
69+
70+
foo2xqx: foo2xqx.o $(LIBJBG)
71+
- $(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG)
72+
+ $(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG) $(LDFLAGS)
73+
74+
foo2zjs: foo2zjs.o $(LIBJBG)
75+
- $(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG)
76+
+ $(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG) $(LDFLAGS)
77+
78+
79+
foo2ddst-wrapper: foo2ddst-wrapper.in Makefile
80+
@@ -586,49 +584,49 @@ ifeq ($(UNAME),Darwin)
81+
endif
82+
83+
ok: ok.o $(LIBJBG)
84+
- $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@
85+
+ $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ $(LDFLAGS)
86+
87+
ddstdecode: ddstdecode.o $(LIBJBG)
88+
- $(CC) $(CFLAGS) ddstdecode.o $(LIBJBG) -o $@
89+
+ $(CC) $(CFLAGS) ddstdecode.o $(LIBJBG) -o $@ $(LDFLAGS)
90+
91+
gipddecode: gipddecode.o $(LIBJBG)
92+
- $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
93+
+ $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@ $(LDFLAGS)
94+
95+
hbpldecode: hbpldecode.o $(LIBJBG)
96+
- $(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@
97+
+ $(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@ $(LDFLAGS)
98+
99+
hipercdecode: hipercdecode.o $(LIBJBG)
100+
- $(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@
101+
+ $(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@ $(LDFLAGS)
102+
103+
lavadecode: lavadecode.o $(LIBJBG)
104+
- $(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@
105+
+ $(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@ $(LDFLAGS)
106+
107+
oakdecode: oakdecode.o $(LIBJBG)
108+
- $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@
109+
+ $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@ $(LDFLAGS)
110+
111+
opldecode: opldecode.o $(LIBJBG)
112+
- $(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@
113+
+ $(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@ $(LDFLAGS)
114+
115+
qpdldecode: qpdldecode.o $(LIBJBG)
116+
- $(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@
117+
+ $(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@ $(LDFLAGS)
118+
119+
splcdecode: splcdecode.o $(LIBJBG)
120+
- $(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@
121+
+ $(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@ $(LDFLAGS)
122+
123+
slxdecode: slxdecode.o $(LIBJBG)
124+
- $(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@
125+
+ $(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@ $(LDFLAGS)
126+
127+
xqxdecode: xqxdecode.o $(LIBJBG)
128+
- $(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@
129+
+ $(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@ $(LDFLAGS)
130+
131+
zjsdecode: zjsdecode.o $(LIBJBG)
132+
- $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
133+
+ $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@ $(LDFLAGS)
134+
135+
command2foo2lava-pjl: command2foo2lava-pjl.o
136+
- $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -lcups -o $@
137+
+ $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -lcups -o $@ $(LDFLAGS)
138+
139+
command2foo2lava-pjl.o: command2foo2lava-pjl.c
140+
- $(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c
141+
+ $(CC) $(CPPFLAGS) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c
142+
143+
#
144+
# Installation rules
145+
@@ -674,8 +672,6 @@ install-test:
146+
#
147+
148+
149+
-UDEVBIN=$(DESTDIR)/bin/
150+
-
151+
install-prog:
152+
#
153+
# Install driver, wrapper, and development tools
154+
@@ -684,7 +680,7 @@ install-prog:
155+
$(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/
156+
if [ "$(BINPROGS)" != "" ]; then \
157+
$(INSTALL) -d $(UDEVBIN); \
158+
- $(INSTALL) -c $(BINPROGS) $(UDEVBIN); \
159+
+ $(INSTALL) -c $(BINPROGS) $(BIN); \
160+
fi
161+
#
162+
# Install gamma correction files. These are just templates,
163+
@@ -878,7 +874,7 @@ install-extra:
164+
done
165+
166+
MODEL=$(PREFIX)/share/cups/model
167+
-LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model
168+
+LOCALMODEL=$(DESTDIR)/local/share/cups/model
169+
MACMODEL=/Library/Printers/PPDs/Contents/Resources
170+
PPD=$(PREFIX)/share/ppd
171+
VARPPD=/var/lp/ppd
172+
@@ -939,9 +935,9 @@ install-ppd:
173+
done; \
174+
fi
175+
176+
-APPL=$(DESTDIR)/usr/share/applications
177+
-OLDAPPL=$(DESTDIR)/usr/share/gnome/apps/System
178+
-PIXMAPS=$(DESTDIR)/usr/share/pixmaps
179+
+APPL=$(DESTDIR)/share/applications
180+
+OLDAPPL=$(DESTDIR)/share/gnome/apps/System
181+
+PIXMAPS=$(DESTDIR)/share/pixmaps
182+
183+
install-desktop:
184+
#
185+
@@ -1518,10 +1514,9 @@ ppd:
186+
foomatic-ppdfile -d $$driver -p $$printer > PPD/$$printer.ppd; \
187+
else \
188+
# 09/06/18: Use the older foomatic??? \
189+
- ENGINE=../foomatic/foomatic-db-engine; \
190+
PERL5LIB=$$ENGINE/lib \
191+
FOOMATICDB=foomatic-db \
192+
- $$ENGINE/foomatic-ppdfile \
193+
+ /usr/bin/foomatic-ppdfile \
194+
-d $$driver -p $$printer \
195+
> PPD/$$printer.ppd; \
196+
fi \
197+
@@ -1980,7 +1975,7 @@ FRC:
198+
misc: pksm2bitcmyk phorum-logo.gif
199+
200+
pksm2bitcmyk: pksm2bitcmyk.c
201+
- $(CC) $(CFLAGS) pksm2bitcmyk.c -lnetpbm -o $@
202+
+ $(CC) $(CFLAGS) pksm2bitcmyk.c -lnetpbm -o $@ $(LDFLAGS)
203+
204+
phorum-logo.gif: archhp.fig
205+
fig2dev -L gif -m.25 archhp.fig | giftrans -t "#ffffff" -o $@
206+
diff --git a/icc2ps/Makefile b/icc2ps/Makefile
207+
index f3abb99..215105b 100644
208+
--- a/icc2ps/Makefile
209+
+++ b/icc2ps/Makefile
210+
@@ -9,7 +9,7 @@ SRC= icc2ps.c xgetopt.c
211+
LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
212+
cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
213+
cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c
214+
-CFLAGS= -O3
215+
+CFLAGS+= -O3
216+
INSTALL=install
217+
ifeq ($(UNAME),SunOS)
218+
INSTALL=/usr/ucb/install
219+
@@ -21,7 +21,7 @@ endif
220+
all: foo2zjs-icc2ps man
221+
222+
foo2zjs-icc2ps: $(SRC) $(LIB)
223+
- $(CC) $(CFLAGS) $(SRC) $(LIB) -lm -o $@
224+
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(SRC) $(LIB) -lm -o $@ $(LDFLAGS)
225+
226+
install: all
227+
$(INSTALL) -c foo2zjs-icc2ps $(BIN)

‎debian/patches/0002-Fix-icc2ps-build.patch‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From: Didier Raboud <odyx@debian.org>
2+
Date: Tue, 4 Oct 2016 11:43:44 +0200
3+
Subject: Fix icc2ps build
4+
5+
Include unistd.h to make sure the swab function is not implicitly declared,
6+
also declare _XOPEN_SOURCE to have it available through unistd.h, and
7+
therefore declare _GNU_SOURCE to have strcasecmp() and vsnprintf()
8+
---
9+
icc2ps/Makefile | 4 ++++
10+
icc2ps/cmsio1.c | 1 +
11+
2 files changed, 5 insertions(+)
12+
13+
diff --git a/icc2ps/Makefile b/icc2ps/Makefile
14+
index 215105b..0aa49ba 100644
15+
--- a/icc2ps/Makefile
16+
+++ b/icc2ps/Makefile
17+
@@ -10,6 +10,10 @@ LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
18+
cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
19+
cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c
20+
CFLAGS+= -O3
21+
+
22+
+# _XOPEN_SOURCE is required for swab() but undefines strcasecmp(), so add _GNU_SOURCE as well:
23+
+CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE
24+
+
25+
INSTALL=install
26+
ifeq ($(UNAME),SunOS)
27+
INSTALL=/usr/ucb/install
28+
diff --git a/icc2ps/cmsio1.c b/icc2ps/cmsio1.c
29+
index 1f02720..9f9d6e4 100644
30+
--- a/icc2ps/cmsio1.c
31+
+++ b/icc2ps/cmsio1.c
32+
@@ -71,6 +71,7 @@ void xswab(const void *from, void *to, size_t len)
33+
#undef STEP
34+
}
35+
#else
36+
+#include <unistd.h>
37+
#define xswab swab
38+
#endif
39+

‎debian/patches/0003-Don-t-build-icc2ps-but-use-psicc-from-liblcms2-utils.patch‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
From: Michael Gilbert <mgilbert@debian.org>
2+
Date: Tue, 4 Oct 2016 11:43:45 +0200
3+
Subject: Don't build icc2ps but use psicc from liblcms2-utils instead
4+
5+
---
6+
Makefile | 22 +++++-----------------
7+
1 file changed, 5 insertions(+), 17 deletions(-)
8+
9+
diff --git a/Makefile b/Makefile
10+
index ea8b2a4..ddd03e4 100644
11+
--- a/Makefile
12+
+++ b/Makefile
13+
@@ -196,13 +196,6 @@ FILES = \
14+
foomatic-db/*/*.xml \
15+
foomatic-test \
16+
getweb.in \
17+
- icc2ps/*.[ch] \
18+
- icc2ps/*.1in \
19+
- icc2ps/Makefile \
20+
- icc2ps/AUTHORS \
21+
- icc2ps/COPYING \
22+
- icc2ps/README \
23+
- icc2ps/README.foo2zjs \
24+
osx-hotplug/Makefile \
25+
osx-hotplug/*.m \
26+
osx-hotplug/*.1in \
27+
@@ -394,7 +387,7 @@ JBGOPTS=-m 16 -d 0 -p 92 # Equivalent options for pbmtojbg
28+
# The usual build rules
29+
#
30+
all: all-test $(PROGS) $(BINPROGS) $(SHELLS) getweb \
31+
- all-icc2ps all-osx-hotplug man doc \
32+
+ all-osx-hotplug man doc \
33+
all-done
34+
35+
MACOSX_stdio=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/stdio.h
36+
@@ -631,7 +624,7 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
37+
#
38+
# Installation rules
39+
#
40+
-install: all install-test install-prog install-icc2ps install-osx-hotplug \
41+
+install: all install-test install-prog install-osx-hotplug \
42+
install-extra install-crd install-foo install-ppd \
43+
install-gui install-desktop install-filter \
44+
install-man install-doc install-aa
45+
@@ -1194,7 +1187,6 @@ uninstall: uninstall-aa
46+
-rm -f $(MANDIR)/man1/foo2ddst*.1 $(MANDIR)/man1/ddstdecode.1
47+
-rm -f $(MANDIR)/man1/gipddecode.1
48+
-rm -f $(MANDIR)/man1/arm2hpdl.1 $(MANDIR)/man1/usb_printerid.1
49+
- -rm -f $(MANDIR)/man1/foo2zjs-icc2ps.1
50+
-rm -rf /usr/share/foo2zjs/
51+
-rm -rf /usr/share/foo2hp/
52+
-rm -rf /usr/share/foo2oak/
53+
@@ -1221,7 +1213,6 @@ uninstall: uninstall-aa
54+
-rm -f /usr/bin/gipddecode
55+
-rm -f /usr/bin/opldecode
56+
-rm -f /usr/bin/rodecode
57+
- -rm -f /usr/bin/foo2zjs-icc2ps
58+
-rm -f /usr/bin/foo2zjs-pstops
59+
-rm -f /usr/bin/command2foo2lava-pjl
60+
-rm -f /usr/lib/cups/filter/command2foo2lava-pjl
61+
@@ -1266,7 +1257,6 @@ clean:
62+
-rm -f *.zjs *.zm *.zc *.zc? *.zc?? *.oak *.pbm *.pksm *.cmyk
63+
-rm -f pksm2bitcmyk
64+
-rm -f *.icm.*.ps
65+
- cd icc2ps; $(MAKE) $@
66+
cd osx-hotplug; $(MAKE) $@
67+
68+
#
69+
@@ -1420,7 +1410,7 @@ pprtest-3.oak: FRC
70+
#
71+
# icc2ps regression tests
72+
#
73+
-ICC2PS=./icc2ps/foo2zjs-icc2ps
74+
+ICC2PS=/usr/bin/psicc
75+
icctest:
76+
for g in *.icm; do \
77+
for i in 0 1 2 3; do \
78+
@@ -1530,7 +1520,7 @@ oldppd:
79+
# Manpage generation. No, I am not interested in "info" files or
80+
# HTML documentation.
81+
#
82+
-man: $(MANPAGES) man-icc2ps man-osx-hotplug
83+
+man: $(MANPAGES) man-osx-hotplug
84+
85+
$(MANPAGES): macros.man includer-man
86+
87+
@@ -1601,7 +1591,6 @@ install-man: man
88+
$(INSTALL) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/
89+
$(INSTALL) -c -m 644 usb_printerid.1 $(MANDIR)/man1/
90+
$(INSTALL) -c -m 644 printer-profile.1 $(MANDIR)/man1/
91+
- cd icc2ps; $(MAKE) install-man
92+
ifeq ($(UNAME),Darwin)
93+
cd osx-hotplug; $(MAKE) install-man
94+
endif
95+
@@ -1622,10 +1611,9 @@ install-doc: doc
96+
97+
GROFF=/usr/local/test/bin/groff
98+
GROFF=groff
99+
-manual.pdf: $(MANPAGES) icc2ps/foo2zjs-icc2ps.1 osx-hotplug/osx-hplj-hotplug.1
100+
+manual.pdf: $(MANPAGES) osx-hotplug/osx-hplj-hotplug.1
101+
-$(GROFF) -t -man \
102+
`ls $(MANPAGES) \
103+
- icc2ps/foo2zjs-icc2ps.1 \
104+
osx-hotplug/osx-hplj-hotplug.1 \
105+
| sort` \
106+
| ps2pdf - $@

0 commit comments

Comments
 (0)