[email protected]
[Top] [All Lists]

Bug#295452: marked as forwarded ([PATCH] SWIG 1.3.4 support)

Subject: Bug#295452: marked as forwarded [PATCH] SWIG 1.3.4 support
From: Debian Bug Tracking System
Date: Sat, 19 Feb 2005 09:03:33 -0800
Your message dated Sat, 19 Feb 2005 17:55:22 +0100
with message-id <[email protected]>
has caused the Debian Bug report #295452,
regarding [PATCH] SWIG 1.3.4 support
to be marked as having been forwarded to the upstream software
author(s) [email protected]

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

---------------------------------------
Received: (at 295452-forwarded) by bugs.debian.org; 19 Feb 2005 16:55:58 +0000
>From [email protected] Sat Feb 19 08:55:58 2005
Return-path: <[email protected]>
Received: from tms.rz.uni-kiel.de [134.245.11.89] 
        by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
        id 1D2Xte-0004fW-00; Sat, 19 Feb 2005 08:55:58 -0800
Received: from amavis by tms.rz.uni-kiel.de with scanned-ok (Exim 4.34)
        id 1D2Xt8-00018A-SW
        for [email protected]; Sat, 19 Feb 2005 17:55:26 +0100
Received: from zaphod.gpi.uni-kiel.de ([134.245.120.1])
        by tms.rz.uni-kiel.de with esmtp (Exim 4.34)
        id 1D2Xt6-000181-NZ; Sat, 19 Feb 2005 17:55:24 +0100
