Fixed gbgofffice compilation issue.

4 files changed, 82 insertions, 3 deletions

diff --git a/app-dicts/gbgoffice/ChangeLog b/app-dicts/gbgoffice/ChangeLog
index d543e8c..d983bc3 100644
--- a/app-dicts/gbgoffice/ChangeLog
+++ b/app-dicts/gbgoffice/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for app-dicts/gbgoffice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 
-*gbgoffice-1.4 (11 Apr 2010)
+*gbgoffice-1.4-r2 (26 Oct 2010)
+  26 Oct 2010; Iskren Slavov <iskren.s@gmail.com>
+  +gbgoffice-1.4-r2.ebuild, 1.4-07_gtk_buttonbox-fix.patch:
+  Fix Gtk::HButtonBox compilation issue. Changed to Gtk::ButtonBox.
+
+*gbgoffice-1.4-r1 (11 Apr 2010)
   11 Apr 2010; Iskren Slavov <iskren.s@gmail.com>
-  +gbgoffice-1.4.ebuild, 1.4-01_re-autogen.patch, 1.4-02_gcc-4.3.patch, 
+  +gbgoffice-1.4-r1.ebuild, 1.4-01_re-autogen.patch, 1.4-02_gcc-4.3.patch, 
   1.4-03_gcc-4.3-const-chars.patch, 1.4-04_sigc-deprecated-fix.patch,
   1.4-05_convert-const.patch, 1.4-06_fsf-address-fix.patch,
   gbgoffice.desktop:
diff --git a/app-dicts/gbgoffice/Manifest b/app-dicts/gbgoffice/Manifest
index 9883f44..abf297e 100644
--- a/app-dicts/gbgoffice/Manifest
+++ b/app-dicts/gbgoffice/Manifest
@@ -4,8 +4,10 @@ AUX 1.4-03_gcc-4.3-const-chars.patch 6524 RMD160 b45a52efc6684a124b45215f3bcea30
 AUX 1.4-04_sigc-deprecated-fix.patch 1391 RMD160 c97b881691982a58b2a161f87da679d05b9743d2 SHA1 f7846ebd3ace5f7924b554a33ea5b8af9c2fcb0a SHA256 ccece955487e0f3bf005568d832f20cf7302c7f68185ef3560bdb73f5f965187
 AUX 1.4-05_convert-const.patch 479 RMD160 ba0f0a27029e6baeac2017431ea63cfe6a89fdb9 SHA1 79555c784c3e303b011bf1657309df10b400eaed SHA256 64dbe77b3f8c9a61e79a036cead0899304c92e10d34ad9224c7fba62cce4b3be
 AUX 1.4-06_fsf-address-fix.patch 1132 RMD160 519659a677983d5dd95b60585d983233f93ef778 SHA1 d75d632679b0f711a5cfc3613f6b6f4ba214ee92 SHA256 de389af7a7ff86c63c9a464d26f5653fd9550bc2af2fac098a184c20a32d8c3c
+AUX 1.4-07_gtk_buttonbox-fix.patch 401 RMD160 d9b8b822480d80ab088b4b2fa0e15ccbc56c81c5 SHA1 e8e68a8181df9022b62c669ab9fe5769b2627186 SHA256 5d49f47f0f8bc3cacae0843a4a25a9abb9fe2736658355934c9a4be68cf180c6
 AUX gbgoffice.desktop 338 RMD160 8f39baacc69b88e41f51db703f66c8450d204512 SHA1 fe301bcd66148c9af9dd9aa3243738770c4c957f SHA256 19870305999f0bcc373ddbef297854f328513c83a6ffb84aafa6c19e4e120e78
 DIST gbgoffice-1.4.tar.gz 206048 RMD160 c86c1e8f053e09b5a90a16ad856562c7578814b9 SHA1 5e75c52d0aafc04a8564a98cc29e7809c8df9479 SHA256 2c575112c0284c27e0180da0de6144841d202d42c58b78a8104ffc580f9624ef
 EBUILD gbgoffice-1.4-r1.ebuild 1648 RMD160 6de254645b8bee22740fca0fbe56e80c641a4160 SHA1 130bd7d2e81a945135850106fe2d3bcbc1c26a23 SHA256 6f32296f530a29237db552443060817c69714db65c5669a72925bd2a5bb6a601
