[SM-Commit] GIT changes to master grimoire by George Sherwood (da18e811ca798f38760995f8f2a2086f64398018)

George Sherwood scm at mail.sourcemage.org
Sat Nov 11 12:18:49 EST 2006


GIT changes to master grimoire by George Sherwood <chat at sourcemage.org>:

 chat-im/gaim-encryption/CONFLICTS                           |    1 
 chat-im/gaim-encryption/DETAILS                             |    2 
 chat-im/gaim-encryption/HISTORY                             |    6 ++
 chat-im/gaim-encryption/PRE_BUILD                           |    3 +
 chat-im/gaim-encryption/gaim-beta5.patch                    |   25 ++++++++++++
 chat-im/gaim-encryption/gaim-encryption-2.39.tar.gz.sig     |    0 
 chat-im/gaim-encryption/gaim-encryption-3.0beta6.tar.gz.sig |binary
 chat-im/gaim/DETAILS                                        |    3 -
 chat-im/gaim/HISTORY                                        |    5 ++
 chat-im/gaim/INSTALL                                        |    5 --
 chat-im/gaim/PROVIDES                                       |    1 
 dev/null                                                    |binary
 12 files changed, 43 insertions(+), 8 deletions(-)

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
      SOURCE_HASH=sha512:53212f274f24d809158c10c7caa9a58a09a4105b6bfb9d50186edabc73709460969bef044eaa9eb5d9d170c7240b098ff10cccea9a88c940ed361daa43188e9f          
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 else
-         VERSION=1.5.0
+         VERSION=2.0.0beta5
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=${SOURCE}.asc
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
@@ -23,7 +23,6 @@ fi
     DISTCC_HOSTS=
           CCACHE=off
          ENTERED=20011024
-         UPDATED=20040416
            SHORT="Instant messanger client for several protocols"
 cat << EOF
 gaim is an instant messanger client used primarly for the AIM protocol
diff --git a/chat-im/gaim/HISTORY b/chat-im/gaim/HISTORY
index 2f5a33f..10513bd 100644
--- a/chat-im/gaim/HISTORY
+++ b/chat-im/gaim/HISTORY
@@ -1,3 +1,8 @@
+2006-11-11 George Sherwood <george at beernabeer.com>
+	* DETAILS: Updated to 2.0beta5. Removed UPDATED.
+	* INSTALL: Removed
+	* PROVIDES: Added to provide GAIMIM
+
 2006-10-07 George Sherwood <george at beernabeer.com>
 	* DETAILS: Updated svn to 20061007
 	* INSTALL: For svn don't copy *.pl
diff --git a/chat-im/gaim/INSTALL b/chat-im/gaim/INSTALL
deleted file mode 100755
index ea1ba8e..0000000
--- a/chat-im/gaim/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-make_normal                      &&
-default_install 
-if  [  "$GAIM_CVS"  ==  "n"  ]; then
-cp  plugins/*.pl  ${INSTALL_ROOT}/usr/lib/gaim                  
-fi
diff --git a/chat-im/gaim/PROVIDES b/chat-im/gaim/PROVIDES
new file mode 100755
index 0000000..e2d2be2
--- /dev/null
+++ b/chat-im/gaim/PROVIDES
@@ -0,0 +1 @@
+GAIMIM



More information about the SM-Commit mailing list