Update to 2.1.3; now it works fine with new wxWidgets

This commit is contained in:
alek 2006-10-12 14:18:53 +00:00
parent 95cc443b3d
commit 66174dc927
8 changed files with 119 additions and 151 deletions

View File

@ -1,13 +1,11 @@
# $OpenBSD: Makefile,v 1.7 2005/12/19 21:26:53 fgsch Exp $
# $OpenBSD: Makefile,v 1.8 2006/10/12 14:18:53 alek Exp $
COMMENT= "another eMule p2p client"
DISTNAME= aMule-2.0.3
PKGNAME= ${DISTNAME:L}p2
DISTNAME= aMule-2.1.3
PKGNAME= ${DISTNAME:L}
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amule/}
HOMEPAGE= http://www.amule.org/
# GPL
@ -16,18 +14,19 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MODULES= devel/gettext
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=amule/}
EXTRACT_SUFX= .tar.bz2
LIB_DEPENDS= wx_gtk:wxWidgets-gtk->=2.4.2-!gtk2:x11/wxWidgets/gtk
LIB_DEPENDS= wx_gtk2_adv,wx_base_net,wx_base,wx_gtk2_core:wxWidgets-gtk2->=2.6.3:x11/wxWidgets
USE_X11= Yes
USE_GMAKE= Yes
WANTLIB= X11 Xext Xi c gdk glib gmodule gtk m pthread stdc++ z
WANTLIB= X11 c m pthread stdc++ z
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-debug --enable-optimize --with-x
CONFIGURE_ENV= WXCONFIG="${LOCALBASE}/bin/wxgtk-2.4-config" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
NO_REGRESS= Yes

View File