-MISC ChangeLog 489 RMD160 f41041527574d030dd5eb8b20632204c744162e0 SHA1 d0a5a16596495abd4870bc08b023b1f335d80fd7 SHA256 fc0a5cb40a61b27f6151fb323ed7b93bb5e2146ea772ccd4d055d8447d10709b
+EBUILD gbgoffice-1.4-r2.ebuild 1705 RMD160 02b39f194dc22b8ef0a13ee5cd24e67285a14b70 SHA1 de9e0affdf6c28037feb5c94931c03dd33f8a9b2 SHA256 053bd153c692e1702e83d0af4d1ea938f00c4bc5e4b8c7695654678dd9d1ebb6
+MISC ChangeLog 706 RMD160 9b2d1c48a83c26b8da81c09b284c8bcf19af94b9 SHA1 2951d4591d7d26a92b1b34ec360d484b422f40ec SHA256 d3d19b0cd1fd1b134e1dfaeb3fde30c90067c99603c40c478fc67dbf2f648d90
 MISC metadata.xml 506 RMD160 a781102fce48373a98ab5c5e82438e2d52129b2e SHA1 f08f4045b8d357fe60ef1ee86f2d22d286ded69f SHA256 5c335ccc0e9719589fef5ada99d5836d28564a1cdd85af087c87794cc324dd17
diff --git a/app-dicts/gbgoffice/files/1.4-07_gtk_buttonbox-fix.patch b/app-dicts/gbgoffice/files/1.4-07_gtk_buttonbox-fix.patch
new file mode 100644
index 0000000..58724f8
--- /dev/null
+++ b/app-dicts/gbgoffice/files/1.4-07_gtk_buttonbox-fix.patch
@@ -0,0 +1,12 @@
+--- gbgoffice-1.4.orig/src/workhelper.cpp	2010-10-26 22:39:08.332999994 +0300
++++ gbgoffice-1.4/src/workhelper.cpp		2010-10-26 22:39:14.705999990 +0300
+@@ -39,7 +39,7 @@
+ 	//set_resize_mode(Gtk::RESIZE_PARENT);
+ 	set_reallocate_redraws(true);
+ 
+-	Gtk::HButtonBox *hba = get_action_area();
++	Gtk::ButtonBox *hba = get_action_area();
+ 
+ 	add_events(Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK);
+ 	
+
diff --git a/app-dicts/gbgoffice/gbgoffice-1.4-r2.ebuild b/app-dicts/gbgoffice/gbgoffice-1.4-r2.ebuild
new file mode 100644
index 0000000..ce8cc2e
--- /dev/null
+++ b/app-dicts/gbgoffice/gbgoffice-1.4-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils gnome2
+
+DESCRIPTION="A very nice GTK based Bulgarian <=> English dictionary"
+HOMEPAGE="http://gbgoffice.info"
+SRC_URI="http://openfmi.net/frs/download.php/341/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE="light"
+
+DEPEND=">=dev-libs/libsigc++-2.2.3
+      >=dev-cpp/gtkmm-2.16.0
+      >=dev-cpp/glibmm-2.20.1
+      >=app-dicts/bgoffice-dictfiles-1.0"
+      
+src_unpack() {
+   einfo "Source unpacking..."
+   if [ "${A}" != "" ]; then
+        unpack ${A} || die "Failed to unpack needed sources!"
+   fi
+   cd ${S}
+
+   # The app is unsupported, so lot's of patches should be applied
+   epatch "${FILESDIR}"/${PV}-01_re-autogen.patch
+   epatch "${FILESDIR}"/${PV}-02_gcc-4.3.patch
+   epatch "${FILESDIR}"/${PV}-03_gcc-4.3-const-chars.patch
+   epatch "${FILESDIR}"/${PV}-04_sigc-deprecated-fix.patch
+   epatch "${FILESDIR}"/${PV}-05_convert-const.patch
+   epatch "${FILESDIR}"/${PV}-06_fsf-address-fix.patch
+   epatch "${FILESDIR}"/${PV}-07_gtk_buttonbox-fix.patch
+}
+
+src_compile() {
+   local myconf
+   if use light; then
+      myconf="${myconf} --enable-light-version"
+   fi
+   einfo "Configuring..."
+    if [ -x ./configure ]; then
+      econf ${myconf} || die "Configuring failed!"
+   fi
+   einfo "Building..."
+   if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+      emake || die "Building failed!"
+   fi
+}
+
+src_install() {
+   # Installing dict
+   einfo "Installing gbgoffice..."
+   emake DESTDIR="${D}" install || die "Install failed!"
+   
+   # Install GNOME icon
+   insinto "/usr/share/applications"
+   doins "${FILESDIR}"/gbgoffice.desktop
+}