rpms/compat-wxGTK26/devel compat-wxGTK26.spec, NONE, 1.1 wxGTK-2.6.3-locale-compat.patch, NONE, 1.1 wxGTK-2.6.3.2-cvs.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Fri Feb 23 14:35:03 UTC 2007
- Previous message (by thread): rpms/compat-wxGTK26 import.log,1.1,1.2
- Next message (by thread): rpms/kbilliards/FC-6 kbilliards-0.8.7b-compiler_warnings.patch, NONE, 1.1 kbilliards-destdir.patch, NONE, 1.1 kbilliards.spec, NONE, 1.1 sqrtl.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mschwendt
Update of /cvs/extras/rpms/compat-wxGTK26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1304/devel
Modified Files:
.cvsignore sources
Added Files:
compat-wxGTK26.spec wxGTK-2.6.3-locale-compat.patch
wxGTK-2.6.3.2-cvs.patch
Log Message:
auto-import compat-wxGTK26-2.6.3-2 on branch devel from compat-wxGTK26-2.6.3-2.src.rpm
--- NEW FILE compat-wxGTK26.spec ---
Name: compat-wxGTK26
Version: 2.6.3
Release: 2
Summary: GTK2 port of the wxWidgets GUI library
# The wxWindows licence is the LGPL with a specific exemption allowing
# distribution of derived binaries under any terms. (This will eventually
# change to be "wxWidgets License" once that is approved by OSI.)
License: wxWidgets Library Licence
Group: System Environment/Libraries
URL: http://www.wxwidgets.org/
Source0: http://dl.sf.net/wxwindows/wxGTK-%{version}.tar.bz2
Patch0: wxGTK-2.6.3.2-cvs.patch
Patch1: wxGTK-2.6.3-locale-compat.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, zlib-devel >= 1.1.4
BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel
BuildRequires: expat-devel, SDL-devel, libgnomeprintui22-devel
BuildRequires: libGL-devel, libGLU-devel
Obsoletes: wxGTK < 2.8
Obsoletes: wxGTK-gl < 2.8
%description
wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets
GUI library, offering classes for all common GUI controls as well as a
comprehensive set of helper classes for most common application tasks,
ranging from networking to HTML display and image manipulation.
%package devel
Group: Development/Libraries
Summary: Development files for the wxGTK2 library
Requires: %{name} = %{version}-%{release}
Requires: gtk2-devel
Requires: libGL-devel, libGLU-devel
Obsoletes: wxGTK-devel < 2.8
%description devel
This package include files needed to link with the wxGTK2 library.
%prep
%setup -q -n wxGTK-%{version}
%patch0 -p1 -b .2.6.3.2
%patch1 -p1 -b .locale-compat
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
# Avoid executable source files in debuginfo package.
find . -perm /+x -a \( -name \*.cpp -o -name \*.h \) | xargs chmod -x
%build
export GDK_USE_XFT=1
# --disable-optimise prevents our $RPM_OPT_FLAGS being overridden
# (see OPTIMISE in configure).
%configure \
--x-libraries=%{_libdir} \
--with-gtk=2 \
--with-opengl \
--without-odbc \
--with-sdl \
--with-gnomeprint \
--enable-shared \
--enable-soname \
--disable-optimise \
--enable-debug_info \
--enable-unicode \
--enable-compat22
make %{?_smp_mflags}
make %{?_smp_mflags} -C contrib/src/stc
make %{?_smp_mflags} -C contrib/src/ogl
make %{?_smp_mflags} -C contrib/src/gizmos
make %{?_smp_mflags} -C contrib/src/animate
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
make DESTDIR=$RPM_BUILD_ROOT install -C contrib/src/stc
make DESTDIR=$RPM_BUILD_ROOT install -C contrib/src/ogl
make DESTDIR=$RPM_BUILD_ROOT install -C contrib/src/gizmos
make DESTDIR=$RPM_BUILD_ROOT install -C contrib/src/animate
# Don't want these.
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/bakefile
find ${RPM_BUILD_ROOT}%{_datadir}/locale -name wxmsw.mo | xargs rm -f
# We have to rename the .mo files. Requires Patch1.
for i in ${RPM_BUILD_ROOT}%{_datadir}/locale/*/LC_MESSAGES/wxstd.mo; do
NEWNAME=`echo $i | sed -e 's!wxstd.mo!compat-wxstd26.mo!'`;
mv $i $NEWNAME;
done
%find_lang compat-wxstd26
# Deal with conflicting files.
cd ${RPM_BUILD_ROOT}%{_bindir}
rm -f wx-config wxrc
ln -s $(find .. -name gtk2-unicode-release-2.6|grep -v include) wx-2.6-config
cd -
mv ${RPM_BUILD_ROOT}%{_datadir}/aclocal/wxwin.m4 \
${RPM_BUILD_ROOT}%{_datadir}/aclocal/wxwin-2.6.m4
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f compat-wxstd26.lang
%defattr(-,root,root,-)
%doc CHANGES*.txt COPYING.LIB LICENCE.txt README*.txt
%{_libdir}/libwx_baseu-*.so.*
%{_libdir}/libwx_baseu_net-*.so.*
%{_libdir}/libwx_baseu_xml-*.so.*
%{_libdir}/libwx_gtk2u_adv-*.so.*
%{_libdir}/libwx_gtk2u_animate-*.so.*
%{_libdir}/libwx_gtk2u_core-*.so.*
%{_libdir}/libwx_gtk2u_gizmos-*.so.*
%{_libdir}/libwx_gtk2u_gizmos_xrc*.so.*
%{_libdir}/libwx_gtk2u_html-*.so.*
%{_libdir}/libwx_gtk2u_media-*.so.*
%{_libdir}/libwx_gtk2u_ogl-*.so.*
%{_libdir}/libwx_gtk2u_xrc-*.so.*
%{_libdir}/libwx_gtk2u_stc-*.so.*
%{_libdir}/libwx_gtk2u_qa-*.so.*
# GL
%{_libdir}/libwx_gtk2u_gl-*.so.*
%files devel
%defattr(-,root,root,-)
%{_bindir}/wx-2.6-config
%{_bindir}/wxrc*
%{_includedir}/wx-2.6
%{_libdir}/libwx_*.so
%dir %{_libdir}/wx
%dir %{_libdir}/wx/include
%{_libdir}/wx/include/gtk2*
%dir %{_libdir}/wx/config
%{_libdir}/wx/config/gtk2*
%{_datadir}/aclocal/*
#{_datadir}/bakefile/presets/
%changelog
* Tue Feb 20 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-2
- Avoid executable source files in debuginfo package.
- Make wx-2.6-config symlink relative.
* Mon Feb 19 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-1
- Turn into a compat-wxGTK26 package that coexists with wxGTK >= 2.8
and wxGTK-devel >= 2.8
- Use standard make install.
- Don't include bakefile presets.
- Rename message object files, add patch to load them.
- Don't include wxmsw.mo.
- Rename wx-config to wx-2.6-config (to run this within packages,
insert a wx-config symlink into PATH, for example).
- Rename aclocal files.
- Merge gl sub-package contents.
- Obsolete wxGTK, wxGTK-devel, wxGTK-gl (all less than 2.8).
* Mon Aug 28 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.3
- bump release for FC6 rebuild
* Mon Jul 3 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.2
- add libGL-devel and libGLU-devel requires to wxGTK-devel package
(see bug #197501).
* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.1
- oops -- forgot to change mesa-libGL*-devel -> libGL*-devel
* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.0
- patch to cvs subrelease 2.6.3.2 (matches wxPython)
* Sat Mar 25 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-1
- 2.6.3 final
- remove the locale_install thing -- that was just an issue with using the
release candidate.
* Tue Mar 21 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-0.rc2
- update to 2.6.3-rc2 package
- all patches now upstream -- removing 'em.
- use complete 'wxWidgets' source tarball instead of the wxGTK-subset one,
since that's all there is for the release candidate. I'm operating under
the assumption that we'll have a wxGTK source tarball in the future --
otherwise, I'm going to eventually have to change the name of this
package again. :)
- add ODBC support via unixODBC as subpackage (see bug #176950)
- wait, no; comment out ODBC support as it doesn't build...
- add explicit make locale_install; apparently not done as part of
the general 'make install' anymore.
* Mon Feb 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.2-5
- rebuild in preparation for FC5
* Mon Feb 06 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.2-4
- add wxGTK-2.6.2-socketclosefix.patch to fix aMule crashes. see
bugzilla bug #178184
- add wxGTK-2.6.2-gcc41stringh.patch (pulled from CVS) to make build on
FC5 devel w/ gcc-4.1.
* Wed Nov 30 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.2-3
- add wxGTK-2.6.2-intl_cpp.patch to deal with amule and probably other
issues (see bug #154618 comment #47)
- obsolete wxGTK2 < 2.6.2-1 specifically, at Matthias Saou's suggestion
* Mon Nov 28 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.2-2
- implemented some suggestions from Matthias Saou:
- removed extraneous / from last line of ./configure
- removed -n from setup macro, since we're now actually using the
standard name
- don't use summary macro in opengl subpackage, as it's not clear which
summary should get used
- don't bother setting CC, CXX, etc., as configure script does that
- move libdir/wx to devel subpackage
* Thu Nov 24 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.2-1
- ready for actually putting into Extras
- update mesa buildreqs for new split-up xorg packaging
- libgnomeprint22-devel -> libgnomeprintui22-devel
* Tue Oct 04 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.6.2-0.1
- Update to 2.6.2.
- Include the sample wx bakefiles.
- Include new .mo files.
- From Paul Johnson:
Change license to wxWidgets due to concerns over trademark infringement.
Add dist tag.
- From Tom Callaway: Build and include libwx_gtk2u_animate-2.6.
* Thu Apr 28 2005 Matthew Miller <mattdm at mattdm.org> 2.6.1-0.1
- update to 2.6.1
- from Michael Schwendt in 2.4.2-11 package: build-require
xorg-x11-Mesa-libGL and xorg-x11-Mesa-libGLU (the libGL and libGLU
deps aren't provided in FC3, so not using that).
- from Thorsten Leemhuis in 2.4.2-12 package: sed -i -e
's|/usr/lib\b|%%{_libdir}|' in configure also to fix x86_64
- properly include older 2.4.x changelog
* Wed Apr 27 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.0-0.1
- include libwx_gtk2u_gizmos_xrc in file listing
* Wed Apr 27 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.0-0.0
- update to 2.6.0 final release
- configure now wants "--with-gtk=2" instead of "--enable-gtk2".
wxGTK-2.6.3-locale-compat.patch:
--- NEW FILE wxGTK-2.6.3-locale-compat.patch ---
diff -Nur wxGTK-2.6.3-orig/src/common/intl.cpp wxGTK-2.6.3/src/common/intl.cpp
--- wxGTK-2.6.3-orig/src/common/intl.cpp 2006-03-22 00:42:10.000000000 +0100
+++ wxGTK-2.6.3/src/common/intl.cpp 2007-02-19 12:36:44.000000000 +0100
@@ -1520,7 +1520,7 @@
bool bOk = true;
if ( bLoadDefault )
{
- bOk = AddCatalog(wxT("wxstd"));
+ bOk = AddCatalog(wxT("compat-wxstd26"));
// there may be a catalog with toolkit specific overrides, it is not
// an error if this does not exist
wxGTK-2.6.3.2-cvs.patch:
--- NEW FILE wxGTK-2.6.3.2-cvs.patch ---
diff -ur wxGTK-2.6.3/configure wxGTK-2.6.3.2/configure
--- wxGTK-2.6.3/configure 2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure 2006-03-30 12:05:51.000000000 -0500
@@ -1669,7 +1669,7 @@
wx_major_version_number=2
wx_minor_version_number=6
wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/configure.in wxGTK-2.6.3.2/configure.in
--- wxGTK-2.6.3/configure.in 2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure.in 2006-03-30 12:05:49.000000000 -0500
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $)dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -8,7 +8,7 @@
dnl
dnl This script is under the wxWidgets licence.
dnl
-dnl Version: $Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $
+dnl Version: $Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $
dnl ---------------------------------------------------------------------------
dnl ---------------------------------------------------------------------------
@@ -33,7 +33,7 @@
wx_major_version_number=2
wx_minor_version_number=6
wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c
--- wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c 2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c 2005-05-04 14:57:49.000000000 -0400
@@ -3,7 +3,7 @@
/* Licence: wxWindows Licence */
/* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
Last change: JS 13 Jul 97 6:17 pm
*/
diff -ur wxGTK-2.6.3/contrib/src/deprecated/doslex.c wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c
--- wxGTK-2.6.3/contrib/src/deprecated/doslex.c 2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c 2005-06-09 14:37:44.000000000 -0400
@@ -1,7 +1,7 @@
/* A lexical scanner generated by flex */
/* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
Last change: JS 13 Jul 97 6:17 pm
*/
/* Copyright: (c) Julian Smart */
diff -ur wxGTK-2.6.3/include/wx/version.h wxGTK-2.6.3.2/include/wx/version.h
--- wxGTK-2.6.3/include/wx/version.h 2006-03-21 18:42:08.000000000 -0500
+++ wxGTK-2.6.3.2/include/wx/version.h 2006-03-30 12:05:48.000000000 -0500
@@ -4,7 +4,7 @@
* Author: Julian Smart
* Modified by: Ryan Norton (Converted to C)
* Created: 29/01/98
-* RCS-ID: $Id: version.h,v 1.69.2.2 2006/01/18 10:25:00 JS Exp $
+* RCS-ID: $Id: version.h,v 1.69.2.3 2006/03/30 17:05:48 RD Exp $
* Copyright: (c) 1998 Julian Smart
* Licence: wxWindows licence
*/
@@ -22,7 +22,7 @@
#define wxMAJOR_VERSION 2
#define wxMINOR_VERSION 6
#define wxRELEASE_NUMBER 3
-#define wxSUBRELEASE_NUMBER 0
+#define wxSUBRELEASE_NUMBER 2
#define wxVERSION_STRING _T("wxWidgets 2.6.3")
/* nothing to update below this line when updating the version */
diff -ur wxGTK-2.6.3/locale/fr.po wxGTK-2.6.3.2/locale/fr.po
--- wxGTK-2.6.3/locale/fr.po 2006-03-21 18:42:51.000000000 -0500
+++ wxGTK-2.6.3.2/locale/fr.po 2005-09-20 11:18:55.000000000 -0400
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: wxWidgets-2.6.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-21 17:37+0200\n"
+"POT-Creation-Date: 2005-04-11 22:24+0200\n"
"PO-Revision-Date: 2005-09-07 09:34+0200\n"
"Last-Translator: Thomas Huriaux <thomas.huriaux at gmail.com>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -13,12 +13,12 @@
"Content-Transfer-Encoding: 8bit\n"
"plural-forms: nplurals=2; plural=n > 1\n"
-#: ../src/common/debugrpt.cpp:569
+#: ../src/common/debugrpt.cpp:547
#, c-format
msgid "\t%s: %s\n"
msgstr "\t%s : %s\n"
-#: ../src/common/debugrpt.cpp:572
+#: ../src/common/debugrpt.cpp:550
msgid ""
"\n"
"Please send this report to the program maintainer, thank you!\n"
@@ -26,20 +26,20 @@
"\n"
"Veuillez envoyer ce rapport au responsable du programme.\n"
-#: ../src/palmos/utils.cpp:206
+#: ../src/palmos/utils.cpp:210
msgid " "
msgstr " "
-#: ../src/generic/dbgrptg.cpp:312
+#: ../src/generic/dbgrptg.cpp:293
msgid " Thank you and we're sorry for the inconvenience!\n"
msgstr " Merci et désolé pour le dérangement.\n"
-#: ../src/common/log.cpp:321
+#: ../src/common/log.cpp:322
#, c-format
msgid " (error %ld: %s)"
msgstr " (erreur %ld : %s)"
-#: ../src/common/docview.cpp:1419
+#: ../src/common/docview.cpp:1380
msgid " - "
msgstr " - "
@@ -47,23 +47,23 @@
msgid " Preview"
msgstr " Aperçu"
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:134
msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
msgstr "Enveloppe n° 10 (4,125 x 9,5 pouces)"
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:135
msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
msgstr "Enveloppe n° 11 (4,5 x 10,375 pouces)"
-#: ../src/common/paper.cpp:126
+#: ../src/common/paper.cpp:136
msgid "#12 Envelope, 4 3/4 x 11 in"
msgstr "Enveloppe n° 12 (4,75 x 11 pouces)"
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:137
msgid "#14 Envelope, 5 x 11 1/2 in"
msgstr "Enveloppe n° 14 (5 x 11,5 pouces)"
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:133
msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
msgstr "Enveloppe n° 9 (3,875 x 8,875 pouces)"
@@ -74,13 +74,13 @@
msgid "#define %s must be an integer."
msgstr "#define %s doit être un entier."
-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/html/helpfrm.cpp:1019 ../src/html/helpfrm.cpp:1021
+#: ../src/html/helpfrm.cpp:1689 ../src/html/helpfrm.cpp:1722
#, c-format
msgid "%i of %i"
msgstr "%i de %i"
-#: ../src/generic/filedlgg.cpp:288
+#: ../src/generic/filedlgg.cpp:287
#, c-format
msgid "%ld bytes"
msgstr "%ld octets"
@@ -90,27 +90,27 @@
msgid "%s (or %s)"
msgstr "%s (ou %s)"
-#: ../src/generic/logg.cpp:261
+#: ../src/generic/logg.cpp:262
#, c-format
msgid "%s Error"
msgstr "%s Erreur"
-#: ../src/generic/logg.cpp:269
+#: ../src/generic/logg.cpp:270
#, c-format
msgid "%s Information"
msgstr "%s Information"
[...16204 lines suppressed...]
--- wxGTK-2.6.3/src/tiff/tif_next.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_next.c 2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_open.c wxGTK-2.6.3.2/src/tiff/tif_open.c
--- wxGTK-2.6.3/src/tiff/tif_open.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_open.c 2005-05-31 05:28:43.000000000 -0400
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_os2.c wxGTK-2.6.3.2/src/tiff/tif_os2.c
--- wxGTK-2.6.3/src/tiff/tif_os2.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_os2.c 2002-12-04 09:10:19.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_packbits.c wxGTK-2.6.3.2/src/tiff/tif_packbits.c
--- wxGTK-2.6.3/src/tiff/tif_packbits.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_packbits.c 2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.c wxGTK-2.6.3.2/src/tiff/tif_predict.c
--- wxGTK-2.6.3/src/tiff/tif_predict.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.c 2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.h wxGTK-2.6.3.2/src/tiff/tif_predict.h
--- wxGTK-2.6.3/src/tiff/tif_predict.h 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.h 2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
/*
* Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_print.c wxGTK-2.6.3.2/src/tiff/tif_print.c
--- wxGTK-2.6.3/src/tiff/tif_print.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_print.c 2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_read.c wxGTK-2.6.3.2/src/tiff/tif_read.c
--- wxGTK-2.6.3/src/tiff/tif_read.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_read.c 2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_strip.c wxGTK-2.6.3.2/src/tiff/tif_strip.c
--- wxGTK-2.6.3/src/tiff/tif_strip.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_strip.c 2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
/*
* Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_swab.c wxGTK-2.6.3.2/src/tiff/tif_swab.c
--- wxGTK-2.6.3/src/tiff/tif_swab.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_swab.c 2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_thunder.c wxGTK-2.6.3.2/src/tiff/tif_thunder.c
--- wxGTK-2.6.3/src/tiff/tif_thunder.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_thunder.c 2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_tile.c wxGTK-2.6.3.2/src/tiff/tif_tile.c
--- wxGTK-2.6.3/src/tiff/tif_tile.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_tile.c 2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
/*
* Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_unix.c wxGTK-2.6.3.2/src/tiff/tif_unix.c
--- wxGTK-2.6.3/src/tiff/tif_unix.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_unix.c 2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_version.c wxGTK-2.6.3.2/src/tiff/tif_version.c
--- wxGTK-2.6.3/src/tiff/tif_version.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_version.c 2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
/*
* Copyright (c) 1992-1997 Sam Leffler
* Copyright (c) 1992-1997 Silicon Graphics, Inc.
diff -ur wxGTK-2.6.3/src/tiff/tif_vms.c wxGTK-2.6.3.2/src/tiff/tif_vms.c
--- wxGTK-2.6.3/src/tiff/tif_vms.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_vms.c 2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_warning.c wxGTK-2.6.3.2/src/tiff/tif_warning.c
--- wxGTK-2.6.3/src/tiff/tif_warning.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_warning.c 2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win32.c wxGTK-2.6.3.2/src/tiff/tif_win32.c
--- wxGTK-2.6.3/src/tiff/tif_win32.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win32.c 2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win3.c wxGTK-2.6.3.2/src/tiff/tif_win3.c
--- wxGTK-2.6.3/src/tiff/tif_win3.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win3.c 2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_write.c wxGTK-2.6.3.2/src/tiff/tif_write.c
--- wxGTK-2.6.3/src/tiff/tif_write.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_write.c 2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_zip.c wxGTK-2.6.3.2/src/tiff/tif_zip.c
--- wxGTK-2.6.3/src/tiff/tif_zip.c 2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_zip.c 2004-11-19 17:29:47.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
/*
* Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/utils/helpview/src/helpview.cpp wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp
--- wxGTK-2.6.3/utils/helpview/src/helpview.cpp 2006-03-21 18:42:49.000000000 -0500
+++ wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp 2006-03-30 06:35:12.000000000 -0500
@@ -5,7 +5,7 @@
// Author: Vaclav Slavik, Julian Smart
// Modified by:
// Created: 2002-07-09
-// RCS-ID: $Id: helpview.cpp,v 1.14 2005/05/30 09:24:08 ABX Exp $
+// RCS-ID: $Id: helpview.cpp,v 1.14.2.1 2006/03/30 11:35:12 JS Exp $
// Copyright: (c) 2002 Vaclav Slavik, Julian Smart and others
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -63,7 +63,7 @@
#ifdef __WXMAC__
wxApp::s_macAboutMenuItemId = wxID_ABOUT;
- wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
+ wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
#endif
int istyle = wxHF_DEFAULT_STYLE;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 23 Feb 2007 12:41:00 -0000 1.1
+++ .cvsignore 23 Feb 2007 14:34:31 -0000 1.2
@@ -0,0 +1 @@
+wxGTK-2.6.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 23 Feb 2007 12:41:00 -0000 1.1
+++ sources 23 Feb 2007 14:34:31 -0000 1.2
@@ -0,0 +1 @@
+3cd76c3c47913e52a3175dd47239c6ec wxGTK-2.6.3.tar.bz2
- Previous message (by thread): rpms/compat-wxGTK26 import.log,1.1,1.2
- Next message (by thread): rpms/kbilliards/FC-6 kbilliards-0.8.7b-compiler_warnings.patch, NONE, 1.1 kbilliards-destdir.patch, NONE, 1.1 kbilliards.spec, NONE, 1.1 sqrtl.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list