Package: libvips-dev
Version: 7.42.3-1
Severity: normal
Tags: patch

Dear maintainer,

The build process of vips produces gobject introspection data, but it is
not included in any of the packages. Attached is a patch that fixes
this. Following the example of other GObject library packages, I have
put the .gir file in the libvips-dev package, and created a new package
gir1.2-vips-8.0 for the .typelib file.

I also encountered two problems while creating this patch:

- The way LD_LIBRARY_PATH is set would cause an extra space to be
  inserted when running under fakeroot.
- Cleaning the build tree and rebuilding would cause the files in
  gtk-doc not to be created again.

The patch fixes these issues as well.

Regards,
Matijs

-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_IE.utf8, LC_CTYPE=en_IE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages libvips-dev depends on:
ii  gettext                            0.19.3-2
ii  libcfitsio-dev                     3.370-2
ii  libexif-gtk-dev                    0.3.5-5
ii  libfftw3-dev [fftw3-dev]           3.3.4-2
ii  libfontconfig1-dev                 2.11.0-6.3
ii  libfreetype6-dev                   2.5.2-4
ii  libglib2.0-dev                     2.44.0-2
ii  libgsf-1-dev                       1.14.33-1
ii  libice-dev                         2:1.0.9-1+b1
ii  libjpeg-dev                        1:1.3.1-12
ii  libjpeg62-turbo-dev [libjpeg-dev]  1:1.3.1-12
ii  liblcms2-dev                       2.6-3+b3
ii  libmagickcore-dev                  8:6.8.9.9-5
ii  libmagickwand-dev                  8:6.8.9.9-5
ii  libmatio-dev                       1.5.2-3+b1
ii  libopenexr-dev                     1.6.1-8
ii  libopenslide-dev                   3.4.0-1+b3
ii  liborc-0.4-dev                     1:0.4.22-1
ii  libpango1.0-dev                    1.36.8-3
ii  libpng12-dev [libpng-dev]          1.2.50-2+b2
ii  libtiff5-dev [libtiff-dev]         4.0.3-13
ii  libvips40                          7.42.3-1
ii  libwebp-dev                        0.4.3-1.2
ii  libxml2-dev                        2.9.2+dfsg1-3
ii  pkg-config                         0.28-1
ii  python-all-dev                     2.7.9-1
ii  python-dev                         2.7.9-1
ii  zlib1g-dev                         1:1.2.8.dfsg-2+b1

Versions of packages libvips-dev recommends:
pn  libvips-doc    <none>
pn  libvips-tools  <none>

Versions of packages libvips-dev suggests:
pn  nip2  <none>

-- no debconf information
diff --new-file -r --unified a/vips-7.42.3/debian/control b/vips-7.42.3/debian/control
--- a/vips-7.42.3/debian/control	2015-03-21 10:54:29.000000000 +0100
+++ b/vips-7.42.3/debian/control	2015-05-06 20:13:04.810775272 +0200
@@ -113,3 +113,22 @@
  includes the application programmers' guide, the library programmers'
  guide, the C++ programmers' guide, and the reference guide, as well
  as HTML versions of the program and library manual pages.
+
+Package: gir1.2-vips-8.0
+Section: introspection
+Architecture: any
+Depends: ${gir:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: GObject introspection data for VIPS
+ VIPS is an image processing system designed with efficiency in mind.
+ It is good with large images (images larger than the amount of RAM in
+ your machine), and for working with colour.  It can perform many
+ image manipulation tasks much faster than other packages such as
+ ImageMagick and the GIMP and includes some special features such as
+ creating single "mosaic" images from multiple parts.
+ .
+ VIPS consists of two main components: an image processing library
+ with some command-line tools and a spreadsheet-like graphical user
+ interface.  The graphical interface is available in the nip2 package.
+ .
+ This package provides the introspection data for VIPS library.
+
diff --new-file -r --unified a/vips-7.42.3/debian/gir1.2-vips-8.0.install b/vips-7.42.3/debian/gir1.2-vips-8.0.install
--- a/vips-7.42.3/debian/gir1.2-vips-8.0.install	1970-01-01 01:00:00.000000000 +0100
+++ b/vips-7.42.3/debian/gir1.2-vips-8.0.install	2015-05-06 20:23:05.432471185 +0200
@@ -0,0 +1 @@
+usr/lib/*/girepository-1.0/* usr/lib/girepository-1.0
diff --new-file -r --unified a/vips-7.42.3/debian/libvips-dev.install b/vips-7.42.3/debian/libvips-dev.install
--- a/vips-7.42.3/debian/libvips-dev.install	2014-12-30 01:00:47.000000000 +0100
+++ b/vips-7.42.3/debian/libvips-dev.install	2015-05-06 19:58:13.980087729 +0200
@@ -2,3 +2,4 @@
 debian/tmp/usr/lib/*/lib*.a
 debian/tmp/usr/lib/*/pkgconfig
 debian/tmp/usr/include
+debian/tmp/usr/share/gir-1.0
diff --new-file -r --unified a/vips-7.42.3/debian/rules b/vips-7.42.3/debian/rules
--- a/vips-7.42.3/debian/rules	2015-03-19 19:18:27.000000000 +0100
+++ b/vips-7.42.3/debian/rules	2015-05-06 22:46:42.195093016 +0200
@@ -40,6 +40,7 @@
 # python.  Setting to "\$${prefix}" doesn't work.
 DEB_CONFIGURE_EXTRA_FLAGS = --exec_prefix=/usr
 DEB_CONFIGURE_USER_FLAGS = --libdir="\$${prefix}/lib/$(DEB_HOST_MULTIARCH)" \
+			   --enable-gtk-doc
 
 ifneq (, $(filter kfreebsd%, $(DEB_HOST_ARCH_OS)))
 DEB_CONFIGURE_EXTRA_FLAGS += --without-v4l
@@ -48,9 +49,9 @@
 # "make install" runs installed programs at one point, so we need to
 # set LD_LIBRARY_PATH to the installed library directory.
 ifeq ("$(LD_LIBRARY_PATH)", "")
-LD_LIBRARY_PATH=$(l_PWD)/debian/tmp/usr/lib
+  LD_LIBRARY_PATH := $(l_PWD)/debian/tmp/usr/lib
 else
-LD_LIBRARY_PATH += :$(l_PWD)/debian/tmp/usr/lib
+  LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(l_PWD)/debian/tmp/usr/lib
 endif
 export LD_LIBRARY_PATH
 

Reply via email to