Commits July 2015

commits@lists.geany.org

1 participants
73 discussions

[geany/geany] 5379e1: Windows installer: fix plugin installation directory
by Enrico Tröger 11 Jul '15

11 Jul '15

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 11 Jul 2015 14:36:03 UTC Commit: 5379e1387fcddc28c3bbcc02faa9bbd1b7cdcd8a https://github.com/geany/geany/commit/5379e1387fcddc28c3bbcc02faa9bbd1b7cdc… Log Message: ----------- Windows installer: fix plugin installation directory Modified Paths: -------------- geany.nsi.in Modified: geany.nsi.in 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -172,7 +172,7 @@ SectionEnd Section "Plugins" SEC02 SectionIn 1 SetOverwrite ifnewer - SetOutPath "$INSTDIR\lib" + SetOutPath "$INSTDIR\lib\geany" File "${RESOURCEDIR}\lib\geany\*.dll" SectionEnd -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d6d472: Rename "maintain history on reload" setting temporarily for 1.25
by Colomban Wendling 11 Jul '15

11 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 11 Jul 2015 13:44:00 UTC Commit: d6d4728f2e708ed275ea9a2b045a8c58c509f138 https://github.com/geany/geany/commit/d6d4728f2e708ed275ea9a2b045a8c58c509f… Log Message: ----------- Rename "maintain history on reload" setting temporarily for 1.25 We want it disabled by default in 1.25 for everyone, but want to be able to get it back on by default later on when the UI is more polished. So we will need to have a way to tell whether the configuration comes from 1.25 and should be upgraded or was willfully disabled by the user in a later version. So, use a temporary setting name that defaults to disabled for 1.25 See #553. Modified Paths: -------------- doc/geany.txt src/keyfile.c Modified: doc/geany.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2652,7 +2652,7 @@ use_gio_unsafe_file_saving Whether to use GIO as the unsafe file t correctly on some complex setups. gio_unsafe_save_backup Make a backup when using GIO unsafe file false immediately saving. Backup is named `filename~`. -keep_edit_history_on_reload Whether to maintain the edit history when false immediately +keep_edit_history_on_reload_125 Whether to maintain the edit history when false immediately reloading a file, and allow the operation to be reverted. **Filetype related** Modified: src/keyfile.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -234,7 +234,7 @@ static void init_pref_groups(void) stash_group_add_boolean(group, &file_prefs.use_gio_unsafe_file_saving, "use_gio_unsafe_file_saving", TRUE); stash_group_add_boolean(group, &file_prefs.keep_edit_history_on_reload, - "keep_edit_history_on_reload", FALSE); + "keep_edit_history_on_reload_125", FALSE); /* for backwards-compatibility */ stash_group_add_integer(group, &editor_prefs.indentation->hard_tab_width, "indent_hard_tab_width", 8); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 8c907d: Merge pull request #555 from b4n/less-spawn-api
by Colomban Wendling 11 Jul '15

