[arch-commits] Commit in gdome2/repos (4 files)

[Evangelos Foutras]

    Date: Saturday, May 16, 2020 @ 20:53:03
  Author: foutrelis
Revision: 384840

archrelease: copy trunk to staging-x86_64

Added:
  gdome2/repos/staging-x86_64/
  gdome2/repos/staging-x86_64/03no_glib_1.patch
    (from rev 384839, gdome2/trunk/03no_glib_1.patch)
  gdome2/repos/staging-x86_64/PKGBUILD
    (from rev 384839, gdome2/trunk/PKGBUILD)
  gdome2/repos/staging-x86_64/gdome2-0.8.1-libxml2.patch
    (from rev 384839, gdome2/trunk/gdome2-0.8.1-libxml2.patch)

----------------------------+
 03no_glib_1.patch          |   34 ++++++++++++++++++++++++++++++++++
 PKGBUILD                   |   40 ++++++++++++++++++++++++++++++++++++++++
 gdome2-0.8.1-libxml2.patch |   18 ++++++++++++++++++
 3 files changed, 92 insertions(+)

Copied: gdome2/repos/staging-x86_64/03no_glib_1.patch (from rev 384839, gdome2/trunk/03no_glib_1.patch)
===================================================================
--- staging-x86_64/03no_glib_1.patch	                        (rev 0)
+++ staging-x86_64/03no_glib_1.patch	2020-05-16 20:53:03 UTC (rev 384840)
@@ -0,0 +1,34 @@
+From: <hesso at 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)

Copied: gdome2/repos/staging-x86_64/PKGBUILD (from rev 384839, gdome2/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2020-05-16 20:53:03 UTC (rev 384840)
@@ -0,0 +1,40 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gdome2
+pkgver=0.8.1
+pkgrel=7
+pkgdesc="Gnome DOM Engine"
+arch=('x86_64')
+url="http://gdome2.cs.unibo.it/"
+license=('LGPL')
+depends=('libxml2' 'glib2')
+source=("http://gdome2.cs.unibo.it/tarball/${pkgname}-${pkgver}.tar.gz"
+        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
+}
+
+
+build() {
+  cd ${pkgname}-${pkgver}
+  CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
+  ./configure --prefix=/usr --mandir=/usr/share/man
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}

Copied: gdome2/repos/staging-x86_64/gdome2-0.8.1-libxml2.patch (from rev 384839, gdome2/trunk/gdome2-0.8.1-libxml2.patch)
===================================================================
--- staging-x86_64/gdome2-0.8.1-libxml2.patch	                        (rev 0)
+++ staging-x86_64/gdome2-0.8.1-libxml2.patch	2020-05-16 20:53:03 UTC (rev 384840)
@@ -0,0 +1,18 @@
+Patch by Harris Landgarten.
+
+The patch was submitted on bug 448236, following the announcement on
+https://mail.gnome.org/archives/xml/2012-August/msg00005.html
+--- libgdome/gdomecore/gdome-xml-documentt.c.orig	2003-07-13 06:47:54.000000000 -0400
++++ libgdome/gdomecore/gdome-xml-documentt.c	2012-12-23 08:57:23.000000000 -0500
+@@ -342,7 +342,11 @@
+ 	}
+ 	xmlNodeDumpOutput (out_buff, NULL, (xmlNode *)is, 0, 0, NULL);
+ 	xmlOutputBufferFlush(out_buff);
++#if LIBXML_VERSION < 20900
+ 	ret = g_strndup (out_buff->buffer->content, out_buff->buffer->use);
++#else
++	ret = g_strndup (xmlBufContent(out_buff->buffer), xmlBufUse(out_buff->buffer));
++#endif
+ 	(void)xmlOutputBufferClose(out_buff);
+ 
+ 	return gdome_xml_str_mkref_own (ret);