summaryrefslogtreecommitdiff
path: root/community/gtranslator
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-11-06 13:53:51 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-11-06 13:53:51 -0300
commita41239c941341e3c2017c6d3644e2cce0f1badf2 (patch)
treeefc401addf8099fa96ecaff2dea962b2cdbc813b /community/gtranslator
parentd333dde0a4d6295e9530ab8e988efa1d654e8716 (diff)
parent85e0e667660650d70269432a90401d4288776d9d (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/frei0r-plugins/PKGBUILD extra/cairo/PKGBUILD extra/libxml++/PKGBUILD
Diffstat (limited to 'community/gtranslator')
-rw-r--r--community/gtranslator/PKGBUILD13
-rw-r--r--community/gtranslator/disable-dockbar.patch76
-rw-r--r--community/gtranslator/gtranslator.changelog5
3 files changed, 90 insertions, 4 deletions
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index e07883740..890dba215 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74570 2012-07-30 18:54:46Z jlichtblau $
+# $Id: PKGBUILD 79447 2012-11-05 19:27:31Z bgyorgy $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
# Contributor: Christer Solskogen (solskogen@carebears.mine.nu)
pkgname=gtranslator
pkgver=2.91.5
-pkgrel=1
+pkgrel=2
pkgdesc="An enhanced gettext po file editor for the GNOME"
arch=('i686' 'x86_64' 'mips64el')
url="http://projects.gnome.org/gtranslator/"
@@ -17,12 +17,17 @@ optdepends=('gucharmap: for charmap plugin'
options=('!libtool')
install=$pkgname.install
changelog=$pkgname.changelog
-source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz)
-sha256sums=('7dcdabd5c2156bef98f35d2ec31798287d1721e400ea738fb3ccc2ff2ef186e6')
+source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz
+ disable-dockbar.patch)
+sha256sums=('7dcdabd5c2156bef98f35d2ec31798287d1721e400ea738fb3ccc2ff2ef186e6'
+ '04647eb198291024e5a65564ad6be239b7af4472421a44c2d57ed5d6a8bb4384')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ # Tempolary disable dockbar, because layout loading is completely broken with gdl 3.6
+ patch -Np1 -i ${srcdir}/disable-dockbar.patch
+
./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
make
}
diff --git a/community/gtranslator/disable-dockbar.patch b/community/gtranslator/disable-dockbar.patch
new file mode 100644
index 000000000..aa8de6c60
--- /dev/null
+++ b/community/gtranslator/disable-dockbar.patch
@@ -0,0 +1,76 @@
+diff -Naur gtranslator-2.91.5.orig/src/gtr-tab.c gtranslator-2.91.5/src/gtr-tab.c
+--- gtranslator-2.91.5.orig/src/gtr-tab.c 2012-06-07 13:48:56.000000000 +0200
++++ gtranslator-2.91.5/src/gtr-tab.c 2012-11-05 19:18:01.899014670 +0100
+@@ -149,9 +149,6 @@
+ g_return_if_fail (GTR_IS_TAB (tab));
+ g_return_if_fail (filename != NULL);
+
+- gdl_dock_layout_save_layout (tab->priv->layout_manager, name);
+- if (!gdl_dock_layout_save_to_file (tab->priv->layout_manager, filename))
+- g_warning ("Saving dock layout to '%s' failed!", filename);
+ }
+
+ static void
+@@ -160,23 +157,6 @@
+ const gchar *name)
+ {
+ g_return_if_fail (GTR_IS_TAB (tab));
+-
+- if (!layout_filename ||
+- !gdl_dock_layout_load_from_file (tab->priv->layout_manager,
+- layout_filename))
+- {
+- gchar *path;
+-
+- path = gtr_dirs_get_ui_file ("layout.xml");
+-
+- if (!gdl_dock_layout_load_from_file (tab->priv->layout_manager,
+- path))
+- g_warning ("Loading layout from '%s' failed!!", path);
+- g_free (path);
+- }
+-
+- if (!gdl_dock_layout_load_layout (tab->priv->layout_manager, name))
+- g_warning ("Loading layout failed!!");
+ }
+
+ static void
+@@ -702,7 +682,6 @@
+ GtkWidget *vertical_box;
+ GtkWidget *msgid_label;
+ GtkWidget *scroll;
+- GtkWidget *dockbar;
+ GtrTabPrivate *priv;
+
+ tab->priv = GTR_TAB_GET_PRIVATE (tab);
+@@ -727,22 +706,6 @@
+ gtk_widget_show (priv->dock);
+ gtk_box_pack_end (GTK_BOX (hbox), priv->dock, TRUE, TRUE, 0);
+
+- dockbar = gdl_dock_bar_new (GDL_DOCK (priv->dock));
+- gtk_widget_show (dockbar);
+- gtk_box_pack_start (GTK_BOX (hbox), dockbar, FALSE, FALSE, 0);
+-
+- priv->layout_manager = gdl_dock_layout_new (GDL_DOCK (priv->dock));
+- g_signal_connect (priv->layout_manager->master,
+- "layout-changed",
+- G_CALLBACK (on_layout_changed),
+- tab);
+-
+- g_settings_bind (priv->ui_settings,
+- GTR_SETTINGS_PANEL_SWITCHER_STYLE,
+- priv->layout_manager->master,
+- "switcher-style",
+- G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+-
+ /* Message table */
+ priv->message_table = gtr_message_table_new (GTK_WIDGET (tab));
+ gtk_widget_show (priv->message_table);
+@@ -904,7 +867,6 @@
+ g_clear_object (&priv->files_settings);
+ g_clear_object (&priv->editor_settings);
+ g_clear_object (&priv->state_settings);
+- g_clear_object (&priv->layout_manager);
+
+ G_OBJECT_CLASS (gtr_tab_parent_class)->dispose (object);
+ }
diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog
index 49dbfa714..7187196b4 100644
--- a/community/gtranslator/gtranslator.changelog
+++ b/community/gtranslator/gtranslator.changelog
@@ -1,3 +1,8 @@
+2012-11-05 Balló György <ballogyor+arch at gmail dot com>
+ * gtranslator 2.91.5-2
+ rebuild for gdl 3.6
+ tempolary disable dockbar, because layout loading is completely broken with gdl 3.6
+
2012-07-30 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
* gtranslator 2.91.5-1