11 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 11 Jul 2015 13:27:02 UTC Commit: 8c907dc00f44e66adcfbd50608e8d8a9d38386f4 https://github.com/geany/geany/commit/8c907dc00f44e66adcfbd50608e8d8a9d3838… Log Message: ----------- Merge pull request #555 from b4n/less-spawn-api spawn: Do not export unnecessary API Modified Paths: -------------- NEWS src/spawn.c src/spawn.h Modified: NEWS 8 lines changed, 3 insertions(+), 5 deletions(-) =================================================================== @@ -129,11 +129,9 @@ Geany 1.25 (unreleased) * Add pseudo-unique document IDs through GeanyDocument::id and document_find_by_id(). This is a safer API for keeping a reference to a document for a long time (PR#256). - * Add convenient and portable spawning API: spawn_sync() - spawn_async(), spawn_async_with_pipes(), spawn_with_callbacks(), - spawn_kill_process(), spawn_get_program_name(), - spawn_check_command(), spawn_write_data(), - spawn_get_exit_status_cb() (PR#441, Dimitar Zhekov). + * Add convenient and portable spawning API: spawn_sync(), spawn_async(), + spawn_with_callbacks(), spawn_kill_process(), spawn_check_command(), + spawn_write_data() (PR#441, Dimitar Zhekov). * plugin_signal_connect() is now safe to use also with objects destroyed before unloading the plugin. * Add document_reload_force() to replace document_reload_file(). Modified: src/spawn.c 78 lines changed, 39 insertions(+), 39 deletions(-) =================================================================== @@ -76,35 +76,17 @@ #define G_IO_FAILURE (G_IO_ERR | G_IO_HUP | G_IO_NVAL) /* always used together */ -/** +/* * Checks whether a command line is syntactically valid and extracts the program name from it. * - * All OS: - * - any leading spaces, tabs and new lines are skipped - * - an empty command is invalid - * Unix: - * - the standard shell quoting and escaping rules are used, see @c g_shell_parse_argv() - * - as a consequence, an unqouted # at the start of an argument comments to the end of line - * Windows: - * - leading carriage returns are skipped too - * - a quoted program name must be entirely inside the quotes. No "C:\Foo\Bar".pdf or - * "C:\Foo\Bar".bat, which would be executed by Windows as C:\Foo\Bar.exe - * - an unquoted program name may not contain spaces. Foo Bar Qux will not be considered - * "Foo Bar.exe" Qux or "Foo Bar Qux.exe", depending on what executables exist, as - * Windows normally does. - * - the program name must be separated from the arguments by at least one space or tab - * - the standard Windows quoting and escaping rules are used: double quote is escaped with - * backslash, and any literal backslashes before a double quote must be duplicated. + * See @c spawn_check_command() for details. * * @param command_line the command line to check and get the program name from. * @param error return location for error. * * @return allocated string with the program name on success, @c NULL on error. - * - * @since 1.25 - **/ -GEANY_API_SYMBOL -gchar *spawn_get_program_name(const gchar *command_line, GError **error) + */ +static gchar *spawn_get_program_name(const gchar *command_line, GError **error) { gchar *program; @@ -206,7 +188,24 @@ gchar *spawn_get_program_name(const gchar *command_line, GError **error) /** * Checks whether a command line is valid. * - * Checks if @a command_line is syntactically valid using @c spawn_get_program_name(). + * Checks if @a command_line is syntactically valid. + * + * All OS: + * - any leading spaces, tabs and new lines are skipped + * - an empty command is invalid + * Unix: + * - the standard shell quoting and escaping rules are used, see @c g_shell_parse_argv() + * - as a consequence, an unqouted # at the start of an argument comments to the end of line + * Windows: + * - leading carriage returns are skipped too + * - a quoted program name must be entirely inside the quotes. No "C:\Foo\Bar".pdf or + * "C:\Foo\Bar".bat, which would be executed by Windows as C:\Foo\Bar.exe + * - an unquoted program name may not contain spaces. Foo Bar Qux will not be considered + * "Foo Bar.exe" Qux or "Foo Bar Qux.exe", depending on what executables exist, as + * Windows normally does. + * - the program name must be separated from the arguments by at least one space or tab + * - the standard Windows quoting and escaping rules are used: double quote is escaped with + * backslash, and any literal backslashes before a double quote must be duplicated. * * If @a execute is TRUE, also checks, using @c g_find_program_in_path(), if the program * specified in @a command_line exists and is executable. @@ -453,7 +452,7 @@ static void spawn_append_argument(GString *command, const char *text) #endif /* G_OS_WIN32 */ -/** +/* * Executes a child program asynchronously and setups pipes. * * This is the low-level spawning function. Please use @c spawn_with_callbacks() unless @@ -478,11 +477,8 @@ static void spawn_append_argument(GString *command, const char *text) * @param error return location for error. * * @return @c TRUE on success, @c FALSE on error. - * - * @since 1.25 - **/ -GEANY_API_SYMBOL -gboolean spawn_async_with_pipes(const gchar *working_directory, const gchar *command_line, + */ +static gboolean spawn_async_with_pipes(const gchar *working_directory, const gchar *command_line, gchar **argv, gchar **envp, GPid *child_pid, gint *stdin_fd, gint *stdout_fd, gint *stderr_fd, GError **error) { @@ -592,8 +588,19 @@ gboolean spawn_async_with_pipes(const gchar *working_directory, const gchar *com /** * Executes a child asynchronously. * - * See @c spawn_async_with_pipes() for a full description; this function simply calls - * @c g_spawn_async_with_pipes() without any pipes. + * A command line or an argument vector must be passed. If both are present, the argument + * vector is appended to the command line. An empty command line is not allowed. + * + * If a @a child_pid is passed, it's your responsibility to invoke @c g_spawn_close_pid(). + * + * @param working_directory child's current working directory, or @c NULL. + * @param command_line child program and arguments, or @c NULL. + * @param argv child's argument vector, or @c NULL. + * @param envp child's environment, or @c NULL. + * @param child_pid return location for child process ID, or @c NULL. + * @param error return location for error. + * + * @return @c TRUE on success, @c FALSE on error. * * @since 1.25 **/ @@ -1043,14 +1050,7 @@ static void spawn_append_gstring_cb(GString *string, GIOCondition condition, gpo } -/** - * Convinience @c GChildWatchFunc callback that copies the child exit status into a gint - * pointed by @a exit_status. - * - * @since 1.25 - **/ -GEANY_API_SYMBOL -void spawn_get_exit_status_cb(G_GNUC_UNUSED GPid pid, gint status, gpointer exit_status) +static void spawn_get_exit_status_cb(G_GNUC_UNUSED GPid pid, gint status, gpointer exit_status) { *(gint *) exit_status = status; } Modified: src/spawn.h 8 lines changed, 0 insertions(+), 8 deletions(-) =================================================================== @@ -35,16 +35,10 @@ G_BEGIN_DECLS -gchar *spawn_get_program_name(const gchar *command_line, GError **error); - gboolean spawn_check_command(const gchar *command_line, gboolean execute, GError **error); gboolean spawn_kill_process(GPid pid, GError **error); -gboolean spawn_async_with_pipes(const gchar *working_directory, const gchar *command_line, - gchar **argv, gchar **envp, GPid *child_pid, gint *stdin_fd, gint *stdout_fd, - gint *stderr_fd, GError **error); - gboolean spawn_async(const gchar *working_directory, const gchar *command_line, gchar **argv, gchar **envp, GPid *child_pid, GError **error); @@ -100,8 +94,6 @@ typedef struct _SpawnWriteData gboolean spawn_write_data(GIOChannel *channel, GIOCondition condition, SpawnWriteData *data); -void spawn_get_exit_status_cb(GPid pid, gint status, gpointer exit_status); - gboolean spawn_sync(const gchar *working_directory, const gchar *command_line, gchar **argv, gchar **envp, SpawnWriteData *stdin_data, GString *stdout_data, GString *stderr_data, gint *exit_status, GError **error); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fd06d4: Merge pull request #548 from techee/run_script_escape
by Colomban Wendling 11 Jul '15

