1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

- Update to 0.9.0.20070603

- Try to remove share/applications when using Qt4
This commit is contained in:
Michael Johnson 2007-06-04 12:33:03 +00:00
parent 5f84e39be8
commit 9a5f882d36
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=192701
5 changed files with 15 additions and 26 deletions

View File

@ -10,8 +10,7 @@
PORTNAME= vlc
DISTVERSION= 0.9.0.20070501
PORTREVISION= 3
DISTVERSION= 0.9.0.20070603
PORTEPOCH= 2
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://nightlies.videolan.org/build/source/

View File

@ -275,7 +275,7 @@ pre-install: build
${ECHO_CMD} "share/pixmaps/wxvlc.png" >> ${PLIST}
${ECHO_CMD} "share/applications/wxvlc.desktop" >> ${PLIST}
.endif
.if !defined(WITHOUT_WXGTK) || defined(WITH_SKINS)
.if !defined(WITHOUT_WXGTK) || defined(WITH_SKINS) || !defined(WITHOUT_QT)
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
.endif
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \

View File

@ -1,3 +1,3 @@
MD5 (vlc-snapshot-20070501.tar.bz2) = 9359a34477e4ef5b6b234f4d20fa51a0
SHA256 (vlc-snapshot-20070501.tar.bz2) = 958a3a0a6020b678b9adb4573368600041f29d1b2ffbd9e2613f5dce326b1627
SIZE (vlc-snapshot-20070501.tar.bz2) = 11685468
MD5 (vlc-snapshot-20070603.tar.bz2) = 19fe289553128a7a0b6021c63aa2c2d0
SHA256 (vlc-snapshot-20070603.tar.bz2) = 235d46aa7d4107637422a0cbf7e8a05e689e59ec32c1bf59835a76479008ef85
SIZE (vlc-snapshot-20070603.tar.bz2) = 12196933

View File

@ -1,6 +1,6 @@
--- configure.orig Mon Apr 30 18:01:36 2007
+++ configure Tue May 1 08:22:07 2007
@@ -2483,8 +2483,7 @@
--- configure.orig Sat Jun 2 18:01:50 2007
+++ configure Sun Jun 3 16:20:03 2007
@@ -2499,8 +2499,7 @@
done
if test -z "$ac_aux_dir"; then
{ { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&5
@ -10,7 +10,7 @@
fi
# These three variables are undocumented and unsupported,
@@ -40476,8 +40475,7 @@
@@ -42336,8 +42335,7 @@
if test -n "${enable_dv}"
then
{ { echo "$as_me:$LINENO: error: cannot find libraw1394 headers" >&5
@ -20,7 +20,7 @@
fi
fi
@@ -40496,8 +40494,7 @@
@@ -42356,8 +42354,7 @@
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
{ { echo "$as_me:$LINENO: error: cannot cd to ${real_dv_raw1394_tree}" >&5
@ -30,7 +30,7 @@
fi
if test -f "${real_dv_raw1394_tree}/src/.libs/libraw1394.a"
then
@@ -40716,8 +40713,7 @@
@@ -42576,8 +42573,7 @@
if test -n "${enable_dv}"
then
{ { echo "$as_me:$LINENO: error: cannot find libavc1394 headers" >&5
@ -40,14 +40,14 @@
fi
fi
@@ -62436,12 +62432,6 @@
@@ -64307,12 +64303,6 @@
if test "${WX_CONFIG}" != "no" -a "${CXX}" != ""
then
- if expr 2.6.0 \> `${WX_CONFIG} --version` >/dev/null || expr 2.7.0 \<= `${WX_CONFIG} --version` >/dev/null
- if expr 2.6.0 \> `${WX_CONFIG} --version` >/dev/null
- then
- { { echo "$as_me:$LINENO: error: You need wxWidgets of the 2.6 branch. Please upgrade/downgrade and try again. Better yet, you can configure with --disable-wxwidgets." >&5
-echo "$as_me: error: You need wxWidgets of the 2.6 branch. Please upgrade/downgrade and try again. Better yet, you can configure with --disable-wxwidgets." >&2;}
- { { echo "$as_me:$LINENO: error: You need wxWidgets version 2.6.0 or upwards. Please upgrade and try again." >&5
-echo "$as_me: error: You need wxWidgets version 2.6.0 or upwards. Please upgrade and try again." >&2;}
- { (exit 1); exit 1; }; }
- fi
ac_ext=cpp

View File

@ -1,10 +0,0 @@
--- modules/gui/wxwidgets/dialogs.cpp
+++ modules/gui/wxwidgets/dialogs.cpp
@@ -380,7 +380,7 @@
{
p_file_generic_dialog->SetMessage( wxU(p_arg->psz_title) );
p_file_generic_dialog->SetWildcard( wxU(p_arg->psz_extensions) );
- p_file_generic_dialog->SetStyle( (p_arg->b_save ? wxSAVE : wxOPEN) |
+ p_file_generic_dialog->SetWindowStyle( (p_arg->b_save ? wxSAVE : wxOPEN) |
(p_arg->b_multiple ? wxMULTIPLE:0) );
}