From 0b6954ed8f02c8766955a71f6acd006802cf4b12 Mon Sep 17 00:00:00 2001
From: Aldas Nabazas <aldas@opensde.net>
Date: Fri, 14 Mar 2008 09:49:45 +0100
Subject: [PATCH] [openh323] Downdated (1.19.0.1 -> 1.18.0) and made it compile
 again

---
 network/openh323/gcc41.patch      | 52 -------------------------------
 network/openh323/header-fix.patch | 27 ++++++++++++++++
 network/openh323/openh323.desc    |  6 ++--
 3 files changed, 30 insertions(+), 55 deletions(-)
 delete mode 100644 network/openh323/gcc41.patch
 create mode 100644 network/openh323/header-fix.patch

diff --git a/network/openh323/gcc41.patch b/network/openh323/gcc41.patch
deleted file mode 100644
index 7fccc122c..000000000
--- a/network/openh323/gcc41.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../openh323/gcc41.patch
-# Copyright (C) 2006 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-#These are some includes which are missing from the source tarbal,
-#but are present in CVS, at the next upgrade they will be useless
-
-diff -ruN ./src.orig/h261codec.cxx ./src/h261codec.cxx
---- ./src.orig/h261codec.cxx	2006-06-06 11:05:40.000000000 +0300
-+++ ./src/h261codec.cxx	2006-09-06 23:25:09.000000000 +0300
-@@ -266,6 +266,7 @@
-  *
-  */
- 
-+#include <ptlib/video.h>
- #include <ptlib.h>
- 
- #ifdef __GNUC__
-diff -ruN ./src.orig/h323ep.cxx ./src/h323ep.cxx
---- ./src.orig/h323ep.cxx	2006-06-09 09:30:12.000000000 +0300
-+++ ./src/h323ep.cxx	2006-09-06 23:16:21.000000000 +0300
-@@ -788,6 +788,7 @@
- #include "../version.h"
- #include "h323pluginmgr.h"
- 
-+#include <ptlib/sound.h>
- #include <ptclib/random.h>
- #include <ptclib/pstun.h>
- #include <ptclib/url.h>
-diff -ruN ./src.orig/h4601.cxx ./src/h4601.cxx
---- ./src.orig/h4601.cxx	2006-06-11 03:17:43.000000000 +0300
-+++ ./src/h4601.cxx	2006-09-06 23:22:09.000000000 +0300
-@@ -55,6 +55,7 @@
- #pragma implementation "h4601.h"
- #endif
- 
-+#include <ptlib/pluginmgr.h>
- #include <h460.h>
- #include "h4601.h"
- #include <h323.h>
diff --git a/network/openh323/header-fix.patch b/network/openh323/header-fix.patch
new file mode 100644
index 000000000..15200f44b
--- /dev/null
+++ b/network/openh323/header-fix.patch
@@ -0,0 +1,27 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../openh323/header-fix.patch
+# Copyright (C) 2008 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+diff -Nur openh323_v1_18_0-orig/include/ixjlid.h openh323_v1_18_0/include/ixjlid.h
+--- openh323_v1_18_0-orig/include/ixjlid.h	2008-03-14 09:32:08.000000000 +0100
++++ openh323_v1_18_0/include/ixjlid.h	2008-03-14 09:32:54.000000000 +0100
+@@ -271,7 +271,6 @@
+ 
+ #ifdef P_LINUX
+ #include <linux/telephony.h>
+-#include <linux/compiler.h>
+ #include <linux/ixjuser.h>
+ #endif
+ 
diff --git a/network/openh323/openh323.desc b/network/openh323/openh323.desc
index ff9ba2b04..d0104f88a 100644
--- a/network/openh323/openh323.desc
+++ b/network/openh323/openh323.desc
@@ -3,7 +3,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../openh323/openh323.desc
-# Copyright (C) 2006 - 2007 The OpenSDE Project
+# Copyright (C) 2006 - 2008 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -51,7 +51,7 @@
 
 [L] MPL
 [S] Stable
-[V] 1.19.0.1
+[V] 1.18.0
 [P] X -----5---9 180.800
 
-[D] 3133164837 openh323-v1_19_0_1-src-tar.gz http://dl.sourceforge.net/sourceforge/openh323/
+[D] 1991688181 openh323-v1_18_0-src-tar.gz http://dl.sourceforge.net/sourceforge/openh323/