New commits:
commit 2540994c15aeec719504d5e8525d455eb1aa42cc
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>
gaim, gaim-encryption: Updated to gaim 2.0.0beta5.
diff --git a/chat-im/gaim-encryption/CONFLICTS
b/chat-im/gaim-encryption/CONFLICTS
new file mode 100755
index 0000000..709edd3
--- /dev/null
+++ b/chat-im/gaim-encryption/CONFLICTS
@@ -0,0 +1 @@
+conflicts gaim-encryption-1.5
diff --git a/chat-im/gaim-encryption/DETAILS b/chat-im/gaim-encryption/DETAILS
index eb4a917..5a51009 100755
--- a/chat-im/gaim-encryption/DETAILS
+++ b/chat-im/gaim-encryption/DETAILS
@@ -6,7 +6,7 @@ if [ "$CVS" == "y" ]; then
FORCE_DOWNLOAD=1
SOURCE_IGNORE=volatile
else
- VERSION=2.39
+ VERSION=3.0beta6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/chat-im/gaim-encryption/HISTORY b/chat-im/gaim-encryption/HISTORY
index 259ba86..d45d61e 100644
--- a/chat-im/gaim-encryption/HISTORY
+++ b/chat-im/gaim-encryption/HISTORY
@@ -1,3 +1,9 @@
+2006-11-11 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 3.0beta6 for gaim 2.0
+ * CONFLICTS: Conflicts with gaim1.5
+ * PRE_BUILD: Added patch to build with gaim2.0.0beta5 vice beta4
+ * gaim-beta5.patch: Added file to build with gaim2.0.0beta5
+
2006-09-17 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.3.9. Removed UPDATED & BUILD_API
Added Keywords. Cleaned up alignment.
diff --git a/chat-im/gaim-encryption/PRE_BUILD
b/chat-im/gaim-encryption/PRE_BUILD
index cc1f6d0..f64388b 100755
--- a/chat-im/gaim-encryption/PRE_BUILD
+++ b/chat-im/gaim-encryption/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+
if [ "$CVS" == "y" ]
then
NOCONFIGURE=Y ./autogen.sh
+else
+ patch -p0 < $SCRIPT_DIRECTORY/gaim-beta5.patch
fi
diff --git a/chat-im/gaim-encryption/gaim-beta5.patch
b/chat-im/gaim-encryption/gaim-beta5.patch
new file mode 100644
index 0000000..ca1fe73
--- /dev/null
+++ b/chat-im/gaim-encryption/gaim-beta5.patch
@@ -0,0 +1,25 @@
+--- state_ui.h.orig 2006-11-11 18:32:15.000000000 +0400
++++ state_ui.h 2006-11-11 18:33:18.000000000 +0400
+@@ -16,22 +16,6 @@
+ #include <gtklog.h>
+ #include <gtkutils.h>
+
+-/* this got stripped from gtklog, so it is in here for now: */
+-struct _GaimGtkLogViewer {
+- GList *logs; /**< The list of logs viewed in this
viewer */
+-
+- GtkWidget *window; /**< The viewer's window
*/
+- GtkTreeStore *treestore; /**< The treestore containing said logs
*/
+- GtkWidget *treeview; /**< The treeview representing said
treestore */
+- GtkWidget *imhtml; /**< The imhtml to display said logs
*/
+- GtkWidget *entry; /**< The search entry, in which search
terms
+- * are entered
*/
+- GaimLogReadFlags flags; /**< The most recently used log flags
*/
+- char *search; /**< The string currently being searched
for */
+- GtkWidget *label; /**< The label at the top of the log
viewer */
+-};
+-typedef struct _GaimGtkLogViewer GaimGtkLogViewer;
+-
+ void GE_state_ui_init();
+ void GE_state_ui_delete();
+
diff --git a/chat-im/gaim-encryption/gaim-encryption-2.39.tar.gz.sig
b/chat-im/gaim-encryption/gaim-encryption-2.39.tar.gz.sig
deleted file mode 100644
index 2f02067..0000000
Binary files a/chat-im/gaim-encryption/gaim-encryption-2.39.tar.gz.sig and
/dev/null differ
diff --git a/chat-im/gaim-encryption/gaim-encryption-3.0beta6.tar.gz.sig
b/chat-im/gaim-encryption/gaim-encryption-3.0beta6.tar.gz.sig
new file mode 100644
index 0000000..b3e5d77
Binary files /dev/null and
b/chat-im/gaim-encryption/gaim-encryption-3.0beta6.tar.gz.sig differ
diff --git a/chat-im/gaim/DETAILS b/chat-im/gaim/DETAILS
index 122e941..3f3339c 100755
--- a/chat-im/gaim/DETAILS
+++ b/chat-im/gaim/DETAILS
@@ -9,7 +9,7 @@ if [ "$GAIM_CVS" == "y" ]; then