11 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 11 Jul 2015 13:10:59 UTC Commit: fd06d47c7bec0659e0ce338ac6eee82de6ca9542 https://github.com/geany/geany/commit/fd06d47c7bec0659e0ce338ac6eee82de6ca9… Log Message: ----------- Merge pull request #548 from techee/run_script_escape Properly escape working directory in run script Closes #554. Modified Paths: -------------- src/build.c Modified: src/build.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1088,9 +1088,9 @@ static gchar *build_create_shellscript(const gchar *working_dir, const gchar *cm str = g_strdup_printf("cd \"%s\"\n\n%s\n\n%s\ndel \"%%0\"\n\npause\n", working_dir, expanded_cmd, (autoclose) ? "" : "pause"); g_free(expanded_cmd); #else - escaped_dir = g_strescape(working_dir, NULL); + escaped_dir = g_shell_quote(working_dir); str = g_strdup_printf( - "#!/bin/sh\n\nrm $0\n\ncd \'%s\'\n\n%s\n\necho \"\n\n------------------\n(program exited with code: $?)\" \ + "#!/bin/sh\n\nrm $0\n\ncd %s\n\n%s\n\necho \"\n\n------------------\n(program exited with code: $?)\" \ \n\n%s\n", escaped_dir, cmd, (autoclose) ? "" : "\necho \"Press return to continue\"\n#to be more compatible with shells like " "dash\ndummy_var=\"\"\nread dummy_var"); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 860e3f: Merge pull request #550 from b4n/fix-ubuntu-libdir
by Colomban Wendling 11 Jul '15

11 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 11 Jul 2015 12:09:58 UTC Commit: 860e3fb12e3ccc785b72c0ea030f0ed954d745be https://github.com/geany/geany/commit/860e3fb12e3ccc785b72c0ea030f0ed954d74… Log Message: ----------- Merge pull request #550 from b4n/fix-ubuntu-libdir autotools: Workaround a Ubuntu issue when installing in /usr/local/lib Modified Paths: -------------- src/Makefile.am Modified: src/Makefile.am 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -181,3 +181,16 @@ signallist.i: $(glade_file) Makefile ) > $@ || { $(RM) $@ && exit 1; } CLEANFILES += signallist.i + +# Ubuntu ld has a bug so that libtool sees /usr/local/lib as a system path so +# doesn't add RPATH, but ld requires explicit ldconfig there, unlike when +# installing in /usr/lib. So, workaround this by calling it explicitly when +# installing in /usr/local/lib and libgeany is not found by the linker. +fix-ubuntu-libdir: + if test "$(DESTDIR)$(libdir)" = /usr/local/lib && \ + LANG=C ldd "$(DESTDIR)$(bindir)/geany" | grep -q 'libgeany.*not found' \ + ; then \ + ldconfig "$(DESTDIR)$(libdir)"; \ + fi + +install-exec-hook: fix-ubuntu-libdir -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 8d367d: Merge pull request #360 from b4n/travis-test
by Enrico Tröger 11 Jul '15

