[SM-Commit] GIT changes to master grimoire by Alexander Tsamutali (1835fdfd4de8f552a9d102fc2fa21602da1c7fd4)

Alexander Tsamutali scm at sourcemage.org
Sat Dec 1 15:55:02 EST 2007


GIT changes to master grimoire by Alexander Tsamutali <astsmtl at gmail.com>:

 dev/null                             |binary
 editors/gobby/BUILD                  |    2 
 editors/gobby/DEPENDS                |    4 
 editors/gobby/DETAILS                |    8 -
 editors/gobby/HISTORY                |    6 +
 editors/gobby/PRE_BUILD              |    3 
 editors/gobby/gobby-0.4.1.tar.gz.sig |    0 
 editors/gobby/gtksourceview2.patch   |  196 +++++++++++++++++++++++++++++++++++
 gnome2-libs/gtksourceview/DEPENDS    |    4 
 gnome2-libs/gtksourceview/HISTORY    |    3 
 libs/obby/DEPENDS                    |    7 -
 libs/obby/DETAILS                    |    7 -
 libs/obby/HISTORY                    |    4 
 libs/obby/obby-0.4.1.tar.gz.sig      |    0 
 net/net6/DETAILS                     |    7 -
 net/net6/HISTORY                     |    4 
 net/net6/net6-1.3.1.tar.gz.sig       |    0 
 net/sobby/DETAILS                    |    7 -
 net/sobby/HISTORY                    |    4 
 net/sobby/sobby-0.4.1.tar.gz.sig     |    0 
 20 files changed, 242 insertions(+), 24 deletions(-)

New commits:
commit 82c3b1be58e05ac9157f6d994e67372cc26efa32
Author: Alexander Tsamutali <astsmtl at gmail.com>
Commit: Alexander Tsamutali <astsmtl at gmail.com>

    net/sobby: updated to 0.4.4

commit f3f0bd2af628e2178d3ec93b9ecd48828f25e907
Author: Alexander Tsamutali <astsmtl at gmail.com>
Commit: Alexander Tsamutali <astsmtl at gmail.com>

    editors/gobby: updated to 0.4.5, made howl optional, fixed building

commit 901fc62e0420ef4a6fdd47d0cfc591b39a8d181e
Author: Alexander Tsamutali <astsmtl at gmail.com>
Commit: Alexander Tsamutali <astsmtl at gmail.com>

    gnome2-libs/gtksourceview: doesn't depend on libgnomeui and libgnomeprintui

commit e42f308e4a38880892d8d362ad95d9115ff31062
Author: Alexander Tsamutali <astsmtl at gmail.com>
Commit: Alexander Tsamutali <astsmtl at gmail.com>

    libs/obby: updated to 0.4.4

commit e027e1679203717ab698bca84ceac20df20271b5
Author: Alexander Tsamutali <astsmtl at gmail.com>
Commit: Alexander Tsamutali <astsmtl at gmail.com>

    net/net6: updated to 1.3.5

diff --git a/editors/gobby/BUILD b/editors/gobby/BUILD
new file mode 100755
index 0000000..fc1e82b
--- /dev/null
+++ b/editors/gobby/BUILD
@@ -0,0 +1,2 @@
+OPTS="$OPTS --with-gtksourceview2" &&
+default_build
diff --git a/editors/gobby/DEPENDS b/editors/gobby/DEPENDS
index a03de2f..c407605 100755
--- a/editors/gobby/DEPENDS
+++ b/editors/gobby/DEPENDS
@@ -1,5 +1,5 @@
 depends obby           &&
-depends howl           &&
 depends libxml++       &&
 depends gtkmm2         &&
-depends gtksourceview
+depends gtksourceview  &&
+optional_depends howl
diff --git a/editors/gobby/DETAILS b/editors/gobby/DETAILS
index aa17ab4..0226d24 100755
--- a/editors/gobby/DETAILS
+++ b/editors/gobby/DETAILS
@@ -1,12 +1,12 @@
            SPELL=gobby
-         VERSION=0.4.1
+         VERSION=0.4.5
           SOURCE=${SPELL}-${VERSION}.tar.gz
    SOURCE_URL[0]=http://releases.0x539.de/${SPELL}/${SOURCE}
-      SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+#      SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+     SOURCE_HASH=sha512:30247dbe06460184b56d2a5aa4f4ff5648e302a0b21537ac30fdece4638892513a37896d3e31c414fb31f4eefab3d6c70d49b726d7442476be0940e13d32ef75
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-        WEB_SITE=http://gobby.0x539.de/index.html
+        WEB_SITE=http://gobby.0x539.de/
          ENTERED=20050930
