Date: Mon, 28 Jul 2003 17:26:00 -0400 (EDT) From: Scott Lambert <lambert@lambertfam.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/54994: wxGTK is out of date, this is a minimal effort update. Message-ID: <20030728212600.8B2668952@laptop.lambertfam.org> Resent-Message-ID: <200307282130.h6SLUJjk013410@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 54994
>Category: ports
>Synopsis: wxGTK is out of date, this is a minimal effort update.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jul 28 14:30:19 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Scott Lambert
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD laptop.lambertfam.org 5.1-CURRENT FreeBSD 5.1-CURRENT #18: Fri Jul 25 23:15:30 EDT 2003 root@laptop.lambertfam.org:/usr/obj/usr/src/sys/LAPTOP i386
>Description:
wxGTK seems to be getting old. I suddenly need it for a VoIP package I
am trying to get working on FreeBSD. I failed to submit a PR the first
time I did this so now I had to re-do it again. Grrrr. That's what I
get for being lazy.
Disclaimer: I know nothing about wx windows. I just needed it for
this project. The stuff in the ports collection didn't seem to work
so I updated to what the wx windows website says is the current stable
release. I have not taken due diligence with the pkg-plist. I just got
it building and it works with the package I am working on.
>How-To-Repeat:
>Fix:
--- wxgtk-devel.diff begins here ---
diff -r -u x11-toolkits/wxgtk-devel/Makefile local/wxgtk/Makefile
--- x11-toolkits/wxgtk-devel/Makefile Mon Jul 28 16:05:44 2003
+++ local/wxgtk/Makefile Mon Jul 28 16:10:39 2003
@@ -6,7 +6,7 @@
#
PORTNAME= wxgtk
-PORTVERSION= 2.4.0
+PORTVERSION= 2.4.1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
diff -r -u x11-toolkits/wxgtk-devel/distinfo local/wxgtk/distinfo
--- x11-toolkits/wxgtk-devel/distinfo Wed Jan 15 13:25:48 2003
+++ local/wxgtk/distinfo Mon Jul 28 16:15:11 2003
@@ -1 +1 @@
-MD5 (wxGTK-2.4.0.tar.bz2) = b51cbef5b29ede3f56121e3d142dbc76
+MD5 (wxGTK-2.4.1.tar.bz2) = 937c299de177990908770989206b7d8c
diff -r -u x11-toolkits/wxgtk-devel/files/patch-configure local/wxgtk/files/patch-configure
--- x11-toolkits/wxgtk-devel/files/patch-configure Wed Jan 15 13:25:48 2003
+++ local/wxgtk/files/patch-configure Mon Jul 28 16:26:15 2003
@@ -1,16 +1,13 @@
-
-$FreeBSD: ports/x11-toolkits/wxgtk-devel/files/patch-configure,v 1.7 2003/01/15 18:25:48 sobomax Exp $
-
---- configure.orig Tue Jan 14 18:31:00 2003
-+++ configure Tue Jan 14 18:31:55 2003
-@@ -13284,14 +13284,14 @@
+--- configure.orig Wed Jul 2 23:04:13 2003
++++ configure Wed Jul 2 23:04:13 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:13289: checking for gdk_im_open in -lgdk" >&5
+-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:13289: checking for gdk_im_open in -lgdk12" >&5
++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
@@ -19,9 +16,9 @@
-LIBS="-lgdk $LIBS"
+LIBS="-lgdk12 $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 13297 "configure"
+ #line 13313 "configure"
#include "confdefs.h"
-@@ -15864,8 +15864,8 @@
+@@ -15897,8 +15897,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 +29,7 @@
if test "$cross_compiling" = "yes"; then
TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
-@@ -15876,13 +15876,11 @@
+@@ -15909,13 +15909,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 +47,7 @@
case "${host}" in
*-*-cygwin* | *-*-mingw32* )
-@@ -18379,7 +18377,7 @@
+@@ -18512,7 +18510,7 @@
fi
;;
*-*-freebsd*)
@@ -59,7 +56,7 @@
;;
*-*-darwin* | *-*-cygwin* )
THREAD_OPTS=""
-@@ -19136,6 +19134,7 @@
+@@ -19269,6 +19267,7 @@
fi
fi
@@ -67,7 +64,7 @@
if test "$WXGTK20" = 1 ; then
cat >> confdefs.h <<EOF
#define __WXGTK20__ $WXGTK20
-@@ -19236,21 +19235,6 @@
+@@ -19369,21 +19368,6 @@
esac
fi
@@ -89,7 +86,7 @@
if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
cat >> confdefs.h <<\EOF
#define WXWIN_COMPATIBILITY_2 1
-@@ -22467,13 +22451,11 @@
+@@ -22600,13 +22584,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
--- wxgtk-devel.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030728212600.8B2668952>