Codebase list splix / 33f101f
Initialize git-dpm Didier Raboud 6 years ago
17 changed file(s) with 146 addition(s) and 107 deletion(s). Raw diff Collapse all Expand all
+8
-0
debian/.git-dpm less more
0 # see git-dpm(1) from git-dpm package
1 a6312ab3586cc621ef7f3f3f4d5aae57ee292168
2 a6312ab3586cc621ef7f3f3f4d5aae57ee292168
3 cf987032600e21d504318bace8c304777ec1dd24
4 cf987032600e21d504318bace8c304777ec1dd24
5 splix_2.0.0+svn315.orig.tar.gz
6 4f706b90a92706397ae6106d23983c36c7c5b688
7 232905
+1
-0
debian/patches/0001-Fix-alignment-problem-on-armel.patch less more
0 From fe098f575428cc5af59d43db10842735775f7094 Mon Sep 17 00:00:00 2001
01 From: Luca Niccoli <lultimouomo@gmail.com>
12 Date: Sun, 12 Jun 2011 15:30:15 +0200
23 Subject: Fix alignment problem on armel
+0
-17
debian/patches/0002-Dont-let-bash-trim-whitespace.patch less more
0 Description: Set IFS when looping over the file to avoid letting /bin/bash trim the whitespace
1 as this makes the build unreproducible.
2 The whitespace in the original .drv.in files should be fixed nevertheless.
3 Author: Didier Raboud
4 Last-Update: 2016-06-12
5
6 --- a/ppd/compile.sh
7 +++ b/ppd/compile.sh
8 @@ -14,7 +14,7 @@
9 # Function parseFile
10 #
11 parseFile() {
12 - while read LINE; do
13 + while IFS= read LINE; do
14 if [ -n "`echo "$LINE" | grep '^[ \t]*#import[ \t]*"[a-zA-Z0-9\.\-]*"'`" ]; then
15 FILE=`echo "$LINE" | sed -re 's/[ \t]*#import[ \t]"([a-zA-Z0-9\.\-]*)"/\1/'`
16 parseFile $FILE $2
+26
-0
debian/patches/0002-Set-IFS-when-looping-over-the-file-to-avoid-letting-.patch less more
0 From c42f94918e6b1fee3371242a6c9751a324106a67 Mon Sep 17 00:00:00 2001
1 From: Didier Raboud <Didier Raboud>
2 Date: Sat, 10 Feb 2018 17:11:44 +0100
3 Subject: Set IFS when looping over the file to avoid letting /bin/bash trim
4 the whitespace
5
6 as this makes the build unreproducible.
7 The whitespace in the original .drv.in files should be fixed nevertheless.
8 Last-Update: 2016-06-12
9 ---
10 ppd/compile.sh | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13 diff --git a/ppd/compile.sh b/ppd/compile.sh
14 index d44a3ae..79f5445 100755
15 --- a/ppd/compile.sh
16 +++ b/ppd/compile.sh
17 @@ -14,7 +14,7 @@
18 # Function parseFile
19 #
20 parseFile() {
21 - while read LINE; do
22 + while IFS= read LINE; do
23 if [ -n "`echo "$LINE" | grep '^[ \t]*#import[ \t]*"[a-zA-Z0-9\.\-]*"'`" ]; then
24 FILE=`echo "$LINE" | sed -re 's/[ \t]*#import[ \t]"([a-zA-Z0-9\.\-]*)"/\1/'`
25 parseFile $FILE $2
+40
-0
debian/patches/0003-Fix-the-aready-already-typo.patch less more
0 From b5711388adaee9fe3980006a2915dc09e80aa942 Mon Sep 17 00:00:00 2001
1 From: Didier Raboud <Didier Raboud>
2 Date: Sat, 10 Feb 2018 17:11:45 +0100
3 Subject: =?UTF-8?q?Fix=20the=20'aready'=20=E2=86=92=20'already'=20typo?=
4 MIME-Version: 1.0
5 Content-Type: text/plain; charset=UTF-8
6 Content-Transfer-Encoding: 8bit
7
8 Last-Update: 2016-06-12
9 ---
10 src/algo0x0d.cpp | 2 +-
11 src/cache.cpp | 2 +-
12 2 files changed, 2 insertions(+), 2 deletions(-)
13
14 diff --git a/src/algo0x0d.cpp b/src/algo0x0d.cpp
15 index 5489886..6514999 100644
16 --- a/src/algo0x0d.cpp
17 +++ b/src/algo0x0d.cpp
18 @@ -448,7 +448,7 @@ BandPlane * Algo0x0D::compress(const Request & request, unsigned char *data,
19 /* Zero value byte padding for data size alignment to 4-byte boundary. */
20 unsigned long zerosPad = 4 - ( outputSize % 4 );
21
22 - /* Pad anyway even if aready aligned. */
23 + /* Pad anyway even if already aligned. */
24 if ( outputSize + zerosPad <= maximumBufferSize ) {
25 while ( zerosPad-- ) {
26 output[ outputSize++ ] = 0;
27 diff --git a/src/cache.cpp b/src/cache.cpp
28 index 0602630..8a6a310 100644
29 --- a/src/cache.cpp
30 +++ b/src/cache.cpp
31 @@ -569,7 +569,7 @@ bool CacheEntry::restoreIntoMemory()
32
33 if (!_tempFile) {
34 ERRORMSG(_("Trying to restore a page instance into memory which is "
35 - "aready into memory"));
36 + "already into memory"));
37 return false;
38 }
39
+0
-26
debian/patches/0003-fix-aready-typo.patch less more
0 Description: Fix the 'aready' → 'already' typo
1 Author: Didier Raboud
2 Last-Update: 2016-06-12
3
4 --- a/src/algo0x0d.cpp
5 +++ b/src/algo0x0d.cpp
6 @@ -448,7 +448,7 @@
7 /* Zero value byte padding for data size alignment to 4-byte boundary. */
8 unsigned long zerosPad = 4 - ( outputSize % 4 );
9
10 - /* Pad anyway even if aready aligned. */
11 + /* Pad anyway even if already aligned. */
12 if ( outputSize + zerosPad <= maximumBufferSize ) {
13 while ( zerosPad-- ) {
14 output[ outputSize++ ] = 0;
15 --- a/src/cache.cpp
16 +++ b/src/cache.cpp
17 @@ -569,7 +569,7 @@
18
19 if (!_tempFile) {
20 ERRORMSG(_("Trying to restore a page instance into memory which is "
21 - "aready into memory"));
22 + "already into memory"));
23 return false;
24 }
25
+30
-0
debian/patches/0004-Set-debian-build-flags-during-build.patch less more
0 From abaeacb60a6936304e2e940961ba95675e2c8066 Mon Sep 17 00:00:00 2001
1 From: Luca Niccoli <lultimouomo@gmail.com>
2 Date: Mon, 12 Aug 2013 13:50:08 +0200
3 Subject: Set debian build flags during build.
4
5 Signed-off-by: Luca Niccoli <lultimouomo@gmail.com>
6 ---
7 module.mk | 6 +++---
8 1 file changed, 3 insertions(+), 3 deletions(-)
9
10 diff --git a/module.mk b/module.mk
11 index 9b6229c..ec84ace 100644
12 --- a/module.mk
13 +++ b/module.mk
14 @@ -28,12 +28,12 @@ DRV_ONLY ?= 0
15
16
17 # Flags
18 -CXXFLAGS += `cups-config --cflags` -Iinclude -Wall -I/opt/local/include
19 +CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) `cups-config --cflags` -Iinclude -Wall -I/opt/local/include
20 DEBUG_CXXFLAGS += -DDEBUG -DDUMP_CACHE
21 OPTIM_CXXFLAGS += -g
22 -rastertoqpdl_LDFLAGS := `cups-config --ldflags` -L/opt/local/lib
23 +rastertoqpdl_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) `cups-config --ldflags` -L/opt/local/lib
24 rastertoqpdl_LIBS := `cups-config --libs` -lcupsimage
25 -pstoqpdl_LDFLAGS := `cups-config --ldflags`
26 +pstoqpdl_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) `cups-config --ldflags`
27 pstoqpdl_LIBS := `cups-config --libs` -lcupsimage
28
29
+0
-29
debian/patches/0005-Set-debian-build-flags-during-build.patch less more
0 From: Luca Niccoli <lultimouomo@gmail.com>
1 Date: Mon, 12 Aug 2013 13:50:08 +0200
2 Subject: Set debian build flags during build.
3
4 Signed-off-by: Luca Niccoli <lultimouomo@gmail.com>
5 ---
6 module.mk | 6 +++---
7 1 file changed, 3 insertions(+), 3 deletions(-)
8
9 diff --git a/module.mk b/module.mk
10 index 9b6229c..bc45432 100644
11 --- a/module.mk
12 +++ b/module.mk
13 @@ -28,12 +28,12 @@ DRV_ONLY ?= 0
14
15
16 # Flags
17 -CXXFLAGS += `cups-config --cflags` -Iinclude -Wall -I/opt/local/include
18 +CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) `cups-config --cflags` -Iinclude -Wall -I/opt/local/include
19 DEBUG_CXXFLAGS += -DDEBUG -DDUMP_CACHE
20 OPTIM_CXXFLAGS += -g
21 -rastertoqpdl_LDFLAGS := `cups-config --ldflags` -L/opt/local/lib
22 +rastertoqpdl_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) `cups-config --ldflags` -L/opt/local/lib
23 rastertoqpdl_LIBS := `cups-config --libs` -lcupsimage
24 -pstoqpdl_LDFLAGS := `cups-config --ldflags`
25 +pstoqpdl_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) `cups-config --ldflags`
26 pstoqpdl_LIBS := `cups-config --libs` -lcupsimage
27
28
+28
-0
debian/patches/0005-Use-compilers-passed-to-make.patch less more
0 From a6312ab3586cc621ef7f3f3f4d5aae57ee292168 Mon Sep 17 00:00:00 2001
1 From: Helmut Grohne <helmut@subdivi.de>
2 Date: Sat, 10 Feb 2018 17:11:47 +0100
3 Subject: Use compilers passed to make
4
5 ---
6 rules.mk | 4 ++--
7 1 file changed, 2 insertions(+), 2 deletions(-)
8
9 diff --git a/rules.mk b/rules.mk
10 index 26ce4b5..17ca407 100644
11 --- a/rules.mk
12 +++ b/rules.mk
13 @@ -6,12 +6,12 @@
14
15 $(rastertoqpdl_TARGET): $(rastertoqpdl_OBJ)
16 $(call printCmd, $(cmd_link))
17 - $(Q)g++ -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \
18 + $(Q)$(CXX) -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \
19 $(rastertoqpdl_LIBS)
20
21 $(pstoqpdl_TARGET): $(pstoqpdl_OBJ)
22 $(call printCmd, $(cmd_link))
23 - $(Q)g++ -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \
24 + $(Q)$(CXX) -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \
25 $(pstoqpdl_LIBS)
26
27 .PHONY: install installcms
+0
-22
debian/patches/0006-cross.patch less more
0 From: Helmut Grohne <helmut@subdivi.de>
1 Subject: Use compilers passed to make
2
3 Index: splix-2.0.0+svn315/rules.mk
4 ===================================================================
5 --- splix-2.0.0+svn315.orig/rules.mk
6 +++ splix-2.0.0+svn315/rules.mk
7 @@ -6,12 +6,12 @@
8
9 $(rastertoqpdl_TARGET): $(rastertoqpdl_OBJ)
10 $(call printCmd, $(cmd_link))
11 - $(Q)g++ -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \
12 + $(Q)$(CXX) -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \
13 $(rastertoqpdl_LIBS)
14
15 $(pstoqpdl_TARGET): $(pstoqpdl_OBJ)
16 $(call printCmd, $(cmd_link))
17 - $(Q)g++ -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \
18 + $(Q)$(CXX) -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \
19 $(pstoqpdl_LIBS)
20
21 .PHONY: install installcms
+4
-4
debian/patches/series less more
00 0001-Fix-alignment-problem-on-armel.patch
1 0002-Dont-let-bash-trim-whitespace.patch
2 0003-fix-aready-typo.patch
3 0005-Set-debian-build-flags-during-build.patch
4 0006-cross.patch
1 0002-Set-IFS-when-looping-over-the-file-to-avoid-letting-.patch
2 0003-Fix-the-aready-already-typo.patch
3 0004-Set-debian-build-flags-during-build.patch
4 0005-Use-compilers-passed-to-make.patch
+3
-3
module.mk less more
2727
2828
2929 # Flags
30 CXXFLAGS += `cups-config --cflags` -Iinclude -Wall -I/opt/local/include
30 CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) `cups-config --cflags` -Iinclude -Wall -I/opt/local/include
3131 DEBUG_CXXFLAGS += -DDEBUG -DDUMP_CACHE
3232 OPTIM_CXXFLAGS += -g
33 rastertoqpdl_LDFLAGS := `cups-config --ldflags` -L/opt/local/lib
33 rastertoqpdl_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) `cups-config --ldflags` -L/opt/local/lib
3434 rastertoqpdl_LIBS := `cups-config --libs` -lcupsimage
35 pstoqpdl_LDFLAGS := `cups-config --ldflags`
35 pstoqpdl_LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) `cups-config --ldflags`
3636 pstoqpdl_LIBS := `cups-config --libs` -lcupsimage
3737
3838
+1
-1
ppd/compile.sh less more
1313 # Function parseFile
1414 #
1515 parseFile() {
16 while read LINE; do
16 while IFS= read LINE; do
1717 if [ -n "`echo "$LINE" | grep '^[ \t]*#import[ \t]*"[a-zA-Z0-9\.\-]*"'`" ]; then
1818 FILE=`echo "$LINE" | sed -re 's/[ \t]*#import[ \t]"([a-zA-Z0-9\.\-]*)"/\1/'`
1919 parseFile $FILE $2
+2
-2
rules.mk less more
55
66 $(rastertoqpdl_TARGET): $(rastertoqpdl_OBJ)
77 $(call printCmd, $(cmd_link))
8 $(Q)g++ -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \
8 $(Q)$(CXX) -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \
99 $(rastertoqpdl_LIBS)
1010
1111 $(pstoqpdl_TARGET): $(pstoqpdl_OBJ)
1212 $(call printCmd, $(cmd_link))
13 $(Q)g++ -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \
13 $(Q)$(CXX) -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \
1414 $(pstoqpdl_LIBS)
1515
1616 .PHONY: install installcms
+1
-1
src/algo0x0d.cpp less more
447447 /* Zero value byte padding for data size alignment to 4-byte boundary. */
448448 unsigned long zerosPad = 4 - ( outputSize % 4 );
449449
450 /* Pad anyway even if aready aligned. */
450 /* Pad anyway even if already aligned. */
451451 if ( outputSize + zerosPad <= maximumBufferSize ) {
452452 while ( zerosPad-- ) {
453453 output[ outputSize++ ] = 0;
+1
-1
src/cache.cpp less more
568568
569569 if (!_tempFile) {
570570 ERRORMSG(_("Trying to restore a page instance into memory which is "
571 "aready into memory"));
571 "already into memory"));
572572 return false;
573573 }
574574
+1
-1
src/qpdl.cpp less more
131131 {
132132 unsigned long version, subVersion, size, dataSize, checkSum;
133133 bool color, headerSent=false;
134 unsigned char header[0x20];
134 unsigned char header[0x20] __attribute__((aligned(4)));
135135 const BandPlane *plane;
136136
137137 version = request.printer()->qpdlVersion();