[arch-commits] Commit in ejabberd-mod_archive-svn/trunk (PKGBUILD build-fix.patch)

[Sergej Pupykin]

    Date: Monday, November 11, 2013 @ 13:50:20
  Author: spupykin
Revision: 100820

Added:
  ejabberd-mod_archive-svn/trunk/build-fix.patch
Modified:
  ejabberd-mod_archive-svn/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   12 ++++++--
 build-fix.patch |   73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-11 12:06:03 UTC (rev 100819)
+++ PKGBUILD	2013-11-11 12:50:20 UTC (rev 100820)
@@ -12,13 +12,19 @@
 depends=('ejabberd')
 makedepends=('subversion')
 options=()
-source=("git://github.com/processone/ejabberd-contrib.git")
-md5sums=('SKIP')
+source=("git://github.com/processone/ejabberd-contrib.git"
+	"build-fix.patch")
+md5sums=('SKIP'
+         'ca7c6731536084aa4cd036735c48b200')
 
+prepare() {
+  cd $srcdir/ejabberd-contrib
+  patch -p1 <$srcdir/build-fix.patch
+}
+
 build() {
   cd $srcdir/ejabberd-contrib/mod_archive
   ./build.sh
-  rm -rf ebin/.svn
 }
 
 package() {

Added: build-fix.patch
===================================================================
--- build-fix.patch	                        (rev 0)
+++ build-fix.patch	2013-11-11 12:50:20 UTC (rev 100820)
@@ -0,0 +1,73 @@
+diff --git a/ejabberd-dev/src/gen_mod.erl b/ejabberd-dev/src/gen_mod.erl
+index f824ff7..5245dc6 100644
+--- a/ejabberd-dev/src/gen_mod.erl
++++ b/ejabberd-dev/src/gen_mod.erl
+@@ -39,6 +39,7 @@
+ %%-export([behaviour_info/1]).
+ 
+ -include("ejabberd.hrl").
++-include("logger.hrl").
+ 
+ -record(ejabberd_module,
+         {module_host = {undefined, <<"">>} :: {atom(), binary()},
+diff --git a/mod_archive/src/mod_archive_odbc.erl b/mod_archive/src/mod_archive_odbc.erl
+index d25ab19..a01ac32 100644
+--- a/mod_archive/src/mod_archive_odbc.erl
++++ b/mod_archive/src/mod_archive_odbc.erl
+@@ -83,6 +83,7 @@
+          terminate/2, code_change/3]).
+ 
+ -include("ejabberd.hrl").
++-include("logger.hrl").
+ -include("jlib.hrl").
+ 
+ -record(state, {host,
+diff --git a/mod_archive/src/mod_archive_webview.erl b/mod_archive/src/mod_archive_webview.erl
+index d8a5fa2..1ebdfd9 100644
+--- a/mod_archive/src/mod_archive_webview.erl
++++ b/mod_archive/src/mod_archive_webview.erl
+@@ -14,9 +14,10 @@
+ 	]).
+ 
+ -include("ejabberd.hrl").
++-include("logger.hrl").
++-include("ejabberd_web_admin.hrl").
+ -include("jlib.hrl").
+--include("web/ejabberd_http.hrl").
+--include("web/ejabberd_web_admin.hrl"). %for all the defines
++-include("ejabberd_http.hrl").
+ 
+ -define(LINK(L) , "/archive/" ++ L).
+ %-define(P(Els), ?XE("p", Els)).
+diff --git a/mod_muc_admin/src/mod_muc_admin.erl b/mod_muc_admin/src/mod_muc_admin.erl
+index 07af7cf..de06595 100644
+--- a/mod_muc_admin/src/mod_muc_admin.erl
++++ b/mod_muc_admin/src/mod_muc_admin.erl
+@@ -30,9 +30,9 @@
+ 
+ -include("ejabberd.hrl").
+ -include("jlib.hrl").
+--include("mod_muc/mod_muc_room.hrl").
+--include("web/ejabberd_http.hrl").
+--include("web/ejabberd_web_admin.hrl").
++-include("mod_muc_room.hrl").
++-include("ejabberd_http.hrl").
++-include("ejabberd_web_admin.hrl").
+ -include("ejabberd_commands.hrl").
+ 
+ %% Copied from mod_muc/mod_muc.erl
+diff --git a/mod_muc_log_http/src/mod_muc_log_http.erl b/mod_muc_log_http/src/mod_muc_log_http.erl
+index f6b52ee..e39c88f 100644
+--- a/mod_muc_log_http/src/mod_muc_log_http.erl
++++ b/mod_muc_log_http/src/mod_muc_log_http.erl
+@@ -19,8 +19,8 @@
+ 
+ -include("ejabberd.hrl").
+ -include("jlib.hrl").
+--include("web/ejabberd_http.hrl").
+--include("mod_muc/mod_muc_room.hrl").
++-include("ejabberd_http.hrl").
++-include("mod_muc_room.hrl").
+ -include_lib("kernel/include/file.hrl").
+ 
+ -define(PROCNAME, mod_muc_log_http).