From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Pirotte Newsgroups: gmane.lisp.guile.devel,gmane.lisp.guile.gtk Subject: guile-gnome: devel branch - Prepare 2.16.5 Date: Fri, 1 Jul 2016 18:45:36 -0300 Message-ID: <20160701184536.45fd211d@capac> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/yPi7vbcq3fRdflsDr1+_qKf"; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1467409604 19982 80.91.229.3 (1 Jul 2016 21:46:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 1 Jul 2016 21:46:44 +0000 (UTC) To: guile-gnome , guile-devel Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Fri Jul 01 23:46:30 2016 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bJ6Ga-0000FC-RG for guile-devel@m.gmane.org; Fri, 01 Jul 2016 23:46:29 +0200 Original-Received: from localhost ([::1]:35900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ6GZ-0004oe-SI for guile-devel@m.gmane.org; Fri, 01 Jul 2016 17:46:27 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ6GU-0004oX-Jw for guile-devel@gnu.org; Fri, 01 Jul 2016 17:46:24 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bJ6GQ-0006Qc-F2 for guile-devel@gnu.org; Fri, 01 Jul 2016 17:46:22 -0400 Original-Received: from maximusconfessor.all2all.org ([79.99.200.102]:52378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bJ6GQ-0006Pa-4v; Fri, 01 Jul 2016 17:46:18 -0400 Original-Received: from localhost (unknown [192.168.0.2]) by maximusconfessor.all2all.org (Postfix) with ESMTP id D2785A04C00C; Fri, 1 Jul 2016 23:45:51 +0200 (CEST) Original-Received: from maximusconfessor.all2all.org ([192.168.0.1]) by localhost (maximusconfessor.all2all.org [192.168.0.2]) (amavisd-new, port 10024) with ESMTP id o3Q+fjjf9gpT; Fri, 1 Jul 2016 23:45:46 +0200 (CEST) Original-Received: from capac (unknown [179.210.35.132]) by maximusconfessor.all2all.org (Postfix) with ESMTPSA id 227A9A04C165; Fri, 1 Jul 2016 23:45:44 +0200 (CEST) X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 79.99.200.102 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: "guile-devel" Xref: news.gmane.org gmane.lisp.guile.devel:18455 gmane.lisp.guile.gtk:1114 Archived-At: --Sig_/yPi7vbcq3fRdflsDr1+_qKf Content-Type: multipart/mixed; boundary="MP_/P10vHQFC5TwzRBbZ=7htpGA" --MP_/P10vHQFC5TwzRBbZ=7htpGA Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hello, Attached 2 patches [the first is insignificant, just a chmod on an example]= to prepare Guile-GNOME 2.16.5, compatible with Guile-2.2 Note [commit log extract]: (a) this patch comments the build for the Corba and Gnome-VFS wrappers, due to incompatible changes in Guile-2.2 (see their corresponding entry in configure.ac for a better explanation); (b) I don't have time to provide the autotool 'machinery' so that It would still build these 2 modules for Guile-2.0, but if someone wants to spend t= he time to do this, it is possible, so please do and let us know. Unless negative feedback, I'll push this patch to the Guile-GNOME devel bra= nch in 2 to 3 weeks from now. Then, If you are using Guile-GNOME and have some free time: I uploaded a prerelease taball and signature file here: http://download.savannah.gnu.org/releases/grip/guile-gnome/ guile-gnome-platform-2.16.5-dev.tar.gz guile-gnome-platform-2.16.5-dev.tar.gz.sig [ Files on mirrors may be subject to a replication delay of up to 24 hours. [ In case of problems use http://download-mirror.savannah.gnu.org/releases/ Grab the latest GNU Guile release 2.1.3 https://lists.gnu.org/archive/html/guile-devel/2016-06/msg00009.html Then compile install both 'somewhere else' [I use /opt2], compile install y= ou app(s) there as well and see if everything is fine...=20 Cheers, David --MP_/P10vHQFC5TwzRBbZ=7htpGA Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-Fix-tic-tac-toe-example-mode-to-a-x.patch =46rom 0399ee526e77274fe7629be9eb798ddeb67ea11a Mon Sep 17 00:00:00 2001 From: David Pirotte Date: Fri, 1 Jul 2016 16:34:53 -0300 Subject: [PATCH 1/2] Fix tic-tac-toe example mode to a+x * gtk/examples/tic-tac-toe.scm: Mode should be executable for all. --- gtk/examples/tic-tac-toe.scm | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 =3D> 100755 gtk/examples/tic-tac-toe.scm diff --git a/gtk/examples/tic-tac-toe.scm b/gtk/examples/tic-tac-toe.scm old mode 100644 new mode 100755 --=20 2.8.1 --MP_/P10vHQFC5TwzRBbZ=7htpGA Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-Prepare-for-Guile-2.2.patch =46rom 4d2c2e0f6d147715c387c6f772a55f022e4de6df Mon Sep 17 00:00:00 2001 From: David Pirotte Date: Fri, 1 Jul 2016 17:29:53 -0300 Subject: [PATCH 2/2] Prepare for Guile-2.2 Notes: (a) this patch comments the build for the Corba and Gnome-VFS wrappers, due to incompatible changes in Guile-2.2 (see their corresponding entry in configure.ac for a better explanation); (b) I don't have time to provide the autotool 'machinery' so that It would still build these 2 modules for Guile-2.0, but if someone wants to spend the time to do this, it is possible, so please do and let us know. * Makefile.am: * common.mk: * configure.ac: Due to incompatible changes in Guile-2.2, and the lack of time to fix both corba and gnome-fvs, this patch comnents the build for these 2 wrappers. If you have the wish, the time and the skill to fix this, please do and let us know. --- Makefile.am | 22 +++++++++++++-- common.mk | 4 ++- configure.ac | 91 ++++++++++++++++++++++++++++++++++++--------------------= ---- 3 files changed, 78 insertions(+), 39 deletions(-) diff --git a/Makefile.am b/Makefile.am index 17a94fb..1b5a3c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,25 @@ # this file is generated by autogen-pkg.sh =20 -SUBDIRS =3D defs glib cairo atk pango gtk libgnomeui libgnomecanvas libgno= me libglade gnome-vfs gconf corba=20 -EXTRA_DIST =3D dev-environ.in h2def.py autogen.sh HACKING ChangeLog.pre-2.= 16 +SUBDIRS =3D \ + defs \ + glib \ + cairo \ + atk \ + pango \ + gtk \ + libgnomeui \ + libgnomecanvas \ + libgnome \ + libglade \ + gconf +# corba +# gnome-vfs + +EXTRA_DIST =3D \ + dev-environ.in \ + h2def.py \ + HACKING \ + ChangeLog.pre-2.16 =20 dist-gzip: distdir $(AMTAR) --format=3Dustar -chf - $(distdir) | GZIP=3D$(GZIP_ENV) gzip -c = >$(distdir).tar.gz diff --git a/common.mk b/common.mk index 5c62641..ade18cf 100644 --- a/common.mk +++ b/common.mk @@ -38,7 +38,9 @@ SUFFIXES =3D .x .doc =20 GUILE_SNARF_CFLAGS =3D $(DEFS) $(AM_CFLAGS) $(GUILE_CFLAGS) $(G_WRAP_CFLAG= S) =20 -PACKAGES =3D atk cairo corba defs gconf glib gnome-vfs gtk libglade libgno= me libgnomecanvas libgnomeui pango +PACKAGES =3D atk cairo defs gconf glib gtk libglade libgnome libgnomecanva= s libgnomeui pango +# gnome-vfs corba + SOURCE_GUILE_PATH=3D$(shell echo $(addprefix $(abs_top_srcdir)/,$(PACKAGES= )) | sed -e 's/ /:/g'):$(srcdir) BUILD_GUILE_PATH=3D$(if $(filter-out $(abs_top_srcdir),$(abs_top_builddir)= ),$(shell echo -n $(addprefix $(abs_top_builddir)/,$(PACKAGES)): | sed -e '= s/ /:/g'),) GUILE_LOAD_PATH:=3D$(BUILD_GUILE_PATH)$(SOURCE_GUILE_PATH):${G_WRAP_MODULE= _DIR}$(if ${GUILE_LOAD_PATH},:${GUILE_LOAD_PATH}) diff --git a/configure.ac b/configure.ac index 239f6be..1e3b529 100644 --- a/configure.ac +++ b/configure.ac @@ -152,15 +152,20 @@ AM_CONDITIONAL(HAVE_CAIRO, $HAVE_CAIRO) record_check cairo $HAVE_CAIRO =20 # corba -PKG_CHECK_MODULES(CORBA, libbonobo-2.0, HAVE_CORBA=3Dtrue, HAVE_CORBA=3Dfa= lse) -AC_SUBST(CORBA_CFLAGS) -AC_SUBST(CORBA_LIBS) -AM_CONDITIONAL(HAVE_CORBA, $HAVE_CORBA) -ORBIT_IDL=3D"`pkg-config --variable=3Dorbit_idl ORBit-2.0`" -AC_SUBST(ORBIT_IDL) -BONOBO_IDL_DIR=3D"`pkg-config --variable=3Didldir libbonobo-2.0`" -AC_SUBST(BONOBO_IDL_DIR) -record_check corba $HAVE_CORBA + +# Uses scm_make_vtable_vtable, deprecated in 2.0 and removed from 2.2: +# till someone has the wish, the time and the skill to fix this, we +# won't build the corba wrapper. + +# PKG_CHECK_MODULES(CORBA, libbonobo-2.0, HAVE_CORBA=3Dtrue, HAVE_CORBA=3D= false) +# AC_SUBST(CORBA_CFLAGS) +# AC_SUBST(CORBA_LIBS) +# AM_CONDITIONAL(HAVE_CORBA, $HAVE_CORBA) +# ORBIT_IDL=3D"`pkg-config --variable=3Dorbit_idl ORBit-2.0`" +# AC_SUBST(ORBIT_IDL) +# BONOBO_IDL_DIR=3D"`pkg-config --variable=3Didldir libbonobo-2.0`" +# AC_SUBST(BONOBO_IDL_DIR) +# record_check corba $HAVE_CORBA =20 # gconf PKG_CHECK_MODULES(GCONF, gconf-2.0 >=3D 2.18, HAVE_GCONF=3Dtrue, HAVE_GCON= F=3Dfalse) @@ -191,17 +196,23 @@ AC_CONFIG_COMMANDS([glib/gnome/gobject/guile-gnome-go= bject], record_check glib true =20 # gnome-vfs -PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0 >=3D 2.16.0, HAVE_GNOME_VFS=3Dt= rue, HAVE_GNOME_VFS=3Dfalse) -AC_SUBST(GNOME_VFS_CFLAGS) -AC_SUBST(GNOME_VFS_LIBS) -AM_CONDITIONAL(HAVE_GNOME_VFS, $HAVE_GNOME_VFS) -if $DISABLE_DEPRECATED; then - GNOME_VFS_DEPRECATED_CFLAGS=3D-DGNOME_VFS_DISABLE_DEPRECATED -else - GNOME_VFS_DEPRECATED_CFLAGS=3D -fi -AC_SUBST(GNOME_VFS_DEPRECATED_CFLAGS) -record_check gnome-vfs $HAVE_GNOME_VFS + +# This wrapper needs updates wrt C port API, which has changed in +# Guile-2.2. See 'API to define new port types from C has changed' in +# the NEWS file for Guile 2.2: till someone has the wish, time and +# skill to fix this, we won't build the gnome-vfs wrapper. + +# PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0 >=3D 2.16.0, HAVE_GNOME_VFS= =3Dtrue, HAVE_GNOME_VFS=3Dfalse) +# AC_SUBST(GNOME_VFS_CFLAGS) +# AC_SUBST(GNOME_VFS_LIBS) +# AM_CONDITIONAL(HAVE_GNOME_VFS, $HAVE_GNOME_VFS) +# if $DISABLE_DEPRECATED; then +# GNOME_VFS_DEPRECATED_CFLAGS=3D-DGNOME_VFS_DISABLE_DEPRECATED +# else +# GNOME_VFS_DEPRECATED_CFLAGS=3D +# fi +# AC_SUBST(GNOME_VFS_DEPRECATED_CFLAGS) +# record_check gnome-vfs $HAVE_GNOME_VFS =20 # gtk PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >=3D 2.10.0, HAVE_GDK_PIXBUF= =3Dtrue, HAVE_GDK_PIBXUF=3Dfalse) @@ -309,6 +320,30 @@ on the prerequisites of a package. fi =20 AC_CONFIG_FILES(dev-environ, [chmod +x ./dev-environ]) + +# if someone fixes it, files below should be added +# below cairo +# corba/doc/Makefile +# corba/tests/Makefile +# corba/gnome/gw/Makefile +# corba/gnome/Makefile +# corba/gnome/corba/Makefile +# corba/Makefile +# corba/demos/Makefile +# corba/demos/corba/Makefile + +# if someone fixes it, files below should be added +# below glib +# gnome-vfs/examples/gnome-vfs/Makefile +# gnome-vfs/examples/Makefile +# gnome-vfs/doc/Makefile +# gnome-vfs/tests/Makefile +# gnome-vfs/gnome/gw/Makefile +# gnome-vfs/gnome/Makefile +# gnome-vfs/gnome/overrides/Makefile +# gnome-vfs/Makefile + + AC_CONFIG_FILES( Makefile atk/doc/Makefile @@ -320,14 +355,6 @@ atk/Makefile cairo/gnome/gw/Makefile cairo/gnome/Makefile cairo/Makefile -corba/doc/Makefile -corba/tests/Makefile -corba/gnome/gw/Makefile -corba/gnome/Makefile -corba/gnome/corba/Makefile -corba/Makefile -corba/demos/Makefile -corba/demos/corba/Makefile defs/tools/Makefile defs/gnome/Makefile defs/gnome/defs/Makefile @@ -352,14 +379,6 @@ glib/gnome/gobject/Makefile glib/test-suite/Makefile glib/Makefile glib/bin/Makefile -gnome-vfs/examples/gnome-vfs/Makefile -gnome-vfs/examples/Makefile -gnome-vfs/doc/Makefile -gnome-vfs/tests/Makefile -gnome-vfs/gnome/gw/Makefile -gnome-vfs/gnome/Makefile -gnome-vfs/gnome/overrides/Makefile -gnome-vfs/Makefile gtk/examples/Makefile gtk/doc/gtk/Makefile gtk/doc/gdk/Makefile --=20 2.8.1 --MP_/P10vHQFC5TwzRBbZ=7htpGA-- --Sig_/yPi7vbcq3fRdflsDr1+_qKf Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJXduSAAAoJEPN0/ZOjBXrXZG4H/AhiYiTdAAnuQFbDcxgBYiA1 U9j0/AhFFt1inymAYZEFH4ykr+T6+/5IFHNSDcwQ9DTb6vXPj+cHU6/gp9DIlU5a eH9RDEFRfe+0wPa2/4ThEPB/eR2cI9zBN04ONrAm5GS1Iysv/acuKn1fYsszaDq0 ptKbskWZiPJ+hlCf8Or2OM6K5W3FW6x8ntVgN5iszdtWO3MmqrzLu6Ujtf/FTO5t ZPx8g1OWKh7fc8aIpqsArhN9EbYkZp/+Ce8CW21Waf7p46iQbSHb7uNPMy4gtFji NrLdiaGsdAZY574UwOx9RbWGqakSTZjbYPorN+g8ek3vEafdzdkp31lSzJKe6Tc= =DAPM -----END PGP SIGNATURE----- --Sig_/yPi7vbcq3fRdflsDr1+_qKf--