Revision: 4631
http://geany.svn.sourceforge.net/geany/?rev=4631&view=rev
Author: eht16
Date: 2010-01-31 22:08:58 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Use utils_spawn_sync() instead of g_spawn_sync().
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/templates.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-01-31 21:54:47 UTC (rev 4630)
+++ trunk/ChangeLog 2010-01-31 22:08:58 UTC (rev 4631)
@@ -6,6 +6,8 @@
Fix 'make distcheck' by removing data/latex.tags from EXTRA_DIST.
* scripts/create_py_tags.py:
Make the script a bit more robust with newer Python versions.
+ * src/templates.c:
+ Use utils_spawn_sync() instead of g_spawn_sync().
2010-01-31 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/templates.c
===================================================================
--- trunk/src/templates.c 2010-01-31 21:54:47 UTC (rev 4630)
+++ trunk/src/templates.c 2010-01-31 22:08:58 UTC (rev 4631)
@@ -758,7 +758,7 @@
"GEANY_FILETYPE", file_type,
"GEANY_FUNCNAME", func_name,
NULL);
- if (! g_spawn_sync(NULL, argv, env, G_SPAWN_SEARCH_PATH,
+ if (! utils_spawn_sync(NULL, argv, env, G_SPAWN_SEARCH_PATH,
NULL, NULL, &result, NULL, NULL, &error))
{
g_warning("templates_replace_command: %s", error->message);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4628
http://geany.svn.sourceforge.net/geany/?rev=4628&view=rev
Author: eht16
Date: 2010-01-31 21:52:56 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Backport from trunk:
Update RPM Spec file (patch by Dominic Hopf, thanks).
Modified Paths:
--------------
branches/geany-0.18.1/ChangeLog
branches/geany-0.18.1/geany.spec.in
Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog 2010-01-31 21:52:47 UTC (rev 4627)
+++ branches/geany-0.18.1/ChangeLog 2010-01-31 21:52:56 UTC (rev 4628)
@@ -4,6 +4,12 @@
Close meta tag for export date properly.
+2010-01-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * geany.spec.in:
+ Update RPM Spec file (patch by Dominic Hopf, thanks).
+
+
2010-01-24 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/gb.c:
Modified: branches/geany-0.18.1/geany.spec.in
===================================================================
--- branches/geany-0.18.1/geany.spec.in 2010-01-31 21:52:47 UTC (rev 4627)
+++ branches/geany-0.18.1/geany.spec.in 2010-01-31 21:52:56 UTC (rev 4628)
@@ -1,41 +1,71 @@
-Summary: A fast and lightweight IDE using GTK2
+# Note: This spec file is very basic to provide functionality
+# on all known RPM based distributions.
+# It's stronly recommended to use packages of your own distributor
+
Name: geany
Version: @VERSION@
Release: 1
-License: GPL2
+Summary: A fast and lightweight IDE using GTK2
+
Group: Development/Tools
+License: GPLv2+
+URL: http://www.geany.org/
Vendor: The Geany developer team <info(a)geany.org>
-Packager: Dominic Hopf <dmaphy(a)gmail.com>
-Source: http://download.geany.org/%{name}-%{version}.tar.gz
-URL: http://www.geany.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Packager: Dominic Hopf <dmaphy(a)googlemail.com>
+Source: http://download.geany.org/%{name}-%{version}.tar.bz2
+
+# The following tags files were retrieved 2nd Jan 2010
+# You will have to download these and put them into your rpmbuild/SOURCES directory,
+# otherwise comment these lines out
+Source1: http://download.geany.org/contrib/tags/sqlite3.c.tags
+Source2: http://download.geany.org/contrib/tags/std.glsl.tags
+Source3: http://download.geany.org/contrib/tags/gtk218.c.tags
+Source4: http://download.geany.org/contrib/tags/xfce46.c.tags
+Source5: http://download.geany.org/contrib/tags/dbus-glib-0.76.c.tags
+Source6: http://download.geany.org/contrib/tags/standard.css.tags
+Source7: http://download.geany.org/contrib/tags/geany-api-0.18.c.tags
+Source8: http://download.geany.org/contrib/tags/std.vala.tags
+Source9: http://download.geany.org/contrib/tags/drupal.php.tags
+Source10: http://download.geany.org/contrib/tags/std.latex.tags
+Source11: http://download.geany.org/contrib/tags/libxml-2.0.c.tags
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: glib2, gtk2, pango
-BuildRequires: glib2-devel, gtk2-devel, pango-devel
+BuildRequires: glib2-devel, gtk2-devel, pango-devel, gettext, intltool
%description
-Geany is a small and lightweight Integrated Development Environment. It
-was developed to provide a small and fast IDE, which has only a few
-dependencies from other packages. Another goal was to be as independent
-as possible from a special Desktop Environment like KDE or GNOME -
-Geany only requires the GTK2 runtime libraries.
+Geany is a small and fast integrated development enviroment with basic
+features and few dependencies to other packages or Desktop Environments.
-Some basic features of Geany:
-
+Some features:
- Syntax highlighting
+- Code completion
- Code folding
-- Symbol name auto-completion
- Construct completion/snippets
- Auto-closing of XML and HTML tags
- Call tips
-- Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal, and others
-- Symbol lists
+- Support for Many languages like C, Java, PHP, HTML, Python, Perl, Pascal
+- symbol lists and symbol name auto-completion
- Code navigation
-- Build system to compile and execute your code
- Simple project management
- Plugin interface
+%package devel
+Summary: Header files for building Geany plug-ins
+Group: Development/Tools
+Requires: geany = %{version}-%{release}
+Requires: pkgconfig gtk2-devel
+
+%description devel
+This package contains the header files and pkg-config file needed for building
+Geany plug-ins. You do not need to install this package to use Geany.
+
%prep
%setup -q
+# remove waf since this isn't needed for the build, we're building the package
+# with autotools
+rm -f waf
+rm -f wscript
%build
%configure
@@ -51,22 +81,31 @@
%__rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
+# Install tags files
+# comment the following two lines out if you didn't download the tags files mentioned
+# above
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
+install -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/%{name}/tags/
+
%clean
%__rm -Rf $RPM_BUILD_ROOT
%files
-%defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO THANKS
+%defattr(-, root, root, -)
+%doc %{_datadir}/doc/%{name}/*
+%doc %{_mandir}/man1/%{name}.1.gz
+
%{_bindir}/%{name}
-%{_libdir}/%{name}/
%{_datadir}/%{name}
+%{_libdir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/locale/*/LC_MESSAGES/%{name}.mo
-%{_datadir}/icons/48x48/%{name}.png
-%{_datadir}/doc/%{name}/
-%{_mandir}/man1/%{name}.1.gz
%{_datadir}/icons/hicolor/16x16/apps/*.png
%{_datadir}/icons/hicolor/48x48/apps/*.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg
-%{_includedir}/%{name}/
-%{_libdir}/pkgconfig/
+
+
+%files devel
+%defattr(-, root, root, -)
+%{_includedir}/geany
+%{_libdir}/pkgconfig/geany.pc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4625
http://geany.svn.sourceforge.net/geany/?rev=4625&view=rev
Author: eht16
Date: 2010-01-31 21:52:20 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Backport from trunk:
Add the default comment character sequence for reStructuredText.
Modified Paths:
--------------
branches/geany-0.18.1/ChangeLog
branches/geany-0.18.1/data/filetypes.restructuredtext
Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog 2010-01-31 21:52:08 UTC (rev 4624)
+++ branches/geany-0.18.1/ChangeLog 2010-01-31 21:52:20 UTC (rev 4625)
@@ -12,6 +12,8 @@
2009-12-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+ * data/filetypes.restructuredtext:
+ Add the default comment character sequence for reStructuredText.
* src/callbacks.c:
Show the Find/Goto dialogs if the corresponding toolbar buttons are
clicked but their text fields are not part of the toolbar (#2920807).
Modified: branches/geany-0.18.1/data/filetypes.restructuredtext
===================================================================
--- branches/geany-0.18.1/data/filetypes.restructuredtext 2010-01-31 21:52:08 UTC (rev 4624)
+++ branches/geany-0.18.1/data/filetypes.restructuredtext 2010-01-31 21:52:20 UTC (rev 4625)
@@ -7,7 +7,7 @@
#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# if only single comment char is supported like # in this file, leave comment_close blank
-#comment_open=#
+comment_open=..
#comment_close=
# this is an alternative way, so multiline comments are used
#comment_open=/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4624
http://geany.svn.sourceforge.net/geany/?rev=4624&view=rev
Author: eht16
Date: 2010-01-31 21:52:08 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Backport from trunk:
Show the Find/Goto dialogs if the corresponding toolbar buttons are clicked but their text fields are not part of the toolbar (#2920807).
Modified Paths:
--------------
branches/geany-0.18.1/ChangeLog
branches/geany-0.18.1/src/callbacks.c
Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog 2010-01-31 21:51:57 UTC (rev 4623)
+++ branches/geany-0.18.1/ChangeLog 2010-01-31 21:52:08 UTC (rev 4624)
@@ -10,6 +10,13 @@
Add gcc commands to build a plugin to the HowTo.
+2009-12-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/callbacks.c:
+ Show the Find/Goto dialogs if the corresponding toolbar buttons are
+ clicked but their text fields are not part of the toolbar (#2920807).
+
+
2009-12-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/editor.c:
Modified: branches/geany-0.18.1/src/callbacks.c
===================================================================
--- branches/geany-0.18.1/src/callbacks.c 2010-01-31 21:51:57 UTC (rev 4623)
+++ branches/geany-0.18.1/src/callbacks.c 2010-01-31 21:52:08 UTC (rev 4624)
@@ -592,6 +592,8 @@
if (search_data.search_bar)
ui_set_search_entry_background(entry, result);
}
+ else
+ on_find1_activate(NULL, NULL);
}
@@ -1285,6 +1287,8 @@
on_toolbutton_goto_entry_activate(NULL, text, NULL);
}
+ else
+ on_go_to_line_activate(NULL, NULL);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4622
http://geany.svn.sourceforge.net/geany/?rev=4622&view=rev
Author: eht16
Date: 2010-01-31 21:51:43 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Backport from trunk:
Future Geany Windows builds will be based on GTK 2.18.
Modified Paths:
--------------
branches/geany-0.18.1/geany.nsi
Modified: branches/geany-0.18.1/geany.nsi
===================================================================
--- branches/geany-0.18.1/geany.nsi 2010-01-31 21:51:34 UTC (rev 4621)
+++ branches/geany-0.18.1/geany.nsi 2010-01-31 21:51:43 UTC (rev 4622)
@@ -196,7 +196,7 @@
; Include GTK runtime library but only if desired from command line
!ifdef INCLUDE_GTK
-Section "GTK 2.16 Runtime Environment" SEC06
+Section "GTK 2.18 Runtime Environment" SEC06
SectionIn 1
SetOverwrite ifnewer
SetOutPath "$INSTDIR\bin"
@@ -303,7 +303,7 @@
!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Manual in Text and HTML format."
!insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Symbol lists necessary for auto completion of symbols."
!ifdef INCLUDE_GTK
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need these files to run Geany. If you have already installed a GTK Runtime Environment (2.8 or higher), you can skip it."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need these files to run Geany. If you have already installed a GTK Runtime Environment (2.18 or higher), you can skip it."
!endif
!insertmacro MUI_DESCRIPTION_TEXT ${SEC07} "Add context menu item 'Open With Geany'"
!insertmacro MUI_DESCRIPTION_TEXT ${SEC08} "Create shortcuts for Geany on the desktop and in the Quicklaunch Bar"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.