11 Jul '15

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 11 Jul 2015 08:05:30 UTC Commit: 8d367d49b98f63a28e2d1a7441faa360f1292fa4 https://github.com/geany/geany/commit/8d367d49b98f63a28e2d1a7441faa360f1292… Log Message: ----------- Merge pull request #360 from b4n/travis-test travis: Add a Travis CI settings file Modified Paths: -------------- .travis.yml scripts/cross-build-mingw.sh Modified: .travis.yml 34 lines changed, 34 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,34 @@ +# we use both C and C++, so advertize C++ +language: cpp +compiler: + - gcc +env: + - GTK3=no + - GTK3=yes + - GTK3=no MINGW=yes + - GTK3=yes MINGW=yes +before_install: + - sudo apt-get update -qq +install: + - sudo apt-get install -y intltool libtool + - test -n "$MINGW" || sudo apt-get install -y libgtk2.0-dev libgtk-3-dev + - test -z "$MINGW" || sudo apt-get install -y mingw-w64-tools g++-mingw-w64-i686 gcc-mingw-w64-i686 binutils-mingw-w64-i686 + - sudo apt-get install -y python-docutils rst2pdf + # try not to install doxygen-latex because we don't need it and it's huge + - sudo apt-get install -y --no-install-recommends doxygen +before_script: + - export CFLAGS="-g -O2 -Werror=pointer-arith -Werror=aggregate-return -Werror=implicit-function-declaration" +script: + - NOCONFIGURE=1 ./autogen.sh + - > + if [ -n "$MINGW" ]; then + arg=-2; [ "$GTK3" = yes ] && arg=-3; + unset CC CXX; + sh ./scripts/cross-build-mingw.sh $arg; + else + mkdir _build && + cd _build && + ../configure --enable-gtk3=$GTK3 && + make -j2 && + make -j2 check; + fi Modified: scripts/cross-build-mingw.sh 104 lines changed, 104 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,104 @@ +#!/bin/sh +# A script to automate setup and build for Windows cross-compilation +# +# What it does: +# 1) prepare a build directory +# 2) download and unpacked the dependencies +# (see http://www.gtk.org/download/win32.php) +# 2.1) fixup the unpacked pkg-config file paths +# 3) setup the few required paths +# 4) configure with sensible options for this +# 5) build +# 6) install in a local directory +# 7) pack the installation in a ZIP file, ready to be used +# (but does not pack the dependencies) + +# You may change those +HOST=i686-w64-mingw32 +GTK2_BUNDLE_ZIP="http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.10…" +GTK3_BUNDLE_ZIP="http://win32builder.gnome.org/gtk+-bundle_3.8.2-20131001_win32.zip" +BUILDDIR=_build-cross-mingw +GTK3=no +CONFIGUREFLAGS="--enable-nls" +MAKEFLAGS="${MAKEFLAGS:--j2}" + +while getopts '32h' o; do + case "$o" in + 3) GTK3=yes;; + 2) GTK3=no;; + h) + cat <<EOF +USAGE: $0 [-2|-3] [-h] + +-2 Build against GTK2 +-3 Build against GTK3 +-h Show this help and exit +EOF + exit 0;; + *) echo "Invalid option $o (see -h)">&2; exit 1;; + esac +done +shift $((OPTIND - 1)) + +CONFIGUREFLAGS="$CONFIGUREFLAGS --enable-gtk3=$GTK3" +if [ "$GTK3" = yes ]; then + BUNDLE_ZIP="$GTK3_BUNDLE_ZIP" +else + BUNDLE_ZIP="$GTK2_BUNDLE_ZIP" +fi + +# USAGE: fetch_and_unzip URL DEST_PREFIX +fetch_and_unzip() +{ + local basename=${1##*/} + curl -L -# "$1" > "$basename" + unzip -q "$basename" -d "$2" + rm -f "$basename" +} + +if test -d "$BUILDDIR"; then + cat >&2 <<EOF +** Directory "$BUILDDIR/" already exists. +If it was created by this tool and just want to build, simply run make: + $ make -C "$BUILDDIR/_build/" + +If however you want to recreate it, please remove it first: + $ rm -rf "$BUILDDIR/" +EOF + exit 1 +fi + +set -e +set -x + + +test -f configure +# check if the host tools are available, because configure falls back +# on default non-prefixed tools if they are missing, and it can spit +# quite a lot of subtle errors. also avoids going further if something +# is obviously missing. +type "$HOST-gcc" + +SRCDIR="$PWD" + +mkdir "$BUILDDIR" +cd "$BUILDDIR" + +mkdir _deps +fetch_and_unzip "$BUNDLE_ZIP" _deps +# fixup the prefix= in the pkg-config files +sed -i "s%^$prefix=$.*$%\1$PWD/_deps%" _deps/lib/pkgconfig/*.pc + +export PKG_CONFIG_PATH="$PWD/_deps/lib/pkgconfig/" +export CPPFLAGS="-I$PWD/_deps/include" +export LDFLAGS="-L$PWD/_deps/lib" + +mkdir _build +cd _build +"$SRCDIR/configure" \ + --host=$HOST \ + --disable-silent-rules \ + --prefix="$PWD/../_install" \ + $CONFIGUREFLAGS +make $MAKEFLAGS +make $MAKEFLAGS install -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3e2b4a: travis: Make it a bit easier to change GTK bundle URLs
by Colomban Wendling 11 Jul '15

11 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Jul 2015 21:45:48 UTC Commit: 3e2b4a269b592908a6a80240a2c5338c70c25b4a https://github.com/geany/geany/commit/3e2b4a269b592908a6a80240a2c5338c70c25… Log Message: ----------- travis: Make it a bit easier to change GTK bundle URLs Modified Paths: -------------- scripts/cross-build-mingw.sh Modified: scripts/cross-build-mingw.sh 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -15,6 +15,8 @@ # You may change those HOST=i686-w64-mingw32 +GTK2_BUNDLE_ZIP="http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.10…" +GTK3_BUNDLE_ZIP="http://win32builder.gnome.org/gtk+-bundle_3.8.2-20131001_win32.zip" BUILDDIR=_build-cross-mingw GTK3=no CONFIGUREFLAGS="--enable-nls" @@ -40,9 +42,9 @@ shift $((OPTIND - 1)) CONFIGUREFLAGS="$CONFIGUREFLAGS --enable-gtk3=$GTK3" if [ "$GTK3" = yes ]; then - BUNDLE_ZIP="http://win32builder.gnome.org/gtk+-bundle_3.8.2-20131001_win32.zip" + BUNDLE_ZIP="$GTK3_BUNDLE_ZIP" else - BUNDLE_ZIP="http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.10…" + BUNDLE_ZIP="$GTK2_BUNDLE_ZIP" fi # USAGE: fetch_and_unzip URL DEST_PREFIX -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 02e668: travis: Enable Windows cross-compilation
by Colomban Wendling 11 Jul '15