@ -1,4 +1,4 @@
MD5 (aMule-2.0.3.tar.gz) = 529e6286087d22c1bec63d0757f9cfae
RMD160 (aMule-2.0.3.tar.gz) = aafa8700e0b3eca23029e7c76a4d060237b76f10
SHA1 (aMule-2.0.3.tar.gz) = a9ee36cd30a0e5747817d3ccb7eef81203261007
SIZE (aMule-2.0.3.tar.gz) = 2870070
MD5 (aMule-2.1.3.tar.bz2) = 0aafdd159edb8ad5f0064da87998b47d
RMD160 (aMule-2.1.3.tar.bz2) = fcc345000e5ad0a221d1e96d0d514f3be36428c3
SHA1 (aMule-2.1.3.tar.bz2) = dd47deb38e7a5b823550b85150f5a814c597b273
SIZE (aMule-2.1.3.tar.bz2) = 3248530

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-docs_Makefile_in,v 1.2 2005/10/07 16:20:34 fgsch Exp $
--- docs/Makefile.in.orig Wed Jun 15 14:06:59 2005
+++ docs/Makefile.in Sat Sep 24 17:55:07 2005
@@ -320,7 +320,7 @@ dist_doc_DATA = ABOUT-NLS \
EC_Protocol.txt \
socks4.protocol
$OpenBSD: patch-docs_Makefile_in,v 1.3 2006/10/12 14:18:53 alek Exp $
--- docs/Makefile.in.orig Sun Jun 11 17:08:56 2006
+++ docs/Makefile.in Fri Oct 6 18:41:36 2006
@@ -253,7 +253,7 @@ ccache_prefix = @ccache_prefix@
crypto_prefix = @crypto_prefix@
datadir = @datadir@
datarootdir = @datarootdir@
-docdir = $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
+docdir = $(datadir)/doc/amule
all: all-recursive
.SUFFIXES:
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_FileLock_h,v 1.1 2006/10/12 14:18:53 alek Exp $
--- src/FileLock.h.orig Fri Oct 6 19:28:24 2006
+++ src/FileLock.h Fri Oct 6 19:28:28 2006
@@ -31,7 +31,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <cerrno>
-
+#include <unistd.h>
/**
* This class provides an easy way to lock non-critical

View File

@ -1,60 +0,0 @@
$OpenBSD: patch-src_OtherFunctions_cpp,v 1.1 2005/10/07 16:20:34 fgsch Exp $
--- src/OtherFunctions.cpp.orig Sat Sep 24 19:27:28 2005
+++ src/OtherFunctions.cpp Sat Sep 24 19:32:51 2005
@@ -235,49 +235,49 @@ wxString GetFiletypeDesc(FileType type,
if (translated) {
return _("Videos");
} else {
- return wxT("Videos");
+ return ED2KFTSTR_VIDEO;
}
break;
case ftAudio:
if (translated) {
return _("Audio");
} else {
- return wxT("Audio");
+ return ED2KFTSTR_AUDIO;
}
break;
case ftArchive:
if (translated) {
return _("Archives");
} else {
- return wxT("Archives");
+ return ED2KFTSTR_ARCHIVE;
}
break;
case ftCDImage:
if (translated) {
return _("CD-Images");
} else {
- return wxT("CD-Images");
+ return ED2KFTSTR_CDIMAGE;
}
break;
case ftPicture:
if (translated) {
return _("Pictures");
} else {
- return wxT("Pictures");
+ return ED2KFTSTR_IMAGE;
}
break;
case ftText:
if (translated) {
return _("Texts");
} else {
- return wxT("Texts");
+ return ED2KFTSTR_DOCUMENT;
}
break;
case ftProgram:
if (translated) {
return _("Programs");
} else {
- return wxT("Programs");
+ return ED2KFTSTR_PROGRAM;
}
break;
default:

View File

@ -1,49 +0,0 @@
$OpenBSD: patch-src_SearchDlg_cpp,v 1.1 2005/10/07 16:20:34 fgsch Exp $
--- src/SearchDlg.cpp.orig Fri Apr 1 21:05:18 2005
+++ src/SearchDlg.cpp Sat Sep 24 20:23:18 2005
@@ -392,7 +392,7 @@ void CSearchDlg::StartNewSearch()
return;
}
- wxString typeText(wxT("Any")), extension;
+ wxString typeText(wxEmptyString), extension;
uint32 min = 0, max = 0, availability = 0;
if (CastChild(ID_EXTENDEDSEARCHCHECK, wxCheckBox)->GetValue()) {
@@ -418,28 +418,28 @@ void CSearchDlg::StartNewSearch()
switch ( CastChild( IDC_TypeSearch, wxChoice )->GetSelection() ) {
case 0:
- typeText = wxT("Any");
+ typeText = wxEmptyString;
break;
case 1:
- typeText = wxT("Archives");
+ typeText = ED2KFTSTR_ARCHIVE;
break;
case 2:
- typeText = wxT("Audio");
+ typeText = ED2KFTSTR_AUDIO;
break;
case 3:
- typeText = wxT("CD-Images");
+ typeText = ED2KFTSTR_CDIMAGE;
break;
case 4:
- typeText = wxT("Pictures");
+ typeText = ED2KFTSTR_IMAGE;
break;
case 5:
- typeText = wxT("Programs");
+ typeText = ED2KFTSTR_PROGRAM;
break;
case 6:
- typeText = wxT("Texts");
+ typeText = ED2KFTSTR_DOCUMENT;
break;
case 7:
- typeText = wxT("Videos");
+ typeText = ED2KFTSTR_VIDEO;
break;
default:
AddDebugLogLineM( true, logGeneral,

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_SearchList_cpp,v 1.1 2005/10/07 16:20:34 fgsch Exp $
--- src/SearchList.cpp.orig Fri Apr 1 21:05:19 2005
+++ src/SearchList.cpp Sat Sep 24 20:34:35 2005
@@ -407,10 +407,10 @@ bool CSearchList::AddToList(CSearchFile*
delete toadd;
return false;
}
-
+
// If the result was not the type user wanted, drop it.
if ( !bClientResponse &&
- !(m_resultType == wxString(wxT("Any")) ||
+ !(m_resultType == wxEmptyString ||
GetFiletypeByName(toadd->GetFileName(), false) == m_resultType)) {
AddDebugLogLineM( false, logSearch,
CFormat( wxT("Dropped result type %s != %s, file %s") )

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/06/07 17:24:49 fgsch Exp $
@comment $OpenBSD: PLIST,v 1.2 2006/10/12 14:18:53 alek Exp $
bin/amule
bin/ed2k
@comment lib/xchat/
@ -41,5 +41,87 @@ share/doc/amule/README
share/doc/amule/amulesig.txt
share/doc/amule/license.txt
@comment share/doc/amule/socks4.protocol
share/locale/
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/amule.mo
share/locale/bg/
share/locale/bg/LC_MESSAGES/
share/locale/bg/LC_MESSAGES/amule.mo
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/amule.mo
share/locale/da/
share/locale/da/LC_MESSAGES/
share/locale/da/LC_MESSAGES/amule.mo
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/amule.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/amule.mo
share/locale/en_US/
share/locale/en_US/LC_MESSAGES/
share/locale/en_US/LC_MESSAGES/amule.mo
share/locale/es/
share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/amule.mo
share/locale/es_MX/
share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/amule.mo
share/locale/et_EE/
share/locale/et_EE/LC_MESSAGES/
share/locale/et_EE/LC_MESSAGES/amule.mo
share/locale/eu/
share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/amule.mo
share/locale/fi/
share/locale/fi/LC_MESSAGES/
share/locale/fi/LC_MESSAGES/amule.mo
share/locale/fr/
share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/amule.mo
share/locale/gl/
share/locale/gl/LC_MESSAGES/
share/locale/gl/LC_MESSAGES/amule.mo
share/locale/hr/
share/locale/hr/LC_MESSAGES/
share/locale/hr/LC_MESSAGES/amule.mo
share/locale/hu/
share/locale/hu/LC_MESSAGES/
share/locale/hu/LC_MESSAGES/amule.mo
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/amule.mo
share/locale/it_CH/
share/locale/it_CH/LC_MESSAGES/
share/locale/it_CH/LC_MESSAGES/amule.mo
share/locale/ko_KR/
share/locale/ko_KR/LC_MESSAGES/
share/locale/ko_KR/LC_MESSAGES/amule.mo
share/locale/nl/
share/locale/nl/LC_MESSAGES/
share/locale/nl/LC_MESSAGES/amule.mo
share/locale/pl/
share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/amule.mo
share/locale/pt_BR/
share/locale/pt_BR/LC_MESSAGES/
share/locale/pt_BR/LC_MESSAGES/amule.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
share/locale/pt_PT/LC_MESSAGES/amule.mo
share/locale/ru/
share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/amule.mo
share/locale/sl/
share/locale/sl/LC_MESSAGES/
share/locale/sl/LC_MESSAGES/amule.mo
share/locale/zh_CN/
share/locale/zh_CN/LC_MESSAGES/
share/locale/zh_CN/LC_MESSAGES/amule.mo
share/locale/zh_TW/
share/locale/zh_TW/LC_MESSAGES/
share/locale/zh_TW/LC_MESSAGES/amule.mo
share/pixmaps/
share/pixmaps/amule.xpm