Updates for the Debian 2.4.5 release, includes fixes for broken

assignments to a non-lvalue, which fails with a strict compiler.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@38689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2006-04-13 07:40:31 +00:00
parent 211acbb674
commit bb7cbba940
19 changed files with 136 additions and 80 deletions

2
configure vendored
View File

@@ -1086,7 +1086,7 @@ test "$host_alias" != "$target_alias" &&
WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=4
WX_RELEASE_NUMBER=4
WX_RELEASE_NUMBER=5
WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER

View File

@@ -48,7 +48,7 @@ dnl libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=4
WX_RELEASE_NUMBER=4
WX_RELEASE_NUMBER=5
WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER

View File

@@ -104,7 +104,8 @@ wxSoundStream& wxSoundStreamESD::Read(void *buffer, wxUint32 len)
return *this;
}
m_lastcount = (wxUint32)ret = read(m_fd_input, buffer, len);
ret = read(m_fd_input, buffer, len);
m_lastcount = (wxUint32)ret;
if (ret < 0)
m_snderror = wxSOUND_IOERROR;
@@ -127,7 +128,8 @@ wxSoundStream& wxSoundStreamESD::Write(const void *buffer, wxUint32 len)
return *this;
}
m_lastcount = (wxUint32)ret = write(m_fd_output, buffer, len);
ret = write(m_fd_output, buffer, len);
m_lastcount = (wxUint32)ret;
if (ret < 0)
m_snderror = wxSOUND_IOERROR;

View File

@@ -83,7 +83,8 @@ wxSoundStream& wxSoundStreamOSS::Read(void *buffer, wxUint32 len)
return *this;
}
m_lastcount = (wxUint32)ret = read(m_fd, buffer, len);
ret = read(m_fd, buffer, len);
m_lastcount = (wxUint32)ret;
m_q_filled = TRUE;
if (ret < 0)

38
debian/changelog vendored
View File

