r59588 - in /trunk/libgtk2-sourceview2-perl: ./ debian/ lib/Gtk2/ t/ xs/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Jun 19 11:54:29 UTC 2010
Author: gregoa
Date: Sat Jun 19 11:54:20 2010
New Revision: 59588
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=59588
Log:
New upstream release.
Modified:
trunk/libgtk2-sourceview2-perl/Changes
trunk/libgtk2-sourceview2-perl/MANIFEST.SKIP
trunk/libgtk2-sourceview2-perl/META.yml
trunk/libgtk2-sourceview2-perl/debian/changelog
trunk/libgtk2-sourceview2-perl/gtk2-sourceview2-perl.h
trunk/libgtk2-sourceview2-perl/lib/Gtk2/SourceView2.pm
trunk/libgtk2-sourceview2-perl/t/GtkSourcePrintCompositor.t
trunk/libgtk2-sourceview2-perl/t/GtkSourceView.t
trunk/libgtk2-sourceview2-perl/xs/GtkSourceIter.xs
trunk/libgtk2-sourceview2-perl/xs/GtkSourceLanguage.xs
trunk/libgtk2-sourceview2-perl/xs/GtkSourceLanguageManager.xs
trunk/libgtk2-sourceview2-perl/xs/GtkSourceStyleScheme.xs
trunk/libgtk2-sourceview2-perl/xs/GtkSourceStyleSchemeManager.xs
Modified: trunk/libgtk2-sourceview2-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-sourceview2-perl/Changes?rev=59588&op=diff
==============================================================================
--- trunk/libgtk2-sourceview2-perl/Changes (original)
+++ trunk/libgtk2-sourceview2-perl/Changes Sat Jun 19 11:54:20 2010
@@ -1,4 +1,8 @@
Revision history for Gtk2::SourceView2.
+
+0.10 Sun May 30 23:35:52 CEST 2010
+ Unit tests now work with Test::Simple 0.95_02.
+ Unit test compatible with gtksourceview 2.10.2 (view most be in a parent).
0.09 Tue Apr 27 20:11:56 CEST 2010
Fix the license in Makefile.PL.
Modified: trunk/libgtk2-sourceview2-perl/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-sourceview2-perl/MANIFEST.SKIP?rev=59588&op=diff
==============================================================================
--- trunk/libgtk2-sourceview2-perl/MANIFEST.SKIP (original)
+++ trunk/libgtk2-sourceview2-perl/MANIFEST.SKIP Sat Jun 19 11:54:20 2010
@@ -7,3 +7,4 @@
^[.]git
^SourceView2[.]bs$
^Gtk2-SourceView2-.+\.tar\.gz$
+^perl-Gtk2-SourceView2[.]doap$
Modified: trunk/libgtk2-sourceview2-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-sourceview2-perl/META.yml?rev=59588&op=diff
==============================================================================
--- trunk/libgtk2-sourceview2-perl/META.yml (original)
+++ trunk/libgtk2-sourceview2-perl/META.yml Sat Jun 19 11:54:20 2010
@@ -1,12 +1,17 @@
--- #YAML:1.0
name: Gtk2-SourceView2
-version: 0.09
+version: 0.10
abstract: Enhanced source code editor widget
author:
- Emmanuel Rodriguez <potyl at cpan.org>
license: perl, gpl
distribution_type: module
configure_requires:
+ ExtUtils::Depends: 0
+ ExtUtils::PkgConfig: 0
+ Glib::MakeHelper: 0
+ Gtk2::CodeGen: 0
+build_requires:
ExtUtils::MakeMaker: 0
requires:
Gtk2: 1.160
@@ -14,7 +19,7 @@
directory:
- t
- inc
-generated_by: ExtUtils::MakeMaker version 6.48
+generated_by: ExtUtils::MakeMaker version 6.55_02
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
Modified: trunk/libgtk2-sourceview2-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-sourceview2-perl/debian/changelog?rev=59588&op=diff
==============================================================================
--- trunk/libgtk2-sourceview2-perl/debian/changelog (original)
+++ trunk/libgtk2-sourceview2-perl/debian/changelog Sat Jun 19 11:54:20 2010
@@ -1,11 +1,8 @@
-libgtk2-sourceview2-perl (0.09-1) UNRELEASED; urgency=low
-
- IGNORE-VERSION: 0.09-1
- (only license info change in metadata)
+libgtk2-sourceview2-perl (0.10-1) UNRELEASED; urgency=low
* New upstream release.
- -- gregor herrmann <gregoa at debian.org> Sun, 02 May 2010 18:04:15 +0200
+ -- gregor herrmann <gregoa at debian.org> Sat, 19 Jun 2010 13:53:15 +0200
libgtk2-sourceview2-perl (0.08-1) unstable; urgency=low
Modified: trunk/libgtk2-sourceview2-perl/gtk2-sourceview2-perl.h
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-sourceview2-perl/gtk2-sourceview2-perl.h?rev=59588&op=diff
==============================================================================
--- trunk/libgtk2-sourceview2-perl/gtk2-sourceview2-perl.h (original)
+++ trunk/libgtk2-sourceview2-perl/gtk2-sourceview2-perl.h Sat Jun 19 11:54:20 2010
@@ -1,4 +1,5 @@
#ifndef _SOURCEVIEW2_PERL_H_
+#define _SOURCEVIEW2_PERL_H_
#include <gtk2perl.h>
@@ -20,18 +21,54 @@
/**
* Returns a gchar** in the stack.
*/
-#define sourceview2perl_return_strv(list) \
+#define sourceview2perl_return_strv(func, free) \
do {\
- if ((list) == NULL) { \
+ gchar **list = (gchar **) func; \
+ if (list == NULL) { \
XSRETURN_EMPTY; \
} \
else { \
size_t i = 0; \
- for (; (list)[i] != NULL ; ++i) { \
- SV *sv = newSVGChar((list)[i]); \
+ for (; list[i] != NULL ; ++i) { \
+ SV *sv = newSVGChar(list[i]); \
XPUSHs(sv_2mortal(sv)); \
} \
} \
+ if (free) g_strfreev(list); \
} while (FALSE)
+
+/**
+ * Generic function that acts as a setter for a property that's a string list.
+ * This is the case for functions that accept a list of paths (strings).
+ */
+#define sourceview2perl_generic_set_dirs(func, arg) \
+do {\
+ gchar **dirs = NULL; \
+ size_t count = items - 1; \
+ size_t i = 0; \
+ \
+ if (count > 0) { \
+ if (count == 1 && !SvOK(ST(1))) { \
+ /* Reset the values to the original list */ \
+ dirs = NULL; \
+ } \
+ else { \
+ dirs = g_new0(gchar *, items); \
+ for (i = 0; i < count; ++i) { \
+ dirs[i] = SvGChar(ST(i + 1)); \
+ } \
+ } \
+ } \
+ else { \
+ /* Clear the current list */ \
+ dirs = g_new0(gchar *, 1); \
+ dirs[1] = NULL; \
+ } \
+ \
+ func(arg, dirs); \
+ g_free(dirs); \
+} while (FALSE)
+
+
#endif /* _SOURCEVIEW2_PERL_H_ */
Modified: trunk/libgtk2-sourceview2-perl/lib/Gtk2/SourceView2.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-sourceview2-perl/lib/Gtk2/SourceView2.pm?rev=59588&op=diff
==============================================================================
--- trunk/libgtk2-sourceview2-perl/lib/Gtk2/SourceView2.pm (original)
+++ trunk/libgtk2-sourceview2-perl/lib/Gtk2/SourceView2.pm Sat Jun 19 11:54:20 2010
@@ -69,7 +69,7 @@
use Gtk2;
-our $VERSION = '0.09';
+our $VERSION = '0.10';
sub dl_load_flags { $^O eq 'darwin' ? 0x00 : 0x01 }
Modified: trunk/libgtk2-sourceview2-perl/t/GtkSourcePrintCompositor.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-sourceview2-perl/t/GtkSourcePrintCompositor.t?rev=59588&op=diff
==============================================================================
--- trunk/libgtk2-sourceview2-perl/t/GtkSourcePrintCompositor.t (original)
+++ trunk/libgtk2-sourceview2-perl/t/GtkSourcePrintCompositor.t Sat Jun 19 11:54:20 2010
@@ -29,9 +29,11 @@
);
isa_ok($print, 'Gtk2::SourceView2::PrintCompositor');
- $print = Gtk2::SourceView2::PrintCompositor->new_from_view(
- Gtk2::SourceView2::View->new()
- );
+ my $window = Gtk2::Window->new();
+ my $view = Gtk2::SourceView2::View->new();
+ $window->add($view);
+
+ $print = Gtk2::SourceView2::PrintCompositor->new_from_view($view);
isa_ok($print, 'Gtk2::SourceView2::PrintCompositor');
}
Modified: trunk/libgtk2-sourceview2-perl/t/GtkSourceView.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-sourceview2-perl/t/GtkSourceView.t?rev=59588&op=diff
==============================================================================
--- trunk/libgtk2-sourceview2-perl/t/GtkSourceView.t (original)
+++ trunk/libgtk2-sourceview2-perl/t/GtkSourceView.t Sat Jun 19 11:54:20 2010
@@ -24,17 +24,22 @@
sub test_constructors {
+ my $parent = Gtk2::HBox->new();
my $view = Gtk2::SourceView2::View->new();
+ $parent->add($view);
isa_ok($view, 'Gtk2::SourceView2::View');
my $buffer = Gtk2::SourceView2::Buffer->new(undef);
$view = Gtk2::SourceView2::View->new_with_buffer($buffer);
+ $parent->add($view);
isa_ok($view, 'Gtk2::SourceView2::View');
}
sub test_properties {
+ my $parent = Gtk2::HBox->new();
my $view = Gtk2::SourceView2::View->new();
+ $parent->add($view);
is_int_ok($view, 'tab_width', 4, 6);
is_int_ok($view, 'indent_width', 4, 6);
@@ -53,7 +58,8 @@
# Draw spaces
$view->set_draw_spaces(['space', 'tab']);
- is($view->get_draw_spaces, '[ space tab ]', "draw_spaces");
+ # Test::Simple 0.95 no longer stringifies its arguments before comparing
+ is('' . $view->get_draw_spaces, '[ space tab ]', "draw_spaces");
# Mark category (pixbuf, priority, background)
Modified: trunk/libgtk2-sourceview2-perl/xs/GtkSourceIter.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-sourceview2-perl/xs/GtkSourceIter.xs?rev=59588&op=diff
==============================================================================
--- trunk/libgtk2-sourceview2-perl/xs/GtkSourceIter.xs (original)
+++ trunk/libgtk2-sourceview2-perl/xs/GtkSourceIter.xs Sat Jun 19 11:54:20 2010
@@ -35,12 +35,14 @@
gtk_source_iter_forward_search (class, const GtkTextIter *iter, const gchar *str, GtkSourceSearchFlags flags)
ALIAS:
backward_search = 1
+
PREINIT:
GtkTextIter match_start;
GtkTextIter match_end;
gboolean found = FALSE;
gboolean (*searchfunc) (const GtkTextIter *iter, const gchar *str, GtkSourceSearchFlags flags, GtkTextIter *match_start, GtkTextIter *match_end, const GtkTextIter *limit);
-GtkTextIter *limit = NULL;
+ GtkTextIter *limit = NULL;
+
PPCODE:
searchfunc = (ix == 0 ? gtk_source_iter_forward_search : gtk_source_iter_backward_search);
Modified: trunk/libgtk2-sourceview2-perl/xs/GtkSourceLanguage.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-sourceview2-perl/xs/GtkSourceLanguage.xs?rev=59588&op=diff
==============================================================================
--- trunk/libgtk2-sourceview2-perl/xs/GtkSourceLanguage.xs (original)
+++ trunk/libgtk2-sourceview2-perl/xs/GtkSourceLanguage.xs Sat Jun 19 11:54:20 2010
@@ -44,30 +44,24 @@
void
gtk_source_language_get_mime_types (GtkSourceLanguage *language)
- PREINIT:
- gchar **list = NULL;
-
PPCODE:
- list = gtk_source_language_get_mime_types(language);
- sourceview2perl_return_strv(list);
- g_strfreev(list);
+ sourceview2perl_return_strv(
+ gtk_source_language_get_mime_types(language),
+ TRUE
+ );
void
gtk_source_language_get_globs (GtkSourceLanguage *language)
- PREINIT:
- gchar **list = NULL;
-
PPCODE:
- list = gtk_source_language_get_globs(language);
- sourceview2perl_return_strv(list);
- g_strfreev(list);
+ sourceview2perl_return_strv(
+ gtk_source_language_get_globs(language),
+ TRUE
+ );
void
gtk_source_language_get_style_ids (GtkSourceLanguage *language)
- PREINIT:
- gchar **list = NULL;
-
PPCODE:
- list = gtk_source_language_get_style_ids(language);
- sourceview2perl_return_strv(list);
- g_strfreev(list);
+ sourceview2perl_return_strv(
+ gtk_source_language_get_style_ids(language),
+ TRUE
+ );
Modified: trunk/libgtk2-sourceview2-perl/xs/GtkSourceLanguageManager.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-sourceview2-perl/xs/GtkSourceLanguageManager.xs?rev=59588&op=diff
==============================================================================
--- trunk/libgtk2-sourceview2-perl/xs/GtkSourceLanguageManager.xs (original)
+++ trunk/libgtk2-sourceview2-perl/xs/GtkSourceLanguageManager.xs Sat Jun 19 11:54:20 2010
@@ -45,53 +45,29 @@
=cut
void
gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm, ...)
- PREINIT:
- gchar **dirs = NULL;
- size_t count = 0;
- size_t i = 0;
-
CODE:
- count = items - 1;
- if (count > 0) {
- if (count == 1 && !SvOK(ST(1))) {
- /* Reset the values to the original list */
- dirs = NULL;
- }
- else {
- dirs = g_new0 (gchar *, items);
- for (i = 0; i < count; ++i) {
- dirs[i] = SvGChar(ST(i + 1));
- }
- }
- }
- else {
- /* Clear the current list */
- dirs = g_new0 (gchar *, 1);
- dirs[1] = NULL;
- }
-
- gtk_source_language_manager_set_search_path(lm, dirs);
- g_free(dirs);
+ sourceview2perl_generic_set_dirs(
+ gtk_source_language_manager_set_search_path,
+ lm
+ );
void
gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm)
- PREINIT:
- gchar **list = NULL;
-
PPCODE:
- list = (gchar **)gtk_source_language_manager_get_search_path(lm);
- sourceview2perl_return_strv(list);
+ sourceview2perl_return_strv(
+ gtk_source_language_manager_get_search_path(lm),
+ FALSE
+ );
void
gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm)
- PREINIT:
- gchar **list = NULL;
-
PPCODE:
- list = (gchar **) gtk_source_language_manager_get_language_ids(lm);
- sourceview2perl_return_strv(list);
+ sourceview2perl_return_strv(
+ gtk_source_language_manager_get_language_ids(lm),
+ FALSE
+ );
GtkSourceLanguage_ornull*
@@ -99,4 +75,3 @@
GtkSourceLanguage_ornull*
gtk_source_language_manager_guess_language (GtkSourceLanguageManager *lm, const gchar_ornull *filename, const gchar_ornull *content_type = NULL)
-
Modified: trunk/libgtk2-sourceview2-perl/xs/GtkSourceStyleScheme.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-sourceview2-perl/xs/GtkSourceStyleScheme.xs?rev=59588&op=diff
==============================================================================
--- trunk/libgtk2-sourceview2-perl/xs/GtkSourceStyleScheme.xs (original)
+++ trunk/libgtk2-sourceview2-perl/xs/GtkSourceStyleScheme.xs Sat Jun 19 11:54:20 2010
@@ -39,9 +39,8 @@
void
gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *style)
- PREINIT:
- gchar **list = NULL;
-
PPCODE:
- list = (gchar **) gtk_source_style_scheme_get_authors(style);
- sourceview2perl_return_strv(list);
+ sourceview2perl_return_strv(
+ gtk_source_style_scheme_get_authors(style),
+ FALSE
+ );
Modified: trunk/libgtk2-sourceview2-perl/xs/GtkSourceStyleSchemeManager.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-sourceview2-perl/xs/GtkSourceStyleSchemeManager.xs?rev=59588&op=diff
==============================================================================
--- trunk/libgtk2-sourceview2-perl/xs/GtkSourceStyleSchemeManager.xs (original)
+++ trunk/libgtk2-sourceview2-perl/xs/GtkSourceStyleSchemeManager.xs Sat Jun 19 11:54:20 2010
@@ -40,33 +40,11 @@
=cut
void
gtk_source_style_scheme_manager_set_search_path (GtkSourceStyleSchemeManager *manager, ...)
- PREINIT:
- gchar **dirs = NULL;
- size_t count = 0;
- size_t i = 0;
-
CODE:
- count = items - 1;
- if (count > 0) {
- if (count == 1 && !SvOK(ST(1))) {
- /* Reset the values to the original list */
- dirs = NULL;
- }
- else {
- dirs = g_new0 (gchar *, items);
- for (i = 0; i < count; ++i) {
- dirs[i] = SvGChar(ST(i + 1));
- }
- }
- }
- else {
- /* Clear the current list */
- dirs = g_new0 (gchar *, 1);
- dirs[1] = NULL;
- }
-
- gtk_source_style_scheme_manager_set_search_path(manager, dirs);
- g_free(dirs);
+ sourceview2perl_generic_set_dirs(
+ gtk_source_style_scheme_manager_set_search_path,
+ manager
+ );
void
@@ -84,19 +62,17 @@
void
gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager)
- PREINIT:
- gchar **list = NULL;
-
PPCODE:
- list = (gchar **)gtk_source_style_scheme_manager_get_search_path(manager);
- sourceview2perl_return_strv(list);
+ sourceview2perl_return_strv(
+ gtk_source_style_scheme_manager_get_search_path(manager),
+ FALSE
+ );
void
gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager)
- PREINIT:
- gchar **list = NULL;
-
PPCODE:
- list = (gchar **)gtk_source_style_scheme_manager_get_scheme_ids(manager);
- sourceview2perl_return_strv(list);
+ sourceview2perl_return_strv(
+ gtk_source_style_scheme_manager_get_scheme_ids(manager),
+ FALSE
+ );
More information about the Pkg-perl-cvs-commits
mailing list