Received: from localhost ([127.0.0.1] helo=stargate.galaxy)
        by zaphod.gpi.uni-kiel.de with esmtp (Exim 3.35 #1 (Debian))
        id 1D2Xt5-0000yH-00; Sat, 19 Feb 2005 17:55:24 +0100
Received: by stargate.galaxy (Postfix, from userid 1000)
        id D3ECE189C4; Sat, 19 Feb 2005 17:55:22 +0100 (CET)
Date: Sat, 19 Feb 2005 17:55:22 +0100
From: Torsten Landschoff <[email protected]>
To: [email protected]
Cc: [email protected]
Subject: [PATCH] Swig 1.3.24 for Subversion 1.1.3
Message-ID: <[email protected]>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
        protocol="application/pgp-signature"; boundary="LpQ9ahxlCli8rRTG"
Content-Disposition: inline
User-Agent: Mutt/1.5.6+20040722i
X-Virus-Scanned: by AMaViS 0.3.12 (Uni-Kiel/tms)
Delivered-To: [email protected]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
        (1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no 
        version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level: 


--LpQ9ahxlCli8rRTG
Content-Type: multipart/mixed; boundary="2oS5YaxWCcQjTEyO"
Content-Disposition: inline


--2oS5YaxWCcQjTEyO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hey there,=20

As the Debian maintainer of SWIG it is in my interest to get the current
SWIG package into the distribution. Problem is that subversion 1.1.3 in
Debian does not build with SWIG 1.3.24 because of the now-missing
runtime libraries.=20

The development branch of subversion 1.2 is patched though so I took
that patch and revised it for 1.1.3. The result is attached. Could
somebody be so kind and take a look if this should be safe? We'd rather
not break subversion in the next Debian release...

Thanks

        Torsten

--2oS5YaxWCcQjTEyO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="swig-1.3.24.patch"
Content-Transfer-Encoding: quoted-printable

Index: Makefile.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Makefile.in (revision 13068)
+++ Makefile.in (working copy)
@@ -114,6 +114,7 @@
                 -I$(abs_srcdir)/subversion/include \
                 -I$(SWIG_LIBSWIG_DIR) \
                 -DSVN_SWIG_VERSION=3D$(SWIG_VERSION) \
+                -DSWIG_TABLE_TYPE=3Dsubversion \
                 $(SVN_APR_INCLUDES) $(SVN_APRUTIL_INCLUDES)
 SWIG_NORUNTIME_FLAG =3D @[email protected]
 SWIG_LDFLAGS =3D @[email protected]
Index: build/ac-macros/swig.m4
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- build/ac-macros/swig.m4     (revision 13068)
+++ build/ac-macros/swig.m4     (working copy)
@@ -109,26 +109,41 @@
     #   packages/rpm/redhat-7.x/subversion.spec
     #   packages/rpm/redhat-8.x/subversion.spec
     if test -n "$SWIG_VERSION" && test "$SWIG_VERSION" -ge "103019" -a \
-                                       "$SWIG_VERSION" -lt "103022"; then
-        SWIG_SUITABLE=3Dyes
-        AC_CACHE_CHECK([for swig library directory], [ac_cv_swig_swiglib_d=
ir],[
-                        ac_cv_swig_swiglib_dir=3D"`$SWIG -swiglib`"
-                       ])
-        SWIG_LIBSWIG_DIR=3D"$ac_cv_swig_swiglib_dir"
+                                      "$SWIG_VERSION" -lt "103022" -o \
+                                      "$SWIG_VERSION" -ge "103024"; then
+      SWIG_SUITABLE=3Dyes
=20
       dnl Newer versions of SWIG have deprecated the -c "do not
       dnl include SWIG runtime functions (used for creating multi-module
       dnl packages)" in favor of the -noruntime flag.
-      if test "$SWIG_VERSION" -ge "103020"; then
+      if test "$SWIG_VERSION" -ge "103024"; then
+        SWIG_NORUNTIME_FLAG=3D''
+        LSWIGPL=3D''
+        LSWIGPY=3D''
+      else
+        if test "$SWIG_VERSION" -ge "103020"; then
           SWIG_NORUNTIME_FLAG=3D'-noruntime'
-      else
+       else
           SWIG_NORUNTIME_FLAG=3D'-c'
+       fi
+       LSWIGPL=3D'-lswigpl'
+       LSWIGPY=3D'-lswigpy'
       fi
     else
-        SWIG_SUITABLE=3Dno
-        AC_MSG_WARN([swig versions 1.3.19, 1.3.20 or 1.3.21 are needed for=
 swig support.])
+      SWIG_SUITABLE=3Dno
+      AC_MSG_WARN([Detected SWIG version $SWIG_VERSION_RAW])
+      AC_MSG_WARN([This is not compatible with Subversion])
+      AC_MSG_WARN([Subversion can use SWIG versions 1.3.19, 1.3.20, 1.3.21=
])
+      AC_MSG_WARN([or 1.3.24 or later])
     fi
=20
+    if test "$SWIG_SUITABLE" =3D "yes"; then
+      AC_CACHE_CHECK([for swig library directory], [ac_cv_swig_swiglib_dir=
],[
+                      ac_cv_swig_swiglib_dir=3D"`$SWIG -swiglib`"
+                     ])
+      SWIG_LIBSWIG_DIR=3D"$ac_cv_swig_swiglib_dir"
+    fi
+   =20
     if test "$PYTHON" !=3D "none" -a "$SWIG_SUITABLE" =3D "yes" -a "$svn_s=
wig_bindings_enable_python" =3D "yes"; then
       AC_MSG_NOTICE([Configuring python swig binding])
       AC_CACHE_CHECK([if swig needs -L for its libraries],
@@ -202,5 +217,7 @@
   AC_SUBST(SWIG_JAVA_LINK)
   AC_SUBST(SWIG_PL_INCLUDES)
   AC_SUBST(SWIG_LIBSWIG_DIR)
+  AC_SUBST(LSWIGPL)
+  AC_SUBST(LSWIGPY)
   AC_SUBST(SWIG_LDFLAGS)
 ])
Index: build/generator/gen_base.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- build/generator/gen_base.py (revision 13068)
+++ build/generator/gen_base.py (working copy)
@@ -560,7 +560,7 @@
     self.name =3D self.lang + '_runtime'=20
     self.path =3D build_path_join(self.path, self.lang)
     self.filename =3D build_path_join(self.path, libname)
-    self.external_lib =3D '-lswig' + abbrev
+    self.external_lib =3D "$(LSWIG" + string.upper(lang_abbrev[self.lang])=
 + ")"
=20
     cfile =3D SWIGObject(build_path_join(self.path, cname), self.lang)
     ofile =3D SWIGObject(build_path_join(self.path, oname), self.lang)
Index: build/generator/gen_win.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- build/generator/gen_win.py  (revision 13068)
+++ build/generator/gen_win.py  (working copy)
@@ -280,7 +280,9 @@
       swig_options =3D ["-" + target.lang]
       swig_deps =3D []
=20
-      if self.swig_vernum >=3D 103020:
+      if self.swig_vernum >=3D 103024:
+        pass
+      elif self.swig_vernum >=3D 103020:
         swig_options.append("-noruntime")
       else:
         swig_options.append("-c")
Index: subversion/bindings/swig/core.i
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- subversion/bindings/swig/core.i     (revision 13068)
+++ subversion/bindings/swig/core.i     (working copy)
@@ -296,6 +296,17 @@
 %typemap (varout,type=3D"$1_descriptor") apr_pool_t *current_pool
   "sv_setiv(SvRV($result),(IV) svn_swig_pl_get_current_pool());";
=20
+/* Fix for SWIG 1.3.24 */
+#if SWIG_VERSION =3D=3D 0x010324
+%typemap(varin) apr_pool_t * {
+  void *temp;
+  if (SWIG_ConvertPtr($input, (void **) &temp, $1_descriptor,0) < 0) {
+    croak("Type error in argument $argnum of $symname. Expected $1_mangle"=
);
+  }
+  $1 =3D ($1_ltype) temp;
+}
+#endif
+
 apr_pool_t *current_pool;
=20
 #endif
Index: subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c        
(revision =
13068)
+++ subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c        
(working c=
opy)
@@ -32,6 +32,12 @@
 #include "svn_opt.h"
 #include "svn_delta.h"
=20
+#if SVN_SWIG_VERSION >=3D 103024
+#include <swigrun.swg>
+#include <python/pyrun.swg>
+#include <runtime.swg>
+#endif
+
 #include "swigutil_py.h"
=20
 =0C
Index: subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h        
(revision =
13068)
+++ subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h        
(working c=
opy)
@@ -34,18 +34,12 @@
 #include "svn_client.h"
 #include "svn_repos.h"
=20
-#if SVN_SWIG_VERSION >=3D 103020
-#include "python/precommon.swg"
-#ifndef SWIG_NewPointerObj
-#define SWIG_NewPointerObj SWIG_Python_NewPointerObj
-#endif
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
=20
 =0C
+#if SVN_SWIG_VERSION < 103024
 /* If this file is being included outside of a wrapper file, then need to
    create stubs for some of the SWIG types. */
=20
@@ -57,12 +51,25 @@
=20
 #ifdef SVN_NEED_SWIG_TYPES
=20
+#if SVN_SWIG_VERSION >=3D 103020
+#include "python/precommon.swg"
+#ifndef SWIG_ConvertPtr
+#define SWIG_ConvertPtr SWIG_Python_ConvertPtr
+#endif
+#ifndef SWIG_NewPointerObj
+#define SWIG_NewPointerObj SWIG_Python_NewPointerObj
+#endif
+#endif
+
 typedef struct _unnamed swig_type_info;
+
 PyObject *SWIG_NewPointerObj(void *, swig_type_info *, int own);
 swig_type_info *SWIG_TypeQuery(const char *name);
=20
 #endif /* SVN_NEED_SWIG_TYPES */
+#endif /* SVN_SWIG_VERSION < 103024 */
=20
+
 /* Functions to manage python's global interpreter lock */
 void svn_swig_py_release_py_lock(void);
 void svn_swig_py_acquire_py_lock(void);
Index: subversion/bindings/swig/perl/native/Makefile.PL.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- subversion/bindings/swig/perl/native/Makefile.PL.in (revision 13068)
+++ subversion/bindings/swig/perl/native/Makefile.PL.in (working copy)
@@ -89,7 +89,9 @@
    my $module_make_commands =3D join ('',map {"\t\$(MAKE) -f Makefile.$_\n=
"} @modules);
=20
    my $flags;
-   if ($swig_version >=3D 103020) {
+   if ($swig_version >=3D 103024) {
+     $flags =3D '-noproxy';
+   } elsif ($swig_version >=3D 103020) {
      $flags =3D '-noruntime -noproxy';
    } else {
      $flags =3D '-c';
Index: subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c        
(revision =
13068)
+++ subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c        
(working c=
opy)
@@ -29,6 +29,12 @@
 #include "svn_pools.h"
 #include "svn_opt.h"
=20
+#if SVN_SWIG_VERSION >=3D 103024
+#include <swigrun.swg>
+#include <perl5/perlrun.swg>
+#include <runtime.swg>
+#endif
+
 #include "swigutil_pl.h"
=20
 /* cache SWIG_TypeQuery results in a perl hash */
Index: subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h        
(revision =
13068)
+++ subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h        
(working c=
opy)
@@ -49,6 +49,8 @@
 #endif
=20
 =0C
+
+#if SVN_SWIG_VERSION < 103024
 /* If this file is being included outside of a wrapper file, then need to
    create stubs for some of the SWIG types. */
=20
@@ -78,6 +80,7 @@
 void SWIG_MakePtr(SV *, void *, swig_type_info *, int flags);
=20
 #endif /* SVN_NEED_SWIG_TYPES */
+#endif /* SVN_SWIG_VERSION < 103024 */
=20
 apr_pool_t *svn_swig_pl_get_current_pool (void);
 void svn_swig_pl_set_current_pool (apr_pool_t *pool);

--2oS5YaxWCcQjTEyO--

--LpQ9ahxlCli8rRTG
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFCF296dQgHtVUb5EcRAvfiAJ4wKRbomEXjJ2v3hPgsPsyohFUyvgCfcwra
QqMKwpR5REgVlqECbw8z+Fo=
=pap4
-----END PGP SIGNATURE-----

--LpQ9ahxlCli8rRTG--


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

<Prev in Thread] Current Thread [Next in Thread>
  • Bug#295452: marked as forwarded ([PATCH] SWIG 1.3.4 support), Debian Bug Tracking System <=