@@ -1,3 +1,41 @@
wxwindows2.4 (2.4.5) unstable; urgency=low
* Removes Gnome project GPL code from gtk/menu.cpp. Incorporating
it here invalidates the wxWindows licence exception. If your app
depends on it (and is GPL), you'll have to source it from Gnome;
if your app wasn't GPL, well, it is now... You've got some work
to do (and nice people to apologise to) as well. sigh.
* Remove the wx-*-config manpage symlinks. They are obsolete now.
* Update fr.po, thanks to Thomas Huriaux and debian-l10n-french.
Closes: #329070
* Fixes FTBFS with new make. If this ugly quoting is the tradeoff,
I'm itching to learn of the fabulous benefits... Closes: #350696
Ack NMU for this from Kurt Roeckx to keep the amd64 transition
rolling while my x86 build machine was painfully dying. Thanks!
* Trimmed dependency on pangox.
* Use WaitTimeout instead of Wait in threadpsx.cpp. See wx bts
report #1263806 on sf.
* Source fix for solaris/sunos/sgi string bug. Does not affect us.
* Source fix for uninitialised variable trouble on ME. Does not
affect us.
* Respect the CONCURRENCY_LEVEL environment variable before taking
a guess based on DISTCC_HOSTS of how many jobs to load make with.
People may have that set for use with make-kpkg, and consistency
here is surely a Good Thing.
* Fix strange and invalid cast-assignment construct in sndesd.cpp
and sndoss.cpp
* Update FSF address in copyright file.
-- Ron Lee <ron@debian.org> Sat, 13 Apr 2006 03:06:11 +1030
wxwindows2.4 (2.4.4.1.1-0.1) unstable; urgency=low
* Non-maintainer upload.
* Make it build using the new make. Patch from
Daniel Schepler <schepler@math.berkeley.edu> (Closes: #350696)
-- Kurt Roeckx <kurt@roeckx.be> Sun, 9 Apr 2006 12:24:28 +0200
wxwindows2.4 (2.4.4.1.1) unstable; urgency=low
* Disable building of the common packages. The 2.6 source package

6
debian/copyright vendored
View File

@@ -100,9 +100,9 @@ under two different licences:
You should have received a copy of the GNU Library General Public Licence
along with this software, usually in a file named COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA.
write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301, USA.
EXCEPTION NOTICE
1. As a special exception, the copyright holders of this library give

View File

@@ -1,2 +0,0 @@
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-config.1.gz

View File

@@ -1 +0,0 @@
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-config.1.gz

View File

@@ -1,2 +0,0 @@
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-=H-config.1.gz

View File

@@ -1,2 +0,0 @@
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-=H-config.1.gz

View File

@@ -1,2 +0,0 @@
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-=V-config.1.gz

View File

@@ -1,2 +0,0 @@
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-=V-config.1.gz

View File

@@ -1,2 +0,0 @@
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxmswd-=V-=H-config.1.gz

View File

@@ -1,2 +0,0 @@
usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxmsw-=V-=H-config.1.gz

112
debian/rules vendored
View File

@@ -9,18 +9,26 @@
#export DH_VERBOSE=1
export DH_OPTIONS
ifdef DISTCC_HOSTS
ifdef CONCURRENCY_LEVEL
#JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$(($$\# + $$\#)))
# Nearly as fast, but doesn't raise the room temperature
# or saturate the build machines quite so much.
# A user who knows what they want, that's like gold...
# respect their precious opinion of how much blue smoke to use.
JOB_COUNT := $(CONCURRENCY_LEVEL)
else ifdef DISTCC_HOSTS
# Otherwise, if they have a cluster, try to put it to good use.
JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$\#)
# Not much faster, but it might keep you warm in winter...
#JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$(($$\# + $$\#)))
endif
ifdef JOB_COUNT
FAST_MAKE = $(MAKE) -j $(JOB_COUNT)
else
FAST_MAKE = $(MAKE)
endif
-include debian/python-version
@@ -33,7 +41,8 @@ endif
# target release.
#
# for etch:
DEBIAN_WX_DEFAULT_VERSION = 2.6
#DEBIAN_WX_DEFAULT_VERSION = 2.6
# XXX
release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
@@ -189,55 +198,53 @@ debian/python-version:
echo python_ver := python$(shell python -c "import sys;print sys.version[:3]") > $@
debian/control: $(addprefix debian/,control.in python-version)
sed -e 's/=V/$(release)/g; \
s/=SOV/$(sorelease)/g; \
s/=PY/$(python_ver)/g' \
sed -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/$(python_ver)/g'\
< debian/control.in > debian/control
control-files-stamp: debian/control
dh_testdir
@for f in links postinst prerm; do \
@for f in postinst prerm; do \
echo "generating control file $(package_wxbase_dev).$$f"; \
sed -e 's/=V/$(release)/g; \
s/=PRIO/$(alt_prio)/g' \
sed -e 's/=V/$(release)/g; '\
' s/=PRIO/$(alt_prio)/g' \
< debian/libwxbase-dev.$$f \
> debian/$(package_wxbase_dev).$$f; \
done;
@for f in links postinst prerm; do \
@for f in postinst prerm; do \
echo "generating control file $(package_wxbase_dbg).$$f"; \
sed -e 's/=V/$(release)/g; \
s/=PRIO/$(alt_prio)/g' \
sed -e 's/=V/$(release)/g; '\
' s/=PRIO/$(alt_prio)/g' \
< debian/libwxbase-dbg.$$f \
> debian/$(package_wxbase_dbg).$$f; \
done;
@for f in links postinst prerm; do \
@for f in postinst prerm; do \
echo "generating control file $(package_gtk_dev).$$f"; \
sed -e 's/=V/$(release)/g; \
s/=PRIO/$(alt_prio)/g' \
sed -e 's/=V/$(release)/g; '\
' s/=PRIO/$(alt_prio)/g' \
< debian/libwxgtk-dev.$$f \
> debian/$(package_gtk_dev).$$f; \
done;
@for f in links postinst prerm; do \
@for f in postinst prerm; do \
echo "generating control file $(package_gtk_dbg).$$f"; \
sed -e 's/=V/$(release)/g; \
s/=PRIO/$(alt_prio)/g' \
sed -e 's/=V/$(release)/g; '\
' s/=PRIO/$(alt_prio)/g' \
< debian/libwxgtk-dbg.$$f \
> debian/$(package_gtk_dbg).$$f; \
done;
@for f in docs postinst prerm; do \
echo "generating control file $(package_gtk_py_lib).$$f"; \
sed -e 's/=PY/$(python_ver)/g; \
s|=WXPYDIR|$(wxpydir)|g; \
s/=V/$(release)/g; \
s/=PRIO/$(alt_prio)/g' \
sed -e 's/=PY/$(python_ver)/g; '\
' s|=WXPYDIR|$(wxpydir)|g; '\
' s/=V/$(release)/g; '\
' s/=PRIO/$(alt_prio)/g' \
< debian/python-wxgtk.$$f \
> debian/$(package_gtk_py_lib).$$f; \
done;
@for f in postinst prerm; do \
echo "generating control file $(package_gtk_dbg_py).$$f"; \
sed -e 's/=PY/$(python_ver)/g; \
s/=V/$(release)/g; \
s/=PRIO/$(alt_prio)/g' \
sed -e 's/=PY/$(python_ver)/g; '\
' s/=V/$(release)/g; '\
' s/=PRIO/$(alt_prio)/g' \
< debian/python-wxgtk-dbg.$$f \
> debian/$(package_gtk_dbg_py).$$f; \
done;
@@ -253,35 +260,35 @@ control-files-stamp: debian/control
echo "generating control file $(package_examples).$$f"; \
cp debian/wx-examples.$$f debian/$(package_examples).$$f; \
done;
@for f in dirs links postinst prerm; do \
@for f in dirs postinst prerm; do \
echo "generating control file $(package_wxbase_msw_dev).$$f";\
sed -e 's/=V/$(release)/g; \
s/=H/$(cross_host)/g; \
s/=PRIO/$(alt_prio)/g' \
sed -e 's/=V/$(release)/g; '\
' s/=H/$(cross_host)/g; '\
' s/=PRIO/$(alt_prio)/g' \
< debian/libwxbase-msw-dev.$$f \
> debian/$(package_wxbase_msw_dev).$$f; \
done;
@for f in dirs links postinst prerm; do \
@for f in dirs postinst prerm; do \
echo "generating control file $(package_wxbase_msw_dbg).$$f";\
sed -e 's/=V/$(release)/g; \
s/=H/$(cross_host)/g; \
s/=PRIO/$(alt_prio)/g' \
sed -e 's/=V/$(release)/g; '\
' s/=H/$(cross_host)/g; '\
' s/=PRIO/$(alt_prio)/g' \
< debian/libwxbase-msw-dbg.$$f \
> debian/$(package_wxbase_msw_dbg).$$f; \
done;
@for f in dirs links postinst prerm; do \
@for f in dirs postinst prerm; do \
echo "generating control file $(package_msw_dev).$$f"; \
sed -e 's/=V/$(release)/g; \
s/=H/$(cross_host)/g; \
s/=PRIO/$(alt_prio)/g' \
sed -e 's/=V/$(release)/g; '\
' s/=H/$(cross_host)/g; '\
' s/=PRIO/$(alt_prio)/g' \
< debian/libwxmsw-dev.$$f \
> debian/$(package_msw_dev).$$f; \
done;
@for f in dirs links postinst prerm; do \
@for f in dirs postinst prerm; do \
echo "generating control file $(package_msw_dbg).$$f"; \
sed -e 's/=V/$(release)/g; \
s/=H/$(cross_host)/g; \
s/=PRIO/$(alt_prio)/g' \
sed -e 's/=V/$(release)/g; '\
' s/=H/$(cross_host)/g; '\
' s/=PRIO/$(alt_prio)/g' \
< debian/libwxmsw-dbg.$$f \
> debian/$(package_msw_dbg).$$f; \
done;
@@ -292,8 +299,8 @@ control-files-stamp: debian/control
> debian/$(package_headers_msw).$$f; \
done;
@echo "generating control file lintian-override"; \
sed -e 's/=V/$(release)/g; \
s/=SOV/$(sorelease)/g' \
sed -e 's/=V/$(release)/g; '\
' s/=SOV/$(sorelease)/g' \
< debian/lintian-override.in \
> debian/lintian-override; \
touch $@
@@ -646,6 +653,8 @@ install-wxbase-dev: build-wxbase-shared-stamp
dh_clean -k
dh_install $(objdir_wxbase_shared)/wxbase-$(release)-config usr/bin
dh_install $(objdir_wxbase_shared)/lib/{wx,*.so} usr/lib
dh_link usr/share/man/man1/wx-xy-config.1.gz \
usr/share/man/man1/wxbase-$(release)-config.1.gz
install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg)
install-wxbase-dbg: build-wxbase-debug-stamp
@@ -656,6 +665,8 @@ install-wxbase-dbg: build-wxbase-debug-stamp
dh_install $(objdir_wxbase_debug)/lib usr
dh_installdirs usr/share/lintian/overrides
cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
dh_link usr/share/man/man1/wx-xy-config.1.gz \
usr/share/man/man1/wxbased-$(release)-config.1.gz
install-gtk-shared-stamp:
dh_testdir
@@ -680,6 +691,8 @@ install-gtk-dev: install-gtk-shared-stamp
dh_clean -k
dh_install $(objdir_gtk_install)/bin/wxgtk-$(release)-config usr/bin
dh_install $(objdir_gtk_install)/lib/{wx,*.so} usr/lib
dh_link usr/share/man/man1/wx-xy-config.1.gz \
usr/share/man/man1/wxgtk-$(release)-config.1.gz
install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
install-gtk-dbg: build-gtk-debug-stamp
@@ -690,6 +703,8 @@ install-gtk-dbg: build-gtk-debug-stamp
dh_install $(objdir_gtk_debug)/lib usr
dh_installdirs usr/share/lintian/overrides
cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
dh_link usr/share/man/man1/wx-xy-config.1.gz \
usr/share/man/man1/wxgtkd-$(release)-config.1.gz
install-gtk-contrib-stamp:
dh_testdir
@@ -804,6 +819,7 @@ install-headers: install-gtk-shared-stamp
dh_clean -k
dh_install $(objdir_gtk_install)/include usr
dh_installman debian/wx-xy-config.1
install-i18n: DH_OPTIONS=-p$(package_i18n)

