Hej Henrik, Vincent,
On Tue, Jan 02, 2018 at 12:11:16AM +0100, Henrik Sandklef wrote:
> I have removed deps to gnomeui (gconf had already been removed) from Xnee
> sources.
Vincent, please see the attached debdiff that incorporates Henriks
change as a patch in debian/patches/ for your convenience.
(You might also want to look into upgrading to a non-deprecated
debhelper compat level (apparently 5 is currently used while anything
before 9 is deprecated), etc. See also other lintian warnings.)
>
> Can I assist you in any way?
Thanks for the offer! From my point of view it's really up to Vincent
how he wants to handle this - I just wanted to remind and point out
the urgency of this issue being resolved in any way.
Hopefully Vincent will get in touch with you if he has something
to discuss.
While poking around I noticed a couple of things which I'm just
mentioning in case it'll interest you:
- Is it true CVS is still used? (Or else I've probably looked at the
wrong upstream location)
- I guess $(libgnomeui_LIBS) and $(libgnomeui_CFLAGS) can now also
be dropped from gnee/src/Makefile.am (and possibly other places?)
- Apparently configure(.in) has no check for pkg-config modules actually
exiting (which I ran into while having pkg-config itself, but not
gtk+-2.0.pc since the libgtk2.0-dev build-dependency was missing in
the debian xnee package). A more obvious error message could have
been produced by explicitly checking
if ! $PKGCONF --exists $GTK2_MODULE >= GTK2_VERSION and erroring out.
Even better though... (see below).
- directly invoking pkg-config is not cross compilation safe (as lintian
points out). It would probably be better to replace all pkg-config
usage with PKG_CHECK_MODULES macro usage instead. (And gtk-config is
long gone so you can probably retire that code path while at it.)
This should also give a more modern and fool-proof configure process.
The lintian report might also give you useful information:
https://lintian.debian.org/maintainer/ber...@debian.org.html#xnee_3.19-1
Med vänlig hälsning,
Andreas Henriksson
diff -Nru xnee-3.19/debian/changelog xnee-3.19/debian/changelog
--- xnee-3.19/debian/changelog 2014-05-23 01:33:06.000000000 +0200
+++ xnee-3.19/debian/changelog 2018-01-02 01:14:24.000000000 +0100
@@ -1,3 +1,15 @@
+xnee (3.19-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add debian/patches/upstream_libgnomui-only-for-applets.patch
+ - upstream commit/revision 1.134->1.135 to not require
+ libgnomeui unless building applets (which is disabled here).
+ * Drop libgnomeui-dev build-dependency. (Closes: #885738)
+ * Add missing build-dependencies on pkg-config and libgtk2.0-dev
+ - previously implicitly pulled in via libgnomeui-dev
+
+ -- Andreas Henriksson <andr...@fatal.se> Tue, 02 Jan 2018 01:14:24 +0100
+
xnee (3.19-1) unstable; urgency=medium
* New upstream version.
diff -Nru xnee-3.19/debian/control xnee-3.19/debian/control
--- xnee-3.19/debian/control 2014-05-23 01:33:06.000000000 +0200
+++ xnee-3.19/debian/control 2018-01-02 01:14:24.000000000 +0100
@@ -7,9 +7,10 @@
debhelper (>= 5),
cdbs,
dh-autoreconf,
+ pkg-config,
+ libgtk2.0-dev,
libxtst-dev,
imagemagick,
- libgnomeui-dev,
dia,
texi2html,
texlive-base,
diff -Nru xnee-3.19/debian/patches/series xnee-3.19/debian/patches/series
--- xnee-3.19/debian/patches/series 2014-05-23 01:33:06.000000000 +0200
+++ xnee-3.19/debian/patches/series 2018-01-02 01:13:16.000000000 +0100
@@ -2,3 +2,4 @@
manpages-fix.patch
fix-docdir.patch
dont-compile-dvi.patch
+upstream_libgnomui-only-for-applets.patch
diff -Nru xnee-3.19/debian/patches/upstream_libgnomui-only-for-applets.patch xnee-3.19/debian/patches/upstream_libgnomui-only-for-applets.patch
--- xnee-3.19/debian/patches/upstream_libgnomui-only-for-applets.patch 1970-01-01 01:00:00.000000000 +0100
+++ xnee-3.19/debian/patches/upstream_libgnomui-only-for-applets.patch 2018-01-02 01:14:24.000000000 +0100
@@ -0,0 +1,117 @@
+--- a/configure.in 2014/05/06 14:13:59 1.134
++++ b/configure.in 2018/01/01 23:06:56 1.135
+@@ -382,62 +382,63 @@
+ fi
+
+
+- GNOMEUI2_MODULE="libgnomeui-2.0"
+- GNOMEUI2_VERSION="2.0.0"
+-
+-
+- if `$PKGCFG --exists $GNOMEUI2_MODULE >= $GNOMEUI2_VERSION`
+- then
+- GTK_MODULES="$GTK_MODULES $GNOMEUI2_MODULE"
+- GTK_ERR=1
+- fi
+-
+- libgnomeui_CFLAGS=`$PKGCFG --cflags $GNOMEUI2_MODULE `
+- libgnomeui_LIBS=`$PKGCFG --libs $GNOMEUI2_MODULE `
+-
+-
+- AC_SUBST(libgnomeui_CFLAGS)
+- AC_SUBST(libgnomeui_LIBS)
+-
+ PIXMAP_DIR=pixmap
+
+-
+- if test x$buildgapplet = xtrue ;
++ if test x$buildgapplet = xtrue;
+ then
+-
+- if test x$GTKCONF = x ;
+- then
+- echo " **************************************** "
+- echo " * WARNING, missing program: gtk-config *"
+- echo " **************************************** "
+- echo ""
+- echo " On Debian based distros, install sth like: libgtk2.0-dev"
+- echo ""
+- echo "However, I will try my best to continue without gtk-config. "
+- echo "Will not be able to check for gtk/gnome header files properly"
+- echo "On most platforms this implies no problem"
+- echo ""
+- else
+- GTK_PREFIX=`$GTKCONF --prefix`
+- GTK_INC_PATH=$GTK_PREFIX/include/$GNOMEUI2_MODULE/
+- GNOME_H_FILE=$GTK_INC_PATH/gnome.h
+-
+- ls -l $GNOME_H_FILE 2>/dev/null >/dev/null
+-
+- MISSING_GNOME_H=$?
+
+- if test x$MISSING_GNOME_H != x0 ;
++ GNOMEUI2_MODULE="libgnomeui-2.0"
++ GNOMEUI2_VERSION="2.0.0"
++
++
++ if `$PKGCFG --exists $GNOMEUI2_MODULE >= $GNOMEUI2_VERSION`
++ then
++ GTK_MODULES="$GTK_MODULES $GNOMEUI2_MODULE"
++ GTK_ERR=1
++ fi
++
++ libgnomeui_CFLAGS=`$PKGCFG --cflags $GNOMEUI2_MODULE `
++ libgnomeui_LIBS=`$PKGCFG --libs $GNOMEUI2_MODULE `
++
++
++ AC_SUBST(libgnomeui_CFLAGS)
++ AC_SUBST(libgnomeui_LIBS)
++
++
++
++ if test x$GTKCONF = x ;
+ then
+- echo "Missing GNOME header file (gnome.h), you need to install development packages"
+- echo "On a Debian based distro system do:"
+- echo ""
+- echo " sudo apt-get install libgnome2-dev"
+- echo ""
+-echo exit 1
+- fi
+- fi
+-
+- fi
++ echo " **************************************** "
++ echo " * WARNING, missing program: gtk-config *"
++ echo " **************************************** "
++ echo ""
++ echo " On Debian based distros, install sth like: libgtk2.0-dev"
++ echo ""
++ echo "However, I will try my best to continue without gtk-config. "
++ echo "Will not be able to check for gtk/gnome header files properly"
++ echo "On most platforms this implies no problem"
++ echo ""
++ else
++ GTK_PREFIX=`$GTKCONF --prefix`
++ GTK_INC_PATH=$GTK_PREFIX/include/$GNOMEUI2_MODULE/
++ GNOME_H_FILE=$GTK_INC_PATH/gnome.h
++
++ ls -l $GNOME_H_FILE 2>/dev/null >/dev/null
++
++ MISSING_GNOME_H=$?
++
++ if test x$MISSING_GNOME_H != x0 ;
++ then
++ echo "Missing GNOME header file (gnome.h), you need to install development packages"
++ echo "On a Debian based distro system do:"
++ echo ""
++ echo " sudo apt-get install libgnome2-dev"
++ echo ""
++ echo exit 1
++ fi
++ fi
++
++ fi
+ fi
+
+
