ports/57556: [orphaned port update] x11-toolkits/wxgtk-devel
Pav Lucistnik
pav at oook.cz
Sat Oct 4 02:10:24 UTC 2003
>Number: 57556
>Category: ports
>Synopsis: [orphaned port update] x11-toolkits/wxgtk-devel
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Oct 03 19:10:18 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Pav Lucistnik
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD hood.oook.cz 5.1-CURRENT FreeBSD 5.1-CURRENT #2: Thu Sep 25 01:25:46 CEST 2003 root at hood.oook.cz:/usr/obj/usr/src/sys/PAV i386
>Description:
wxWindows is a popular GUI framework. Here is update of -devel port to 2.4.2,
the latest release.
Commiter please remove files/patch-include::wx::menuitem.h
it is now included in distfile.
- 2.4.x is now stable release according to authors, so remove NO_LATEST_LINK
- add know WITH_GTK2 to allow building against Gtk2 toolkit.
Note that you have to rebuild all applications using wxgtk
if they were linked against wxgtk-gtk12.
- supply new pkg-descr and update website link
I tested WITH_GTK2 with: xchm, xmule, py-wxPython, poedit, audacity.
Everything works fine. Here are two screenshots:
http://www.oook.cz/screenshots/xmule.png
http://www.oook.cz/screenshots/xchm.png
Please users test with other wxgtk-devel using applications and report me results.
In future I'd like to see x11-toolkits/wxgtk die and x11-toolkits/wxgtk-devel
repomoved to x11-toolkits/wxgtk. 2.2.x is now gone from the website,
and only three ports depend on it, 17 depends on wxgtk-devel.
I'll check those 3 ports over weekend.
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/x11-toolkits/wxgtk-devel/Makefile wxgtk-devel/Makefile
--- /usr/ports/x11-toolkits/wxgtk-devel/Makefile Thu Sep 4 00:04:16 2003
+++ wxgtk-devel/Makefile Sat Oct 4 03:36:19 2003
@@ -6,8 +6,7 @@
#
PORTNAME= wxgtk
-PORTVERSION= 2.4.1
-PORTREVISION= 1
+PORTVERSION= 2.4.2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
@@ -21,34 +20,53 @@
tiff.4:${PORTSDIR}/graphics/tiff \
iconv.3:${PORTSDIR}/converters/libiconv
-NO_LATEST_LINK= "Unstable, development version."
-
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_MESA= yes
USE_GMAKE= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-USE_GNOME= gtk12
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-libpng=sys \
--with-libjpeg=sys \
--with-libtiff=sys \
- --with-zlib=builtin \
- --with-opengl \
- --host=${CONFIGURE_TARGET} \
- --build=${CONFIGURE_TARGET}
+ --with-zlib=sys \
+ --with-opengl
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} \
-I${WRKSRC}/include \
-I${LOCALBASE}/include \
-I${X11BASE}/include" \
LDFLAGS="${PTHREAD_LIBS} \
-L${LOCALBASE}/lib -liconv \
- -L${X11BASE}/lib" \
- GTK_CONFIG_2_0="no"
+ -L${X11BASE}/lib"
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GTK2)
+USE_GNOME= gtk20
+CONFIGURE_ARGS+=--enable-gtk2 ${MACHINE_ARCH}-portbld-freebsd${OSREL}
+.else
+USE_GNOME= gtk12
+CONFIGURE_ARGS+=--host=${CONFIGURE_TARGET} --build=${CONFIGURE_TARGET}
+.endif
+
+pre-everything:
+.if !defined(WITH_GTK2)
+ @${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *"
+ @${ECHO_MSG} "You can define WITH_GTK2=yes if you want to use Gtk20 toolkit."
+ @${ECHO_MSG} "This is marked as experimental by wxGTK authors."
+ @${ECHO_MSG} "Note: applications already linked to Gtk12 wxGTK will no longer work."
+ @${ECHO_MSG} " You have to rebuild them by hand."
+ @${ECHO_MSG} "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *"
+.endif
pre-patch:
@${REINPLACE_CMD} -e 's|[$$]THREADS_LINK|${PTHREAD_LIBS}|g' \
${WRKSRC}/configure
+.if defined(WITH_GTK2)
+ @${REINPLACE_CMD} -e 's|lgdk|lgdk-x11-2.0|g' ${WRKSRC}/configure
+.else
+ @${REINPLACE_CMD} -e 's|lgdk|lgdk12|g' ${WRKSRC}/configure
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN /usr/ports/x11-toolkits/wxgtk-devel/distinfo wxgtk-devel/distinfo
--- /usr/ports/x11-toolkits/wxgtk-devel/distinfo Fri Aug 29 20:01:22 2003
+++ wxgtk-devel/distinfo Sat Oct 4 01:43:16 2003
@@ -1 +1 @@
-MD5 (wxGTK-2.4.1.tar.bz2) = 937c299de177990908770989206b7d8c
+MD5 (wxGTK-2.4.2.tar.bz2) = cdadfe82fc93f8a65a2ae18a95b0b0e3
diff -ruN /usr/ports/x11-toolkits/wxgtk-devel/files/patch-configure wxgtk-devel/files/patch-configure
--- /usr/ports/x11-toolkits/wxgtk-devel/files/patch-configure Fri Aug 29 20:01:22 2003
+++ wxgtk-devel/files/patch-configure Sat Oct 4 02:58:49 2003
@@ -1,27 +1,6 @@
-
-$FreeBSD: ports/x11-toolkits/wxgtk-devel/files/patch-configure,v 1.8 2003/08/29 06:37:29 tg Exp $
-
---- configure.orig Wed Aug 27 18:55:50 2003
-+++ configure Wed Aug 27 18:57:06 2003
-@@ -13300,14 +13300,14 @@
- TOOLKIT=GTK
- GUIDIST=GTK_DIST
-
-- echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
--echo "configure:13305: checking for gdk_im_open in -lgdk" >&5
-+ echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6
-+echo "configure:13305: 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
- else
- ac_save_LIBS="$LIBS"
--LIBS="-lgdk $LIBS"
-+LIBS="-lgdk12 $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 13313 "configure"
- #include "confdefs.h"
-@@ -15897,8 +15897,8 @@
+--- configure.orig Sat Oct 4 02:17:08 2003
++++ configure Sat Oct 4 02:37:10 2003
+@@ -16048,8 +16048,8 @@
WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
@@ -32,7 +11,7 @@
if test "$cross_compiling" = "yes"; then
TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
-@@ -15909,13 +15909,11 @@
+@@ -16060,13 +16060,11 @@
WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
@@ -50,7 +29,7 @@
case "${host}" in
*-*-cygwin* | *-*-mingw32* )
-@@ -18512,7 +18510,7 @@
+@@ -18669,7 +18667,7 @@
fi
;;
*-*-freebsd*)
@@ -59,15 +38,7 @@
;;
*-*-darwin* | *-*-cygwin* )
THREAD_OPTS=""
-@@ -19269,6 +19267,7 @@
- fi
- fi
-
-+WXGTK20=
- if test "$WXGTK20" = 1 ; then
- cat >> confdefs.h <<EOF
- #define __WXGTK20__ $WXGTK20
-@@ -19369,21 +19368,6 @@
+@@ -19531,21 +19530,6 @@
esac
fi
@@ -89,7 +60,7 @@
if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
cat >> confdefs.h <<\EOF
#define WXWIN_COMPATIBILITY_2 1
-@@ -22600,13 +22584,11 @@
+@@ -22780,13 +22764,11 @@
s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g
s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
diff -ruN /usr/ports/x11-toolkits/wxgtk-devel/files/patch-include::wx::menuitem.h wxgtk-devel/files/patch-include::wx::menuitem.h
--- /usr/ports/x11-toolkits/wxgtk-devel/files/patch-include::wx::menuitem.h Wed Sep 3 09:43:26 2003
+++ wxgtk-devel/files/patch-include::wx::menuitem.h Thu Jan 1 01:00:00 1970
@@ -1,19 +0,0 @@
---- include/wx/menuitem.h.orig Wed Aug 27 21:11:09 2003
-+++ include/wx/menuitem.h Wed Aug 27 21:11:35 2003
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin
- // Modified by:
- // Created: 25.10.99
--// RCS-ID: $Id: menuitem.h,v 1.22 2002/04/12 13:15:43 JS Exp $
-+// RCS-ID: $Id: menuitem.h,v 1.22.2.1 2003/06/10 23:48:45 RD Exp $
- // Copyright: (c) 1999 Vadim Zeitlin <zeitlin at dptmaths.ens-cachan.fr>
- // Licence: wxWindows license
- ///////////////////////////////////////////////////////////////////////////////
-@@ -49,6 +49,7 @@
-
- // the menu we're in
- wxMenu *GetMenu() const { return m_parentMenu; }
-+ void SetMenu(wxMenu* menu) { m_parentMenu = menu; }
-
- // get/set id
- void SetId(int id) { m_id = id; }
diff -ruN /usr/ports/x11-toolkits/wxgtk-devel/pkg-descr wxgtk-devel/pkg-descr
--- /usr/ports/x11-toolkits/wxgtk-devel/pkg-descr Thu Jan 31 14:04:43 2002
+++ wxgtk-devel/pkg-descr Sat Oct 4 03:51:50 2003
@@ -1,4 +1,4 @@
-A C++ package for platform independent software development (unstable,
-development version).
+wxWindows is a C++ GUI framework for platform independent software
+development. On FreeBSD the Gtk toolkit is used.
-WWW: http://wesley.informatik.uni-freiburg.de/~wxxt/
+WWW: http://www.wxwindows.org/
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list