fix for renamed members of GTKEntry from gtk+-2.17 on (see bug 323127)

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/sci-electronics/geda/ChangeLog b/sci-electronics/geda/ChangeLog
index 9c1f46c616c77dbb8304538e1b03009d7bcd6c92..185e3902851b6f9296befc871f0d4f807974aa90 100644 (file)
--- a/sci-electronics/geda/ChangeLog
+++ b/sci-electronics/geda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/geda
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.58 2010/03/28 16:12:35 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.59 2010/06/22 18:43:03 tomjbe Exp $
+
+  22 Jun 2010; Thomas Beierlein <tomjbe@gentoo.org> geda-1.4.0-r1.ebuild,
+  +files/geda-gattrib-1.4.0-gtkentry.patch:
+  fix for renamed members of GTKEntry from gtk+-2.17 on (see bug 323127)
 
   28 Mar 2010; Denis Dupeyron <calchan@gentoo.org> geda-1.6.1.ebuild:
   Fixed bug 311699, thanks to Kostya Sha.

diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest
index b6ce5c08db1e6d54d60d8e61575fd49743b48160..920b19ee4fc8bc759f112e303726c20c62314b64 100644 (file)
--- a/sci-electronics/geda/Manifest
+++ b/sci-electronics/geda/Manifest
@@ -1,3 +1,4 @@
+AUX geda-gattrib-1.4.0-gtkentry.patch 4473 RMD160 67c7949c495c16cf842880c49e5f9f50e7258ff6 SHA1 7095f2785c361ff6facedaa59baac650592b7e0b SHA256 3e950ffdfd7c4cf649bec9e9d2bee62176cb382d0e032ae6b1a2de32d691abe3
 DIST geda-docs-1.4.0.tar.gz 1833377 RMD160 087d16a3cbaff1eb1a948e59ad6b87e950aa236f SHA1 d8b77a3f39fa324637314b62bdd56a7b2742f1a2 SHA256 383887369adbaede5dbfa7d46294ee840580dbc988bb8adcc101533af2e94741
 DIST geda-docs-1.4.1.tar.gz 1838517 RMD160 cd133d8a66510bc08a3bf1fe04880aed7e137366 SHA1 3dc8be0121f2a8a64e6c3b2aa815f4fa348fc261 SHA256 6b9c73f34f498b12851ac32e1225b72228e4ea629d321b0426d505ad18309e54
 DIST geda-docs-1.4.3.tar.gz 1839084 RMD160 e6245be1d708f629623fb3c216d9ecc379cefbc1 SHA1 dda5b33b2df4486f3cdc930d771880b8f6bba3c0 SHA256 26e0d0aa9a24e75af57c27c5710521ed9005dcf4242d912ac0c497653b9a1959
@@ -24,11 +25,11 @@ DIST geda-symbols-1.4.3.tar.gz 843490 RMD160 a1ba094beb80d42c982ee89614b43289e59
 DIST geda-utils-1.4.0.tar.gz 322537 RMD160 212ac8d9975ddbe02ea774e1cb897a91d6f28f23 SHA1 725311fe02f6736f83f426c070e9fc40e42a231d SHA256 403df63e4a1254368979afa16b780efc1a5c5c34dad5d03806949ea8a0fbf48a
 DIST geda-utils-1.4.1.tar.gz 328694 RMD160 07aa4eac1e7b11d474b679de42865ee097988ead SHA1 a3fd06862a0ca1423b41fcc63ed24afaac048b6f SHA256 dfe4d3d3033e92254aa5e00fa7ab6921589747604269bc7b01e59ba9b630e82c
 DIST geda-utils-1.4.3.tar.gz 329706 RMD160 9296488bcccc23070265f25c2d674498873a4220 SHA1 3f9e8d3443ba804168d91bffb21165382c6b4219 SHA256 d4814c6c11b38a3cce88b193f7a6d18cba46c44f8226716fdde53f0ccc58de49
