Control: tags -1 patch Attached is a complete patch for this issue, based on Helmut's work.
Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ [email protected] [email protected]
diff -Nru blt-2.5.3+dfsg/debian/changelog blt-2.5.3+dfsg/debian/changelog --- blt-2.5.3+dfsg/debian/changelog 2014-11-21 14:11:22.000000000 +0000 +++ blt-2.5.3+dfsg/debian/changelog 2015-08-31 19:32:38.000000000 +0000 @@ -1,3 +1,17 @@ +blt (2.5.3+dfsg-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * debian/patches/autoreconf.patch: fix autotools input for + compatibility with recent autoconf. Thanks to Helmut Grohne + <[email protected]>. Closes: #772590. + * debian/patches/pkgindex.patch: correct this patch to patch the + configure.in source, not the generated configure script. + * debian/patches/install.patch: fix the distclean targets. + * debian/patches/*: remove patching of autogenerated configure + * Drop debian/rules override_dh_clean target, which gets it wrong. + + -- Steve Langasek <[email protected]> Mon, 31 Aug 2015 19:12:35 +0000 + blt (2.5.3+dfsg-1) unstable; urgency=medium * Removed non-distributable files library/dd_protocols/* from the source diff -Nru blt-2.5.3+dfsg/debian/control blt-2.5.3+dfsg/debian/control --- blt-2.5.3+dfsg/debian/control 2014-11-19 07:37:09.000000000 +0000 +++ blt-2.5.3+dfsg/debian/control 2015-08-31 19:03:24.000000000 +0000 @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: Sergei Golovan <[email protected]> -Build-Depends: tk8.6-dev, debhelper (>= 9), autotools-dev (>= 20120210.1), dpkg-dev (>= 1.16.1) +Build-Depends: tk8.6-dev, debhelper (>= 9), dpkg-dev (>= 1.16.1), dh-autoreconf Standards-Version: 3.9.6 Homepage: http://blt.sourceforge.net/ diff -Nru blt-2.5.3+dfsg/debian/patches/autoreconf.patch blt-2.5.3+dfsg/debian/patches/autoreconf.patch --- blt-2.5.3+dfsg/debian/patches/autoreconf.patch 1970-01-01 00:00:00.000000000 +0000 +++ blt-2.5.3+dfsg/debian/patches/autoreconf.patch 2015-08-31 19:28:57.000000000 +0000 @@ -0,0 +1,43 @@ +Description: fix autotools input for compatibility with recent autoconf + It is not possible to regenerate the blt configure script using current + versions of autoconf. Update for recent syntax so that we can get a modern + (and cross-build-friendly) configure script at build. +Author: Helmut Grohne <[email protected]> +Bug-Debian: http://bugs.debian.org/772590 + +diff -ruN a/aclocal.m4 b/aclocal.m4 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -12,7 +12,7 @@ + cat > conftest.$ac_ext <<EOF + [#]line __oline__ "configure" + #include "confdefs.h" +-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus ++AC_LANG_CASE([C++], [#ifdef __cplusplus + extern "C" void exit(int); + #endif + ])dnl +diff -ruN a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -127,9 +127,9 @@ + AC_CACHE_VAL(blt_cv_prog_cc, blt_cv_prog_cc=$CC) + AC_SUBST(CC) + AC_PROG_CPP +-if test "x${GCC}" != "x" ; then ++AS_IF([test "x${GCC}" != "x"],[ + blt_have_gcc="yes" +-else ++],[ + AC_MSG_CHECKING([if C compiler is really gcc]) + AC_EGREP_CPP(_cc_is_gcc_, [ + #ifdef __GNUC__ +@@ -137,7 +137,7 @@ + #endif + ], [blt_have_gcc=yes], [blt_have_gcc=no]) + AC_MSG_RESULT([$blt_have_gcc]) +-fi ++]) + + # + # CFLAGS search order diff -Nru blt-2.5.3+dfsg/debian/patches/install.patch blt-2.5.3+dfsg/debian/patches/install.patch --- blt-2.5.3+dfsg/debian/patches/install.patch 2014-07-04 05:38:55.000000000 +0000 +++ blt-2.5.3+dfsg/debian/patches/install.patch 2015-08-31 19:37:08.000000000 +0000 @@ -2,10 +2,13 @@ INSTALL_ROOT. Also, it adds bltOldConfig.h to the installable headers list and fixes it to include tk.h. Author: Chris Waters and Sergei Golovan -Last-Modified: Fri, 04 Jul 2014 09:32:58 +0400 +Author: Steve Langasek <[email protected]> +Last-Modified: Mon, 31 Aug 2015 12:37:00 -0700 ---- a/Makefile.in -+++ b/Makefile.in +Index: blt-2.5.3+dfsg/Makefile.in +=================================================================== +--- blt-2.5.3+dfsg.orig/Makefile.in ++++ blt-2.5.3+dfsg/Makefile.in @@ -47,9 +47,9 @@ (cd library; $(MAKE) install) (cd man; $(MAKE) install) @@ -39,13 +42,15 @@ config.status config.cache config.log Makefile distclean: clean -+ (cd src; $(MAKE) distclean) ++ (cd generic; $(MAKE) distclean) + (cd library; $(MAKE) distclean) + (cd man; $(MAKE) distclean) + (cd demos; $(MAKE) distclean) $(RM) $(GENERATED_FILES) ---- a/generic/Makefile.in -+++ b/generic/Makefile.in +Index: blt-2.5.3+dfsg/generic/Makefile.in +=================================================================== +--- blt-2.5.3+dfsg.orig/generic/Makefile.in ++++ blt-2.5.3+dfsg/generic/Makefile.in @@ -152,6 +152,7 @@ $(srcdir)/bltChain.h \ bltHash.h \ @@ -73,8 +78,10 @@ .c.o: $(CC) -c $(CC_SWITCHES) $< ---- a/generic/shared/Makefile.in -+++ b/generic/shared/Makefile.in +Index: blt-2.5.3+dfsg/generic/shared/Makefile.in +=================================================================== +--- blt-2.5.3+dfsg.orig/generic/shared/Makefile.in ++++ blt-2.5.3+dfsg/generic/shared/Makefile.in @@ -145,14 +145,20 @@ $(srcdir)/bltInit.c $(RM) $@ @@ -98,7 +105,7 @@ install: mkdirs install-lib install-demo -@@ -175,7 +181,7 @@ +@@ -175,10 +181,10 @@ done clean: $(RM) $(OBJS) $(lib_so) $(tcl_only_lib_so) $(bltwish) $(bltsh) \ @@ -106,9 +113,15 @@ + *pure* .pure* bltInit.o distclean: clean - $(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"* ---- a/demos/Makefile.in -+++ b/demos/Makefile.in +- $(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"* ++ $(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"* Makefile + + # ------------------------------------------------------------------------ + # in lieu of viewpath-ing... +Index: blt-2.5.3+dfsg/demos/Makefile.in +=================================================================== +--- blt-2.5.3+dfsg.orig/demos/Makefile.in ++++ blt-2.5.3+dfsg/demos/Makefile.in @@ -79,7 +79,7 @@ : ; \ else \ @@ -118,8 +131,10 @@ fi ; \ done ---- a/man/Makefile.in -+++ b/man/Makefile.in +Index: blt-2.5.3+dfsg/man/Makefile.in +=================================================================== +--- blt-2.5.3+dfsg.orig/man/Makefile.in ++++ blt-2.5.3+dfsg/man/Makefile.in @@ -52,7 +52,7 @@ : ; \ else \ @@ -129,8 +144,10 @@ fi ; \ done ---- a/library/Makefile.in -+++ b/library/Makefile.in +Index: blt-2.5.3+dfsg/library/Makefile.in +=================================================================== +--- blt-2.5.3+dfsg.orig/library/Makefile.in ++++ blt-2.5.3+dfsg/library/Makefile.in @@ -61,7 +61,7 @@ for i in $(miscFiles) ; do \ $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \ @@ -149,8 +166,10 @@ fi ; \ done ---- a/generic/bltOldConfig.h -+++ b/generic/bltOldConfig.h +Index: blt-2.5.3+dfsg/generic/bltOldConfig.h +=================================================================== +--- blt-2.5.3+dfsg.orig/generic/bltOldConfig.h ++++ blt-2.5.3+dfsg/generic/bltOldConfig.h @@ -1,5 +1,7 @@ /* Old config headers. */ diff -Nru blt-2.5.3+dfsg/debian/patches/ldflags.patch blt-2.5.3+dfsg/debian/patches/ldflags.patch --- blt-2.5.3+dfsg/debian/patches/ldflags.patch 2014-07-09 15:27:15.000000000 +0000 +++ blt-2.5.3+dfsg/debian/patches/ldflags.patch 2015-08-31 19:26:37.000000000 +0000 @@ -4,34 +4,6 @@ Author: Sergei Golovan Last-Modified: Fri, 04 Jul 2014 09:29:39 +0400 ---- a/configure -+++ b/configure -@@ -3859,7 +3859,7 @@ - SHLIB_LIB_SPECS="${JPEG_LIB_SPEC}" - SHLIB_TCL_ONLY_LIB_SPECS="${TCL_ONLY_LIB_SPECS}" - SHLIB_TCL_ONLY_LIB_SPECS="" --LDFLAGS="" -+LDFLAGS="${LDFLAGS}" - LD_RUN_PATH="" - EXTRA_LIB_SPECS="" - -@@ -4035,13 +4035,13 @@ - fi - ;; - -- *-linux*) -+ *-linux*|*-gnu*) - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="${CC}" - SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@' -- LD_RUN_PATH="-Wl,-rpath,${loader_run_path}" -+ LD_RUN_PATH="" - -- LDFLAGS="" -+ LDFLAGS="${LDFLAGS}" - EXTRA_LIB_SPECS="-ldl" - ;; - --- a/configure.in +++ b/configure.in @@ -1061,7 +1061,7 @@ diff -Nru blt-2.5.3+dfsg/debian/patches/pkgindex.patch blt-2.5.3+dfsg/debian/patches/pkgindex.patch --- blt-2.5.3+dfsg/debian/patches/pkgindex.patch 2014-07-09 15:27:15.000000000 +0000 +++ blt-2.5.3+dfsg/debian/patches/pkgindex.patch 2015-08-31 19:09:55.000000000 +0000 @@ -5,43 +5,13 @@ package is installed). Also, it skips initializing widget bindings if Tk isn't present. Author: Sergei Golovan -Last-Modified: Fri, 04 Jul 2014 09:27:54 +0400 +Author: Steve Langasek <[email protected]> +Last-Modified: Mon, 31 Aug 2015 12:09:00 -0700 ---- a/configure -+++ b/configure -@@ -3757,6 +3757,22 @@ - - BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION} - -+echo $ac_n "checking BLT_PATCH_LEVEL""... $ac_c" 1>&6 -+echo "configure:3742: checking BLT_PATCH_LEVEL" >&5 -+if eval "test \"`echo '$''{'blt_cv_patch_level'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.awk <<EOF -+/^# *define *BLT_PATCH_LEVEL[ \t]/ { print \$3 } -+EOF -+blt_cv_patch_level=`${AWK} -f conftest.awk ${srcdir}/generic/blt.h` -+rm -rf conftest* -+ -+fi -+ -+echo "$ac_t""$blt_cv_patch_level" 1>&6 -+BLT_PATCH_LEVEL=${blt_cv_patch_level} -+ - # Add BLT to the run path - libdir=${exec_prefix}/lib - -@@ -4448,6 +4464,7 @@ - s%@BLT_MAJOR_VERSION@%$BLT_MAJOR_VERSION%g - s%@BLT_MINOR_VERSION@%$BLT_MINOR_VERSION%g - s%@BLT_VERSION@%$BLT_VERSION%g -+s%@BLT_PATCH_LEVEL@%$BLT_PATCH_LEVEL%g - s%@AUX_LIBS@%$AUX_LIBS%g - s%@TCL_LIB_DIR@%$TCL_LIB_DIR%g - s%@TCL_VERSION@%$TCL_VERSION%g ---- a/library/Makefile.in -+++ b/library/Makefile.in +Index: blt-2.5.3+dfsg/library/Makefile.in +=================================================================== +--- blt-2.5.3+dfsg.orig/library/Makefile.in ++++ blt-2.5.3+dfsg/library/Makefile.in @@ -5,6 +5,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -58,8 +28,10 @@ sed -e 's/%LIB_PREFIX%/$(lib_prefix)/' | \ sed -e 's;%LIB_DIR%;$(libdir);' > pkgIndex.tcl ---- a/library/pkgIndex.tcl.in -+++ b/library/pkgIndex.tcl.in +Index: blt-2.5.3+dfsg/library/pkgIndex.tcl.in +=================================================================== +--- blt-2.5.3+dfsg.orig/library/pkgIndex.tcl.in ++++ blt-2.5.3+dfsg/library/pkgIndex.tcl.in @@ -49,11 +49,13 @@ } if { ![file exists $library] } continue @@ -75,8 +47,10 @@ +package ifneeded BLT $patchlevel [list LoadBLT25 $version $dir] # End of package index file ---- a/library/init.tcl -+++ b/library/init.tcl +Index: blt-2.5.3+dfsg/library/init.tcl +=================================================================== +--- blt-2.5.3+dfsg.orig/library/init.tcl ++++ blt-2.5.3+dfsg/library/init.tcl @@ -8,7 +8,9 @@ } } @@ -88,3 +62,29 @@ } +Index: blt-2.5.3+dfsg/configure.in +=================================================================== +--- blt-2.5.3+dfsg.orig/configure.in ++++ blt-2.5.3+dfsg/configure.in +@@ -977,6 +977,13 @@ + + BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION} + ++AC_MSG_CHECKING([BLT_PATCH_LEVEL]) ++AC_CACHE_VAL(blt_cv_patch_level, ++AC_GREP_SYMBOL(blt_cv_patch_level, BLT_PATCH_LEVEL, ${srcdir}/generic/blt.h) ++) ++AC_MSG_RESULT([$blt_cv_patch_level]) ++BLT_PATCH_LEVEL=${blt_cv_patch_level} ++ + # Add BLT to the run path + libdir=${exec_prefix}/lib + +@@ -1386,6 +1393,7 @@ + AC_SUBST(DEFINES) + AC_SUBST(BLT_MAJOR_VERSION) + AC_SUBST(BLT_MINOR_VERSION) ++AC_SUBST(BLT_PATCH_LEVEL) + AC_SUBST(BLT_VERSION) + AC_SUBST(AUX_LIBS) + AC_SUBST(TCL_LIB_DIR) diff -Nru blt-2.5.3+dfsg/debian/patches/series blt-2.5.3+dfsg/debian/patches/series --- blt-2.5.3+dfsg/debian/patches/series 2014-07-09 15:27:15.000000000 +0000 +++ blt-2.5.3+dfsg/debian/patches/series 2015-08-31 19:02:27.000000000 +0000 @@ -18,3 +18,4 @@ uninitialized.patch unused.patch pointertoint.patch +autoreconf.patch diff -Nru blt-2.5.3+dfsg/debian/patches/usetclint.patch blt-2.5.3+dfsg/debian/patches/usetclint.patch --- blt-2.5.3+dfsg/debian/patches/usetclint.patch 2014-07-06 03:48:52.000000000 +0000 +++ blt-2.5.3+dfsg/debian/patches/usetclint.patch 2015-08-31 19:27:22.000000000 +0000 @@ -14,16 +14,6 @@ /* Namespace related routines */ ---- a/configure -+++ b/configure -@@ -3493,6 +3493,7 @@ - "${TCL_INC_DIR}" != "${TK_INC_DIR}" ; then - INC_SPECS="${INC_SPECS} -I${TCL_INC_DIR}" - fi -+INC_SPECS="${INC_SPECS} -I${TCL_SRC_DIR}/generic -I${TCL_SRC_DIR}/unix" - - - # On Windows, override the default include directory with our own. --- a/configure.in +++ b/configure.in @@ -825,6 +825,7 @@ diff -Nru blt-2.5.3+dfsg/debian/patches/usetkint.patch blt-2.5.3+dfsg/debian/patches/usetkint.patch --- blt-2.5.3+dfsg/debian/patches/usetkint.patch 2014-07-04 05:38:55.000000000 +0000 +++ blt-2.5.3+dfsg/debian/patches/usetkint.patch 2015-08-31 19:27:43.000000000 +0000 @@ -1397,16 +1397,6 @@ TkpMenuNotifyToplevelCreate(framePtr->interp, framePtr->menuName); } #endif /* TK_MAJOR_VERSION > 4 */ ---- a/configure -+++ b/configure -@@ -3484,6 +3484,7 @@ - if test "${TK_INC_DIR}" != "/usr/include" ; then - INC_SPECS="${INC_SPECS} -I${TK_INC_DIR}" - fi -+INC_SPECS="${INC_SPECS} -I${TK_SRC_DIR}/generic -I${TK_SRC_DIR}/unix" - - # Tcl include files - # --- a/configure.in +++ b/configure.in @@ -816,6 +816,7 @@ diff -Nru blt-2.5.3+dfsg/debian/rules blt-2.5.3+dfsg/debian/rules --- blt-2.5.3+dfsg/debian/rules 2014-11-19 07:37:09.000000000 +0000 +++ blt-2.5.3+dfsg/debian/rules 2015-08-31 19:22:17.000000000 +0000 @@ -11,19 +11,14 @@ dtmp = $(shell pwd)/debian/tmp %: - dh $@ + dh $@ --with autoreconf override_dh_auto_configure: - dh_autotools-dev_updateconfig dh_auto_configure -- \ --host=$(DEB_HOST_GNU_TYPE) \ --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(tclv) \ --with-tk=/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(tclv) -override_dh_clean: - [ ! -f Makefile ] || $(MAKE) clean - [ ! -f Makefile ] || $(MAKE) distclean - override_dh_auto_build: $(MAKE) lib_so=$(lib_so) \ tcl_only_lib_so=$(tcl_only_lib_so) @@ -83,6 +78,6 @@ tar -Jcf $$CURDIR/blt_$(v).3+dfsg.orig.tar.xz blt$(v) && \ rm -rf $$TMPDIR -.PHONY: override_dh_auto_configure override_dh_clean override_dh_auto_build \ +.PHONY: override_dh_auto_configure override_dh_auto_build \ override_dh_auto_install override_dh_makeshlibs override_dh_installdocs \ get-orig-source
signature.asc
Description: Digital signature
