SF.net SVN: gar:[22487] csw/mgar/pkg
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Wed Nov 13 13:18:45 CET 2013
Revision: 22487
http://gar.svn.sourceforge.net/gar/?rev=22487&view=rev
Author: pfelecan
Date: 2013-11-13 12:18:44 +0000 (Wed, 13 Nov 2013)
Log Message:
-----------
verbiste/trunk: instantiate
Added Paths:
-----------
csw/mgar/pkg/verbiste/
csw/mgar/pkg/verbiste/Makefile
csw/mgar/pkg/verbiste/branches/
csw/mgar/pkg/verbiste/tags/
csw/mgar/pkg/verbiste/trunk/
csw/mgar/pkg/verbiste/trunk/Makefile
csw/mgar/pkg/verbiste/trunk/checksums
csw/mgar/pkg/verbiste/trunk/files/
csw/mgar/pkg/verbiste/trunk/files/0001-fix-locale.patch
Added: csw/mgar/pkg/verbiste/Makefile
===================================================================
--- csw/mgar/pkg/verbiste/Makefile (rev 0)
+++ csw/mgar/pkg/verbiste/Makefile 2013-11-13 12:18:44 UTC (rev 22487)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Property changes on: csw/mgar/pkg/verbiste/trunk
___________________________________________________________________
Added: svn:ignore
+ work
Added: csw/mgar/pkg/verbiste/trunk/Makefile
===================================================================
--- csw/mgar/pkg/verbiste/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/verbiste/trunk/Makefile 2013-11-13 12:18:44 UTC (rev 22487)
@@ -0,0 +1,62 @@
+# $Id$
+
+NAME = verbiste
+VERSION = 0.1.40
+GARTYPE = v2
+
+DESCRIPTION = French conjugation system
+define BLURB
+ Syst\xE8me de conjugaison fran\xE7aise.
+endef
+
+MASTER_SITES = http://perso.b2b2c.ca/sarrazip/dev/
+DISTFILES = $(DISTNAME).tar.gz
+PATCHFILES += 0001-fix-locale.patch
+
+BUILD_DEP_PKGS += CSWlibglib2-dev
+BUILD_DEP_PKGS += CSWlibgtk2-dev
+BUILD_DEP_PKGS += CSWlibcairo-dev
+BUILD_DEP_PKGS += CSWlibpango-dev
+BUILD_DEP_PKGS += CSWlibgdk-pixbuf-dev
+BUILD_DEP_PKGS += CSWlibatk-dev
+BUILD_DEP_PKGS += CSWlibgnomeui-devel
+BUILD_DEP_PKGS += CSWlibbonobo2
+BUILD_DEP_PKGS += CSWlibbonoboui
+BUILD_DEP_PKGS += CSWlibgnomecanvas-dev
+BUILD_DEP_PKGS += CSWlibart
+BUILD_DEP_PKGS += CSWlibgnome-dev
+BUILD_DEP_PKGS += CSWgnomevfs2-dev
+
+GARCOMPILER = GNU
+GARFLAVOR = DBG
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-gtk-app
+CONFIGURE_ARGS += --with-gnome-app
+CONFIGURE_ARGS += --with-console-app
+
+EXTRA_CXXFLAGS += -I${includedir}/glib-2.0
+EXTRA_CXXFLAGS += -I${libdir}/glib-2.0/include
+EXTRA_CXXFLAGS += -I${includedir}/gtk-2.0
+EXTRA_CXXFLAGS += -I${libdir}/gtk-2.0/include
+EXTRA_CXXFLAGS += -I${includedir}/cairo
+EXTRA_CXXFLAGS += -I${includedir}/pango-1.0
+EXTRA_CXXFLAGS += -I${includedir}/gdk-pixbuf-2.0
+EXTRA_CXXFLAGS += -I${includedir}/atk-1.0
+EXTRA_CXXFLAGS += -I${includedir}/libgnomeui-2.0
+EXTRA_CXXFLAGS += -I${includedir}/libbonobo-2.0
+EXTRA_CXXFLAGS += -I${includedir}/libbonoboui-2.0
+EXTRA_CXXFLAGS += -I${includedir}/libgnomecanvas-2.0
+EXTRA_CXXFLAGS += -I${includedir}/libart-2.0
+EXTRA_CXXFLAGS += -I${includedir}/libgnome-2.0
+EXTRA_CXXFLAGS += -I${includedir}/gnome-vfs-2.0
+
+EXTRA_LDFLAGS = -lintl
+
+include gar/category.mk
+
+PATH := /opt/csw/gnu:$(PATH)
+
+pre-configure-modulated:
+ cd $(WORKSRC); autoreconf -fi
+ @$(MAKECOOKIE)
Property changes on: csw/mgar/pkg/verbiste/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: csw/mgar/pkg/verbiste/trunk/checksums
===================================================================
--- csw/mgar/pkg/verbiste/trunk/checksums (rev 0)
+++ csw/mgar/pkg/verbiste/trunk/checksums 2013-11-13 12:18:44 UTC (rev 22487)
@@ -0,0 +1 @@
+e5801736ba08818dbb6edc61b7e214db verbiste-0.1.40.tar.gz
Added: csw/mgar/pkg/verbiste/trunk/files/0001-fix-locale.patch
===================================================================
--- csw/mgar/pkg/verbiste/trunk/files/0001-fix-locale.patch (rev 0)
+++ csw/mgar/pkg/verbiste/trunk/files/0001-fix-locale.patch 2013-11-13 12:18:44 UTC (rev 22487)
@@ -0,0 +1,140 @@
+From cbaeebeafc228e0b1b2c2093a6f5478043b71b43 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 13 Nov 2013 12:47:32 +0100
+Subject: [PATCH] fix locale
+
+---
+ examples/Makefile.am | 2 +-
+ examples/conjugator.c | 18 +++++++++++++-----
+ examples/deconjugator.c | 14 +++++++++++---
+ src/commands/Makefile.am | 2 +-
+ src/commands/console-app.cpp | 1 +
+ 5 files changed, 27 insertions(+), 10 deletions(-)
+
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index 99816c8..8ef95a7 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -28,7 +28,7 @@ conjugator_LDADD = \
+ -lstdc++ \
+ ../src/verbiste/libverbiste-$(API).la
+
+-LU = LIBDATADIR=$(top_srcdir)/data LANG=en_US.UTF-8
++LU = LIBDATADIR=$(top_srcdir)/data LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
+
+ # These test lines are in Latin-1, except where noted otherwise:
+ check: all
+diff --git a/examples/conjugator.c b/examples/conjugator.c
+index e5d22b2..5039689 100644
+--- a/examples/conjugator.c
++++ b/examples/conjugator.c
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <locale.h>
+ #include <verbiste/c-api.h>
+
+
+@@ -77,6 +78,7 @@ int main( int argc, char *argv[])
+ return EXIT_FAILURE;
+ }
+
++ setlocale(LC_CTYPE, "");
+ libdatadir = getenv("LIBDATADIR");
+ if (libdatadir == NULL)
+ libdatadir = LIBDATADIR;
+@@ -84,11 +86,17 @@ int main( int argc, char *argv[])
+ snprintf(conjFN, sizeof(conjFN), "%s/conjugation-fr.xml", libdatadir);
+ snprintf(verbsFN, sizeof(verbsFN), "%s/verbs-fr.xml", libdatadir);
+
+- verbiste_init(conjFN, verbsFN, "fr");
++ if(verbiste_init(conjFN, verbsFN, "fr") == 0)
++ {
++ exit_status = demo(argv[1]);
+
+- exit_status = demo(argv[1]);
++ verbiste_close();
++ }
++ else
++ {
++ fprintf(stderr, "Internal error in libverbiste (dictionary creation).\n");
++ exit_status = EXIT_FAILURE;
++ }
+
+- verbiste_close();
+-
+- return exit_status;
++ return exit_status;
+ }
+diff --git a/examples/deconjugator.c b/examples/deconjugator.c
+index 8c8d251..ef025aa 100644
+--- a/examples/deconjugator.c
++++ b/examples/deconjugator.c
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <locale.h>
+ #include <verbiste/c-api.h>
+
+
+@@ -10,6 +11,7 @@ int main(int argc, char *argv[])
+ const char *libdatadir;
+ char conjFN[512], verbsFN[512];
+
++ setlocale(LC_CTYPE, "");
+ libdatadir = getenv("LIBDATADIR");
+ if (libdatadir == NULL)
+ libdatadir = LIBDATADIR;
+@@ -17,8 +19,8 @@ int main(int argc, char *argv[])
+ snprintf(conjFN, sizeof(conjFN), "%s/conjugation-fr.xml", libdatadir);
+ snprintf(verbsFN, sizeof(verbsFN), "%s/verbs-fr.xml", libdatadir);
+
+- verbiste_init(conjFN, verbsFN, "fr");
+-
++ if(verbiste_init(conjFN, verbsFN, "fr") == 0)
++ {
+ if (argc < 2)
+ {
+ printf("deconjugator.c: demo of the C API of Verbiste\n");
+@@ -51,6 +53,12 @@ int main(int argc, char *argv[])
+ verbiste_free_mtpn_array(vec);
+
+ verbiste_close();
++ }
++ else
++ {
++ fprintf(stderr, "Internal error in libverbiste (dictionary creation).\n");
++ return EXIT_FAILURE;
++ }
+
+- return EXIT_SUCCESS;
++ return EXIT_SUCCESS;
+ }
+diff --git a/src/commands/Makefile.am b/src/commands/Makefile.am
+index d2d7493..b4a4c21 100644
+--- a/src/commands/Makefile.am
++++ b/src/commands/Makefile.am
+@@ -65,7 +65,7 @@ endif BUILD_CONSOLE_APP
+ # where $(LU) is used.
+ #
+ ENV = LIBDATADIR=$(top_srcdir)/data
+-LU = $(ENV) LANG=en_US.UTF-8
++LU = $(ENV) LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
+
+ .PHONY: check-fr check-it
+
+diff --git a/src/commands/console-app.cpp b/src/commands/console-app.cpp
+index ccb7648..c57ec45 100644
+--- a/src/commands/console-app.cpp
++++ b/src/commands/console-app.cpp
+@@ -145,6 +145,7 @@ private:
+ int
+ main(int /*argc*/, char * /*argv*/[])
+ {
++ setlocale(LC_CTYPE, "");
+ bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+ textdomain(GETTEXT_PACKAGE);
+--
+1.8.4.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list