-      PATCHLEVEL=0
       LICENSE[0]=GPL
         KEYWORDS="editors"
            SHORT="collaborative editor"
diff --git a/editors/gobby/HISTORY b/editors/gobby/HISTORY
index 4faa9d5..5830752 100644
--- a/editors/gobby/HISTORY
+++ b/editors/gobby/HISTORY
@@ -1,3 +1,9 @@
+2007-12-02 Alexander Tsamutali <astsmtl at gmail.com>
+	* DETAILS: updated spell to 0.4.5
+	  fixed WEB_SITE
+	* DEPENDS: made howl optional
+	* PRE_BUILD, BUILD, gtksourceview2.patch: added to fix building
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/editors/gobby/PRE_BUILD b/editors/gobby/PRE_BUILD
new file mode 100755
index 0000000..3ffb71a
--- /dev/null
+++ b/editors/gobby/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < ${SPELL_DIRECTORY}/gtksourceview2.patch
diff --git a/editors/gobby/gobby-0.4.1.tar.gz.sig b/editors/gobby/gobby-0.4.1.tar.gz.sig
deleted file mode 100644
index 70c0e59..0000000
Binary files a/editors/gobby/gobby-0.4.1.tar.gz.sig and /dev/null differ
diff --git a/editors/gobby/gtksourceview2.patch b/editors/gobby/gtksourceview2.patch
new file mode 100644
index 0000000..9b9b17a
--- /dev/null
+++ b/editors/gobby/gtksourceview2.patch
@@ -0,0 +1,196 @@
+Index: src/preferencesdialog.cpp
+===================================================================
+--- src/preferencesdialog.cpp (revision 1623)
++++ src/preferencesdialog.cpp (revision 1663)
+@@ -350,12 +350,17 @@
+ {
+ #ifdef WITH_GTKSOURCEVIEW2
+-	const GSList* list =
+-		gtk_source_language_manager_list_languages(lang_mgr);
++	GSList* languages = NULL;
++	const gchar* const* ids = gtk_source_language_manager_get_language_ids(lang_mgr);
++	for(const gchar* const* id = ids; *id != NULL; ++ id)
++	{
++		GtkSourceLanguage* language = gtk_source_language_manager_get_language(lang_mgr, *id);
++		languages = g_slist_prepend(languages, language);
++	}
+ #else
+ 	const GSList* list =
+ 		gtk_source_languages_manager_get_available_languages(lang_mgr);
++	GSList* languages = g_slist_copy(const_cast<GSList*>(list));
+ #endif
+ 
+-	GSList* languages = g_slist_copy(const_cast<GSList*>(list));
+ 	languages = g_slist_sort(languages, &lang_sort);
+ 
+@@ -521,11 +526,11 @@
+ {
+ #ifdef WITH_GTKSOURCEVIEW2
+-	const GSList* list =
+-		gtk_source_language_manager_list_languages(m_lang_mgr);
++	const gchar* const* ids = gtk_source_language_manager_get_language_ids(m_lang_mgr);
+ 
+ 	GtkSourceLanguage* lang = NULL;
+-	for(; list != NULL; list = list->next)
+-	{
+-		GtkSourceLanguage* language = GTK_SOURCE_LANGUAGE(list->data);
++	for(const gchar* const* id = ids; *id != NULL; ++ id)
++	{
++		GtkSourceLanguage* language = gtk_source_language_manager_get_language(m_lang_mgr, *id);
++
+ 		gchar** mime_types = gtk_source_language_get_mime_types(language);
+ 		for(gchar** mime_type = mime_types; *mime_type != NULL; ++ mime_type)
+Index: src/header.cpp
+===================================================================
+--- src/header.cpp (revision 1623)
++++ src/header.cpp (revision 1663)
+@@ -98,5 +98,5 @@
+ 
+ 			// Not an ASCII character, or a dangerous one?
+-			if(c == '<' || c == '>' || c == '\"' || c > 0x7f)
++			if(c == '<' || c == '>' || c == '\"' || c > 0x7f || Glib::Unicode::isspace(c))
+ 			{
+ 				// Get next iter to find the end position
+@@ -611,13 +611,19 @@
+ 	// Get available languages
+ #ifdef WITH_GTKSOURCEVIEW2
+-	const GSList* list = gtk_source_language_manager_list_languages(
+-		lang_mgr);
++	GSList* lang_list = NULL;
++	const gchar* const* ids = gtk_source_language_manager_get_language_ids(lang_mgr);
++	for(const gchar* const* id = ids; *id != NULL; ++ id)
++	{
++		GtkSourceLanguage* language = gtk_source_language_manager_get_language(lang_mgr, *id);
++		lang_list = g_slist_prepend(lang_list, language);
++	}
+ #else
+ 	const GSList* list = gtk_source_languages_manager_get_available_languages(
+ 		lang_mgr);
++
++	// Copy the list, so we can sort languages by name
++	GSList* lang_list = g_slist_copy(const_cast<GSList*>(list));
+ #endif
+ 
+-	// Copy the last, so we can sort languages by name
+-	GSList* lang_list = g_slist_copy(const_cast<GSList*>(list));
+ 	lang_list = g_slist_sort(lang_list, &language_sort_callback);
+ 
+Index: src/docwindow.cpp
+===================================================================
+--- src/docwindow.cpp (revision 1623)
++++ src/docwindow.cpp (revision 1663)
+@@ -17,10 +17,11 @@
+  */
+ 
++#include "features.hpp"
++
+ #include <glibmm/pattern.h>
+ #include <gtkmm/textview.h>
+ 
+-#include "features.hpp"
+ #ifdef WITH_GTKSOURCEVIEW2
+-# include <gtksourceview/gtksourcestylemanager.h>
++# include <gtksourceview/gtksourcebuffer.h>
+ #endif
+ 
+@@ -70,5 +71,5 @@
+ 
+ 	// Set source language by filename
+-	gtk_source_buffer_set_highlight(buffer, FALSE);
++	gtk_source_buffer_set_highlight_syntax(buffer, FALSE);
+ 
+ 	for(Preferences::FileList::iterator iter = preferences.files.begin();
+@@ -80,5 +81,5 @@
+ 		{
+ 			gtk_source_buffer_set_language(buffer, iter.language());
+-			gtk_source_buffer_set_highlight(buffer, TRUE);
++			gtk_source_buffer_set_highlight_syntax(buffer, TRUE);
+ 		}
+ 	}
+@@ -88,8 +89,8 @@
+ 	// TODO: This should be temporary code until gtksourceview2 sets a default
+ 	// theme.
+-	GtkSourceStyleManager* sm = gtk_source_style_manager_new();
++/*	GtkSourceStyleManager* sm = gtk_source_style_manager_new();
+ 	GtkSourceStyleScheme* scheme = gtk_source_style_manager_get_scheme(sm, "gvim");
+ 	gtk_source_buffer_set_style_scheme(buffer, scheme);
+-	g_object_unref(G_OBJECT(sm));
++	g_object_unref(G_OBJECT(sm));*/
+ #endif
+ 
+@@ -225,5 +226,5 @@
+ 
+ 	gtk_source_buffer_set_language(buffer, language);
+-	gtk_source_buffer_set_highlight(buffer, language != NULL);
++	gtk_source_buffer_set_highlight_syntax(buffer, language != NULL);
+ 
+ 	m_signal_language_changed.emit();
+@@ -343,5 +344,5 @@
+ 	GtkTextBuffer* buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(m_view));
+ 
+-	gtk_source_view_set_tabs_width(GTK_SOURCE_VIEW(m_view),
++	gtk_source_view_set_tab_width(GTK_SOURCE_VIEW(m_view),
+ 		m_preferences.editor.tab_width);
+ 	gtk_source_view_set_insert_spaces_instead_of_tabs(GTK_SOURCE_VIEW(m_view),
+@@ -365,9 +366,9 @@
+ 	gtk_source_view_set_highlight_current_line(GTK_SOURCE_VIEW(m_view),
+ 		m_preferences.view.curline_highlight);
+-	gtk_source_view_set_show_margin(GTK_SOURCE_VIEW(m_view),
++	gtk_source_view_set_show_right_margin(GTK_SOURCE_VIEW(m_view),
+ 		m_preferences.view.margin_display);
+-	gtk_source_view_set_margin(GTK_SOURCE_VIEW(m_view),
++	gtk_source_view_set_right_margin_position(GTK_SOURCE_VIEW(m_view),
+ 		m_preferences.view.margin_pos);
+-	gtk_source_buffer_set_check_brackets(GTK_SOURCE_BUFFER(buffer),
++	gtk_source_buffer_set_highlight_matching_brackets(GTK_SOURCE_BUFFER(buffer),
+ 		m_preferences.view.bracket_highlight);
+ 
+Index: src/preferences.cpp
+===================================================================
+--- src/preferences.cpp (revision 1641)
++++ src/preferences.cpp (revision 1663)
+@@ -33,13 +33,16 @@
+ 	{
+ #ifdef WITH_GTKSOURCEVIEW2
+-		const GSList* list =
+-			gtk_source_language_manager_list_languages(manager);
+-
+-		for(; list != NULL; list = list->next)
++		const gchar* const* ids = gtk_source_language_manager_get_language_ids(manager);
++
++		for(const gchar* const* id = ids; *id != NULL; ++ id)
+ 		{
++			GtkSourceLanguage* language = gtk_source_language_manager_get_language(manager, *id);
++			g_assert(language != NULL);
++
+ 			gchar** mime_types =
+ 				gtk_source_language_get_mime_types(
+-					GTK_SOURCE_LANGUAGE(list->data)
++					GTK_SOURCE_LANGUAGE(language)
+ 				);
++
+ 			if(mime_types != NULL)
+ 			{
+@@ -49,5 +52,5 @@
+ 					{
+ 						g_strfreev(mime_types);
+-						return GTK_SOURCE_LANGUAGE(list->data);
++						return language;
+ 					}
+ 				}
+@@ -252,10 +255,10 @@
+ 	{
+ #ifdef WITH_GTKSOURCEVIEW2
+-		const GSList* list = gtk_source_language_manager_list_languages(
+-			lang_mgr);
+-
+-		for(; list != NULL; list = list->next)
++		const gchar* const* ids = gtk_source_language_manager_get_language_ids(lang_mgr);
++
++		for(const gchar* const* id = ids; *id != NULL; ++ id)
+ 		{
+-			GtkSourceLanguage* language = GTK_SOURCE_LANGUAGE(list->data);
++			GtkSourceLanguage* language = gtk_source_language_manager_get_language(lang_mgr, *id);
++
+ 			gchar** globs = gtk_source_language_get_globs(language);
+ 			if(globs != NULL)
diff --git a/gnome2-libs/gtksourceview/DEPENDS b/gnome2-libs/gtksourceview/DEPENDS
index 558fec7..8aef5f0 100755
--- a/gnome2-libs/gtksourceview/DEPENDS
+++ b/gnome2-libs/gtksourceview/DEPENDS
@@ -1,6 +1,4 @@
-depends gtk+2           &&
-depends libgnomeui      &&
-depends libgnomeprintui &&
+depends gtk+2 &&
 
 optional_depends gtk-doc                            \
                  "--enable-gtk-doc"                 \
diff --git a/gnome2-libs/gtksourceview/HISTORY b/gnome2-libs/gtksourceview/HISTORY
index d8f3cd8..cd64116 100644
--- a/gnome2-libs/gtksourceview/HISTORY
+++ b/gnome2-libs/gtksourceview/HISTORY
@@ -1,3 +1,6 @@
+2007-12-02 Alexander Tsamutali <astsmtl at gmail.com>
+	* DEPENDS: doesn't depend on libgnomeui and libgnomeprintui
+
 2007-11-26 Robin Cook <rcook at wyrms.net>
 	* DETAILS: updated VERSION to 2.0.2
 
diff --git a/libs/obby/DEPENDS b/libs/obby/DEPENDS
index 8466843..d65e2cd 100755
--- a/libs/obby/DEPENDS
+++ b/libs/obby/DEPENDS
@@ -1,4 +1,5 @@
-depends net6      &&
-depends libgcrypt &&
-depends gnutls    &&
+depends libsigc++3 &&
+depends net6       &&
+depends libgcrypt  &&
+depends gnutls     &&
 depends -sub GMP_CXX gmp
diff --git a/libs/obby/DETAILS b/libs/obby/DETAILS
index 00ec494..03ebe53 100755
--- a/libs/obby/DETAILS
+++ b/libs/obby/DETAILS
@@ -1,12 +1,11 @@
            SPELL=obby
-         VERSION=0.4.1
+         VERSION=0.4.4
           SOURCE=${SPELL}-${VERSION}.tar.gz
    SOURCE_URL[0]=http://releases.0x539.de/${SPELL}/${SOURCE}
-      SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+     SOURCE_HASH=sha512:d4bf48127bf5ae65cadfd51bea15c6935b764160b2d7904600b7e40078c251e8e9df35db45e889b5aa1132eae0bbd391ecc02c699e7becf401a8259980c98928
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-        WEB_SITE=http://gobby.0x539.de/index.html
+        WEB_SITE=http://gobby.0x539.de/
          ENTERED=20050930
-      PATCHLEVEL=0
       LICENSE[0]=GPL
         KEYWORDS="libs"
            SHORT="library which provides synced document buffers"
diff --git a/libs/obby/HISTORY b/libs/obby/HISTORY
index b046cef..e75bac7 100644
--- a/libs/obby/HISTORY
+++ b/libs/obby/HISTORY
@@ -1,3 +1,7 @@
+2007-11-15 Alexander Tsamutali <astsmtl at gmail.com>
+	* DETAILS: updated spell to 0.4.4, fixed WEB_SITE
+	* DEPENDS: added libsigc++3
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/libs/obby/obby-0.4.1.tar.gz.sig b/libs/obby/obby-0.4.1.tar.gz.sig
deleted file mode 100644
index 8134a5a..0000000
Binary files a/libs/obby/obby-0.4.1.tar.gz.sig and /dev/null differ
diff --git a/net/net6/DETAILS b/net/net6/DETAILS
index ff33966..990ad45 100755
--- a/net/net6/DETAILS
+++ b/net/net6/DETAILS
@@ -1,12 +1,11 @@
            SPELL=net6
-         VERSION=1.3.1
+         VERSION=1.3.5
           SOURCE=${SPELL}-${VERSION}.tar.gz
    SOURCE_URL[0]=http://releases.0x539.de/${SPELL}/${SOURCE}
-      SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+     SOURCE_HASH=sha512:3b561196997c914464e4aecfc5b9ba05056a38d495d159ef9899546bfac551a3776d5ac00406f671cf1ec7c81baa1a4fbb470fe406646a9a80c4781819da5480
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-        WEB_SITE=http://gobby.0x539.de/index.html
+        WEB_SITE=http://gobby.0x539.de/
          ENTERED=20050930
-      PATCHLEVEL=0
       LICENSE[0]=LGPL
         KEYWORDS="net"
            SHORT="TCP protocol abstraction for C++"
diff --git a/net/net6/HISTORY b/net/net6/HISTORY
index 4df28b6..47bc68b 100644
--- a/net/net6/HISTORY
+++ b/net/net6/HISTORY
@@ -1,3 +1,7 @@
+2007-11-15 Alexander Tsamutali <astsmtl at gmail.com>
+	* DETAILS: updated spell to 1.3.5
+	  fixed WEB_SITE
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/net/net6/net6-1.3.1.tar.gz.sig b/net/net6/net6-1.3.1.tar.gz.sig
deleted file mode 100644
index b35a52c..0000000
Binary files a/net/net6/net6-1.3.1.tar.gz.sig and /dev/null differ
diff --git a/net/sobby/DETAILS b/net/sobby/DETAILS
index 82b60a0..f30fef1 100755
--- a/net/sobby/DETAILS
+++ b/net/sobby/DETAILS
@@ -1,12 +1,11 @@
            SPELL=sobby
-         VERSION=0.4.1
+         VERSION=0.4.4
           SOURCE=${SPELL}-${VERSION}.tar.gz
       SOURCE_URL=http://releases.0x539.de/${SPELL}/${SOURCE}
-      SOURCE_GPG=gurus.gpg:${SOURCE}.sig
+     SOURCE_HASH=sha512:2c308254b16abad4433c150aa2a5d08b1fb02aed08040529b08aff383c70006e6fc118f8210f084e1d4256f8aead48c2f95286b273fe7f5b67cd3dcaa9f069a8
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-        WEB_SITE=http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/WikiStart
+        WEB_SITE=http://gobby.0x539.de/
          ENTERED=20060625
-      PATCHLEVEL=0
       LICENSE[0]=GPL
            SHORT="standalone obby server"
 cat << EOF
diff --git a/net/sobby/HISTORY b/net/sobby/HISTORY
index 40159bf..8d03f76 100644
--- a/net/sobby/HISTORY
+++ b/net/sobby/HISTORY
@@ -1,3 +1,7 @@
+2007-12-02 Alexander Tsamutali <astsmtl at gmail.com>
+	* DETAILS: updated spell to 0.4.4
+	  fixed WEB_SITE
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/net/sobby/sobby-0.4.1.tar.gz.sig b/net/sobby/sobby-0.4.1.tar.gz.sig
deleted file mode 100644
index c46bf90..0000000
Binary files a/net/sobby/sobby-0.4.1.tar.gz.sig and /dev/null differ



More information about the SM-Commit mailing list