Date: Thursday, May 31, 2018 @ 09:31:11
Author: jgc
Revision: 325434
archrelease: copy trunk to extra-x86_64
Added:
gdome2/repos/extra-x86_64/03no_glib_1.patch
(from rev 325433, gdome2/trunk/03no_glib_1.patch)
gdome2/repos/extra-x86_64/PKGBUILD
(from rev 325433, gdome2/trunk/PKGBUILD)
gdome2/repos/extra-x86_64/gdome2-0.8.1-libxml2.patch
(from rev 325433, gdome2/trunk/gdome2-0.8.1-libxml2.patch)
Deleted:
gdome2/repos/extra-x86_64/PKGBUILD
gdome2/repos/extra-x86_64/gdome2-0.8.1-libxml2.patch
----------------------------+
03no_glib_1.patch | 34 ++++++++++++++++++++
PKGBUILD | 73 +++++++++++++++++++++++--------------------
gdome2-0.8.1-libxml2.patch | 36 ++++++++++-----------
3 files changed, 92 insertions(+), 51 deletions(-)
Copied: gdome2/repos/extra-x86_64/03no_glib_1.patch (from rev 325433,
gdome2/trunk/03no_glib_1.patch)
===================================================================
--- 03no_glib_1.patch (rev 0)
+++ 03no_glib_1.patch 2018-05-31 09:31:11 UTC (rev 325434)
@@ -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)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-31 09:31:07 UTC (rev 325433)
+++ PKGBUILD 2018-05-31 09:31:11 UTC (rev 325434)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Jan de Groot <j...@archlinux.org>
-
-pkgname=gdome2
-pkgver=0.8.1
-pkgrel=5
-pkgdesc="Gnome DOM Engine"
-arch=('i686' '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)
-md5sums=('bfc114e59eec50cbda8e4ece751ff022'
- 'bde155107f30bf65d441adf70efc3c00')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p0 -i "${srcdir}/gdome2-0.8.1-libxml2.patch"
-}
-
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr --mandir=/usr/share/man
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
Copied: gdome2/repos/extra-x86_64/PKGBUILD (from rev 325433,
gdome2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-05-31 09:31:11 UTC (rev 325434)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+
+pkgname=gdome2
+pkgver=0.8.1
+pkgrel=6
+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}
+ ./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
+}
Deleted: gdome2-0.8.1-libxml2.patch
===================================================================
--- gdome2-0.8.1-libxml2.patch 2018-05-31 09:31:07 UTC (rev 325433)
+++ gdome2-0.8.1-libxml2.patch 2018-05-31 09:31:11 UTC (rev 325434)
@@ -1,18 +0,0 @@
-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);
Copied: gdome2/repos/extra-x86_64/gdome2-0.8.1-libxml2.patch (from rev 325433,
gdome2/trunk/gdome2-0.8.1-libxml2.patch)
===================================================================
--- gdome2-0.8.1-libxml2.patch (rev 0)
+++ gdome2-0.8.1-libxml2.patch 2018-05-31 09:31:11 UTC (rev 325434)
@@ -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);
