Add some EBook file types

(upstream git commit 6c838fc0d67d86ca22e9c793b88badd8a3258b6c)

Add missing semicolon
(upstream git commit 7c67f345702595e6ba9bd29b12734451decb24d8)
This commit is contained in:
dcoppa 2013-08-13 12:46:15 +00:00
parent 99118ef258
commit 89dc9a0c1b
3 changed files with 43 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.40 2013/03/14 12:57:36 dcoppa Exp $
# $OpenBSD: Makefile,v 1.41 2013/08/13 12:46:15 dcoppa Exp $
COMMENT-main = another eDonkey P2P file sharing client
COMMENT-web = webserver interface to amuled
@ -6,7 +6,7 @@ COMMENT-daemon =stand-alone daemon/cmdline for amule
V = 2.3.1
DISTNAME = aMule-$V
REVISION = 12
REVISION = 13
CATEGORIES = net
HOMEPAGE = http://www.amule.org/

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-src_OtherFunctions_cpp,v 1.3 2013/08/13 12:46:15 dcoppa Exp $
Add some EBook file types
(upstream git commit 6c838fc0d67d86ca22e9c793b88badd8a3258b6c)
--- src/OtherFunctions.cpp.orig Mon Jun 13 10:50:25 2011
+++ src/OtherFunctions.cpp Tue Aug 13 16:06:18 2013
@@ -902,14 +902,17 @@ class CED2KFileTypes{ (public)
ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".sub"), ED2KFT_CDIMAGE)); // Subtitle File
ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".toast"), ED2KFT_CDIMAGE)); // Toast Disc Image
+ ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".azw"), ED2KFT_DOCUMENT)); // EBook File
ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".chm"), ED2KFT_DOCUMENT)); // Compiled HTML Help File
ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".css"), ED2KFT_DOCUMENT)); // Cascading Style Sheet
ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".diz"), ED2KFT_DOCUMENT)); // Description in Zip File
ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".doc"), ED2KFT_DOCUMENT)); // Document File
ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dot"), ED2KFT_DOCUMENT)); // Document Template File
+ ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".epub"), ED2KFT_DOCUMENT)); // EBook File
ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".hlp"), ED2KFT_DOCUMENT)); // Help File
ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".htm"), ED2KFT_DOCUMENT)); // HTML File
ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".html"), ED2KFT_DOCUMENT)); // HTML File
+ ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mobi"), ED2KFT_DOCUMENT)); // EBook File
ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".nfo"), ED2KFT_DOCUMENT)); // Warez Information File
ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".odp"), ED2KFT_DOCUMENT)); // OpenDocument Presentation
ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ods"), ED2KFT_DOCUMENT)); // OpenDocument Spreadsheet

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_webserver_src_php_parser_y,v 1.1 2013/08/13 12:46:15 dcoppa Exp $
Add missing semicolon
(upstream git commit 7c67f345702595e6ba9bd29b12734451decb24d8)
--- src/webserver/src/php_parser.y.orig Tue Aug 13 16:03:00 2013
+++ src/webserver/src/php_parser.y Tue Aug 13 16:03:22 2013
@@ -242,7 +242,7 @@ static_var : VARIABLE { $1->var_node->flags |= PHP_
function_decl_statement:
FUNCTION IDENT {
- switch_push_scope_table(make_scope_table())
+ switch_push_scope_table(make_scope_table());
} '(' parameter_list ')' '{' top_statement_list '}' {
$$ = make_func_decl_syn_node($2, $5);
$$->func_decl->scope = g_current_scope;