11 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Jul 2015 21:32:56 UTC Commit: 02e6682ea65ad0094d2cee0b14a2c8c4afa738b6 https://github.com/geany/geany/commit/02e6682ea65ad0094d2cee0b14a2c8c4afa73… Log Message: ----------- travis: Enable Windows cross-compilation We unfortunately can't run tests as they require running the just build (foreign) executable, but at least it tries and build the Windows code paths. Modified Paths: -------------- .travis.yml scripts/cross-build-mingw.sh Modified: .travis.yml 24 lines changed, 17 insertions(+), 7 deletions(-) =================================================================== @@ -5,20 +5,30 @@ compiler: env: - GTK3=no - GTK3=yes + - GTK3=no MINGW=yes + - GTK3=yes MINGW=yes before_install: - sudo apt-get update -qq install: - - sudo apt-get install -y libgtk2.0-dev libgtk-3-dev intltool libtool + - sudo apt-get install -y intltool libtool + - test -n "$MINGW" || sudo apt-get install -y libgtk2.0-dev libgtk-3-dev + - test -z "$MINGW" || sudo apt-get install -y mingw-w64-tools g++-mingw-w64-i686 gcc-mingw-w64-i686 binutils-mingw-w64-i686 - sudo apt-get install -y python-docutils rst2pdf # try not to install doxygen-latex because we don't need it and it's huge - sudo apt-get install -y --no-install-recommends doxygen before_script: - export CFLAGS="-g -O2 -Werror=pointer-arith -Werror=aggregate-return -Werror=implicit-function-declaration" script: + - NOCONFIGURE=1 ./autogen.sh - > - NOCONFIGURE=1 ./autogen.sh && - mkdir _build && - cd _build && - ../configure --enable-gtk3=$GTK3 && - make -j2 && - make -j2 check + if [ -n "$MINGW" ]; then + arg=-2; [ "$GTK3" = yes ] && arg=-3; + unset CC CXX; + sh ./scripts/cross-build-mingw.sh $arg; + else + mkdir _build && + cd _build && + ../configure --enable-gtk3=$GTK3 && + make -j2 && + make -j2 check; + fi Modified: scripts/cross-build-mingw.sh 102 lines changed, 102 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,102 @@ +#!/bin/sh +# A script to automate setup and build for Windows cross-compilation +# +# What it does: +# 1) prepare a build directory +# 2) download and unpacked the dependencies +# (see http://www.gtk.org/download/win32.php) +# 2.1) fixup the unpacked pkg-config file paths +# 3) setup the few required paths +# 4) configure with sensible options for this +# 5) build +# 6) install in a local directory +# 7) pack the installation in a ZIP file, ready to be used +# (but does not pack the dependencies) + +# You may change those +HOST=i686-w64-mingw32 +BUILDDIR=_build-cross-mingw +GTK3=no +CONFIGUREFLAGS="--enable-nls" +MAKEFLAGS="${MAKEFLAGS:--j2}" + +while getopts '32h' o; do + case "$o" in + 3) GTK3=yes;; + 2) GTK3=no;; + h) + cat <<EOF +USAGE: $0 [-2|-3] [-h] + +-2 Build against GTK2 +-3 Build against GTK3 +-h Show this help and exit +EOF + exit 0;; + *) echo "Invalid option $o (see -h)">&2; exit 1;; + esac +done +shift $((OPTIND - 1)) + +CONFIGUREFLAGS="$CONFIGUREFLAGS --enable-gtk3=$GTK3" +if [ "$GTK3" = yes ]; then + BUNDLE_ZIP="http://win32builder.gnome.org/gtk+-bundle_3.8.2-20131001_win32.zip" +else + BUNDLE_ZIP="http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/2.24/gtk+-bundle_2.24.10…" +fi + +# USAGE: fetch_and_unzip URL DEST_PREFIX +fetch_and_unzip() +{ + local basename=${1##*/} + curl -L -# "$1" > "$basename" + unzip -q "$basename" -d "$2" + rm -f "$basename" +} + +if test -d "$BUILDDIR"; then + cat >&2 <<EOF +** Directory "$BUILDDIR/" already exists. +If it was created by this tool and just want to build, simply run make: + $ make -C "$BUILDDIR/_build/" + +If however you want to recreate it, please remove it first: + $ rm -rf "$BUILDDIR/" +EOF + exit 1 +fi + +set -e +set -x + + +test -f configure +# check if the host tools are available, because configure falls back +# on default non-prefixed tools if they are missing, and it can spit +# quite a lot of subtle errors. also avoids going further if something +# is obviously missing. +type "$HOST-gcc" + +SRCDIR="$PWD" + +mkdir "$BUILDDIR" +cd "$BUILDDIR" + +mkdir _deps +fetch_and_unzip "$BUNDLE_ZIP" _deps +# fixup the prefix= in the pkg-config files +sed -i "s%^$prefix=$.*$%\1$PWD/_deps%" _deps/lib/pkgconfig/*.pc + +export PKG_CONFIG_PATH="$PWD/_deps/lib/pkgconfig/" +export CPPFLAGS="-I$PWD/_deps/include" +export LDFLAGS="-L$PWD/_deps/lib" + +mkdir _build +cd _build +"$SRCDIR/configure" \ + --host=$HOST \ + --disable-silent-rules \ + --prefix="$PWD/../_install" \ + $CONFIGUREFLAGS +make $MAKEFLAGS +make $MAKEFLAGS install -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e0eb17: Mention that GTK3 version is not experimental anymore
by Colomban Wendling 11 Jul '15