-EBUILD geda-1.4.0-r1.ebuild 3513 RMD160 22a51ab72e7aed911dc99995b193e00e36ec6411 SHA1 fe49a6f13cefbb7614f8783e1ed07e22e2d681fc SHA256 fcbacee1c9a993a65709c2969069c376f34f405b80768017214d465e924c3e9e
+EBUILD geda-1.4.0-r1.ebuild 3675 RMD160 86e957f556a443b120831efebffb10994f8ce3ec SHA1 1f656f6ac5c6c4b7709a74ebaec83eaf77ad7dae SHA256 91e206ed6c28083374df6a956e71a95eb28f1b3e4e31d136cb83cb93e0ffc703
 EBUILD geda-1.4.1.ebuild 3514 RMD160 83c61afe90a65a4743892dab71a6018e9d0dd96b SHA1 300ef6c038c6c4e247bd90822c0e345d13af2767 SHA256 d38080f1aea34bf6f6447e7a5a57bb7ca158cd61e761f4cdf7b28a2d8103a8bd
 EBUILD geda-1.4.3-r1.ebuild 792 RMD160 15424e4c5e5b515892653adb25fc2fdddfe60bdf SHA1 ba23322821bbf408d951f4145f2d0062460fb0a4 SHA256 cfc5a0f264f41a6fc9025092fe4aff64aca4e3bf6e25db68af59f0970740c608
 EBUILD geda-1.4.3.ebuild 3534 RMD160 cd5abb3717099184746d7229d9dd752541bf99fc SHA1 d5dc39b9ea380697713d70ac15343a7b1f381ea9 SHA256 ae914f6886071e40fefab0ea05fe2469c390e7cc8e62f2d6841167b2d526bd1b
 EBUILD geda-1.6.0-r1.ebuild 2201 RMD160 76b400230687b40707bb7a7a29e4e55a3c20985e SHA1 5d9ef66b6df0a774f05f98ae85c2ab55ec541f91 SHA256 fb51ae4e06dac45927282fd4c29a7c387a6d17e0f17e43f95f31a9fbe18c0e83
 EBUILD geda-1.6.1.ebuild 2206 RMD160 b03cf64415a00dea837da58ee493bb5147a1657d SHA1 df2652c41b88d15ee60b71d81c38036b8df27d98 SHA256 41734b651aa54e185ecbd12096821b4f9ca252f0794e0844af9bce22c82ba0f1
-MISC ChangeLog 8955 RMD160 2a065f729fadf1d0aa8cba1c0e5ec4a38cb9261d SHA1 c8806d357c700f00c4d67d142574ab4d750dce5e SHA256 55d7492df2ea1bd9bc845c4a19767621ed27c2322dddf385919312eda525e976
+MISC ChangeLog 9146 RMD160 9b90c21664568b3e45297427f22786e23c08ecd7 SHA1 657f41ba54672547c06525df92ff81fe50e92209 SHA256 cf64c294c4a9a7c0503bfa9e85166cd7e0b9d2a4c707b61174b4664c819447ab
 MISC metadata.xml 1008 RMD160 56bf21dd5495092dacdd23cfd2fc2b6c9a32aed6 SHA1 2471d8dd043020ca3954c8960138f37b2a623180 SHA256 0a95314c82e8543fda8e9e95ad1b8097d183e482d278cfca5f082fa987e2838b

