From 46c919a2bca7b0d27d74fe9f4362d3273e509d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20=27Nille=27=20=C3=85kerstr=C3=B6m?= Date: Wed, 5 Jan 2011 07:05:38 -0200 Subject: development/poedit: Updated for version 1.4.6.1. Signed-off-by: Niels Horn --- development/poedit/doinst.sh | 5 +++- development/poedit/poedit-gtkspell.patch | 49 -------------------------------- development/poedit/poedit.SlackBuild | 8 ++---- development/poedit/poedit.info | 10 +++---- development/poedit/slack-desc | 3 +- 5 files changed, 12 insertions(+), 63 deletions(-) delete mode 100644 development/poedit/poedit-gtkspell.patch (limited to 'development') diff --git a/development/poedit/doinst.sh b/development/poedit/doinst.sh index 1f8ff67ded..9424ce43ff 100644 --- a/development/poedit/doinst.sh +++ b/development/poedit/doinst.sh @@ -2,9 +2,12 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 fi fi - diff --git a/development/poedit/poedit-gtkspell.patch b/development/poedit/poedit-gtkspell.patch deleted file mode 100644 index a1299755fd..0000000000 --- a/development/poedit/poedit-gtkspell.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: src/edframe.cpp -=================================================================== ---- src/edframe.cpp (revision 1450) -+++ src/edframe.cpp (working copy) -@@ -829,14 +829,26 @@ - wxASSERT_MSG( textview, _T("wxTextCtrl is supposed to use GtkTextView") ); - GtkSpell *spell = gtkspell_get_from_text_view(textview); - -- if (spell) -- gtkspell_detach(spell); -+ printf("init spellchecker for %s\n", (const char*)lang.ToAscii()); - - if (enable) - { - GError *err = NULL; -- if (!gtkspell_new_attach(textview, lang.ToAscii(), &err)) -+ bool ok; -+ -+ if (spell) - { -+ printf("gtkspell_set_language\n"); -+ ok = gtkspell_set_language(spell, lang.ToAscii(), &err); -+ } -+ else -+ { -+ printf("gtkspell_new_attach\n"); -+ ok = gtkspell_new_attach(textview, lang.ToAscii(), &err) != NULL; -+ } -+ -+ if (!ok) -+ { - #if 0 - // FIXME: report the failure in some less intrusive way than the - // code that was used here; say for which language, too -@@ -846,6 +858,14 @@ - g_error_free(err); - } - } -+ else -+ { -+ if (spell) -+ { -+ printf("gtkspell_detach\n"); -+ gtkspell_detach(spell); -+ } -+ } - } - #endif // __WXGTK__ - diff --git a/development/poedit/poedit.SlackBuild b/development/poedit/poedit.SlackBuild index f967504ac7..7b1a0c0c5d 100644 --- a/development/poedit/poedit.SlackBuild +++ b/development/poedit/poedit.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for poedit -# Copyright 2008 Niklas "Nille" Åkerström +# Copyright 2008 Niklas "Nille" Ã…kerström # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,16 +23,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=poedit -VERSION=1.4.2 +VERSION=1.4.6.1 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -67,8 +65,6 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R a-s,u+rw,go+r-w . -# Patch to fix program crash when using localized LANG bug #276 -patch -p0 < $CWD/poedit-gtkspell.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/development/poedit/poedit.info b/development/poedit/poedit.info index 6ad96b5e71..b579999ada 100644 --- a/development/poedit/poedit.info +++ b/development/poedit/poedit.info @@ -1,10 +1,10 @@ PRGNAM="poedit" -VERSION="1.4.2" +VERSION="1.4.6.1" HOMEPAGE="http://www.poedit.net" -DOWNLOAD="http://downloads.sourceforge.net/poedit/poedit-1.4.2.tar.gz" -MD5SUM="5aca5ed4c8c81e0f10efb20ac3a191ac" +DOWNLOAD="http://downloads.sourceforge.net/poedit/poedit-1.4.6.1.tar.gz" +MD5SUM="c63ffd991b1a6085ef356a6922356e0a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -MAINTAINER="Niklas 'Nille' Åkerström" +MAINTAINER="Niklas 'Nille' Ã…kerström" EMAIL="nille.kungen[AT]gmail.com" -APPROVED="dsomero" +APPROVED="Niels Horn" diff --git a/development/poedit/slack-desc b/development/poedit/slack-desc index 8bfd3a540b..8ed7296eea 100644 --- a/development/poedit/slack-desc +++ b/development/poedit/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -poedit: Poedit (cross-platform gettext catalogs editor) +poedit: Poedit (cross-platform gettext catalogs editor) poedit: poedit: Poedit is an cross-platform gettext catalogs (.po files) editor. poedit: @@ -16,4 +16,3 @@ poedit: It also has support for spellchecking (gtkspell). poedit: poedit: Homepage: http://www.poedit.net poedit: -poedit: -- cgit v1.2.3