Update gcalctool-gtk3 to 6.6.1 * Fix error reporting not working for certain types of error * Add shadow around display * Remove reference to removed source file * Replace lex/bison parser with hand-written parser * Use g_warning not g_error when unable to parse currency file * Set window icon correctly * Port to GtkApplication * Replace menubar with a GMenu * Only show thousands separators in decimal mode * Translation updates (unimpressed by https://bugzilla.gnome.org/show_bug.cgi?id=670098)diff -r1.12 -r1.13 pkgsrc/math/gcalctool-gtk3/Makefile
(prlw1)
@@ -1,29 +1,26 @@ | @@ -1,29 +1,26 @@ | |||
1 | # $NetBSD: Makefile,v 1.12 2012/10/08 23:02:01 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.13 2012/10/26 11:36:34 prlw1 Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= gcalctool-6.4.2.1 | 4 | DISTNAME= gcalctool-6.6.1 | |
5 | PKGREVISION= 4 | |||
6 | CATEGORIES= math gnome | 5 | CATEGORIES= math gnome | |
7 | MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gcalctool/6.4/} | 6 | MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gcalctool/6.6/} | |
8 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
9 | 8 | |||
10 | MAINTAINER= prlw1@cam.ac.uk | 9 | MAINTAINER= prlw1@cam.ac.uk | |
11 | HOMEPAGE= http://live.gnome.org/Gcalctool | 10 | HOMEPAGE= http://live.gnome.org/Gcalctool | |
12 | COMMENT= Desktop calculator for GNOME | 11 | COMMENT= Desktop calculator for GNOME | |
13 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
14 | 13 | |||
15 | GNU_CONFIGURE= YES | 14 | GNU_CONFIGURE= yes | |
16 | CONFIGURE_ENV+= HAVE_YACC=yes | |||
17 | ||||
18 | USE_LIBTOOL= yes | 15 | USE_LIBTOOL= yes | |
19 | USE_TOOLS+= bison gmake gsed intltool flex msgfmt pkg-config | 16 | USE_TOOLS+= gmake gsed intltool msgfmt pkg-config | |
20 | USE_PKGLOCALEDIR= yes | 17 | USE_PKGLOCALEDIR= yes | |
21 | 18 | |||
22 | BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool | 19 | BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool | |
23 | 20 | |||
24 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | 21 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | |
25 | .include "../../devel/glib2/schemas.mk" | 22 | .include "../../devel/glib2/schemas.mk" | |
26 | .include "../../textproc/libxml2/buildlink3.mk" | 23 | .include "../../textproc/libxml2/buildlink3.mk" | |
27 | .include "../../textproc/gnome-doc-utils/buildlink3.mk" | 24 | .include "../../textproc/gnome-doc-utils/buildlink3.mk" | |
28 | .include "../../x11/gtk3/buildlink3.mk" | 25 | .include "../../x11/gtk3/buildlink3.mk" | |
29 | .include "../../mk/bsd.pkg.mk" | 26 | .include "../../mk/bsd.pkg.mk" |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2012/07/04 20:01:58 drochner Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2012/10/26 11:36:34 prlw1 Exp $ | |
2 | bin/gcalccmd | 2 | bin/gcalccmd | |
3 | bin/gcalctool | 3 | bin/gcalctool | |
4 | bin/gnome-calculator | 4 | bin/gnome-calculator | |
5 | man/man1/gcalccmd.1 | 5 | man/man1/gcalccmd.1 | |
6 | man/man1/gcalctool.1 | 6 | man/man1/gcalctool.1 | |
7 | share/applications/gcalctool.desktop | 7 | share/applications/gcalctool.desktop | |
8 | share/gcalctool/buttons-advanced.ui | 8 | share/gcalctool/buttons-advanced.ui | |
9 | share/gcalctool/buttons-basic.ui | 9 | share/gcalctool/buttons-basic.ui | |
10 | share/gcalctool/buttons-financial.ui | 10 | share/gcalctool/buttons-financial.ui | |
11 | share/gcalctool/buttons-programming.ui | 11 | share/gcalctool/buttons-programming.ui | |
12 | share/gcalctool/preferences.ui | 12 | share/gcalctool/preferences.ui | |
13 | share/glib-2.0/schemas/org.gnome.gcalctool.gschema.xml | 13 | share/glib-2.0/schemas/org.gnome.gcalctool.gschema.xml | |
14 | share/help/C/gcalctool/absolute.page | 14 | share/help/C/gcalctool/absolute.page | |
@@ -505,26 +505,54 @@ share/help/pt_BR/gcalctool/functions.pag | @@ -505,26 +505,54 @@ share/help/pt_BR/gcalctool/functions.pag | |||
505 | share/help/pt_BR/gcalctool/index.page | 505 | share/help/pt_BR/gcalctool/index.page | |
506 | share/help/pt_BR/gcalctool/keyboard.page | 506 | share/help/pt_BR/gcalctool/keyboard.page | |
507 | share/help/pt_BR/gcalctool/legal.xml | 507 | share/help/pt_BR/gcalctool/legal.xml | |
508 | share/help/pt_BR/gcalctool/logarithm.page | 508 | share/help/pt_BR/gcalctool/logarithm.page | |
509 | share/help/pt_BR/gcalctool/modulus.page | 509 | share/help/pt_BR/gcalctool/modulus.page | |
510 | share/help/pt_BR/gcalctool/mouse.page | 510 | share/help/pt_BR/gcalctool/mouse.page | |
511 | share/help/pt_BR/gcalctool/number-display.page | 511 | share/help/pt_BR/gcalctool/number-display.page | |
512 | share/help/pt_BR/gcalctool/percentage.page | 512 | share/help/pt_BR/gcalctool/percentage.page | |
513 | share/help/pt_BR/gcalctool/power.page | 513 | share/help/pt_BR/gcalctool/power.page | |
514 | share/help/pt_BR/gcalctool/scientific.page | 514 | share/help/pt_BR/gcalctool/scientific.page | |
515 | share/help/pt_BR/gcalctool/superscript.page | 515 | share/help/pt_BR/gcalctool/superscript.page | |
516 | share/help/pt_BR/gcalctool/trigonometry.page | 516 | share/help/pt_BR/gcalctool/trigonometry.page | |
517 | share/help/pt_BR/gcalctool/variables.page | 517 | share/help/pt_BR/gcalctool/variables.page | |
518 | share/help/ro/gcalctool/absolute.page | |||
519 | share/help/ro/gcalctool/base.page | |||
520 | share/help/ro/gcalctool/boolean.page | |||
521 | share/help/ro/gcalctool/complex.page | |||
522 | share/help/ro/gcalctool/conv-base.page | |||
523 | share/help/ro/gcalctool/conv-character.page | |||
524 | share/help/ro/gcalctool/conv-currency.page | |||
525 | share/help/ro/gcalctool/conv-length.page | |||
526 | share/help/ro/gcalctool/conv-time.page | |||
527 | share/help/ro/gcalctool/conv-weight.page | |||
528 | share/help/ro/gcalctool/equation.page | |||
529 | share/help/ro/gcalctool/factorial.page | |||
530 | share/help/ro/gcalctool/factorize.page | |||
531 | share/help/ro/gcalctool/financial.page | |||
532 | share/help/ro/gcalctool/functions.page | |||
533 | share/help/ro/gcalctool/index.page | |||
534 | share/help/ro/gcalctool/keyboard.page | |||
535 | share/help/ro/gcalctool/legal.xml | |||
536 | share/help/ro/gcalctool/logarithm.page | |||
537 | share/help/ro/gcalctool/modulus.page | |||
538 | share/help/ro/gcalctool/mouse.page | |||
539 | share/help/ro/gcalctool/number-display.page | |||
540 | share/help/ro/gcalctool/percentage.page | |||
541 | share/help/ro/gcalctool/power.page | |||
542 | share/help/ro/gcalctool/scientific.page | |||
543 | share/help/ro/gcalctool/superscript.page | |||
544 | share/help/ro/gcalctool/trigonometry.page | |||
545 | share/help/ro/gcalctool/variables.page | |||
518 | share/help/ru/gcalctool/absolute.page | 546 | share/help/ru/gcalctool/absolute.page | |
519 | share/help/ru/gcalctool/base.page | 547 | share/help/ru/gcalctool/base.page | |
520 | share/help/ru/gcalctool/boolean.page | 548 | share/help/ru/gcalctool/boolean.page | |
521 | share/help/ru/gcalctool/complex.page | 549 | share/help/ru/gcalctool/complex.page | |
522 | share/help/ru/gcalctool/conv-base.page | 550 | share/help/ru/gcalctool/conv-base.page | |
523 | share/help/ru/gcalctool/conv-character.page | 551 | share/help/ru/gcalctool/conv-character.page | |
524 | share/help/ru/gcalctool/conv-currency.page | 552 | share/help/ru/gcalctool/conv-currency.page | |
525 | share/help/ru/gcalctool/conv-length.page | 553 | share/help/ru/gcalctool/conv-length.page | |
526 | share/help/ru/gcalctool/conv-time.page | 554 | share/help/ru/gcalctool/conv-time.page | |
527 | share/help/ru/gcalctool/conv-weight.page | 555 | share/help/ru/gcalctool/conv-weight.page | |
528 | share/help/ru/gcalctool/equation.page | 556 | share/help/ru/gcalctool/equation.page | |
529 | share/help/ru/gcalctool/factorial.page | 557 | share/help/ru/gcalctool/factorial.page | |
530 | share/help/ru/gcalctool/factorize.page | 558 | share/help/ru/gcalctool/factorize.page |
@@ -1,5 +1,9 @@ | @@ -1,5 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.2 2012/07/04 20:01:58 drochner Exp $ | 1 | $NetBSD: distinfo,v 1.3 2012/10/26 11:36:34 prlw1 Exp $ | |
2 | 2 | |||
3 | SHA1 (gcalctool-6.4.2.1.tar.xz) = 808cdacb849a75e37c7cd0df418aa220c3cb93ed | 3 | SHA1 (gcalctool-6.6.1.tar.xz) = 2aa52bfee77068b01cf5afaa239c6de67fcbe49d | |
4 | RMD160 (gcalctool-6.4.2.1.tar.xz) = ec0d3b722ba694bca159344c69836f60bf11f6b0 | 4 | RMD160 (gcalctool-6.6.1.tar.xz) = c28adcee28095806522188a20abe1cdf4c729754 | |
5 | Size (gcalctool-6.4.2.1.tar.xz) = 1009352 bytes | 5 | Size (gcalctool-6.6.1.tar.xz) = 967848 bytes | |
6 | SHA1 (patch-data_buttons-advanced.ui) = f7ce6b1dd5dde6f8fa2a3b88bf68ce6312a2ad9e | |||
7 | SHA1 (patch-data_buttons-basic.ui) = c2631f72858f607e2038cf84e7b9626b68d8cd9a | |||
8 | SHA1 (patch-data_buttons-financial.ui) = 8939389bd39d6cc762b2836e9a5d2e91e2248d52 | |||
9 | SHA1 (patch-data_buttons-programming.ui) = 529de5e486436ffb9d8f11a24390f66bb9d85e81 |
$NetBSD: patch-data_buttons-advanced.ui,v 1.1 2012/10/26 11:36:34 prlw1 Exp $
Revert the following commit, as the window doesn't look "more seamless"
with "missing icon" icons.
commit f962134f6683a1cfcdc51fd19abd6f9fb03d5e10
Author: Rui Matos <tiagomatos@gmail.com>
Date: Tue Feb 14 16:44:13 2012 +0100
Change 'undo' and 'clear' buttons to use symbolic icons
This way they don't stand out as much and the whole window looks more
seamless.
https://bugzilla.gnome.org/show_bug.cgi?id=670098
--- data/buttons-advanced.ui.orig 2012-07-28 16:40:03.000000000 +0000
+++ data/buttons-advanced.ui
@@ -444,7 +444,7 @@
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="icon-name">edit-clear-symbolic</property>
+ <property name="stock">gtk-clear</property>
</object>
</child>
</object>
@@ -822,7 +822,7 @@
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="icon-name">edit-undo-symbolic</property>
+ <property name="stock">gtk-undo</property>
</object>
</child>
</object>
$NetBSD: patch-data_buttons-basic.ui,v 1.1 2012/10/26 11:36:34 prlw1 Exp $
Revert the following commit, as the window doesn't look "more seamless"
with "missing icon" icons.
commit f962134f6683a1cfcdc51fd19abd6f9fb03d5e10
Author: Rui Matos <tiagomatos@gmail.com>
Date: Tue Feb 14 16:44:13 2012 +0100
Change 'undo' and 'clear' buttons to use symbolic icons
This way they don't stand out as much and the whole window looks more
seamless.
https://bugzilla.gnome.org/show_bug.cgi?id=670098
--- data/buttons-basic.ui.orig 2012-02-15 22:30:59.000000000 +0000
+++ data/buttons-basic.ui
@@ -366,7 +366,7 @@
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="icon-name">edit-clear-symbolic</property>
+ <property name="stock">gtk-clear</property>
</object>
</child>
</object>
@@ -436,7 +436,7 @@
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="icon-name">edit-undo-symbolic</property>
+ <property name="stock">gtk-undo</property>
</object>
</child>
</object>
$NetBSD: patch-data_buttons-financial.ui,v 1.1 2012/10/26 11:36:34 prlw1 Exp $
Revert the following commit, as the window doesn't look "more seamless"
with "missing icon" icons.
commit f962134f6683a1cfcdc51fd19abd6f9fb03d5e10
Author: Rui Matos <tiagomatos@gmail.com>
Date: Tue Feb 14 16:44:13 2012 +0100
Change 'undo' and 'clear' buttons to use symbolic icons
This way they don't stand out as much and the whole window looks more
seamless.
https://bugzilla.gnome.org/show_bug.cgi?id=670098
--- data/buttons-financial.ui.orig 2012-07-28 16:40:03.000000000 +0000
+++ data/buttons-financial.ui
@@ -2350,7 +2350,7 @@
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">edit-clear-symbolic</property>
+ <property name="stock">gtk-clear</property>
</object>
</child>
</object>
@@ -2567,7 +2567,7 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">edit-undo-symbolic</property>
+ <property name="stock">gtk-undo</property>
</object>
</child>
</object>
$NetBSD: patch-data_buttons-programming.ui,v 1.1 2012/10/26 11:36:34 prlw1 Exp $
Revert the following commit, as the window doesn't look "more seamless"
with "missing icon" icons.
commit f962134f6683a1cfcdc51fd19abd6f9fb03d5e10
Author: Rui Matos <tiagomatos@gmail.com>
Date: Tue Feb 14 16:44:13 2012 +0100
Change 'undo' and 'clear' buttons to use symbolic icons
This way they don't stand out as much and the whole window looks more
seamless.
https://bugzilla.gnome.org/show_bug.cgi?id=670098
--- data/buttons-programming.ui.orig 2012-02-15 22:30:59.000000000 +0000
+++ data/buttons-programming.ui
@@ -2113,7 +2113,7 @@
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="icon-name">edit-clear-symbolic</property>
+ <property name="stock">gtk-clear</property>
</object>
</child>
</object>