diff --git a/sci-electronics/geda/files/geda-gattrib-1.4.0-gtkentry.patch b/sci-electronics/geda/files/geda-gattrib-1.4.0-gtkentry.patch
new file mode 100644 (file)
index 0000000..10d023e
--- /dev/null
+++ b/sci-electronics/geda/files/geda-gattrib-1.4.0-gtkentry.patch
@@ -0,0 +1,109 @@
+diff -ur -u geda-gattrib-1.4.3.orig/src/gtkitementry_2_2.c geda-gattrib-1.4.3/src/gtkitementry_2_2.c
+--- geda-gattrib-1.4.3.orig/src/gtkitementry_2_2.c     2010-06-08 16:53:06.000000000 +0000
++++ geda-gattrib-1.4.3/src/gtkitementry_2_2.c  2010-06-08 16:56:16.000000000 +0000
+@@ -811,23 +811,23 @@
+       new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
+     }
+ 
+-  if (new_text_length + entry->n_bytes + 1 > entry->text_size)
++  if (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
+     {
+-      while (new_text_length + entry->n_bytes + 1 > entry->text_size)
++      while (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
+       {
+-        if (entry->text_size == 0)
+-          entry->text_size = MIN_SIZE;
++        if (entry->x_text_size == 0)
++          entry->x_text_size = MIN_SIZE;
+         else
+           {
+-            if (2 * (guint)entry->text_size < MAX_SIZE &&
+-                2 * (guint)entry->text_size > entry->text_size)
+-              entry->text_size *= 2;
++            if (2 * (guint)entry->x_text_size < MAX_SIZE &&
++                2 * (guint)entry->x_text_size > entry->x_text_size)
++              entry->x_text_size *= 2;
+             else
+               {
+-                entry->text_size = MAX_SIZE;
+-                if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1)
++                entry->x_text_size = MAX_SIZE;
++                if (new_text_length > (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1)
+                   {
+-                    new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1;
++                    new_text_length = (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1;
+                     new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
+                     n_chars = g_utf8_strlen (new_text, new_text_length);
+                   }
+@@ -836,19 +836,19 @@
+           }
+       }
+ 
+-      entry->text = g_realloc (entry->text, entry->text_size);
++      entry->text = g_realloc (entry->text, entry->x_text_size);
+     }
+ 
+   index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
+ 
+-  g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index);
++  g_memmove (entry->text + index + new_text_length, entry->text + index, entry->x_n_bytes - index);
+   memcpy (entry->text + index, new_text, new_text_length);
+ 
+-  entry->n_bytes += new_text_length;
++  entry->x_n_bytes += new_text_length;
+   entry->text_length += n_chars;
+ 
+   /* NUL terminate for safety and convenience */
+-  entry->text[entry->n_bytes] = '\0';
++  entry->text[entry->x_n_bytes] = '\0';
+   
+   if (entry->current_pos > *position)
+     entry->current_pos += n_chars;
+@@ -881,9 +881,9 @@
+       gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
+       gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
+ 
+-      g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index);
++      g_memmove (entry->text + start_index, entry->text + end_index, entry->x_n_bytes + 1 - end_index);
+       entry->text_length -= (end_pos - start_pos);
+-      entry->n_bytes -= (end_index - start_index);
++      entry->x_n_bytes -= (end_index - start_index);
+       
+       if (entry->current_pos > start_pos)
+       entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos;
+@@ -1157,7 +1157,7 @@
+ {
+   gtk_im_context_set_surrounding (context,
+                                   entry->text,
+-                                  entry->n_bytes,
++                                  entry->x_n_bytes,
+                                   g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
+ 
+   return TRUE;
+@@ -1364,7 +1364,7 @@
+       
+       if (entry->visible)
+         {
+-          g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
++          g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes);
+           g_string_insert (tmp_string, cursor_index, preedit_string);
+         }
+       else
+@@ -1373,7 +1373,7 @@
+           gint preedit_len_chars;
+           gunichar invisible_char;
+           
+-          ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
++          ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes);
+           preedit_len_chars = g_utf8_strlen (preedit_string, -1);
+           ch_len += preedit_len_chars;
+ 
+@@ -1407,7 +1407,7 @@
+     {
+       if (entry->visible)
+         {
+-          pango_layout_set_text (layout, entry->text, entry->n_bytes);
++          pango_layout_set_text (layout, entry->text, entry->x_n_bytes);
+         }
+       else
+         {

diff --git a/sci-electronics/geda/geda-1.4.0-r1.ebuild b/sci-electronics/geda/geda-1.4.0-r1.ebuild
index 3fc01ed662be07f729dd2fe2a170a6c97726cd64..708b271945452905fc5149938e35a22e59dc73ec 100644 (file)
--- a/sci-electronics/geda/geda-1.4.0-r1.ebuild
+++ b/sci-electronics/geda/geda-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-1.4.0-r1.ebuild,v 1.1 2008/12/10 18:01:53 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-1.4.0-r1.ebuild,v 1.2 2010/06/22 18:43:03 tomjbe Exp $
 
 inherit eutils versionator
 
@@ -23,7 +23,7 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ppc sparc x86"
 SLOT="0"
 
-DEPEND=">=x11-libs/gtk+-2.4
+DEPEND=">=x11-libs/gtk+-2.18.6
        >=dev-scheme/guile-1.6.3
        =sci-libs/libgeda-${PV}"
 
@@ -47,6 +47,9 @@ src_unpack() {
                -e 's:>/tmp/\$\$:>${TMP}:' \
                "${S}"/geda-gnetlist-${PV}/scripts/sch2eaglepos.sh \
                || die "sed failed"
+       # fix for renamed members of GTKEntry from gtk+-2.17 on (see bug 323127)
+       cd "${S}"/geda-gattrib-${PV}
+       epatch "${FILESDIR}"/geda-gattrib-${PV}-gtkentry.patch
 }
 
 src_compile() {