Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cbd10c45b746c0ab2ae08121edc9064fab855e1a
commit cbd10c45b746c0ab2ae08121edc9064fab855e1a Author: crazy <[EMAIL PROTECTED]> Date: Wed Dec 5 12:36:25 2007 +0100 wxgtk-2.8.7-1-i686 * Version bump * now with -u8 subpackage * added TODO diff --git a/source/xlib-extra/wxgtk/FrugalBuild b/source/xlib-extra/wxgtk/FrugalBuild index d27ee48..b18a4e1 100644 --- a/source/xlib-extra/wxgtk/FrugalBuild +++ b/source/xlib-extra/wxgtk/FrugalBuild @@ -1,53 +1,89 @@ -# Compiling Time: 2.30 SBU +# Compiling Time: 15.12 SBU # Maintainer: crazy <[EMAIL PROTECTED]> # Contributor: Miklos Nemeth <[EMAIL PROTECTED]> pkgname=wxgtk -pkgver=2.6.4 -pkgrel=4 +pkgver=2.8.7 +pkgrel=1 pkgdesc="GTK+ implementation of wxWidgets API for GUI'" _F_sourceforge_dirname="wxwindows" _F_sourceforge_name="wxGTK" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://www.wxwidgets.org/"; -source=($source g_free.patch) -depends=('gtk+2>=2.12.0' 'sdl' 'cppunit') +# TODO: gst* +depends=('libdrm' 'sdl' 'gtk+2' 'libgl' 'freetype2' 'libxcb' 'glib2') groups=('xlib-extra') archs=('i686' 'x86_64') options=('scriptlet') replaces=('wxgtk-devel') conflicts=('wxgtk-devel') -sha1sums=('f2cad3189b8c5d3b5ca3f8f592bafdb183be7dd2' \ - 'd5526f171231febd957e84574a55a2e2a8cbbfe6') +VER="2.8" + +subpkgs=("$pkgname-locale" "$pkgname-u8") +subdescs=('Locale files for wxWidgets' "GTK+ implementation of wxWidgets API for GUI (unicode).") +subgroups=('locale-extra' 'xlib-extra') +subdepends=("$pkgname=$pkgver" "$pkgname=$pkgver") +subarchs=('i686 x86_64' 'i686 x86_64') + + +wx_compile() +{ + make || Fdie + Fmakeinstall + cd contrib/src || Fdie + Fconf + make || Fdie + Fmakeinstall + cd ../.. || Fdie +} -subpkgs=("$pkgname-locale") -subdescs=('Locale files for wxWidgets') -subgroups=('locale-extra') -subdepends=("$pkgname=$pkgver") -subarchs=('i686 x86_64') build() { - Fcd wxGTK-$pkgver - Fbuild \ - --disable-unicode \ - --with-opengl \ + cd $Fsrcdir || Fdie + export CFLAGS="$CFLAGS -fno-strict-aliasing" + export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" + cp -r wxGTK-$pkgver wxGTK-$pkgver-u8 || Fdie + ## TODO: figure|enable more things + wxconfig="--with-opengl \ --enable-geometry \ + --enable-timer \ --enable-sound \ --with-sdl \ + --enable-graphics_ctx \ --enable-mediactrl \ --enable-display \ - --with-gtk2 - cd contrib/src - Fconf - make || Fdie - Fmakeinstall - Frm /usr/bin/wx-config - Fln /usr/lib/wx/config/gtk2-ansi-release-2.6 /usr/bin/wx-config - + --enable-plugins \ + --enable-compat24" + ## Unicode one + cd wxGTK-$pkgver-u8 || Fdie + Fpatchall + autoconf || Fdie + Fconf \ + ${wxconfig} \ + --enable-unicode + wx_compile + Frm usr/lib/wx/${VER} + ## This is still not a solution ... + Frm usr/include usr/share/aclocal usr/share/bakefile usr/share/locale usr/bin/wx-config usr/bin/wxrc + Fln /usr/lib/wx/config/gtk2-unicode-release-${VER} /usr/bin/wx-config-u8 + Fmv /usr/bin/wxrc-${VER} /usr/bin/wxrc-${VER}-u8 + Fln /usr/bin/wxrc-${VER}-u8 /usr/bin/wxrc-u8 + Fsplit $pkgname-u8 /usr + ## Normal build + cd ../wxGTK-$pkgver + Fpatchall + autoconf || Fdie + Fconf \ + ${wxconfig} \ + --disable-unicode + wx_compile + Frm usr/bin/wx-config + Fln /usr/lib/wx/config/gtk2-ansi-release-${VER} /usr/bin/wx-config + ## lang stuff ( why is this split anyway ? ) Fsplit $pkgname-locale usr/share/locale - } +sha1sums=('07247cce8f6602ab532666b766c15bf3c7cdea3f') # optimization OK diff --git a/source/xlib-extra/wxgtk/g_free.patch b/source/xlib-extra/wxgtk/g_free.patch deleted file mode 100644 index ca0fb43..0000000 --- a/source/xlib-extra/wxgtk/g_free.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naurp wxGTK-2.6.4/src/gtk/button.cpp wxGTK-2.6.4-p/src/gtk/button.cpp ---- wxGTK-2.6.4/src/gtk/button.cpp 2007-03-20 16:50:07.000000000 +0100 -+++ wxGTK-2.6.4-p/src/gtk/button.cpp 2007-09-23 01:53:30.000000000 +0200 -@@ -89,7 +89,7 @@ gtk_button_style_set_callback( GtkWidget - right_border += default_border->right; - top_border += default_border->top; - bottom_border += default_border->bottom; -- g_free( default_border ); -+ gtk_border_free( default_border ); - } - #else - left_border = 6; -diff -Naurp wxGTK-2.6.4/src/gtk/window.cpp wxGTK-2.6.4-p/src/gtk/window.cpp ---- wxGTK-2.6.4/src/gtk/window.cpp 2007-03-20 16:50:07.000000000 +0100 -+++ wxGTK-2.6.4-p/src/gtk/window.cpp 2007-09-23 01:53:30.000000000 +0200 -@@ -3273,7 +3273,7 @@ void wxWindowGTK::DoSetSize( int x, int - right_border += default_border->right; - top_border += default_border->top; - bottom_border += default_border->bottom; -- g_free( default_border ); -+ gtk_border_free( default_border ); - } - #else - left_border = 6; _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
