update to 5.32.2
This switches to the gnome-2.32 release branch.
This commit is contained in:
drochner
parent
6ffea6fc21
commit
8e532e28af
5 changed files with 117 additions and 48 deletions
|
|
@ -1,10 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.93 2010/11/15 22:57:50 abs Exp $
|
||||
# $NetBSD: Makefile,v 1.94 2011/01/11 15:10:20 drochner Exp $
|
||||
#
|
||||
|
||||
DISTNAME= gcalctool-5.30.2
|
||||
PKGREVISION= 2
|
||||
DISTNAME= gcalctool-5.32.2
|
||||
CATEGORIES= math gnome
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gcalctool/5.30/}
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gcalctool/5.32/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
|
|
@ -20,7 +19,9 @@ USE_LIBTOOL= yes
|
|||
USE_TOOLS+= bison gmake intltool flex msgfmt pkg-config
|
||||
USE_PKGLOCALEDIR= yes
|
||||
|
||||
GCONF_SCHEMAS= gcalctool.schemas
|
||||
#GCONF_SCHEMAS= gcalctool.schemas
|
||||
|
||||
BUILD_DEPENDS+= gsed-[0-9]*:../../textproc/gsed
|
||||
|
||||
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
|
||||
.include "../../devel/GConf/schemas.mk"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
@comment $NetBSD: PLIST,v 1.28 2010/06/15 21:09:31 drochner Exp $
|
||||
@comment $NetBSD: PLIST,v 1.29 2011/01/11 15:10:20 drochner Exp $
|
||||
bin/gcalccmd
|
||||
bin/gcalctool
|
||||
bin/gnome-calculator
|
||||
man/man1/gcalctool.1
|
||||
share/applications/gcalctool.desktop
|
||||
share/gcalctool/financial.ui
|
||||
share/gcalctool/gcalctool.ui
|
||||
share/gconf/schemas/gcalctool.schemas
|
||||
share/gcalctool/buttons-advanced.ui
|
||||
share/gcalctool/buttons-basic.ui
|
||||
share/gcalctool/buttons-financial.ui
|
||||
share/gcalctool/buttons-programming.ui
|
||||
share/gcalctool/preferences.ui
|
||||
share/glib-2.0/schemas/org.gnome.gcalctool.gschema.xml
|
||||
share/gnome/help/gcalctool/C/absolute.page
|
||||
share/gnome/help/gcalctool/C/base.page
|
||||
share/gnome/help/gcalctool/C/boolean.page
|
||||
|
|
@ -231,6 +234,34 @@ share/gnome/help/gcalctool/eu/scientific.page
|
|||
share/gnome/help/gcalctool/eu/superscript.page
|
||||
share/gnome/help/gcalctool/eu/trigonometry.page
|
||||
share/gnome/help/gcalctool/eu/variables.page
|
||||
share/gnome/help/gcalctool/fi/absolute.page
|
||||
share/gnome/help/gcalctool/fi/base.page
|
||||
share/gnome/help/gcalctool/fi/boolean.page
|
||||
share/gnome/help/gcalctool/fi/complex.page
|
||||
share/gnome/help/gcalctool/fi/conv-base.page
|
||||
share/gnome/help/gcalctool/fi/conv-character.page
|
||||
share/gnome/help/gcalctool/fi/conv-currency.page
|
||||
share/gnome/help/gcalctool/fi/conv-length.page
|
||||
share/gnome/help/gcalctool/fi/conv-time.page
|
||||
share/gnome/help/gcalctool/fi/conv-weight.page
|
||||
share/gnome/help/gcalctool/fi/equation.page
|
||||
share/gnome/help/gcalctool/fi/factorial.page
|
||||
share/gnome/help/gcalctool/fi/factorize.page
|
||||
share/gnome/help/gcalctool/fi/financial.page
|
||||
share/gnome/help/gcalctool/fi/functions.page
|
||||
share/gnome/help/gcalctool/fi/index.page
|
||||
share/gnome/help/gcalctool/fi/keyboard.page
|
||||
share/gnome/help/gcalctool/fi/legal.xml
|
||||
share/gnome/help/gcalctool/fi/logarithm.page
|
||||
share/gnome/help/gcalctool/fi/modulus.page
|
||||
share/gnome/help/gcalctool/fi/mouse.page
|
||||
share/gnome/help/gcalctool/fi/number-display.page
|
||||
share/gnome/help/gcalctool/fi/percentage.page
|
||||
share/gnome/help/gcalctool/fi/power.page
|
||||
share/gnome/help/gcalctool/fi/scientific.page
|
||||
share/gnome/help/gcalctool/fi/superscript.page
|
||||
share/gnome/help/gcalctool/fi/trigonometry.page
|
||||
share/gnome/help/gcalctool/fi/variables.page
|
||||
share/gnome/help/gcalctool/fr/absolute.page
|
||||
share/gnome/help/gcalctool/fr/base.page
|
||||
share/gnome/help/gcalctool/fr/boolean.page
|
||||
|
|
@ -259,6 +290,62 @@ share/gnome/help/gcalctool/fr/scientific.page
|
|||
share/gnome/help/gcalctool/fr/superscript.page
|
||||
share/gnome/help/gcalctool/fr/trigonometry.page
|
||||
share/gnome/help/gcalctool/fr/variables.page
|
||||
share/gnome/help/gcalctool/gl/absolute.page
|
||||
share/gnome/help/gcalctool/gl/base.page
|
||||
share/gnome/help/gcalctool/gl/boolean.page
|
||||
share/gnome/help/gcalctool/gl/complex.page
|
||||
share/gnome/help/gcalctool/gl/conv-base.page
|
||||
share/gnome/help/gcalctool/gl/conv-character.page
|
||||
share/gnome/help/gcalctool/gl/conv-currency.page
|
||||
share/gnome/help/gcalctool/gl/conv-length.page
|
||||
share/gnome/help/gcalctool/gl/conv-time.page
|
||||
share/gnome/help/gcalctool/gl/conv-weight.page
|
||||
share/gnome/help/gcalctool/gl/equation.page
|
||||
share/gnome/help/gcalctool/gl/factorial.page
|
||||
share/gnome/help/gcalctool/gl/factorize.page
|
||||
share/gnome/help/gcalctool/gl/financial.page
|
||||
share/gnome/help/gcalctool/gl/functions.page
|
||||
share/gnome/help/gcalctool/gl/index.page
|
||||
share/gnome/help/gcalctool/gl/keyboard.page
|
||||
share/gnome/help/gcalctool/gl/legal.xml
|
||||
share/gnome/help/gcalctool/gl/logarithm.page
|
||||
share/gnome/help/gcalctool/gl/modulus.page
|
||||
share/gnome/help/gcalctool/gl/mouse.page
|
||||
share/gnome/help/gcalctool/gl/number-display.page
|
||||
share/gnome/help/gcalctool/gl/percentage.page
|
||||
share/gnome/help/gcalctool/gl/power.page
|
||||
share/gnome/help/gcalctool/gl/scientific.page
|
||||
share/gnome/help/gcalctool/gl/superscript.page
|
||||
share/gnome/help/gcalctool/gl/trigonometry.page
|
||||
share/gnome/help/gcalctool/gl/variables.page
|
||||
share/gnome/help/gcalctool/hu/absolute.page
|
||||
share/gnome/help/gcalctool/hu/base.page
|
||||
share/gnome/help/gcalctool/hu/boolean.page
|
||||
share/gnome/help/gcalctool/hu/complex.page
|
||||
share/gnome/help/gcalctool/hu/conv-base.page
|
||||
share/gnome/help/gcalctool/hu/conv-character.page
|
||||
share/gnome/help/gcalctool/hu/conv-currency.page
|
||||
share/gnome/help/gcalctool/hu/conv-length.page
|
||||
share/gnome/help/gcalctool/hu/conv-time.page
|
||||
share/gnome/help/gcalctool/hu/conv-weight.page
|
||||
share/gnome/help/gcalctool/hu/equation.page
|
||||
share/gnome/help/gcalctool/hu/factorial.page
|
||||
share/gnome/help/gcalctool/hu/factorize.page
|
||||
share/gnome/help/gcalctool/hu/financial.page
|
||||
share/gnome/help/gcalctool/hu/functions.page
|
||||
share/gnome/help/gcalctool/hu/index.page
|
||||
share/gnome/help/gcalctool/hu/keyboard.page
|
||||
share/gnome/help/gcalctool/hu/legal.xml
|
||||
share/gnome/help/gcalctool/hu/logarithm.page
|
||||
share/gnome/help/gcalctool/hu/modulus.page
|
||||
share/gnome/help/gcalctool/hu/mouse.page
|
||||
share/gnome/help/gcalctool/hu/number-display.page
|
||||
share/gnome/help/gcalctool/hu/percentage.page
|
||||
share/gnome/help/gcalctool/hu/power.page
|
||||
share/gnome/help/gcalctool/hu/scientific.page
|
||||
share/gnome/help/gcalctool/hu/superscript.page
|
||||
share/gnome/help/gcalctool/hu/trigonometry.page
|
||||
share/gnome/help/gcalctool/hu/variables.page
|
||||
share/gnome/help/gcalctool/it/absolute.page
|
||||
share/gnome/help/gcalctool/it/base.page
|
||||
share/gnome/help/gcalctool/it/boolean.page
|
||||
|
|
@ -563,6 +650,7 @@ share/locale/en@shaw/LC_MESSAGES/gcalctool.mo
|
|||
share/locale/en_CA/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/en_GB/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/en_US/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/eo/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/es/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/et/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/eu/LC_MESSAGES/gcalctool.mo
|
||||
|
|
@ -576,10 +664,12 @@ share/locale/he/LC_MESSAGES/gcalctool.mo
|
|||
share/locale/hi/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/hr/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/hu/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/hy/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/id/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/it/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/ja/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/ka/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/kk/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/kn/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/ko/LC_MESSAGES/gcalctool.mo
|
||||
share/locale/ku/LC_MESSAGES/gcalctool.mo
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: distinfo,v 1.46 2010/07/06 15:39:35 drochner Exp $
|
||||
$NetBSD: distinfo,v 1.47 2011/01/11 15:10:20 drochner Exp $
|
||||
|
||||
SHA1 (gcalctool-5.30.2.tar.bz2) = 3d0d2f90695dc20fbd3eadddb49f9666fb9eebed
|
||||
RMD160 (gcalctool-5.30.2.tar.bz2) = af3e031d370f2fc9a88cb821ebe59e9a5913ee2d
|
||||
Size (gcalctool-5.30.2.tar.bz2) = 1126899 bytes
|
||||
SHA1 (patch-aa) = 67e23446b886b4bb442a7650e5bbe2e394c05958
|
||||
SHA1 (gcalctool-5.32.2.tar.bz2) = a894d910a45a20d4eab1cbd5d4277939145ec64c
|
||||
RMD160 (gcalctool-5.32.2.tar.bz2) = df98f5ff659f8abc877a20e146ea791b7411a8a2
|
||||
Size (gcalctool-5.32.2.tar.bz2) = 1178049 bytes
|
||||
SHA1 (patch-ab) = 1da38334710223b87b9a59e010f77c77067f87eb
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
$NetBSD: patch-aa,v 1.16 2010/06/18 01:53:47 obache Exp $
|
||||
|
||||
portability fix (no advantage to use getline(3) here)
|
||||
http://git.gnome.org/browse/gcalctool/commit/?id=436147a1f63fbf980d117f880d253fa0abbd11f8
|
||||
|
||||
--- src/gcalccmd.c.orig 2010-04-26 01:14:22.000000000 +0000
|
||||
+++ src/gcalccmd.c
|
||||
@@ -72,8 +72,7 @@ str_adjust(char *str)
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
- char *equation;
|
||||
- int bytes_read;
|
||||
+ char *equation, *line;
|
||||
size_t nbytes = MAXLINE;
|
||||
|
||||
/* Seed random number generator. */
|
||||
@@ -82,12 +81,12 @@ main(int argc, char **argv)
|
||||
equation = (char *) malloc(MAXLINE * sizeof(char));
|
||||
while (1) {
|
||||
printf("> ");
|
||||
- bytes_read = getline(&equation, &nbytes, stdin);
|
||||
-
|
||||
- if (bytes_read >= 0)
|
||||
+ line = fgets(equation, nbytes, stdin);
|
||||
+
|
||||
+ if (line != NULL)
|
||||
str_adjust(equation);
|
||||
|
||||
- if (bytes_read < 0 || strcmp(equation, "exit") == 0 || strcmp(equation, "quit") == 0 || strlen(equation) == 0)
|
||||
+ if (line == NULL || strcmp(equation, "exit") == 0 || strcmp(equation, "quit") == 0 || strlen(equation) == 0)
|
||||
break;
|
||||
|
||||
solve(equation);
|
||||
12
math/gcalctool/patches/patch-ab
Normal file
12
math/gcalctool/patches/patch-ab
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
$NetBSD: patch-ab,v 1.1 2011/01/11 15:10:20 drochner Exp $
|
||||
|
||||
--- src/gcalctool.c.orig 2010-11-16 22:44:48.000000000 +0000
|
||||
+++ src/gcalctool.c
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
+#include <locale.h>
|
||||
|
||||
#include "currency.h"
|
||||
#include "unittest.h"
|
||||
Loading…
Reference in a new issue