14
debian/wx-xy-config.1 vendored Normal file
View File

@@ -0,0 +1,14 @@
.TH wx\-xy\-config 1 "15 Feb 2000" "Debian GNU/Linux" "wxWindows"
.SH NAME
wx-XY-config \- generate compile time requirements for specific wxWindows versions
.SH DESCRIPTION
You should not call the versioned \fIwx\-XY\-config\fP scripts directly,
instead call \fIwx\-config\fP with the options you require.
These files are deprecated and have (already) been removed from
later releases.
.SH SEE ALSO
.BR wx\-config (1),
.SH COPYRIGHT
This manpage was created by Ron Lee <ron@debian.org> for the Debian
distribution. It may be used freely by anyone who cares to find it
useful.

View File

@@ -15,13 +15,13 @@
// Bump-up with each new version
#define wxMAJOR_VERSION 2
#define wxMINOR_VERSION 4
#define wxRELEASE_NUMBER 4
#define wxVERSION_STRING _T("wxWindows 2.4.4")
#define wxRELEASE_NUMBER 5
#define wxVERSION_STRING _T("wxWindows 2.4.5")
// These are used by src/msw/version.rc and should always be ASCII, not Unicode
// and must be updated manually as well each time the version above changes
#define wxVERSION_NUM_DOT_STRING "2.4.4"
#define wxVERSION_NUM_STRING "244"
#define wxVERSION_NUM_DOT_STRING "2.4.5"
#define wxVERSION_NUM_STRING "245"
// nothing should be updated below this line when updating the version

View File

@@ -15,8 +15,8 @@ from distutils.command.install_data import install_data
VER_MAJOR = 2 # The first three must match wxWindows
VER_MINOR = 4
VER_RELEASE = 4
VER_SUBREL = 1 # wxPython release num for x.y.z release of wxWindows
VER_RELEASE = 5
VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWindows
VER_FLAGS = "" # release flags, such as prerelease num, unicode, etc.
DESCRIPTION = "Cross platform GUI toolkit for Python"

View File

@@ -1,10 +1,10 @@
# This file was generated by setup.py...
wxVERSION_STRING = '2.4.4.1'
wxVERSION_STRING = '2.4.5.0'
wxMAJOR_VERSION = 2
wxMINOR_VERSION = 4
wxRELEASE_VERSION = 4
wxSUBREL_VERSION = 1
wxRELEASE_VERSION = 5
wxSUBREL_VERSION = 0
wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_VERSION,
wxSUBREL_VERSION, '')