--- a/ChangeLog Tue Nov 28 09:33:43 2006 +0000
+++ b/ChangeLog Thu Nov 30 21:11:33 2006 +0000
@@ -1,3 +1,32 @@
+2006-11-30 Laszlo (Laca) Peter <[email protected]>
+
+ * SFEdvdauthor.spec: (new) dvd movie generator (spec file from Doug
+ Scott)
+ * SFEdvdstyler.spec: (new) dvd building application (spec file from
+ Doug Scott)
+ * SFEmjpegtools.spec: (new) MPEG tools (spec file from Doug)
+ * SFEmono.spec: bump to 1.2
+ * SFEmpgtx.spec: (new) MPEG file toolbox (spec file by Doug)
+ * SFEmplayer.spec: bump to 1.0rc1
+ * SFEnetpbm.spec: (new) network portable bitmap tools (spec file by
+ Doug)
+ * SFEwxSVG.spec: (new) SVG library for wxwidgets (spec file by Doug)
+ * SFEwxwidgets.spec: disable expat support, enable mimetype support
+ * linux-specs/gthumb.spec: bump to 2.7.9
+ * patches/dvdauthor-01-types.diff: (new)
+ * patches/dvdauthor-02-wall.diff: (new)
+ * patches/dvdauthor-03-typo.diff: (new)
+ * patches/dvdstyler-01-wxwidgets-2.8.diff: (new)
+ * patches/dvdstyler-02-libs.diff: (new)
+ * patches/dvdstyler-03-array.diff: (new)
+ * patches/mjpegtools-01-progname.diff: (new)
+ * patches/mjpegtools-02-alloca.diff: (new)
+ * patches/netpbm-01-strings.diff: (new)
+ * patches/netpbm-Makefile.conf: (new)
+ * patches/wxsvg-01-sqrt.diff: (new)
+ * patches/wxsvg-02-pango-deprecated.diff: (new)
+ * patches/wxsvg-03-1586173-append-void.diff: (new)
+
2006-11-28 Harry Lu <[email protected]>
* linux-specs/libopensync-plugin-file.spec: add new patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEdvdauthor.spec Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,64 @@
+#
+# spec file for package SFEdvdauthor
+#
+# includes module(s): SFEdvdauthor
+#
+%include Solaris.inc
+
+Name: SFEdvdauthor
+Summary: dvdauthor a program that will generate a DVD movie
+Version: 0.6.11
+Source: http://nchc.dl.sourceforge.net/sourceforge/dvdauthor/dvdauthor-%{version}.tar.gz
+Patch1: dvdauthor-01-types.diff
+Patch2: dvdauthor-02-wall.diff
+Patch3: dvdauthor-03-typo.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+Requires: SUNWlibC
+Requires: SUNWgnome-base-libs
+BuildRequires: SUNWgnome-base-libs-devel
+
+%prep
+%setup -q -n dvdauthor-%version
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+export CFLAGS="%optflags"
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+export MSGFMT="/usr/bin/msgfmt"
+
+LDFLAGS="-L/usr/X11/lib -L/usr/sfw/lib -R/usr/X11/lib:/usr/sfw/lib" \
+CPPFLAGS="-I/usr/X11/include -I/usr/sfw/include" \
+./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir} \
+ --enable-shared \
+ --disable-static
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%dir %attr (0755, root, sys) %dir %{_datadir}
+%{_bindir}/*
+%{_datadir}/*
+
+%changelog
+* Thu Nov 22 2006 - [email protected]
+- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEdvdstyler.spec Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,112 @@
+#
+# spec file for package SFEDVDStyler
+#
+# includes module(s): DVDStyler
+#
+%include Solaris.inc
+
+Name: SFEdvdstyler
+Summary: a dvd building application
+Version: 1.5.0.7
+%define tarball_version 1.5b7
+Source: http://nchc.dl.sourceforge.net/sourceforge/dvdstyler/DVDStyler-%{tarball_version}.tar.gz
+Patch1: dvdstyler-01-wxwidgets-2.8.diff
+Patch2: dvdstyler-02-libs.diff
+Patch3: dvdstyler-03-array.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{tarball_version}-build
+%include default-depend.inc
+Requires: SUNWlibC
+Requires: SUNWgnome-base-libs
+BuildRequires: SUNWgnome-base-libs-devel
+%if %(pkginfo -q SFEwxwidgets && echo 1 || echo 0)
+Requires: SFEwxwidgets
+%else
+Requires: SFEwxGTK
+%endif
+Requires: SFEwxSVG
+Requires: SFEdvdauthor
+Requires: SFEmpgtx
+Requires: SFEnetpbm
+Requires: SFEmjpegtools
+
+%if %build_l10n
+%package l10n
+Summary: %{summary} - l10n files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %{name}
+%endif
+
+%prep
+%setup -q -n DVDStyler-%{tarball_version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+export CFLAGS="%optflags"
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+export MSGFMT="/usr/bin/msgfmt"
+%ifarch sparc
+export CXXFLAGS="-norunpath -xO5 -xlibmil -xlibmopt -features=%all"
+%else
+export CXXFLAGS="-norunpath -xO3 -xlibmil -xlibmopt -features=%all"
+%endif
+
+touch NEWS
+aclocal
+autoconf
+automake -a
+LDFLAGS="-L/usr/X11/lib -L/usr/sfw/lib -R/usr/X11/lib:/usr/sfw/lib" \
+CPPFLAGS="-I/usr/X11/include -I/usr/sfw/include" \
+./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir} \
+ --enable-shared \
+ --disable-static
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%if %build_l10n
+%else
+# REMOVE l10n FILES
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/doc
+%{_datadir}/doc/*
+%{_datadir}/dvdstyler*
+
+%if %build_l10n
+%files l10n
+%defattr (-, root, other)
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/locale
+%{_datadir}/locale/*
+%endif
+
+
+%changelog
+* Tue Nov 28 2006 - [email protected]
+- make it work with either SFEwxwidgets or SFEwxGTK
+- change version to numeric
+* Thu Nov 22 2006 - [email protected]
+- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEmjpegtools.spec Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,89 @@
+#
+# spec file for package SFEmjpegtools
+#
+# includes module(s): SFEmjpegtools
+#
+%include Solaris.inc
+
+Name: SFEmjpegtools
+Summary: mjpegtools - MPEG tools
+Version: 1.8.0
+Source: http://nchc.dl.sourceforge.net/sourceforge/mjpeg/mjpegtools-%{version}.tar.gz
+Patch1: mjpegtools-01-progname.diff
+Patch2: mjpegtools-02-alloca.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+Requires: SUNWlibC
+Requires: SUNWgnome-base-libs
+BuildRequires: SUNWgnome-base-libs-devel
+%if %(pkginfo -q SFEwxwidgets && echo 1 || echo 0)
+Requires: SFEwxwidgets
+%else
+Requires: SFEwxGTK
+%endif
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n mjpegtools-%version
+%patch1 -p1
+%patch2 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+export CFLAGS="%optflags"
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+export MSGFMT="/usr/bin/msgfmt"
+
+# use GCC
+unset CC CXX CFLAGS CXXFLAGS
+LDFLAGS="-L/usr/X11/lib -L/usr/sfw/lib -R/usr/X11/lib:/usr/sfw/lib" \
+CPPFLAGS="-I/usr/X11/include -I/usr/sfw/include" \
+./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir} \
+ --infodir=%{_datadir}/info \
+ --enable-shared \
+ --disable-static
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_libdir}/lib*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%dir %attr (0755, root, sys) %dir %{_datadir}
+%{_datadir}/info
+%{_datadir}/man
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+
+%changelog
+* Tue Nov 28 2006 - [email protected]
+- make it work with either SFEwxwidgets or SFEwxGTK
+* Thu Nov 22 2006 - [email protected]
+- Initial version
--- a/SFEmono.spec Tue Nov 28 09:33:43 2006 +0000
+++ b/SFEmono.spec Thu Nov 30 21:11:33 2006 +0000
@@ -9,7 +9,7 @@
Name: SFEmono
License: Other
Group: System/Libraries
-Version: 1.1.18
+Version: 1.2
Summary: mono - .NET framework
Source: http://go-mono.com/sources/mono/mono-%{version}.tar.gz
URL: http://www.mono-project.com/Main_Page
@@ -17,10 +17,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
SUNW_BaseDir: %{_basedir}
-Autoreqprov: on
BuildRequires: SUNWgnome-base-libs-devel
Requires: SUNWgnome-base-libs
-Requires: %name-root
+Requires: %name-root
Requires: SUNWbash
Requires: SUNWgccruntime
@@ -125,6 +124,8 @@
%{_libdir}/pkgconfig/*
%changelog
+* Thu Nov 30 2006 - [email protected]
+- bump to 1.2
* Sat Oct 14 2006 - [email protected]
- bump to 1.1.18
* Wed Sep 7 2006 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEmpgtx.spec Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,71 @@
+#
+# spec file for package SFEmpgtx
+#
+# includes module(s): SFEmpgtx
+#
+%include Solaris.inc
+
+Name: SFEmpgtx
+Summary: MPEG file toolbox, that slices and joins audio and video files
+Version: 1.3
+Source: http://nchc.dl.sourceforge.net/sourceforge/mpgtx/mpgtx-%{version}.tgz
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+Requires: SUNWlibC
+
+%prep
+%setup -q -n mpgtx-%version
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+export CFLAGS="%optflags"
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+%ifarch sparc
+export CXXFLAGS="-norunpath -xO5 -xlibmil -xlibmopt -features=tmplife"
+%else
+export CXXFLAGS="-norunpath -xO3 -xlibmil -xlibmopt -features=tmplife"
+%endif
+
+export CPPFLAGS="-I/usr/X11/include -I/usr/sfw/include"
+
+${CXX} ${CXXFLAGS} -DNOSIGNAL_H -o mpgtx *.cxx
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/usr/bin
+cp mpgtx $RPM_BUILD_ROOT/usr/bin
+(
+ cd $RPM_BUILD_ROOT/usr/bin
+ ln -s mpgtx mpgjoin
+ ln -s mpgtx mpgsplit
+ ln -s mpgtx mpgcat
+ ln -s mpgtx mpginfo
+ ln -s mpgtx mpgdemux
+ ln -s mpgtx tagmp3
+)
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
+cp man/mpgtx.1 $RPM_BUILD_ROOT/usr/share/man/man1
+cp man/mpgtx.1 $RPM_BUILD_ROOT/usr/share/man/man1/mpgjoin
+cp man/mpgtx.1 $RPM_BUILD_ROOT/usr/share/man/man1/mpgsplit
+cp man/mpgtx.1 $RPM_BUILD_ROOT/usr/share/man/man1/mpgcat
+cp man/mpgtx.1 $RPM_BUILD_ROOT/usr/share/man/man1/mpginfo
+cp man/mpgtx.1 $RPM_BUILD_ROOT/usr/share/man/man1/mpgdemux
+cp man/tagmp3.1 $RPM_BUILD_ROOT/usr/share/man/man1
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/*
+
+%changelog
+* Thu Nov 22 2006 - [email protected]
+- Initial version
--- a/SFEmplayer.spec Tue Nov 28 09:33:43 2006 +0000
+++ b/SFEmplayer.spec Thu Nov 30 21:11:33 2006 +0000
@@ -8,17 +8,15 @@
Name: SFEmplayer
Summary: mplayer - The Movie Player
Version: 1.0
-%define tarball_version 1.0pre8
+%define tarball_version 1.0rc1
Source: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{tarball_version}.tar.bz2
-Source2: http://www1.mplayerhq.hu/MPlayer/releases/codecs/essential-20060611.tar.bz2
+Source2: http://www1.mplayerhq.hu/MPlayer/releases/codecs/essential-20061022.tar.bz2
Source3: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.6.tar.bz2
Source4: http://www.mplayerhq.hu/MPlayer/skins/Abyss-1.6.tar.bz2
Source5: http://www.mplayerhq.hu/MPlayer/skins/neutron-1.5.tar.bz2
Source6: http://www.mplayerhq.hu/MPlayer/skins/proton-1.2.tar.bz2
Source7: http://www.3gpp.org/ftp/Specs/latest/Rel-6/26_series/26104-610.zip
Source8: http://www.3gpp.org/ftp/Specs/latest/Rel-6/26_series/26204-600.zip
-Patch1: mplayer-01-cddb.diff
-Patch2: mplayer-02-makefile-libfame-dep.diff
SUNW_BaseDir: %{_basedir}
BuildRoot: %{_tmppath}/%{name}-%{tarball_version}-build
%include default-depend.inc
@@ -36,7 +34,6 @@
Requires: SUNWsmbau
Requires: SUNWgnome-audio
Requires: SUNWxorg-clientlibs
-Requires: SUNWxorg-mesa
Requires: SUNWfontconfig
Requires: SUNWfreetype2
Requires: SUNWspeex
@@ -67,8 +64,6 @@
%prep
%setup -q -n MPlayer-%tarball_version
-%patch1 -p1
-%patch2 -p1
unzip %SOURCE7
unzip 26104-610_ANSI_C_source_code.zip
mv c-code libavcodec/amr_float
@@ -86,27 +81,25 @@
export LDFLAGS="-L%{x11}/lib -L/usr/sfw/lib"
export CC=gcc
-./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+bash ./configure --prefix=%{_prefix} --mandir=%{_mandir} \
--libdir=%{_libdir} \
--confdir=%{_sysconfdir} \
--enable-gui \
--enable-menu \
- --with-x11incdir=%{x11}/include \
+ --with-extraincdir=%{x11}/include \
--with-x11libdir=%{x11}/lib \
--with-extraincdir=/usr/sfw/include \
--with-extralibdir=/usr/sfw/lib \
--with-codecsdir=%{_libdir}/mplayer/codecs \
--enable-libfame \
- --enable-external-faad \
+ --enable-faad-external \
--enable-live \
--with-livelibdir=/usr/lib/live \
--enable-rpath \
- --enable-largefiles
+ --enable-largefiles \
+ --disable-directfb
-echo "#ifndef SOLARIS" >> config.h
-echo "#define SOLARIS" >> config.h
-echo "#endif" >> config.h
-gmake -j$CPUS
+make -j$CPUS
%install
rm -rf $RPM_BUILD_ROOT
@@ -130,7 +123,6 @@
ln -s /usr/openwin/lib/X11/fonts/TrueType/FreeSerif.ttf $RPM_BUILD_ROOT%{_datadir}/mplayer/subfont.ttf
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
-#
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}
%clean
@@ -153,6 +145,8 @@
%{_datadir}/pixmaps/*
%changelog
+* Wed Nov 29 2006 - [email protected]
+- bump to 1.0rc1
* Tue Sep 26 2006 - [email protected]
- Add Requires after check-deps.pl run
* Tue Sep 26 2006 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEnetpbm.spec Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,89 @@
+#
+# spec file for package SFEnetpbm
+#
+# includes module(s): SFEnetpbm
+#
+%include Solaris.inc
+%define svn_url https://svn.sourceforge.net/svnroot/netpbm/advanced
+
+Name: SFEnetpbm
+Summary: netpbm - network portable bitmap tools
+Version: 10.35
+Patch1: netpbm-01-strings.diff
+Patch2: netpbm-Makefile.conf
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+Requires: SUNWlibC
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%prep
+rm -rf netpbm-%version
+mkdir netpbm-%version
+cd netpbm-%version
+rm -rf netpbm
+[ ! -f ../../SOURCES/netpbm-%version.tar.bz2 ] && {
+ svn checkout %{svn_url} netpbm
+ tar fcp - netpbm | bzip2 -c > ../../SOURCES/netpbm-%version.tar.bz2
+}
+[ ! -d netpbm ] && bunzip2 -c ../../SOURCES/netpbm-%version.tar.bz2 | tar fxp -
+cd netpbm
+%patch1 -p1
+cat Makefile.config.in %{PATCH2} > Makefile.config
+touch Makefile.depend
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+export CFLAGS="%optflags"
+
+cd netpbm-%version
+cd netpbm
+make -j$CPUS
+
+%install
+cd netpbm-%version
+cd netpbm
+rm -rf $RPM_BUILD_ROOT
+mkdir $RPM_BUILD_ROOT
+make package PKGDIR=$RPM_BUILD_ROOT/package
+cd $RPM_BUILD_ROOT/package/lib
+ln -s libnetpbm.so.10 libnetpbm.so
+cd ..
+mkdir -p $RPM_BUILD_ROOT/usr/share
+mv bin $RPM_BUILD_ROOT/usr
+mv include $RPM_BUILD_ROOT/usr
+mv lib $RPM_BUILD_ROOT/usr
+mv man $RPM_BUILD_ROOT/usr/share
+mv misc $RPM_BUILD_ROOT/usr/share/netpbm
+cd $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT/package
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/*
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/*
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+
+%changelog
+* Thu Nov 22 2006 - [email protected]
+- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEwxSVG.spec Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,92 @@
+#
+# spec file for package SFEwxSVG
+#
+# includes module(s): SFEwxSVG
+#
+%include Solaris.inc
+
+Name: SFEwxSVG
+Summary: wxGTK a C++ library to create, manipulate and render SVG files
+Version: 1.0.0.7
+%define tarball_version 1.0b7
+Source: http://nchc.dl.sourceforge.net/sourceforge/wxsvg/wxsvg-%{tarball_version}_1.tar.gz
+Patch1: wxsvg-01-sqrt.diff
+Patch2: wxsvg-02-pango-deprecated.diff
+Patch3: wxsvg-03-1586173-append-void.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+Requires: SUNWlibC
+Requires: SUNWgnome-base-libs
+BuildRequires: SUNWgnome-base-libs-devel
+%if %(pkginfo -q SFEwxwidgets && echo 1 || echo 0)
+Requires: SFEwxwidgets
+%else
+Requires: SFEwxGTK
+%endif
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n wxsvg-%tarball_version
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+export CFLAGS="%optflags"
+%if %cc_is_gcc
+%else
+export CXX="${CXX} -norunpath"
+%endif
+%ifarch sparc
+export CXXFLAGS="-norunpath -xO5 -xlibmil -xlibmopt -features=tmplife"
+%else
+export CXXFLAGS="-norunpath -xO3 -xlibmil -xlibmopt -features=tmplife"
+%endif
+
+LDFLAGS="-L/usr/X11/lib -L/usr/sfw/lib -R/usr/X11/lib:/usr/sfw/lib" \
+CPPFLAGS="-I/usr/X11/include -I/usr/sfw/include" \
+./configure --prefix=%{_prefix} --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir} \
+ --enable-shared \
+ --disable-static
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_libdir}/lib*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/*
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+
+%changelog
+* Tue Nov 28 2006 - [email protected]
+- make it work with either SFEwxwidgets or SFEwxGTK
+- change version to numeric
+* Thu Nov 22 2006 - [email protected]
+- Initial version
--- a/SFEwxwidgets.spec Tue Nov 28 09:33:43 2006 +0000
+++ b/SFEwxwidgets.spec Thu Nov 30 21:11:33 2006 +0000
@@ -10,7 +10,8 @@
Summary: wxWidgets - Cross-Platform GUI Library
URL: http://wxwidgets.org/
Version: 2.6.3
-Source: http://easynews.dl.sourceforge.net/sourceforge/wxwindows/wxWidgets-%{version}.tar.bz2
+%define tarball_version 2.6.3
+Source: http://easynews.dl.sourceforge.net/sourceforge/wxwindows/wxWidgets-%{tarball_version}.tar.bz2
Patch1: wxwidgets-01-msgfmt.diff
Patch11: wxgtk-01-sqrt.diff
SUNW_BaseDir: %{_basedir}
@@ -35,7 +36,7 @@
%prep
rm -rf %name-%version
-%setup -q -n wxWidgets-%version
+%setup -q -n wxWidgets-%tarball_version
%patch1 -p1
%patch11 -p1
@@ -45,7 +46,8 @@
CPUS=1
fi
export CFLAGS="%optflags"
-export LDFLAGS="%{_ldflags}"
+export LD=/usr/ccs/bin/ld
+export LDFLAGS="-lCrun -lCstd"
%if %cc_is_gcc
%else
export CXX="${CXX} -norunpath"
@@ -58,9 +60,10 @@
--with-gtk \
--enable-gtk2 \
--enable-unicode \
+ --enable-mimetype \
--with-sdl \
- --with-gnomeprint \
- --enable-mimetype=no
+ --without-expat \
+ --with-gnomeprint
make -j$CPUS
cd contrib
@@ -79,7 +82,7 @@
cd $RPM_BUILD_ROOT%{_bindir}
rm -f wx-config
-ln -s ../lib/wx/config/gtk2-unicode-release-2.6 wx-config
+ln -s ../lib/wx/config/gtk2-unicode-release-* wx-config
%if %build_l10n
%else
@@ -115,6 +118,10 @@
%endif
%changelog
+* Tue Nov 28 2006 - [email protected]
+- enable mimetype (wxUSE_MIMETYPE), needed by dvdstyler
+- disable expat support as it conflicts with wxXML, which is also included
+ in wxSVG
* Sat Oct 14 2006 - [email protected]
- fix wx-config to be a relative symlink
* Mon Jul 10 2006 - [email protected]
--- a/linux-specs/gthumb.spec Tue Nov 28 09:33:43 2006 +0000
+++ b/linux-specs/gthumb.spec Thu Nov 30 21:11:33 2006 +0000
@@ -8,8 +8,8 @@
Name: gthumb
License: GPL
Group: Applications/Multimedia
-Version: 2.7.6
-Release: 41
+Version: 2.7.9
+Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: An image viewer and browser for GNOME.
@@ -137,6 +137,8 @@
%doc %{_datadir}/gnome/help/gthumb
%changelog
+* Thu Nov 20 2006 - [email protected]
+- bump to 2.7.9
* Sat May 13 2006 - [email protected]
- Move to /usr
* Thu Apr 20 2006 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/dvdauthor-01-types.diff Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,14 @@
+diff -ur dvdauthor-0.6.11-orig/src/compat.h dvdauthor-0.6.11/src/compat.h
+--- dvdauthor-0.6.11-orig/src/compat.h 2005-02-01 09:26:18.000000000 +0700
++++ dvdauthor-0.6.11/src/compat.h 2006-11-23 12:13:58.809155911 +0700
+@@ -106,3 +106,10 @@
+ #define FT_FREETYPE_H <freetype/freetype.h>
+ #define FT_GLYPH_H <freetype/ftglyph.h>
+ #endif
++
++#ifdef sun
++typedef uint8_t u_int8_t;
++typedef uint16_t u_int16_t;
++typedef uint32_t u_int32_t;
++typedef uint64_t u_int64_t;
++#endif sun
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/dvdauthor-02-wall.diff Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,31 @@
+diff -ur dvdauthor-0.6.11-orig/src/Makefile.am dvdauthor-0.6.11/src/Makefile.am
+--- dvdauthor-0.6.11-orig/src/Makefile.am 2005-02-11 04:34:40.000000000 +0700
++++ dvdauthor-0.6.11/src/Makefile.am 2006-11-23 12:15:27.880521483 +0700
+@@ -3,7 +3,7 @@
+ nodist_bin_SCRIPTS = dvddirdel
+
+ AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" @XML_CPPFLAGS@ @MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CPPFLAGS@
+-AM_CFLAGS = -Wall
++AM_CFLAGS =
+
+ dvdauthor_SOURCES = dvdauthor.c dvdauthor.h da-internal.h \
+ dvdcompile.c dvdvm.h dvdvml.c dvdvmy.c dvdvmy.h \
+@@ -53,4 +53,4 @@
+ dvdvmy.c dvdvmy.h: dvdvmy.y
+ $(BISON) -o dvdvmy.c -d -p dvdvm $<
+
+-dvdvml.o: dvdvmy.h
+\ No newline at end of file
++dvdvml.o: dvdvmy.h
+diff -ur dvdauthor-0.6.11-orig/src/Makefile.in dvdauthor-0.6.11/src/Makefile.in
+--- dvdauthor-0.6.11-orig/src/Makefile.in 2005-02-11 04:37:27.000000000 +0700
++++ dvdauthor-0.6.11/src/Makefile.in 2006-11-23 12:15:41.668603043 +0700
+@@ -199,7 +199,7 @@
+ target_alias = @target_alias@
+ nodist_bin_SCRIPTS = dvddirdel
+ AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" @XML_CPPFLAGS@ @MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CPPFLAGS@
+-AM_CFLAGS = -Wall
++AM_CFLAGS =
+ dvdauthor_SOURCES = dvdauthor.c dvdauthor.h da-internal.h \
+ dvdcompile.c dvdvm.h dvdvml.c dvdvmy.c dvdvmy.h \
+ dvdifo.c dvdvob.c dvdpgc.c \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/dvdauthor-03-typo.diff Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,12 @@
+diff -ur dvdauthor-0.6.11-orig/src/compat.h dvdauthor-0.6.11/src/compat.h
+--- dvdauthor-0.6.11-orig/src/compat.h 2005-02-01 09:26:18.000000000 +0700
++++ dvdauthor-0.6.11/src/compat.h 2006-11-23 12:19:38.969476940 +0700
+@@ -81,7 +81,7 @@
+
+
+ #ifndef HAVE_STRSEP
+-chat *strsep(char **stringp,const char *delim);
++char *strsep(char **stringp,const char *delim);
+ #endif
+
+ #if !HAVE_DECL_O_BINARY
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/dvdstyler-01-wxwidgets-2.8.diff Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,32 @@
+--- DVDStyler-1.5b7/src/Makefile.am.orig 2006-11-28 15:57:58.554912000 -0500
++++ DVDStyler-1.5b7/src/Makefile.am 2006-11-28 16:06:51.901038000 -0500
+@@ -7,8 +7,8 @@
+ BurnDlg.cpp ProgressDlg.cpp\
+ MainWin.cpp dvdstyler.cpp
+
+-CXXFLAGS = @CXXFLAGS@ -I..
+-LDADD = ../wxVillaLib/libwxvilla.a
++AM_CXXFLAGS = @CXXFLAGS@ -I..
++LDADD = ../wxVillaLib/libwxvilla.a -ljpeg
+
+ SUBDIRS = rc
+
+--- DVDStyler-1.5b7/wxVillaLib/Makefile.am.orig 2006-11-28 16:01:45.140995000 -0500
++++ DVDStyler-1.5b7/wxVillaLib/Makefile.am 2006-11-28 16:01:49.675515000 -0500
+@@ -4,4 +4,4 @@
+ PipeExecute.cpp PropDlg.cpp SConv.cpp\
+ Thumbnails.cpp ThumbnailFactory.cpp\
+ utils.cpp VerticalToolbar.cpp
+-CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@
++AM_CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@
+--- DVDStyler-1.5b7/configure.in.orig 2006-11-28 16:04:13.026085000 -0500
++++ DVDStyler-1.5b7/configure.in 2006-11-28 16:06:00.114727000 -0500
+@@ -64,7 +64,7 @@
+ LIBS="$LIBS $WX_LIBS "
+
+ dnl check for wxSVG
+-AC_CHECK_LIB(wxsvg, main, [LIBS="$LIBS -lwxsvg"], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])])
++AC_CHECK_LIB(wxsvg, malloc, [LIBS="$LIBS -lwxsvg"], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])])
+ AC_CHECK_HEADER([wxSVG/svg.h], [], [AC_MSG_ERROR([*** missing wxSVG library (wxsvg.sf.net) ***])])
+
+ dnl check gnomeui-2.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/dvdstyler-02-libs.diff Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,12 @@
+diff -ur DVDStyler-1.5b7-orig/src/Makefile.in DVDStyler-1.5b7/src/Makefile.in
+--- DVDStyler-1.5b7-orig/src/Makefile.in 2006-11-05 23:54:05.000000000 +0700
++++ DVDStyler-1.5b7/src/Makefile.in 2006-11-24 21:45:15.446624832 +0700
+@@ -182,7 +182,7 @@
+ dvdstyler_OBJECTS = $(am_dvdstyler_OBJECTS)
+ dvdstyler_LDADD = $(LDADD)
+ dvdstyler_DEPENDENCIES = ../wxVillaLib/libwxvilla.a
+-dvdstyler_LDFLAGS =
++dvdstyler_LDFLAGS = -ljpeg -lwx_gtk2u_adv-2.6
+
+ DEFAULT_INCLUDES = -I. -I$(srcdir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/dvdstyler-03-array.diff Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,15 @@
+diff -ur DVDStyler-1.5b7-orig/src/MenuPalettes.cpp DVDStyler-1.5b7/src/MenuPalettes.cpp
+--- DVDStyler-1.5b7-orig/src/MenuPalettes.cpp 2006-11-05 23:46:22.000000000 +0700
++++ DVDStyler-1.5b7/src/MenuPalettes.cpp 2006-11-24 21:54:51.052944850 +0700
+@@ -19,7 +19,11 @@
+ colours.erase(-1);
+ }
+ coloursCount = colours.size();
++#ifdef sun
++ unsigned char r[256], g[256], b[256];
++#else
+ unsigned char r[colours.size()], g[colours.size()], b[colours.size()];
++#endif
+ int i = 0;
+ for (IntHashSet::iterator it = colours.begin(); it != colours.end(); ++it)
+ {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/mjpegtools-01-progname.diff Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,108 @@
+diff -ur mjpegtools-1.8.0-orig/lavtools/y4mblack.c mjpegtools-1.8.0/lavtools/y4mblack.c
+--- mjpegtools-1.8.0-orig/lavtools/y4mblack.c 2005-06-17 07:30:02.000000000 +0700
++++ mjpegtools-1.8.0/lavtools/y4mblack.c 2006-11-24 13:36:41.362661140 +0700
+@@ -21,7 +21,11 @@
+
+ #include "yuv4mpeg.h"
+
++#ifdef sun
++char *__progname="y4mblack";
++#else
+ extern char *__progname;
++#endif
+
+ static void usage(void);
+ static void chroma_usage(void);
+diff -ur mjpegtools-1.8.0-orig/lavtools/y4mshift.c mjpegtools-1.8.0/lavtools/y4mshift.c
+--- mjpegtools-1.8.0-orig/lavtools/y4mshift.c 2004-04-06 00:07:34.000000000 +0700
++++ mjpegtools-1.8.0/lavtools/y4mshift.c 2006-11-24 13:37:17.727156147 +0700
+@@ -29,7 +29,11 @@
+
+ #include "yuv4mpeg.h"
+
++#ifdef sun
++char *__progname="y4mshift";
++#else
+ extern char *__progname;
++#endif
+
+ #define HALFSHIFT (shiftnum / SS_H)
+
+diff -ur mjpegtools-1.8.0-orig/lavtools/y4mspatialfilter.c mjpegtools-1.8.0/lavtools/y4mspatialfilter.c
+--- mjpegtools-1.8.0-orig/lavtools/y4mspatialfilter.c 2005-01-04 02:03:54.000000000 +0700
++++ mjpegtools-1.8.0/lavtools/y4mspatialfilter.c 2006-11-24 13:37:56.253536857 +0700
+@@ -23,7 +23,11 @@
+ #include "mmx.h"
+ #endif
+
++#ifdef sun
++char *__progname="y4mspatialfilter";
++#else
+ extern char *__progname;
++#endif
+
+ #define MIN(a,b) (((a)<(b))?(a):(b))
+ #define MAX(a,b) (((a)>(b))?(a):(b))
+diff -ur mjpegtools-1.8.0-orig/lavtools/y4mstabilizer.c mjpegtools-1.8.0/lavtools/y4mstabilizer.c
+--- mjpegtools-1.8.0-orig/lavtools/y4mstabilizer.c 2005-05-10 05:34:09.000000000 +0700
++++ mjpegtools-1.8.0/lavtools/y4mstabilizer.c 2006-11-24 13:38:45.512354788 +0700
+@@ -52,7 +52,11 @@
+ #include "yuv4mpeg.h"
+ #include "subsample.h"
+
++#ifdef sun
++char *__progname="y4mstabilizer";
++#else
+ extern char *__progname;
++#endif
+
+ struct
+ {
+diff -ur mjpegtools-1.8.0-orig/lavtools/yuv4mpeg.c mjpegtools-1.8.0/lavtools/yuv4mpeg.c
+--- mjpegtools-1.8.0-orig/lavtools/yuv4mpeg.c 2005-05-25 10:08:59.000000000 +0700
++++ mjpegtools-1.8.0/lavtools/yuv4mpeg.c 2006-11-24 13:39:42.942994485 +0700
+@@ -61,7 +61,11 @@
+
+ #include "yuv4mpeg.h"
+
+-extern char *__progname;
++#ifdef sun
++char *__progname="yuv4mpeg";
++#else
++extern char *__progname;
++#endif
+
+ static void usage(void);
+ static void chroma_usage(void);
+diff -ur mjpegtools-1.8.0-orig/lavtools/yuyvtoy4m.c mjpegtools-1.8.0/lavtools/yuyvtoy4m.c
+--- mjpegtools-1.8.0-orig/lavtools/yuyvtoy4m.c 2005-05-25 09:28:28.000000000 +0700
++++ mjpegtools-1.8.0/lavtools/yuyvtoy4m.c 2006-11-24 13:41:19.960656185 +0700
+@@ -45,7 +45,11 @@
+
+ #include "yuv4mpeg.h"
+
+-extern char *__progname;
++#ifdef sun
++char *__progname="yuyvtoy4m";
++#else
++extern char *__progname;
++#endif
+
+ static void usage(void);
+
+diff -ur mjpegtools-1.8.0-orig/y4munsharp/y4munsharp.c mjpegtools-1.8.0/y4munsharp/y4munsharp.c
+--- mjpegtools-1.8.0-orig/y4munsharp/y4munsharp.c 2005-04-12 01:16:42.000000000 +0700
++++ mjpegtools-1.8.0/y4munsharp/y4munsharp.c 2006-11-24 13:43:39.282557172 +0700
+@@ -50,7 +50,11 @@
+ #define MAX(a,b) ((a) >= (b) ? (a) : (b))
+ #define ROUND(x) ((int) ((x) + 0.5))
+
+-extern char *__progname;
++#ifdef sun
++char *__progname="y4munsharp";
++#else
++extern char *__progname;
++#endif
+
+ void usage(void);
+ void y4munsharp(void);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/mjpegtools-02-alloca.diff Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,13 @@
+diff -ur mjpegtools-1.8.0-orig/y4mdenoise/SearchBorder.hh mjpegtools-1.8.0/y4mdenoise/SearchBorder.hh
+--- mjpegtools-1.8.0-orig/y4mdenoise/SearchBorder.hh 2004-04-28 03:45:56.000000000 +0700
++++ mjpegtools-1.8.0/y4mdenoise/SearchBorder.hh 2006-11-24 13:51:30.479482271 +0700
+@@ -12,6 +12,9 @@
+ #include "Limits.hh"
+ #include "DoublyLinkedList.hh"
+ #include "SetRegion2D.hh"
++#ifdef sun
++#include <alloca.h>
++#endif
+
+ // HACK: for development error messages.
+ #include <stdio.h>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/netpbm-01-strings.diff Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,10 @@
+--- netpbm-orig/other/pamx/image.h 2006-11-24 15:39:21.866679882 +0700
++++ netpbm/other/pamx/image.h 2006-11-24 15:01:02.356345136 +0700
+@@ -1,6 +1,6 @@
+ #ifndef IMAGE_H_INCLUDED
+ #define IMAGE_H_INCLUDED
+-#include <strings.h>
++#include <string.h>
+
+ #include "pm_c_util.h"
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/netpbm-Makefile.conf Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,19 @@
+####Lines above were copied from Makefile.config.in by 'configure'.
+####Lines below were added by 'configure' based on the SOLARIS platform.
+DEFAULT_TARGET = nonmerge
+NETPBMLIBTYPE=unixshared
+NETPBMLIBSUFFIX=so
+STATICLIB_TOO=n
+NETPBMLIB_RUNTIME_PATH=/usr/netpbm/lib
+LDSHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME)
+NEED_RUNTIME_PATH = Y
+CFLAGS+= -D__inline=inline
+CFLAGS_SHLIB = -Kpic
+RPATHOPTNAME = -R
+NETWORKLD = -lsocket -lnsl
+LINKERISCOMPILER = Y
+TIFFLIB = libtiff.dylib
+JPEGLIB = libjpeg.dylib
+ZLIB = libz.dylib
+X11LIB = /usr/X11R6/lib/libX11.dylib
+NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/wxsvg-01-sqrt.diff Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,12 @@
+diff -ur wxsvg-1.0b7-orig/include/wxSVG/SVGLength.h wxsvg-1.0b7/include/wxSVG/SVGLength.h
+--- wxsvg-1.0b7-orig/include/wxSVG/SVGLength.h 2005-07-29 03:09:58.000000000 +0700
++++ wxsvg-1.0b7/include/wxSVG/SVGLength.h 2006-11-23 11:25:15.821208390 +0700
+@@ -62,7 +62,7 @@
+ inline void ToViewportSize(float viewportWidth, float viewportHeight)
+ {
+ m_value = m_valueInSpecifiedUnits*
+- sqrt(viewportWidth*viewportWidth + viewportHeight*viewportHeight)/sqrt(2)/100;
++ sqrt(viewportWidth*viewportWidth + viewportHeight*viewportHeight)/sqrt((double)2)/100;
+ }
+
+ virtual void NewValueSpecifiedUnits(wxSVG_LENGTHTYPE unitType, double valueInSpecifiedUnits);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/wxsvg-02-pango-deprecated.diff Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,10 @@
+--- wxsvg-1.0b7/src/freetype/SVGCanvasTextFreetype.h.orig 2006-11-28 15:38:46.317353000 -0500
++++ wxsvg-1.0b7/src/freetype/SVGCanvasTextFreetype.h 2006-11-28 15:39:37.908589000 -0500
+@@ -13,6 +13,7 @@
+
+ #include "SVGCanvasItem.h"
+
++#undef PANGO_DISABLE_DEPRECATED
+ #include <pango/pangoft2.h>
+
+ class wxSVGCanvasTextFreetype: public wxSVGCanvasText
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/wxsvg-03-1586173-append-void.diff Thu Nov 30 21:11:33 2006 +0000
@@ -0,0 +1,19 @@
+--- wxsvg-1.0b7/svgview/svgview.cpp.orig 2006-11-29 20:28:31.221883000 -0500
++++ wxsvg-1.0b7/svgview/svgview.cpp 2006-11-29 20:30:03.074920000 -0500
+@@ -78,12 +78,15 @@
+ {
+ // Make a menubar
+ wxMenu *fileMenu = new wxMenu;
++ wxMenuItem* it;
+ fileMenu->Append(wxID_OPEN, _T("&Open..."));
+ fileMenu->Append(wxID_SAVE, _T("&Save as..."));
+ fileMenu->AppendSeparator();
+ fileMenu->Append(wxID_EXIT, _T("&Close"));
+ fileMenu->AppendSeparator();
+- fileMenu->AppendCheckItem(wxID_FIT, _T("&FitToFrame"))->Check();
++ fileMenu->AppendCheckItem(wxID_FIT, _T("&FitToFrame"));
++ it = fileMenu->FindChildItem( wxID_FIT );
++ it->Check();
+ fileMenu->AppendCheckItem(wxID_HITTEST, _T("&Hit-Test"));
+
+ wxMenuBar *menuBar = new wxMenuBar;