mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
Update to 2.3.0.
This commit is contained in:
parent
7e0bca4d14
commit
b7b824a367
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=45729
@ -6,11 +6,11 @@
|
||||
#
|
||||
|
||||
PORTNAME= wxgtk
|
||||
PORTVERSION= 2.2.7
|
||||
PORTEPOCH= 1
|
||||
PORTVERSION= 2.3.0
|
||||
CATEGORIES= x11-toolkits
|
||||
MASTER_SITES= ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/ \
|
||||
http://www.mirror.ac.uk/sites/wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
|
||||
ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
|
||||
MASTER_SITE_SUBDIR= wxpython
|
||||
DISTNAME= wxGTK-${PORTVERSION}
|
||||
|
||||
MAINTAINER= sobomax@FreeBSD.org
|
||||
@ -18,6 +18,8 @@ MAINTAINER= sobomax@FreeBSD.org
|
||||
LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
|
||||
tiff.4:${PORTSDIR}/graphics/tiff
|
||||
|
||||
NO_LATEST_LINK= "Unstable, development version."
|
||||
|
||||
USE_X_PREFIX= yes
|
||||
USE_MESA= yes
|
||||
USE_GMAKE= yes
|
||||
@ -33,7 +35,8 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} \
|
||||
-I${LOCALBASE}/include \
|
||||
-I${X11BASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib \
|
||||
-L${X11BASE}/lib -lm"
|
||||
-L${X11BASE}/lib" \
|
||||
GTK_CONFIG_2_0="no"
|
||||
|
||||
pre-patch:
|
||||
@${PERL} -pi -e 's|-l\$$THREADS_LIB|${PTHREAD_LIBS}|g ; \
|
||||
|
@ -1 +1 @@
|
||||
MD5 (wxGTK-2.2.7.tar.gz) = 042ba034e2bc31ca1df74f6f9f60fe57
|
||||
MD5 (wxGTK-2.3.0.tar.gz) = 9dfbe08a7f574ed3b187bc361012981d
|
||||
|
@ -1,16 +1,31 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- configure.orig Mon Jul 23 14:48:10 2001
|
||||
+++ configure Mon Jul 23 15:12:50 2001
|
||||
@@ -7452,14 +7452,14 @@
|
||||
--- configure.orig Mon May 28 20:11:23 2001
|
||||
+++ configure Mon May 28 20:14:20 2001
|
||||
@@ -7606,10 +7606,10 @@
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
if test "$GTK_CONFIG_2_0" = "no" ; then
|
||||
- echo "*** The gtk-config-2.0 script installed by GTK could not be found"
|
||||
- echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
- echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the"
|
||||
- echo "*** full path to gtk-config-2.0."
|
||||
+# echo "*** The gtk-config-2.0 script installed by GTK could not be found"
|
||||
+# echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
+# echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the"
|
||||
+# echo "*** full path to gtk-config-2.0."
|
||||
else
|
||||
if test -f conf.gtktest ; then
|
||||
:
|
||||
@@ -7941,14 +7941,14 @@
|
||||
TOOLKIT=GTK
|
||||
GUIDIST=GTK_DIST
|
||||
|
||||
- echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
|
||||
-echo "configure:7457: checking for gdk_im_open in -lgdk" >&5
|
||||
-echo "configure:7946: checking for gdk_im_open in -lgdk" >&5
|
||||
+ echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6
|
||||
+echo "configure:7457: checking for gdk_im_open in -lgdk12" >&5
|
||||
+echo "configure:7946: checking for gdk_im_open in -lgdk12" >&5
|
||||
ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
@ -19,9 +34,9 @@ $FreeBSD$
|
||||
-LIBS="-lgdk $LIBS"
|
||||
+LIBS="-lgdk12 $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7465 "configure"
|
||||
#line 7954 "configure"
|
||||
#include "confdefs.h"
|
||||
@@ -8707,16 +8707,12 @@
|
||||
@@ -9207,16 +9207,12 @@
|
||||
WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
|
||||
WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
|
||||
|
||||
@ -43,23 +58,15 @@ $FreeBSD$
|
||||
SHARED_LD=
|
||||
PIC_FLAG=
|
||||
WX_ALL=
|
||||
@@ -8805,8 +8801,13 @@
|
||||
*-*-freebsd* | *-*-openbsd* | *-*-netbsd*)
|
||||
SHARED_LD="${CC} -shared -o"
|
||||
PIC_FLAG="-fPIC"
|
||||
- WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
- WX_ALL="CREATE_LINKS"
|
||||
+ if test "$wxUSE_OPENGL" = "yes"; then
|
||||
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
|
||||
+ WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
|
||||
+ else
|
||||
+ WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
|
||||
+ WX_ALL="CREATE_LINKS"
|
||||
+ fi
|
||||
;;
|
||||
*-*-osf* )
|
||||
SHARED_LD="${CXX} -shared -o"
|
||||
@@ -12054,24 +12055,6 @@
|
||||
@@ -12945,6 +12941,7 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
+WXGTK20=
|
||||
if test "$WXGTK20" = 1 ; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define __WXGTK20__ $WXGTK20
|
||||
@@ -13115,24 +13112,6 @@
|
||||
fi
|
||||
|
||||
|
||||
@ -84,7 +91,7 @@ $FreeBSD$
|
||||
ZLIB_INCLUDE=
|
||||
if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
@@ -14754,8 +14737,6 @@
|
||||
@@ -15947,8 +15926,6 @@
|
||||
s%@WX_LIBRARY@%$WX_LIBRARY%g
|
||||
s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
|
||||
s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
|
||||
@ -93,7 +100,7 @@ $FreeBSD$
|
||||
s%@PROGRAM_EXT@%$PROGRAM_EXT%g
|
||||
s%@WX_LIBRARY_NAME_GL@%$WX_LIBRARY_NAME_GL%g
|
||||
s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g
|
||||
@@ -14763,8 +14744,6 @@
|
||||
@@ -15956,8 +15933,6 @@
|
||||
s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g
|
||||
s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g
|
||||
s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g
|
||||
|
32
x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h
Normal file
32
x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h
Normal file
@ -0,0 +1,32 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- include/wx/wxchar.h.orig Fri May 25 05:55:35 2001
|
||||
+++ include/wx/wxchar.h Mon May 28 22:12:39 2001
|
||||
@@ -276,12 +276,7 @@
|
||||
# ifdef HAVE_WCSTR_H
|
||||
# include <wcstr.h>
|
||||
# else
|
||||
-# ifndef __FreeBSD__
|
||||
# include <wchar.h>
|
||||
-# else
|
||||
-# include <stdlib.h>
|
||||
-# define wxNEED_WCSLEN
|
||||
-# endif
|
||||
# endif
|
||||
# endif
|
||||
|
||||
@@ -511,11 +506,11 @@
|
||||
#endif
|
||||
|
||||
// checks whether the passed in pointer is NULL and if the string is empty
|
||||
-inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
|
||||
+WXDLLEXPORT inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
|
||||
|
||||
#ifndef wxNEED_WX_STRING_H
|
||||
// safe version of strlen() (returns 0 if passed NULL pointer)
|
||||
-inline size_t wxStrlen(const wxChar *psz)
|
||||
+WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz)
|
||||
{ return psz ? wxStrlen_(psz) : 0; }
|
||||
#endif
|
||||
|
@ -1 +1 @@
|
||||
The wxWindows GUI toolkit with GTK+ bindings
|
||||
The wxWindows GUI toolkit with GTK+ bindings (unstable version)
|
||||
|
@ -1,3 +1,4 @@
|
||||
A C++ package for platform independed program development.
|
||||
A C++ package for platform independed program development (unstable,
|
||||
development version).
|
||||
|
||||
WWW: http://wesley.informatik.uni-freiburg.de/~wxxt/
|
||||
|
@ -24,6 +24,7 @@ include/wx/combobox.h
|
||||
include/wx/confbase.h
|
||||
include/wx/config.h
|
||||
include/wx/control.h
|
||||
include/wx/cshelp.h
|
||||
include/wx/ctrlsub.h
|
||||
include/wx/cursor.h
|
||||
include/wx/dataobj.h
|
||||
@ -60,6 +61,7 @@ include/wx/file.h
|
||||
include/wx/fileconf.h
|
||||
include/wx/filedlg.h
|
||||
include/wx/filefn.h
|
||||
include/wx/filename.h
|
||||
include/wx/filesys.h
|
||||
include/wx/font.h
|
||||
include/wx/fontdlg.h
|
||||
@ -79,6 +81,7 @@ include/wx/generic/caret.h
|
||||
include/wx/generic/choicdgg.h
|
||||
include/wx/generic/colrdlgg.h
|
||||
include/wx/generic/dcpsg.h
|
||||
include/wx/generic/dirctrlg.h
|
||||
include/wx/generic/dirdlgg.h
|
||||
include/wx/generic/dragimgg.h
|
||||
include/wx/generic/filedlgg.h
|
||||
@ -94,18 +97,19 @@ include/wx/generic/laywin.h
|
||||
include/wx/generic/listctrl.h
|
||||
include/wx/generic/msgdlgg.h
|
||||
include/wx/generic/notebook.h
|
||||
include/wx/generic/paletteg.h
|
||||
include/wx/generic/panelg.h
|
||||
include/wx/generic/plot.h
|
||||
include/wx/generic/printps.h
|
||||
include/wx/generic/prntdlgg.h
|
||||
include/wx/generic/progdlgg.h
|
||||
include/wx/generic/sashwin.h
|
||||
include/wx/generic/scrolwin.h
|
||||
include/wx/generic/splash.h
|
||||
include/wx/generic/splitter.h
|
||||
include/wx/generic/statusbr.h
|
||||
include/wx/generic/tabg.h
|
||||
include/wx/generic/textdlgg.h
|
||||
include/wx/generic/treectrl.h
|
||||
include/wx/generic/treectlg.h
|
||||
include/wx/generic/wizard.h
|
||||
include/wx/geometry.h
|
||||
include/wx/gifdecod.h
|
||||
@ -150,23 +154,24 @@ include/wx/gtk/menu.h
|
||||
include/wx/gtk/menuitem.h
|
||||
include/wx/gtk/minifram.h
|
||||
include/wx/gtk/notebook.h
|
||||
include/wx/gtk/palette.h
|
||||
include/wx/gtk/pen.h
|
||||
include/wx/gtk/radiobox.h
|
||||
include/wx/gtk/radiobut.h
|
||||
include/wx/gtk/region.h
|
||||
include/wx/gtk/scrolbar.h
|
||||
include/wx/gtk/scrolwin.h
|
||||
include/wx/gtk/settings.h
|
||||
include/wx/gtk/setup.h
|
||||
include/wx/gtk/slider.h
|
||||
include/wx/gtk/spinbutt.h
|
||||
include/wx/gtk/spinctrl.h
|
||||
include/wx/gtk/setup.h
|
||||
include/wx/gtk/statbmp.h
|
||||
include/wx/gtk/statbox.h
|
||||
include/wx/gtk/statline.h
|
||||
include/wx/gtk/stattext.h
|
||||
include/wx/gtk/tbargtk.h
|
||||
include/wx/gtk/textctrl.h
|
||||
include/wx/gtk/tglbtn.h
|
||||
include/wx/gtk/timer.h
|
||||
include/wx/gtk/tooltip.h
|
||||
include/wx/gtk/treectrl.h
|
||||
@ -202,6 +207,7 @@ include/wx/imagpcx.h
|
||||
include/wx/imagpng.h
|
||||
include/wx/imagpnm.h
|
||||
include/wx/imagtiff.h
|
||||
include/wx/imagxpm.h
|
||||
include/wx/intl.h
|
||||
include/wx/ioswrap.h
|
||||
include/wx/ipcbase.h
|
||||
@ -237,7 +243,6 @@ include/wx/palette.h
|
||||
include/wx/panel.h
|
||||
include/wx/paper.h
|
||||
include/wx/pen.h
|
||||
include/wx/plot.h
|
||||
include/wx/print.h
|
||||
include/wx/printdlg.h
|
||||
include/wx/prntbase.h
|
||||
@ -268,6 +273,7 @@ include/wx/slider.h
|
||||
include/wx/socket.h
|
||||
include/wx/spinbutt.h
|
||||
include/wx/spinctrl.h
|
||||
include/wx/splash.h
|
||||
include/wx/splitter.h
|
||||
include/wx/statbmp.h
|
||||
include/wx/statbox.h
|
||||
@ -285,13 +291,16 @@ include/wx/tbarsmpl.h
|
||||
include/wx/textctrl.h
|
||||
include/wx/textdlg.h
|
||||
include/wx/textfile.h
|
||||
include/wx/tglbtn.h
|
||||
include/wx/thread.h
|
||||
include/wx/time.h
|
||||
include/wx/timer.h
|
||||
include/wx/tipdlg.h
|
||||
include/wx/tipwin.h
|
||||
include/wx/tokenzr.h
|
||||
include/wx/toolbar.h
|
||||
include/wx/tooltip.h
|
||||
include/wx/treebase.h
|
||||
include/wx/treectrl.h
|
||||
include/wx/txtstrm.h
|
||||
include/wx/types.h
|
||||
@ -318,7 +327,7 @@ include/wx/wxchar.h
|
||||
include/wx/wxexpr.h
|
||||
include/wx/wxhtml.h
|
||||
include/wx/wxprec.h
|
||||
include/wx/xpmhand.h
|
||||
include/wx/xpmdecod.h
|
||||
include/wx/zipstrm.h
|
||||
include/wx/zstream.h
|
||||
lib/libwx_gtk.so
|
||||
@ -328,14 +337,12 @@ lib/libwx_gtk_gl.so.2
|
||||
share/locale/cs/LC_MESSAGES/wxstd.mo
|
||||
share/locale/da/LC_MESSAGES/wxstd.mo
|
||||
share/locale/de/LC_MESSAGES/wxstd.mo
|
||||
share/locale/es/LC_MESSAGES/wxstd.mo
|
||||
share/locale/fi/LC_MESSAGES/wxstd.mo
|
||||
share/locale/fr/LC_MESSAGES/wxstd.mo
|
||||
share/locale/it/LC_MESSAGES/wxstd.mo
|
||||
share/locale/nl/LC_MESSAGES/wxstd.mo
|
||||
share/locale/ru/LC_MESSAGES/wxstd.mo
|
||||
share/locale/sv/LC_MESSAGES/wxstd.mo
|
||||
share/locale/zh/LC_MESSAGES/wxstd.mo
|
||||
share/wx/afm/Cour.afm
|
||||
share/wx/afm/CourBo.afm
|
||||
share/wx/afm/CourBoO.afm
|
||||
|
Loading…
Reference in New Issue
Block a user