Date: Thursday, May 31, 2018 @ 09:31:07 Author: jgc Revision: 325433 upgpkg: gdome2 0.8.1-6
Rebuild, use patch from Debian to avoid glib dependency for autoreconf Added: gdome2/trunk/03no_glib_1.patch Modified: gdome2/trunk/PKGBUILD -------------------+ 03no_glib_1.patch | 34 ++++++++++++++++++++++++++++++++++ PKGBUILD | 19 +++++++++++++------ 2 files changed, 47 insertions(+), 6 deletions(-) Added: 03no_glib_1.patch =================================================================== --- 03no_glib_1.patch (rev 0) +++ 03no_glib_1.patch 2018-05-31 09:31:07 UTC (rev 325433) @@ -0,0 +1,34 @@ +From: <he...@pool.math.tu-berlin.de> +Subject: Comment out the paragraph for glib-1 + It is no longer needed and AM_PATH_GLIB is not available unless we + also depend on the old glib. + +--- gdome2-0.8.1+debian.orig/configure.in ++++ gdome2-0.8.1+debian/configure.in +@@ -63,18 +63,18 @@ + GLIB_1=yes + ) + +-if test "x$GLIB_1" = "xyes" +-then +- PKG_CHECK_MODULES(GLIB, glib) +- GLIB_REQUIRED="glib" +- GLIB_MIN_VERSION=1.2.10 +- AM_PATH_GLIB($GLIB_MIN_VERSION,,AC_MSG_ERROR(Could not find GLIB (see config.log for details).)) +-else ++#if test "x$GLIB_1" = "xyes" ++#then ++# PKG_CHECK_MODULES(GLIB, glib) ++# GLIB_REQUIRED="glib" ++# GLIB_MIN_VERSION=1.2.10 ++# AM_PATH_GLIB($GLIB_MIN_VERSION,,AC_MSG_ERROR(Could not find GLIB (see config.log for details).)) ++#else + PKG_CHECK_MODULES(GLIB, glib-2.0) + GLIB_REQUIRED="glib-2.0" + GLIB_MIN_VERSION=2.2.0 + AM_PATH_GLIB_2_0($GLIB_MIN_VERSION,,AC_MSG_ERROR(Could not find GLIB (see config.log for details).)) +-fi ++#fi + AC_SUBST(GLIB_MIN_VERSION) + AC_SUBST(GLIB_LIBS) + AC_SUBST(GLIB_REQUIRED) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-31 09:15:08 UTC (rev 325432) +++ PKGBUILD 2018-05-31 09:31:07 UTC (rev 325433) @@ -1,10 +1,9 @@ # $Id$ -# Maintainer: -# Contributor: Jan de Groot <j...@archlinux.org> +# Maintainer: Jan de Groot <j...@archlinux.org> pkgname=gdome2 pkgver=0.8.1 -pkgrel=5 +pkgrel=6 pkgdesc="Gnome DOM Engine" arch=('x86_64') url="http://gdome2.cs.unibo.it/" @@ -11,13 +10,18 @@ license=('LGPL') depends=('libxml2' 'glib2') source=("http://gdome2.cs.unibo.it/tarball/${pkgname}-${pkgver}.tar.gz" - gdome2-0.8.1-libxml2.patch) -md5sums=('bfc114e59eec50cbda8e4ece751ff022' - 'bde155107f30bf65d441adf70efc3c00') + gdome2-0.8.1-libxml2.patch + 03no_glib_1.patch) +sha256sums=('f4bb80a2ef8e5fd9397ab8aa36d059d0b32e98c4bcf185c7952a7e3874d1d543' + '9c7c1bf3ad05bc25b0a4b65971b37206cf02ee40e87cbd3df382a15f2d9913b1' + 'de99def0e868ac25733cf340349b00e772514de4bcff4834aec610481124ea38') prepare() { cd ${pkgname}-${pkgver} patch -p0 -i "${srcdir}/gdome2-0.8.1-libxml2.patch" + patch -p1 -i "${srcdir}/03no_glib_1.patch" + libtoolize -c -f + autoreconf -fi } @@ -24,6 +28,9 @@ build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make }