Re: Ghostscript 9.18 packaging
Hi Jonas,
Yes - hit the wrong button - meant to write to the list.
So, following your advice I've added the variable in - this gets us much
of the way there, although still fails to build cups., and with cups
disabled, uses the wrong -llib_openjpeg which should be -lopenjpeg in
the .tr files, which I think are generated, so my patch to these is a
bit worthless as the changes get overwritten during clean/build.
I've tried fiddling with one of the older patches to get that to change
but to no avail.
I'm officially stuck at the moment - might try and have another stab at
this next week!
Have attached a patch of where I have gotten to though.
Thank you for all the help to date,
Damian
On 11/02/2016 00:28, Jonas Smedegaard wrote:
[replying via public list, assuming simple error]
Quoting Damian Dimmich (2016-02-10 11:43:38)
Update regarding the issue - in base/tiff.mak $(TIFFCONFIG_H) and
$(TIFFCONF_H) are both incorrectly configured and point to
/libtiff/tiff_config.h and /libtiff/tiffconfig.h respectively (neither
of which exist).
As far as I can tell, both of these should be pointing to
/usr/include/x86_64-linux-gnu/tiffconf.h - I believe these are
synonymous.
Ahh - then I almost had it nailed few days ago - but failed at grep'ing
too narrowly for "config" among libtiff5-dev filenames :-P
That conf file predates a configure-compatible macro
for tiff and is just used by 'legacy' applications,
of which I am guessing GS is one of.
The probably "correct", long-term fix, would be to get GS to use the
libtiff make macro.
If trying to get that straightened out, it seems there is alother bug in
configure.ac setting LIBTIFFCONFDIR (not TIFFCONFDIR).
In the short term I was able to get GS to build by replacing the
incorrect variables to point to /usr/include/x86_64-linux-gnu/tiffconf.h
Clearly, this isn't a good solution, as its nowhere near cross platform.
That said, I'm not quite sure how to proceed as there is no tiff-config
command.
Maybe if we can get TIFFCONFIG_H overrided at build time, using
/usr/lib/$(DEB_HOST_MULTIARCH) <- that variable is available to us at
build time.
- Jonas
>From c5d15f9a2c8d0426dd057a1fbaff9831b05320d1 Mon Sep 17 00:00:00 2001
From: Damian Dimmich <damian@tauri-tec.com>
Date: Wed, 10 Feb 2016 07:39:11 +0000
Subject: [PATCH] trying to get this to build on sid with 9.18
---
debian/patches/020151014~e126995.patch | 2 +-
debian/patches/name-of-my-patch.diff | 62 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 64 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/name-of-my-patch.diff
diff --git a/debian/patches/020151014~e126995.patch b/debian/patches/020151014~e126995.patch
index 1cf1c1e..ec3b9f2 100644
--- a/debian/patches/020151014~e126995.patch
+++ b/debian/patches/020151014~e126995.patch
@@ -4762,7 +4762,7 @@ Last-Update: 2016-02-07
- $(MAKEDIRS)
+$(OPEN_JPEG_GEN)openjpeg_1.dev : $(OPEN_JPEG_MAK) $(ECHOGS_XE) \
+ $(OPEN_JPEG_MAK) $(MAKEDIRS)
- $(SETMOD) $(OPEN_JPEG_GEN)openjpeg_1 -lib lib_openjpeg
+ $(SETMOD) $(OPEN_JPEG_GEN)openjpeg_1 -lib openjpeg
# compile our own .dev
-$(OPEN_JPEG_GEN)openjpeg_0.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE) $(open_jpeg_OBJS) \
diff --git a/debian/patches/name-of-my-patch.diff b/debian/patches/name-of-my-patch.diff
new file mode 100644
index 0000000..b0c1a73
--- /dev/null
+++ b/debian/patches/name-of-my-patch.diff
@@ -0,0 +1,62 @@
+Description: <short description, required>
+ <long description that can span multiple lines, optional>
+Author: <name and email of author, optional>
+Origin: <upstream|backport|vendor|other>, <URL, required except if Author is present>
+Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
+Bug-<Vendor>: <URL to the vendor bug report if any, optional>
+Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
+Applied-Upstream: <version|URL|commit, identifies patches merged upstream, optional>
+Reviewed-by: <name and email of a reviewer, optional>
+Last-Update: <YYYY-MM-DD, last update of the meta-information, optional>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/base/tiff.mak
++++ b/base/tiff.mak
+@@ -27,8 +27,10 @@ TIFFOBJ=$(TIFFOBJDIR)$(D)
+ TIFFO_=$(O_)$(TIFFOBJ)
+ JPEGGEN=$(JGENDIR)$(D)
+
+-TIFFCONFIG_H=$(TIFFCONF)libtiff$(D)tif_config$(TIFFCONFIG_SUFFIX).h
+-TIFFCONF_H=$(TIFFCONF)libtiff$(D)tiffconf$(TIFFCONFIG_SUFFIX).h
++# TIFFCONFIG_H=$(TIFFCONF)libtiff$(D)tif_config$(TIFFCONFIG_SUFFIX).h
++TIFFCONFIG_H=/usr/include/x86_64-linux-gnu/tiffconf.h
++TIFFCONF_H=/usr/include/x86_64-linux-gnu/tiffconf.h
++# TIFFCONF_H=$(TIFFCONF)libtiff$(D)tiffconf$(TIFFCONFIG_SUFFIX).h
+
+ # Define the name of this makefile.
+ LIBTIFF_MAK=$(GLSRC)tiff.mak $(TOP_MAKEFILES)
+--- a/base/lcups.mak
++++ b/base/lcups.mak
+@@ -23,7 +23,8 @@
+ # LCUPS_LIBS - if SHARE_CUPS=1, the link options for the shared library
+
+ # (Rename directories.)
+-LIBCUPSSRC=$(LCUPSSRCDIR)$(D)libs$(D)cups$(D)
++# LIBCUPSSRC=$(LCUPSSRCDIR)$(D)libs$(D)cups$(D)
++LIBCUPSSRC=/usr/include/$(D)cups$(D)
+ LIBCUPSGEN=$(LCUPSGENDIR)$(D)
+ LIBCUPSOBJ=$(LCUPSOBJDIR)$(D)
+ LCUPSO_=$(O_)$(LIBCUPSOBJ)
+--- a/base/lcupsi.mak
++++ b/base/lcupsi.mak
+@@ -24,7 +24,8 @@
+ # LCUPSI_LIBS - if SHARE_LCUPSI=1, the link options for the shared library
+
+ # (Rename directories.)
+-LIBCUPSISRC=$(LCUPSISRCDIR)$(D)libs$(D)filter$(D)
++# LIBCUPSSRC=$(LCUPSSRCDIR)$(D)libs$(D)cups$(D)
++LIBCUPSSRC=/usr/include/$(D)cups$(D)
+ LIBCUPSIGEN=$(LCUPSIGENDIR)$(D)
+ LIBCUPSIOBJ=$(LCUPSIOBJDIR)$(D)
+ LCUPSIO_=$(O_)$(LIBCUPSIOBJ)
+--- a/soobj/gsld.tr
++++ b/soobj/gsld.tr
+@@ -614,7 +614,7 @@
+ -lijs \
+ -lpng \
+ -llcms2 \
+--llib_openjpeg \
++-lopenjpeg \
+ -ljbig2dec \
+ -ljpeg \
+ -lz \
diff --git a/debian/patches/series b/debian/patches/series
index 4856624..354b7e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@
2009_avoid_ramfs.patch
2010_add_build_timestamp_setting.patch
2011_force_shared_openjpeg.patch
+name-of-my-patch.diff
--
2.7.0.rc3
Reply to: