[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-calculator/files/data-3.20.2/, gnome-extra/gnome-calculator/

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-calculator/files/data-3.20.2/, gnome-extra/gnome-calculator/

[Gilles Dartiguelongue]

commit:     7bf5daad111cbe450f67b73d39e843198d0fd572
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 21:19:15 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 21:30:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf5daad

gnome-extra/gnome-calculator: add missing data files, bug #593438

Package-Manager: portage-2.3.0

 .../files/data-3.20.2/history-entry.ui             | 50 ++++++++++++++++++++++
 .../files/data-3.20.2/history-view.ui              | 30 +++++++++++++
 .../gnome-calculator-3.20.2.ebuild                 |  8 ++++
 3 files changed, 88 insertions(+)

diff --git a/gnome-extra/gnome-calculator/files/data-3.20.2/history-entry.ui b/gnome-extra/gnome-calculator/files/data-3.20.2/history-entry.ui
new file mode 100644
index 00000000..e7bccb8
--- /dev/null
+++ b/gnome-extra/gnome-calculator/files/data-3.20.2/history-entry.ui
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.19.0 -->
+<interface>
+  <requires lib="gtk+" version="3.16"/>
+  <template class="HistoryEntry" parent="GtkListBoxRow">
+    <child>
+      <object class="GtkGrid" id="grid">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="column_homogeneous">True</property>
+        <child>
+          <object class="GtkLabel" id="equation_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
+            <property name="xalign">0.0</property>
+            <property name="yalign">0.0</property>
+            <property name="ellipsize">end</property>
+            <property name="max_width_chars">1</property>
+            <signal name="button-press-event" handler="equation_clicked_cb" swapped="no"/>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+            <property name="width">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="answer_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
+            <property name="xalign">0.0</property>
+            <property name="yalign">0.0</property>
+            <property name="ellipsize">end</property>
+            <property name="max_width_chars">1</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+            <signal name="button-press-event" handler="answer_clicked_cb" swapped="no"/>
+          </object>
+          <packing>
+            <property name="left_attach">3</property>
+            <property name="top_attach">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>

diff --git a/gnome-extra/gnome-calculator/files/data-3.20.2/history-view.ui b/gnome-extra/gnome-calculator/files/data-3.20.2/history-view.ui
new file mode 100644
index 00000000..ce0dcd5
--- /dev/null
+++ b/gnome-extra/gnome-calculator/files/data-3.20.2/history-view.ui
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.19.0 -->
+<interface>
+  <requires lib="gtk+" version="3.16"/>
+  <template class="HistoryView" parent="GtkScrolledWindow">
+    <property name="width_request">100</property>
+    <property name="height_request">100</property>
+    <property name="visible">True</property>
+    <property name="can_focus">True</property>
+    <property name="vexpand">True</property>
+    <property name="hscrollbar_policy">never</property>
+    <property name="shadow_type">etched-out</property>
+    <signal name="size-allocate" handler="scroll_bottom" swapped="no"/>
+    <child>
+      <object class="GtkViewport" id="viewport">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkListBox" id="listbox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="vexpand">True</property>
+            <property name="border_width">5</property>
+            <property name="selection_mode">none</property>
+          </object>
+        </child>
+      </object>
+    </child>
+  </template>
+</interface>

diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.20.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.20.2.ebuild
index 230f371..01f51dd 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.20.2.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.20.2.ebuild
@@ -32,6 +32,14 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	# Add forgotten source files, bug #593438
+	# upstream commit 8ed992e and 829add8
+	cp "${FILESDIR}"/data-${PV}/* "${S}"/data/ || die
+
+	gnome2_src_prepare
+}
+
 src_configure() {
 	gnome2_src_configure \
 		--disable-static \