11 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Jul 2015 21:00:22 UTC Commit: e0eb1764189b3b44e1c2d4c16af30ea8b6a3d51b https://github.com/geany/geany/commit/e0eb1764189b3b44e1c2d4c16af30ea8b6a3d… Log Message: ----------- Mention that GTK3 version is not experimental anymore Modified Paths: -------------- NEWS Modified: NEWS 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,6 +1,7 @@ Geany 1.25 (unreleased) General + * GTK3 support, while not enabled by default, is now considered stable. * Improve MacOS X support (PR#396, PR#419, PR#420, Jiří Techet). * Improve subprocess spawning (especially on Windows) (PR#441, Dimitar Zhekov). -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3bd7c8: Replace references to GTK2 with GTK+
by Colomban Wendling 11 Jul '15

11 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Jul 2015 20:58:48 UTC Commit: 3bd7c80776b0fcdb8c6929d5f4553cb865bd31b9 https://github.com/geany/geany/commit/3bd7c80776b0fcdb8c6929d5f4553cb865bd3… Log Message: ----------- Replace references to GTK2 with GTK+ This allows to be GTK version agnostic, not to single out GTK3 builds. Modified Paths: -------------- README configure.ac doc/geany.txt geany.desktop.in geany.pc.in geany.spec.in po/ar.po po/ast.po po/be.po po/bg.po po/ca.po po/cs.po po/de.po po/el.po po/en_GB.po po/es.po po/et.po po/eu.po po/fa.po po/fi.po po/fr.po po/gl.po po/he.po po/hi.po po/hu.po po/id.po po/it.po po/ja.po po/kk.po po/ko.po po/lb.po po/lt.po po/mn.po po/nl.po po/nn.po po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sl.po po/sr.po po/sv.po po/tr.po po/uk.po po/vi.po po/zh_CN.po po/zh_TW.po Modified: README 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -8,8 +8,8 @@ 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. So it -is using only the GTK2 toolkit and therefore you need only the -GTK2 runtime libraries to run Geany. +is using only the GTK+ toolkit and therefore you need only the +GTK+ runtime libraries to run Geany. Features Modified: configure.ac 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -89,7 +89,7 @@ PKG_CHECK_MODULES([GTHREAD], [$gthread_modules]) AC_SUBST([GTHREAD_CFLAGS]) AC_SUBST([GTHREAD_LIBS]) -# --disable-deprecated switch for GTK2 purification +# --disable-deprecated switch for GTK purification AC_ARG_ENABLE([deprecated], [AS_HELP_STRING([--disable-deprecated], [Disable deprecated GTK functions.])], [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], Modified: doc/geany.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -41,7 +41,7 @@ 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 on other packages. Another goal was to be as independent as possible from a particular Desktop Environment like KDE or GNOME - -Geany only requires the GTK2 runtime libraries. +Geany only requires the GTK+ runtime libraries. Some basic features of Geany: Modified: geany.desktop.in 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ Type=Application Version=1.0 _Name=Geany _GenericName=Integrated Development Environment -_Comment=A fast and lightweight IDE using GTK2 +_Comment=A fast and lightweight IDE using GTK+ Exec=geany %F Icon=geany Terminal=false Modified: geany.pc.in 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -7,7 +7,7 @@ datadir=@datadir@ localedir=@localedir@ Name: Geany -Description: A fast and lightweight IDE using GTK2 +Description: A fast and lightweight IDE using GTK+ Requires: @DEPENDENCIES@ Version: @VERSION@ Libs: -L${libdir} -lgeany Modified: geany.spec.in 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -5,7 +5,7 @@ Name: geany Version: @VERSION@ Release: 1 -Summary: A fast and lightweight IDE using GTK2 +Summary: A fast and lightweight IDE using GTK+ Group: Development/Tools License: GPLv2+ Modified: po/ar.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,8 +31,8 @@ msgid "Integrated Development Environment" msgstr "بيئة التطوير المتكاملة" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "بيئة تطوير خفيفة وسريع تستخدم مكتبات GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "بيئة تطوير خفيفة وسريع تستخدم مكتبات GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/ast.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,8 +27,8 @@ msgid "Integrated Development Environment" msgstr "Entornu Integráu de Desarrollu" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Un IDE rápidu y llixeru basáu en GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Un IDE rápidu y llixeru basáu en GTK+" #: ../data/geany.glade.h:1 #, fuzzy Modified: po/be.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -29,8 +29,8 @@ msgid "Integrated Development Environment" msgstr "Інтэграванае асяроддзе распрацоўкі" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Хуткае і легкаважнае асяроддзе распрацоўкі, выкарыстоўваючае GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Хуткае і легкаважнае асяроддзе распрацоўкі, выкарыстоўваючае GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/bg.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -29,7 +29,7 @@ msgstr "Вградена среда за разработка" #: ../geany.desktop.in.h:3 #, fuzzy -msgid "A fast and lightweight IDE using GTK2" +msgid "A fast and lightweight IDE using GTK+" msgstr "Бърза и лека среда за разработване" #: ../data/geany.glade.h:1 Modified: po/ca.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -28,8 +28,8 @@ msgid "Integrated Development Environment" msgstr "Entorn Integrat de Desenvolupament" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Un IDE ràpid i lleuger fet amb GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Un IDE ràpid i lleuger fet amb GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/cs.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -43,8 +43,8 @@ msgstr "Integrované vývojové prostředí" # ### # #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Rychlé a lehké IDE pro GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Rychlé a lehké IDE pro GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/de.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -33,8 +33,8 @@ msgid "Integrated Development Environment" msgstr "Integrierte Entwicklungsumgebung" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Eine kleine und schnelle Entwicklungsumgebung für GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Eine kleine und schnelle Entwicklungsumgebung für GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/el.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -28,8 +28,8 @@ msgid "Integrated Development Environment" msgstr "Ενιαίο Περιβάλλον Ανάπτυξης" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Γρήγορο και ελαφρύ GTK2 IDE" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Γρήγορο και ελαφρύ GTK+ IDE" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/en_GB.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,8 +27,8 @@ msgid "Integrated Development Environment" msgstr "Integrated Development Environment" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "A fast and lightweight IDE using GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "A fast and lightweight IDE using GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/es.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -28,8 +28,8 @@ msgid "Integrated Development Environment" msgstr "Entorno de desarrollo integrado" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Un IDE rápido y ligero para GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Un IDE rápido y ligero para GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/et.po 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -26,8 +26,8 @@ msgid "Integrated Development Environment" msgstr "Integreeritud arenduskeskkond" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Kiire ja väike IDE GTK2 põhjal" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Kiire ja väike IDE GTK+ põhjal" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" @@ -2153,7 +2153,7 @@ msgstr "Geany teave" #: ../src/about.c:213 msgid "A fast and lightweight IDE" -msgstr "Kiire ja väike IDE GTK2 põhjal" +msgstr "Kiire ja väike IDE GTK+ põhjal" #: ../src/about.c:235 #, c-format Modified: po/eu.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -26,8 +26,8 @@ msgid "Integrated Development Environment" msgstr "Garapen ingurune integratua" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "GTK2 erabiltzen duen IDE azkar eta arina" +msgid "A fast and lightweight IDE using GTK+" +msgstr "GTK+ erabiltzen duen IDE azkar eta arina" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/fa.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -29,8 +29,8 @@ msgid "Integrated Development Environment" msgstr "محیط توسعه ی نرم افزار" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "A fast and lightweight IDE using GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "A fast and lightweight IDE using GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/fi.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,8 +31,8 @@ msgid "Integrated Development Environment" msgstr "Integroitu ohjelmointiympäristö" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Nopea ja kevyt GTK2-pohjainen ohjelmointiympäristö" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Nopea ja kevyt GTK+-pohjainen ohjelmointiympäristö" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/fr.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -30,8 +30,8 @@ msgid "Integrated Development Environment" msgstr "Environnement de Développement Intégré" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Un EDI rapide et léger utilisant GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Un EDI rapide et léger utilisant GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/gl.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -26,8 +26,8 @@ msgid "Integrated Development Environment" msgstr "Contorno integrado de desenvolvemento" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Un IDE rápido e lixeiro empregando GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Un IDE rápido e lixeiro empregando GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/he.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,8 +27,8 @@ msgid "Integrated Development Environment" msgstr "סביבת פיתוח משולבת" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "סביבת פיתוח משולבת קטנה וקלת משקל העושה שימוש ב־GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "סביבת פיתוח משולבת קטנה וקלת משקל העושה שימוש ב־GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/hi.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -26,8 +26,8 @@ msgid "Integrated Development Environment" msgstr "एकीकृत विकास वातावरण" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "एक तेज और हलका GTK2 का उपयोग कर आईडीई" +msgid "A fast and lightweight IDE using GTK+" +msgstr "एक तेज और हलका GTK+ का उपयोग कर आईडीई" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/hu.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -26,8 +26,8 @@ msgid "Integrated Development Environment" msgstr "Integrált Fejlesztői Felület" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Gyors és pehelykönnyű IDE GTK2 alapokon" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Gyors és pehelykönnyű IDE GTK+ alapokon" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/id.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -26,8 +26,8 @@ msgid "Integrated Development Environment" msgstr "Integrated Development Environment" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Sebuah IDE yang cepat dan ringan menggunakan GTK2 " +msgid "A fast and lightweight IDE using GTK+" +msgstr "Sebuah IDE yang cepat dan ringan menggunakan GTK+ " #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/it.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,8 +31,8 @@ msgid "Integrated Development Environment" msgstr "Ambiente di sviluppo integrato" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Un IDE veloce e leggero che usa GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Un IDE veloce e leggero che usa GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/ja.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -30,8 +30,8 @@ msgid "Integrated Development Environment" msgstr "統合開発環境" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "GTK2 を用いた高速で軽量な IDE" +msgid "A fast and lightweight IDE using GTK+" +msgstr "GTK+ を用いた高速で軽量な IDE" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/kk.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,8 +27,8 @@ msgid "Integrated Development Environment" msgstr "Интеграцияланған өндіру ортасы" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "GTK2 негізіндегі жылдам әрі жеңіл өндіру ортасы" +msgid "A fast and lightweight IDE using GTK+" +msgstr "GTK+ негізіндегі жылдам әрі жеңіл өндіру ортасы" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/ko.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,8 +27,8 @@ msgid "Integrated Development Environment" msgstr "통합 개발 환경" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "빠르고 가벼운 GTK2 기반의 통합개발환경" +msgid "A fast and lightweight IDE using GTK+" +msgstr "빠르고 가벼운 GTK+ 기반의 통합개발환경" #: ../data/geany.glade.h:1 #, fuzzy Modified: po/lb.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -28,8 +28,8 @@ msgid "Integrated Development Environment" msgstr "Integréiert Entwécklungsumgebung" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "En klenge an schnelle IDE fir GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "En klenge an schnelle IDE fir GTK+" #: ../data/geany.glade.h:1 #, fuzzy Modified: po/lt.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -28,8 +28,8 @@ msgid "Integrated Development Environment" msgstr "Integruota kūrimo aplinka" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Greita ir supaprastinta kūrimo aplinka naudojanti GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Greita ir supaprastinta kūrimo aplinka naudojanti GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/mn.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -28,7 +28,7 @@ msgstr "" #: ../geany.desktop.in.h:3 #, fuzzy -msgid "A fast and lightweight IDE using GTK2" +msgid "A fast and lightweight IDE using GTK+" msgstr "Хурдан авсаархан IDE" #: ../data/geany.glade.h:1 Modified: po/nl.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -28,8 +28,8 @@ msgid "Integrated Development Environment" msgstr "Geintegreerde Ontwikkel Omgeving" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Een snel en lichtgewicht, op GTK2 gebaseerde, IDE" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Een snel en lichtgewicht, op GTK+ gebaseerde, IDE" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/nn.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -26,8 +26,8 @@ msgid "Integrated Development Environment" msgstr "Integrert utviklingsmiljø" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Eit raskt og lett IDE som nyttar GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Eit raskt og lett IDE som nyttar GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/pl.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -34,8 +34,8 @@ msgid "Integrated Development Environment" msgstr "Zintegrowane środowisko programistyczne" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Szybkie i lekkie środowisko programistyczne oparte na GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Szybkie i lekkie środowisko programistyczne oparte na GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/pt.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,8 +31,8 @@ msgid "Integrated Development Environment" msgstr "Ambiente integrado de desenvolvimento" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Um IDE rápido e leve, usando GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Um IDE rápido e leve, usando GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/pt_BR.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -29,8 +29,8 @@ msgid "Integrated Development Environment" msgstr "Ambiente de Desenvolvimento Integrado" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Um IDE rápido e leve usando GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Um IDE rápido e leve usando GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/ro.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,8 +27,8 @@ msgid "Integrated Development Environment" msgstr "Mediu de dezvoltare" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Un IDE rapid folosind GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Un IDE rapid folosind GTK+" #: ../data/geany.glade.h:1 #, fuzzy Modified: po/ru.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,8 +31,8 @@ msgid "Integrated Development Environment" msgstr "Интегрированная среда разработки" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Быстрая и легковесная среда разработки, использующая GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Быстрая и легковесная среда разработки, использующая GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/sk.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -26,7 +26,7 @@ msgid "Integrated Development Environment" msgstr "Integorvané Vývojové Prostredie" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" +msgid "A fast and lightweight IDE using GTK+" msgstr "Rýchle vývojové prostredie" #: ../data/geany.glade.h:1 Modified: po/sl.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -30,8 +30,8 @@ msgid "Integrated Development Environment" msgstr "Vdelano razvojno okolje" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Hitro in lahkotno vdelano razvojno okolje z uporabo GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Hitro in lahkotno vdelano razvojno okolje z uporabo GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/sr.po 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,7 @@ msgid "Integrated Development Environment" msgstr "Интегрисано развојно окружење" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" +msgid "A fast and lightweight IDE using GTK+" msgstr "Брзо и лагано GTK развојно окружење" #: ../data/geany.glade.h:1 Modified: po/sv.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -28,8 +28,8 @@ msgid "Integrated Development Environment" msgstr "Integrerad utvecklingsmiljö" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Ett snabbt och lättviktigt IDE som använder GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Ett snabbt och lättviktigt IDE som använder GTK+" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/tr.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -25,8 +25,8 @@ msgid "Integrated Development Environment" msgstr "Tümleşik Geliştirme Ortamı" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "GTK2 kullanan hızlı ve hafif bir IDE" +msgid "A fast and lightweight IDE using GTK+" +msgstr "GTK+ kullanan hızlı ve hafif bir IDE" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/uk.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,8 +27,8 @@ msgid "Integrated Development Environment" msgstr "Об'єднане середовище розробки" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Швидке та легке графічне середовище, що використовує GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Швидке та легке графічне середовище, що використовує GTK+" #: ../data/geany.glade.h:1 #, fuzzy Modified: po/vi.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -27,8 +27,8 @@ msgid "Integrated Development Environment" msgstr "Môi trường Phát triển Hợp nhất" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "Một IDE nhanh và nhẹ nhàng dùng GTK2" +msgid "A fast and lightweight IDE using GTK+" +msgstr "Một IDE nhanh và nhẹ nhàng dùng GTK+" #: ../data/geany.glade.h:1 #, fuzzy Modified: po/zh_CN.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -30,8 +30,8 @@ msgid "Integrated Development Environment" msgstr "集成开发环境" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "GTK2 编写的轻快的 IDE" +msgid "A fast and lightweight IDE using GTK+" +msgstr "GTK+ 编写的轻快的 IDE" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" Modified: po/zh_TW.po 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -28,8 +28,8 @@ msgid "Integrated Development Environment" msgstr "整合開發環境" #: ../geany.desktop.in.h:3 -msgid "A fast and lightweight IDE using GTK2" -msgstr "一個快速且輕巧的 GTK2 整合開發環境" +msgid "A fast and lightweight IDE using GTK+" +msgstr "一個快速且輕巧的 GTK+ 整合開發環境" #: ../data/geany.glade.h:1 msgid "_Toolbar Preferences" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2015