Andreas Tille pushed to branch master at Debian Med / ctsim
Commits: 56133786 by Andreas Tille at 2019-08-01T06:02:38Z Apply patch by Olly Betts to build against GTK+3 flavour of wxWidgets - - - - - 31166c88 by Andreas Tille at 2019-08-01T06:42:08Z Fix doc-base control file - - - - - 994db4e9 by Andreas Tille at 2019-08-01T06:54:00Z Upload to unstable - - - - - 6 changed files: - debian/changelog - debian/ctsim-doc.doc-base - debian/ctsim-doc.links - − debian/patches/fix_includes.patch - + debian/patches/improve-configure-wx-probes.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,17 +1,20 @@ -ctsim (6.0.2-3) UNRELEASED; urgency=medium +ctsim (6.0.2-3) unstable; urgency=medium [ Jelmer Vernooij ] * Trim trailing whitespace. [ Andreas Tille ] - * rebuild against wxWidgets GTK 3 package - Closes: #933471 * include dir provided by wx3.0-headers * debhelper-compat 12 * Standards-Version: 4.4.0 * Remove trailing whitespace in debian/copyright + * Fix doc-base control file - -- Andreas Tille <[email protected]> Wed, 31 Jul 2019 10:39:38 +0200 + [ Olly Betts ] + * Build against GTK+3 flavour of wxWidgets (Closes: #933471) + + New patch: improve-configure-wx-probes.patch + + -- Andreas Tille <[email protected]> Thu, 01 Aug 2019 08:45:38 +0200 ctsim (6.0.2-2) unstable; urgency=medium ===================================== debian/ctsim-doc.doc-base ===================================== @@ -6,8 +6,8 @@ Abstract: This manual describes the theory Section: Science/Medicine Format: PDF -Files: /usr/share/doc/ctsim-doc/ctsim.pdf.gz +Files: /usr/share/doc/ctsim/ctsim.pdf.gz Format: HTML -Index: /usr/share/doc/ctsim-doc/html/index.html -Files: /usr/share/doc/ctsim-doc/html/*.html +Index: /usr/share/doc/ctsim/html/index.html +Files: /usr/share/doc/ctsim/html/*.html ===================================== debian/ctsim-doc.links ===================================== @@ -1,2 +1 @@ -usr/share/doc/ctsim-doc/html/ctsim_contents.html usr/share/doc/ctsim-doc/html/index.html - +usr/share/doc/ctsim/html/ctsim_contents.html usr/share/doc/ctsim/html/index.html ===================================== debian/patches/fix_includes.patch deleted ===================================== @@ -1,16 +0,0 @@ -Author: Andreas Tille <[email protected]> -Last-Update: Wed, 31 Jul 2019 10:39:38 +0200 -Description: Forcing call of wx-config --cflags - FIXME: This patch should not be needed if wx-3.0 configuration would work properly - ---- a/configure.ac -+++ b/configure.ac -@@ -363,7 +363,7 @@ dnl Our Makefile.am files test the autom - dnl whether X should be supported. - AM_CONDITIONAL(NO_X, test "x$with_x" = "xno") - --my_includes="$my_includes -I../include -I.. -I/usr/local/include" -+my_includes="$my_includes -I../include -I.. `wx-config --cflags`" - - LDFLAGS="$LDFLAGS -L/usr/local/lib" - ===================================== debian/patches/improve-configure-wx-probes.patch ===================================== @@ -0,0 +1,74 @@ +Description: Improve configure probes related to wxWidgets + Determine wxGTK vs wxMac by looking at output of wx-config --cppflags + rather than probing for particular libraries, the names of which can + vary (for example, depending on the GTK+ major version in use). + . + Don't hard code --version=3.0 in wx-config arguments. That way the + user can specify a different version via alternatives or explicitly on the + configure command line, e.g.: + . + ./configure wxconfig='/usr/bin/wx-config --version=3.1' + . + Remove probes for GTK and glib, which don't seem to be needed. +Author: Olly Betts <[email protected]> +Bug-Debian: https://bugs.debian.org/933471 +Forwarded: no +Last-Update: 2019-08-01 + +--- a/configure.ac ++++ b/configure.ac +@@ -71,21 +71,15 @@ + AC_CHECK_LIB(readline, main, [readline=true; + AC_DEFINE([HAVE_READLINE],1,[Readline library])], + [readline=false], [-lcurses]) +-wxwin=false +-AC_CHECK_LIB(gtk-x11-2.0, main, [hasx11gtk2=true], []) +-if test "x$hasx11gtk2" = "x" ; then +- AC_MSG_NOTICE([Does not have X11 GTK2]) +- AC_DEFUN([AM_PATH_GLIB_2_0], []) +- AC_DEFUN([AM_PATH_GTK_2_0], []) +-fi +-if test "$hasx11gtk2" = "true" ; then +- AM_PATH_GLIB_2_0(2.0.0,,AC_MSG_ERROR(You should get glib 2.0.0 or better.)) +- AM_PATH_GTK_2_0(2.0.0,havegtk_am=yes,havegtk_am=no) +- CFLAGS="${CFLAGS} ${g76GTK_CFLAGS} ${GLIB_CFLAGS}" ++wxwin=true ++case `$wxconfig --cppflags 2> /dev/null` in ++ *-D__WXGTK__*) wx_gtk=true ;; ++ *-D__WXMAC__*) wx_mac=true ;; ++ "") wxwin=false ;; ++esac ++if test "$wxwin" = true ; then ++ AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library]) + fi +- +-AC_CHECK_LIB(wx_gtk2u_core-3.0, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])], [], [-L/usr/lib64 -L/usr/lib ${GTK_LIBS} ${GLIB_LIBS} ]) +-AC_CHECK_LIB(wx_mac_core-3.0, main, [wxwin=true; wx_mac=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])]) + AC_CHECK_LIB(fftw3, fftw_malloc, [fftw=true; AC_DEFINE(HAVE_FFTW,1,[FFTW library])], [fftw=false], [-L/usr/lib64 -L/usr/lib]) + AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -L/usr/X11R6/lib64]) + AC_CHECK_LIB(pthread, main, [pthread=true], [pthread=false]) +@@ -384,12 +378,7 @@ + if test "$debug" = "true"; then + wxdebug="--debug" + fi +- if test "x$wx_gtk" != "x" ; then +- ctlib_graphics="$ctlib_graphics `$wxconfig $wxdebug --version=3.0 --libs std,gl` ${GTK_LIBS} ${GLIB_LIBS}" +- +- elif test "x$wx_mac" != "x" ; then +- ctlib_graphics="$ctlib_graphics `$wxconfig $wxdebug --version=3.0 --libs std,gl`" +- fi ++ ctlib_graphics="$ctlib_graphics `$wxconfig $wxdebug --libs std,gl`" + fi + fi + if test "$wxwin" = "true" ; then +@@ -462,8 +451,8 @@ + + if test "$wxwin" = "true" ; then + if test "$wx_gtk" = "true" -o "$wx_mac" = "true" ; then +- wxcflags=`$wxconfig $wxdebug --cxxflags --version=3.0` +- #wxlibs=`$wxconfig --libs` ++ wxcflags=`$wxconfig $wxdebug --cxxflags` ++ wxlibs=`$wxconfig --libs` + else + wxcflags="-D__WXMSW__ -D__WIN32__ -D__GNUWIN32__" + wxlibs="-lwx -lglui -ljpeg -lxpm -lzlib -ltiff" ===================================== debian/patches/series ===================================== @@ -1,2 +1,2 @@ drop_incorrect_cppflags.patch -fix_includes.patch +improve-configure-wx-probes.patch View it on GitLab: https://salsa.debian.org/med-team/ctsim/compare/42c947d1270325b386e689009f7b4c7b19d7980b...994db4e926caa814a89b2e23c4efa9f257e8b487 -- View it on GitLab: https://salsa.debian.org/med-team/ctsim/compare/42c947d1270325b386e689009f7b4c7b19d7980b...994db4e926caa814a89b2e23c4efa9f257e8b487 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
